perfsonar development work

Author: michalis
Date: 2008-07-07 06:48:16 -0400 (Mon, 07 Jul 2008)
New Revision: 4123

Added:
   branches/WebAdmin/graphics/testdepl_fail.gif
   branches/WebAdmin/graphics/testdepl_main.gif
   branches/WebAdmin/graphics/testdepl_return.gif
   branches/WebAdmin/graphics/testdepl_startbn.gif
   branches/WebAdmin/graphics/testdepl_succ.gif
Modified:
   branches/WebAdmin/Service_Admin.js
   branches/WebAdmin/default.css
   branches/WebAdmin/graphics/Thumbs.db
   branches/WebAdmin/index.html
   branches/WebAdmin/main.css
   branches/WebAdmin/testdepl.jsp
Log:


Modified: branches/WebAdmin/Service_Admin.js
===================================================================
--- branches/WebAdmin/Service_Admin.js  2008-07-04 15:06:40 UTC (rev 4122)
+++ branches/WebAdmin/Service_Admin.js  2008-07-07 10:48:16 UTC (rev 4123)
@@ -31,7 +31,7 @@
                 reset_button.style.left = 83 + '%';
             }
             else {
-                //alert("Not 768 "+x);
+                               //alert("Not 768 "+x);
                 reset_button.style.top = 95 + '%';
                 reset_button.style.left = 67 + '%';
             }
@@ -42,7 +42,7 @@
                 button.style.left = 91.5 + '%';
             }
             else {
-                button.style.top = 95 + '%';
+              button.style.top = 95 + '%';
                 button.style.left = 74 + '%';
             }
         }
@@ -55,45 +55,68 @@
 onresize = FloatPosition;
 
 function checkStarFields(){
+       
+       var divs = document.getElementsByTagName("div");
+       var filled=true;
+       
+       for (var i = 0; i < divs.length; i++) {
+       
+       var div=divs[i];
+       if(div.style.display=="block"){
+               var input_array=div.getElementsByTagName("input");
+               var text=document.createElement("td");
+               var ex=document.getElementById("extra");
+               if(ex!=null){
+                       var p= ex.parentNode;
+                       p.removeChild(ex);
+               }
+               text.id="extra";
+               text.innerHTML='<p style=\"color:red;\">Please fill in the 
field!</p>';
+               
+               for (var j = 0; j < input_array.length; j++) {
+                       
+                       var input = input_array[j];
+                       if(input.id=="required"){
+                               var parent=input.parentNode.parentNode;
+                         if(input.value==null || input.value=="" || 
input.value==" "){
+                               filled=false; 
+                               parent.appendChild(text);
+                               return filled;
+                         }
+                         
+                       }
+                       
+               }
+       }
+       
+       }
+       
+       return filled;
+       
+}
 
-    var divs = document.getElementsByTagName("div");
-    var filled = true;
-    
-    for (var i = 0; i < divs.length; i++) {
-    
-        var div = divs[i];
-        if (div.style.display == "block") {
-            var input_array = div.getElementsByTagName("input");
-            var text = document.createElement("td");
-            var ex = document.getElementById("extra");
-            if (ex != null) {
-                var p = ex.parentNode;
-                p.removeChild(ex);
-            }
-            text.id = "extra";
-            text.innerHTML = '<p style=\"color:red;\">Please fill in the 
field!</p>';
-            
-            for (var j = 0; j < input_array.length; j++) {
-            
-                var input = input_array[j];
-                if (input.id == "required") {
-                    var parent = input.parentNode.parentNode;
-                    if (input.value == null || input.value == "" || 
input.value == " ") {
-                        filled = false;
-                        parent.appendChild(text);
-                        return filled;
-                    }
-                    
-                }
-                
-            }
-        }
-        
-    }
-    
-    return filled;
-    
+function getDate(){
+       
+var date = document.getElementById("date");
+
+var stampdays = new Array( 
"Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"); 
+
+var stampmonths = new Array( 
"January","February","March","April","May","June","July","August","September","October","November","December");
+
+var thedate = new Date(); 
+
+date.innerHTML=stampdays[ thedate.getDay()] + ", " + stampmonths[ 
thedate.getMonth()] + " " + thedate.getDate() + ", " +   
thedate.getFullYear();
+
 }
 
+function highlight(el){
+       //alert("Highlighted");
+       var links=document.getElementsByTagName("a");
+       for (var i = 0; i < links.length; i++) {
+           
+               var link = links[i];
+               
+               link.className
+       }
+}
 
-

Modified: branches/WebAdmin/default.css
===================================================================
--- branches/WebAdmin/default.css       2008-07-04 15:06:40 UTC (rev 4122)
+++ branches/WebAdmin/default.css       2008-07-07 10:48:16 UTC (rev 4123)
@@ -637,5 +637,15 @@
     font-size: 13px;
 }
 
+.test_table {
+    background-color: #99ff99;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 13px;
+}
 
+.test_table td {
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 13px;
+}
 
+

Modified: branches/WebAdmin/graphics/Thumbs.db
===================================================================
(Binary files differ)

Added: branches/WebAdmin/graphics/testdepl_fail.gif


Property changes on: branches/WebAdmin/graphics/testdepl_fail.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/WebAdmin/graphics/testdepl_main.gif


Property changes on: branches/WebAdmin/graphics/testdepl_main.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/WebAdmin/graphics/testdepl_return.gif


Property changes on: branches/WebAdmin/graphics/testdepl_return.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/WebAdmin/graphics/testdepl_startbn.gif


Property changes on: branches/WebAdmin/graphics/testdepl_startbn.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/WebAdmin/graphics/testdepl_succ.gif


Property changes on: branches/WebAdmin/graphics/testdepl_succ.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: branches/WebAdmin/index.html
===================================================================
--- branches/WebAdmin/index.html        2008-07-04 15:06:40 UTC (rev 4122)
+++ branches/WebAdmin/index.html        2008-07-07 10:48:16 UTC (rev 4123)
@@ -3,6 +3,8 @@
         <title>perfSONAR Service Web Administration page</title>
         <link rel="stylesheet" type="text/css" href="main.css"/>
         <meta http-equiv="Content-Type" content="text/html; 
charset=iso-8859-1">
+                <script src="Service_Admin.js"></script>
+
         <style type="text/css">
          <!--
         
@@ -46,7 +48,8 @@
         -->
         </style>
     </head>
-    <body>
+    <body onload="getDate()">
+      
         <div class="adminPanel">
             <div class="banner">
                 <table border="0" align="left" cellpadding="0" 
cellspacing="0">
@@ -54,6 +57,8 @@
                         <td>
                             <a href="welcome.htm" target="main"><img 
src="perfsonar_logo.gif" alt="perfSONAR" width="192" height="94" border="0" 
align="right"></a>
                         </td>
+                                               <td id="service" >Service 
Name</td>
+                                               <td id="date"></td>
                     </tr>
                 </table>
             </div>
@@ -74,9 +79,9 @@
                                     </span>
                                 </p>
                                 <p>
-                                    <span class="navtex"><a href="Wizard" 
target="main">Service</a></span>
+                                    <span class="navtex"><a 
onclick="highlight()" href="Wizard" target="main">Service</a></span>
                                  <br>
-                                        <a href="testdepl.jsp" 
target="main">Test</a>
+                                        <a onclick="highlight()" 
href="testdepl.jsp" target="main">Test</a>
                                 </p>
                             </td>
                         </tr>
@@ -90,12 +95,15 @@
                                     </span>
                                 </p>
                                 <p>
-                                    <span class="navtex style3"><a 
href="ServiceAdmin?serviceProperties" target="main">Service</a>
+                                    <span class="navtex style3"><a 
onclick="highlight()" href="ServiceAdmin?serviceProperties" 
target="main">Service</a>
                                         <br>
-                                        <a 
href="ServiceAdmin?loggingProperties" target="main">Logging</a>
+                                        <a onclick="highlight()" 
href="ServiceAdmin?loggingProperties" target="main">Logging</a>
                                         <br>
-                                        <a href="eXistAdmin" 
target="main">eXist Database</a>
+                                        <a onclick="highlight()" 
href="eXistAdmin" target="main">eXist Database</a>
                                         <br>
+                                        <a onclick="highlight()" 
href="MetadataAdmin" target="main">Config File Management</a>
+                                        <br>
+
                                     </span>
                                 </p>
                             </td>

Modified: branches/WebAdmin/main.css
===================================================================
--- branches/WebAdmin/main.css  2008-07-04 15:06:40 UTC (rev 4122)
+++ branches/WebAdmin/main.css  2008-07-07 10:48:16 UTC (rev 4123)
@@ -354,4 +354,107 @@
        border-left-color: #FFFFFF;
        }
        
+.execute_button_testdepl {
+    display: block;
+    margin-top: 5px;
+    width: 120px;
+    height: 30px;
+    float: right;
+    border: none;
+    font-family: Helvetica, Calibri, Arial, sans-serif;
+    font-size: 60%;
+    font-weight: 400;
+    text-decoration: none;
+    cursor: pointer;
+    background: transparent url(graphics/button_2_medium.gif) no-repeat 
center;
+}
 
+.testdeplmain {
+       text-align: left;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 12px;
+       margin-left: -20%;
+       border-width: 1px;
+       border-color: #61AF61;
+       padding: 5px;
+       width: 556px;
+       height:108px;
+    background: transparent url(graphics/testdepl_main.gif) no-repeat center;
+}
+
+.testdeplsucc {
+       text-align: left;
+       float: left;
+       margin-left: -5%;
+       padding: 5px;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 12px;
+       border:solid;
+       border-width: 1px;
+       border-color: #61AF61;
+       width: 544px;
+       height: 220px;
+    background: transparent url(graphics/testdepl_succ.gif) no-repeat center;
+}
+
+.testdeplfail {
+       text-align: left;
+       float: left;
+       padding: 5px;
+       margin-left: 5%;
+    height: 105px;
+    width:555px;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 12px;
+       border:solid;
+       border-width: 1px;
+       border-color: #61AF61;
+       background: transparent url(graphics/testdepl_fail.gif) no-repeat 
center;
+}
+
+.testdeplstartbn {
+    display: block;
+    margin-top: 5px;
+    width: 120px;
+    height: 30px;
+    float: right;
+    border: none;
+    font-family: Helvetica, Calibri, Arial, sans-serif;
+    font-size: 60%;
+    font-weight: 400;
+    text-decoration: none;
+    cursor: pointer;
+    background: transparent url(graphics/testdepl_startbn.gif) no-repeat 
center;
+}
+
+.testdeplretbn {
+    display: block;
+    margin-top: 5px;
+    width: 150px;
+    height: 30px;
+    float: none;;
+    border: none;
+    font-family: Helvetica, Calibri, Arial, sans-serif;
+    font-size: 60%;
+    font-weight: 400;
+    text-decoration: none;
+    cursor: pointer;
+    background: transparent url(graphics/testdepl_return.gif) no-repeat 
center;
+}
+
+.testdeplretbn2 {
+    display: block;
+    margin-top: 5px;
+    width: 150px;
+    height: 30px;
+    float: right;
+    border: none;
+    font-family: Helvetica, Calibri, Arial, sans-serif;
+    font-size: 60%;
+    font-weight: 400;
+    text-decoration: none;
+    cursor: pointer;
+    background: transparent url(graphics/testdepl_return.gif) no-repeat 
center;
+}
+       
+

Modified: branches/WebAdmin/testdepl.jsp
===================================================================
--- branches/WebAdmin/testdepl.jsp      2008-07-04 15:06:40 UTC (rev 4122)
+++ branches/WebAdmin/testdepl.jsp      2008-07-07 10:48:16 UTC (rev 4123)
@@ -4,117 +4,108 @@
 <%@ page session="false" %>
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
     <head>
+
         <meta http-equiv="Content-Type" content="text/html; 
charset=iso-8859-1"/>
         <title>Untitled Document</title>
                <link rel="stylesheet" type="text/css" href="main.css"/>
+                <link rel="stylesheet" type="text/css" href="default.css"/>
     </head>
     <body style="background-color: #FFFFFF" >
+
         <div class="centerWindow" >
-               <p class="welcometext">Welcome to the perfSONAR service 
deployment testing interface</p>
+               <p class="welcometext">Welcome to the perfSONAR service web 
administration interface</p>
             <p class="heading1">
-               Deployment Test 
+               Deployment test 
             </p>
-            <table width="0" border="0" cellpadding="0" cellspacing="0">
-                <tr>
-                    <td>
-                        <table width="0"   border="0" cellpadding="0" 
cellspacing="0" style="width:100%; background-color:#99CC99"  
class="contenttable">
-                            <tr>
-                                <td>
-                                </td>
-                            </tr>
-                           <tr>
-                                <td >
-                                    <p>
-                                        &nbsp;
-                                    </p>
-                                    <p>
-                                        &nbsp;
-                                    </p>
-                                    <p>
-                                        &nbsp;
-                                    </p>
-                                </td>
-                            </tr>
-                                                       <tr><td> </td></tr>
 
-                            <tr>
-                                <td class="configheading" > 
-                                    <p>
-                                        <a href="?testit=true" 
target="_self">Test deployment</a>
-                            <%
-                               ServletContext sc = getServletContext();
+          <center>
+           <table >
+           <tr>
+           <td>
+
+           <%
+               ServletContext sc = getServletContext();
                                // Getting the service path
-                                 String rootPath = sc.getRealPath("/");
-                                  String parm,endpoint = 
"http://127.0.0.1:8080/"; + 
perfSONARWebAdmin.admin.service.soapclient.SoapClient.
+               String parm,
+                       rootPath = sc.getRealPath("/");;
+              if( (parm=request.getParameter("testit")) != null  &&  
parm.equals("true")  )
+               {
+
+
+                String 
+                        endpoint = "http://127.0.0.1:8080/"; + 
perfSONARWebAdmin.admin.service.soapclient.SoapClient.
                                                                              
      guessWebServiceUrl(rootPath) , /* this path */
-                                                        filein = rootPath + 
"/WEB-INF/samples/requests/EchoRequest.xml",
-                                                       fileout= rootPath + 
"/WEB-INF/samples/responses/EchoResponse.xml";
+                       filein = rootPath + 
"/WEB-INF/samples/requests/EchoRequest.xml",
+                       fileout= rootPath + 
"/WEB-INF/samples/responses/EchoResponse.xml";
+                 int ret = 0;
 
-                                 if( (parm=request.getParameter("testit")) 
!= null && parm.equals("true")  ){
-                                       if( 
endpoint.equals("http://127.0.0.1:8080/";) == false ){ 
+                       if( endpoint.equals("http://127.0.0.1:8080/";) == 
false )
+                       { 
                                //      out.println("<br/><br/>Root path:" + 
(new java.io.File(rootPath)).getCanonicalPath() );
-                                       out.println("<br/><br/>Contacted 
endpoint:");
-                                       out.println("<br/><br/>" + endpoint);
-                                        boolean result =  
perfSONARWebAdmin.admin.service.soapclient.SoapClient.
-                                         
testDeployment(endpoint,perfSONARWebAdmin.admin.service.soapclient.SoapClient.Level.DEBUG,null,filein,fileout);
 
-                                        if( result ) 
out.println("<br/><br/>Deployment test successful");
-                                        else 
out.println("<br/><br/>Deployment test failed.");
-                                       }
-                                       else out.println("<br/> Internal 
failure. Please contact the web admin. "+filein+ " "+fileout);
-                                  }
-                              %>
-                                    </p>
-                                    <p>
-                                        &nbsp;
-                                    </p>
-                                    <p>
-                                        &nbsp;
-                                    </p>
-                                </td> 
-                            </tr>
-                                                       <tr>
-                                <td >
-                                    <p>
-                                        &nbsp;
-                                    </p>
-                                    <p>
-                                        &nbsp;
-                                    </p>
-                                    <p>
-                                        &nbsp;
-                                    </p>
-                                </td>
-                            </tr>
-                                                       <tr>
-                                <td >
-                                    <p>
-                                        &nbsp;
-                                    </p>
-                                    <p>
-                                        &nbsp;
-                                    </p>
-                                    <p>
-                                        &nbsp;
-                                    </p>
-                                </td>
-                            </tr>
-                                                       <tr><td> </td></tr>
-                           <tr>
-                                <td>
-                                 <a href="." target="main">Return to main 
page</a>
-                                </td>
+                               //out.println("<br/><br/>Contacted 
endpoint:");
+                               //out.println("<br/><br/>" + endpoint);
+                                ret =  
perfSONARWebAdmin.admin.service.soapclient.SoapClient.
+                                         
testDeployment(endpoint,perfSONARWebAdmin.admin.service.soapclient.SoapClient.Level.DEBUG,null,filein,fileout)?
+                                         0:1;
+                                        //if( result ) 
out.println("<br/><br/>Deployment test successful");
+                                        //else 
out.println("<br/><br/>Deployment test failed.");
+                        }
+                        else ret = -1;
+                       // out.println("<br/> Internal failure. Please 
contact the web admin.");
+                   String result = "";
+                   String parms1 = "", cssName2 = "";
 
-                           </tr>
+                   switch(ret)
+                   {
+                       case 0: 
+                               result = "<br/>Contacted endpoint :<br/>" + 
endpoint + "<br/> Deployment test successful.";
+                               parms1 = " class=\"testdeplsucc\""; 
+                               cssName2 = "\"testdeplretbn\""; 
+                               break;
+                       default:
+                               result = ""; 
+                               parms1 = " style=\"width:550px;height:300px\" 
class=\"testdeplfail\""; 
+                               cssName2 = "\"testdeplretbn2\""; 
+                               break;
 
-                            <tr>
-                                <td>
-                                 <!--   <img 
src="graphics/step_1_bottom.gif" width="350" height="18"> -->
-                                </td>
-                            </tr>
-                        </table>
-                    </td>
-                </tr>
-            </table>
+                   }
+            %>
+
+              <table  <%=parms1 %>  >
+                   <tr>      <td ></td>  </tr>
+                   <tr>      <td >      &nbsp;   
+                       <%= result %>
+                                </td> </tr>
+                 </table>
+
+       
+           <% } else {  %>
+
+              <table  class="testdeplmain">
+                   <tr>      <td>                                </td>       
                     </tr>
+                   <tr>      <td >     
+                       Click on the  start test  button to check if you have 
deployed the <%=new java.io.File(rootPath).getName()%> web service correctly. 
      
+                                </td> </tr>
+
+                       <tr>
+                         <td>
+                              <center> <br/> 
+                                 <a href="?testit=true" target="_self"
+                                       class="testdeplstartbn"></a>
+                               </center>
+                           </td>
+       
+                       </tr>
+                 </table>
+
+           <% } %> 
+
+            </td>
+            </tr>
+           </table>
+          </center>
+
         </div>
     </body>
 </html>
+