perfsonar development work

Author: michalis
Date: 2008-06-06 06:51:26 -0400 (Fri, 06 Jun 2008)
New Revision: 3963

Added:
   branches/WebAdmin/perfSONARWebAdmin/admin/service/soapclient/test.java
   branches/WebAdmin/perfSONARWebAdmin/admin/service/test.java
   branches/WebAdmin/perfSONARWebAdmin/admin/stitching/
   branches/WebAdmin/perfSONARWebAdmin/admin/stitching/StitchingServlet.java
   branches/WebAdmin/perfSONARWebAdmin/auxiliary/service/
   branches/WebAdmin/perfSONARWebAdmin/auxiliary/service/HTMLOutput.java
   branches/WebAdmin/perfSONARWebAdmin/auxiliary/stitching/
   branches/WebAdmin/perfSONARWebAdmin/auxiliary/stitching/ElementParser.java
   
branches/WebAdmin/perfSONARWebAdmin/auxiliary/stitching/MetadataManager.java
   
branches/WebAdmin/perfSONARWebAdmin/auxiliary/stitching/MetadataManagerImpl.java
   branches/WebAdmin/perfSONARWebAdmin/auxiliary/stitching/test.java
Modified:
   branches/WebAdmin/perfSONARWebAdmin/admin/service/Admin.java
   
branches/WebAdmin/perfSONARWebAdmin/admin/service/soapclient/SoapClient.java
Log:
Updateing web admin code and adding stitching servlet back end classes

Modified: branches/WebAdmin/perfSONARWebAdmin/admin/service/Admin.java
===================================================================
--- branches/WebAdmin/perfSONARWebAdmin/admin/service/Admin.java        
2008-06-06 10:26:42 UTC (rev 3962)
+++ branches/WebAdmin/perfSONARWebAdmin/admin/service/Admin.java        
2008-06-06 10:51:26 UTC (rev 3963)
@@ -29,6 +29,7 @@
 import perfSONARWebAdmin.auxiliary.ServicePropertiesImpl;
 import perfSONARWebAdmin.auxiliary.ServletProperties;
 import perfSONARWebAdmin.auxiliary.ServletPropertiesImpl;
+import perfSONARWebAdmin.auxiliary.service.HTMLOutput;
 import perfSONARWebAdmin.auxiliary.wizard.WizardProperties;
 import perfSONARWebAdmin.auxiliary.wizard.WizardProperty;
 import sun.misc.BASE64Decoder;
@@ -57,6 +58,9 @@
        // Path to service installation directory
        private static String servicePath = null;
 
+       // A class responsible for generation the html code
+       private static HTMLOutput output = null;
+       
        private static String extraFunctionalities = "off";
 
        // 
-----------------------------------------------------------------------
@@ -133,6 +137,9 @@
                String filePath = "";
                response.setContentType("text/html");
 
+               output = new HTMLOutput();
+               output.setOuputStream(out);
+               
                if (session.getAttribute("propertyType") != null) {
 
                        if (session.getAttribute("propertyType")
@@ -205,23 +212,20 @@
                                                        // clearing up 
session and ivalidating it
                                                        
session.setAttribute("authenticated", false);
                                                        
session.removeAttribute("properties");
-                                                       restart_page(out, 
Type);
+                                                       output.restart_page( 
Type);
                                                } else {
-                                                       error_page(
-                                                                       out,
+                                                       output.error_page(
                                                                        
"Error modifying properties file. PLease try again",
                                                                        Type);
                                                }
                                        } else {
-                                               error_page(
-                                                               out,
+                                               output.error_page(
                                                                "Error 
modyfying properties file. PLease try again",
                                                                Type);
                                        }
                                } else {
                                        if (servicePath == null)
-                                               error_page(
-                                                               out,
+                                               output.error_page(
                                                                "Config file 
points to non existing service.\n Please input the right service to the 
servlet.properties file",
                                                                Type);
                                        else {
@@ -244,7 +248,7 @@
                                                // Showing the properties and 
user options
                                                if (properties != null) {
 
-                                                       main_page(out, 
groupProperies(properties),Type);
+                                                       
output.main_page(groupProperies(properties),Type,extraFunctionalities);
                                                } else {
                                                        String path;
                                                        if 
(Type.equals("loggingProperties")) {
@@ -252,8 +256,7 @@
                                                        } else {
                                                                path = 
servicePath + this.serviceProperties;
                                                        }
-                                                       error_page(out,
-                                                                       
"service properties file does not exist! "
+                                                       
output.error_page("service properties file does not exist! "
                                                                              
          + filePath + "\n" + path, Type);
                                                }
                                        }
@@ -311,7 +314,7 @@
                                                properties = 
(PerfsonarProperties) session
                                                                
.getAttribute("properties");
                                        }
-                                       main_page(out, 
groupProperies(properties),Type);
+                                       
output.main_page(groupProperies(properties),Type,extraFunctionalities);
                                } else {
                                        askForPassword(response);
                                        session.invalidate();
@@ -389,257 +392,6 @@
        }
 
        /**
-        * Method for outputing the restart page to the user ince he had made 
his
-        * changes
-        * 
-        * @param out
-        *            The output writer
-        * @param Type
-        *            The type of the properties file
-        * @throws IOException
-        */
-       private void restart_page(ServletOutputStream out, String Type)
-                       throws IOException {
-
-               preempt(out);
-               out.println("<div class=\"info\" >");
-               out.println("<p class=\"welcometextlavender\">Service 
Administration<p>");
-               out.println("<p class=\"blueheader\" >");
-               out.println("The properties file has been modified. Please 
restart tomcat for any changes to  take effect!");
-               out.println("<a href=\"ServiceAdmin?" + Type + "\">Go 
Back</a>");
-               out.println("</p>");
-               out.println("</div>");
-               out.println("</body>");
-               out.println("</html>");
-       }
-
-       /**
-        * Method for dispalying an error message to the user
-        * 
-        * @param out
-        *            The output writer
-        * @param error
-        *            The error message
-        * @param Type
-        *            The type of the properties file
-        * @throws IOException
-        */
-       private void error_page(ServletOutputStream out, String error, String 
Type)
-                       throws IOException {
-               // TODO Auto-generated method stub
-
-               preempt(out);
-               out.println("<div class=\"info\" >");
-               out.println("<p>Service Administration<>");
-               out.println("<p class=\"blueheader\">" + error + "</p>");
-               out.println("<p class=\"blueheader\"> ");
-               out.println("<a href=\"ServiceAdmin?" + Type + "\">Go Back");
-               out.println("</p>");
-               out.println("</div>");
-               out.println("</body>");
-               out.println("</html>");
-       }
-
-       private void main_page(ServletOutputStream out,
-                       Hashtable<String, PerfsonarProperties> 
groupedProperties,String type)
-                       throws IOException {
-
-               preempt(out);
-               out.println("<div class=\"tablessContent\" >");
-               out.println("</div>");
-               out.println("<div class=\"manage\">");
-               String tableName="Service Properties Table";
-               if(!type.equals("serviceProperties")){
-                       tableName="Logging Properties Table";
-               }
-               out
-                               .println("<p 
class=\"welcometextlavender\">"+tableName+"</p>");
-               out.println("<p class=\"formated_text\" >The listed settings 
are optional. You can configure them to customise your installation. Place 
your mouse cursor on a setting to display help.</p><br/>");
-               out.println("<form action=\"ServiceAdmin\" method=\"POST\"> 
");
-
-               out.println("<table>");
-               out.println("<tr class=\"headerlavender\">");
-               out.println("<th>Group</th>");
-               out.println("<th>Service Property</th>");
-               out.println("<th>Service Property Value</th>");
-               out.println("</tr>");
-               out.println("<tr/>");
-
-               // Populating the table
-               Iterator it = groupedProperties.keySet().iterator();
-               String cssclass="lightgrey";
-               boolean change=false;
-               while (it.hasNext()) {
-                       String group = (String) it.next();
-                       PerfsonarProperties properties = 
groupedProperties.get(group);
-                       Iterator propIt = properties.getKeysIterator();
-
-                       if(change){
-                               cssclass="darkgrey";
-                               change=false;
-                       }else{
-                               cssclass="lightgrey";
-                               change=true;
-                       }
-                       String key = (String) propIt.next();
-                       PerfsonarProperty property = 
properties.getProperty(key);
-                       out.println("<tr class=\""+cssclass+"\" >");
-                       out.println("<th class=\"blueheader\">" + group + 
"</th>");
-                       group = group.replace("'", "\\'");
-                       group = group.replace("(", "[").replace(")", "]");
-                       String description = 
property.getDescription().replace("'", "\\'");
-                       description = description.replace(")", "]");
-                       description = description.replace("(", "[");
-                       description = description.replace("#", "");
-                       out.println("<td onmouseover=\"setTip(this,'" + 
description
-                                       + "','#C7C7F2')\" >");
-                       out.println(property.getKey());
-                       out.println("</td>");
-                       out.println("<td>");
-                       out.println("<input "
-                                       + "  type=\"text\" 
class=\"input_style_blue\" size=60 name=\""
-                                       + property.getKey() + "\" value=\"" + 
property.getValue()
-                                       + "\" onmouseover=\"setTip(null,'" + 
property.getValue()
-                                       + "','#C7C7F2')\"  />");
-                       out.println();
-                       out.println("</td>");
-                       out.println("</tr>");
-
-                       while (propIt.hasNext()) {
-                               key = (String) propIt.next();
-                               property = properties.getProperty(key);
-                               description = 
property.getDescription().replace("'", "\\'");
-                               description = description.replace(")", "]");
-                               description = description.replace("(", "[");
-                               description = description.replace("#", "");
-                               out.println("<tr class=\""+cssclass+"\">");
-                               out.println("<td/>");
-                               out.println("<td onmouseover=\"setTip(this,'" 
+ description
-                                               + "','#C7C7F2')\">");
-                               out.println(property.getKey());
-                               out.println("</td>");
-                               out.println("<td>");
-                               out
-                                               .println("<input 
type=\"text\" class=\"input_style_blue\" size=60 name=\""
-                                                               + 
property.getKey()
-                                                               + "\" 
value=\""
-                                                               + 
property.getValue()
-                                                               + "\"  
onmouseover=\"setTip(null,'"
-                                                               + 
property.getValue() + "','#C7C7F2')\"  />");
-                               out.println();
-                               out.println("</td>");
-                               out.println("</tr>");
-                       }
-                       
-               }
-
-               out.println("<tr/>");
-               out.println("<tr>");
-               out.println("<th/><td/><td>");
-               out
-                               .println("<input class=\"floatResetButton\" 
id=\"ResetButton\" type=\"reset\" class=\"submit_button\" value=\"Cancel\" 
/><input class=\"floatSubmitButton\" type=\"submit\" id=\"Button\" 
name=\"store\" value=\"Apply\" class=\"submit_button\" /></td>");
-               out.println("</tr>");
-               out.println("</table>");
-               out.println("</form>");
-
-               if (extraFunctionalities.equals("on")) {
-                       // Options foa adding and deleting a property are 
added
-
-                       out.println("<form  action=\"ServiceAdmin\" 
method=\"POST\"> ");
-                       out.println("<p>");
-                       out.println("<table>");
-                       out.println("<tr>");
-                       out
-                                       .println("<th>Add new property name 
to the left column and the property value to the right column. Below add 
Group and Description</th>");
-                       out.println("</tr>");
-                       out.println("</table>");
-                       out.println("<p>");
-                       out.println("<p>");
-                       out.println("<table>");
-                       out.println("<tr>");
-                       out.println("<th>Property Name</th><th>Property 
Value</th>");
-                       out.println("</tr>");
-                       out.println("<tr>");
-                       out.println("<td>");
-                       out
-                                       .println("<input type=\"text\" 
size=60 name=\"propertyName\" value=\" \" />");
-                       out.println("</td><td>");
-                       out
-                                       .println("<input type=\"text\"  
name=\"propertyValue\" size=60 value=\" \" />");
-                       out.println("</td>");
-                       out.println("</tr>");
-                       out.println("<tr>");
-                       out.println("<th>Group</th><th>Description</th>");
-                       out.println("</tr>");
-                       out.println("<tr>");
-                       out.println("<td>");
-                       out
-                                       .println("<input type=\"text\" 
size=60 name=\"propertyGroup\" value=\" \" />");
-                       out.println("</td><td>");
-                       out
-                                       .println("<input type=\"text\"  
name=\"propertyDescription\" size=60 value=\" \" />");
-                       out.println("</td>");
-                       out.println("<tr>");
-                       out.println("<td>");
-                       out
-                                       .println("<input  "
-                                                       + " type=\"submit\" 
name=\"add\" value=\"Add property\" />  ");
-                       out.println("</td>");
-                       out.println("</tr>");
-                       out.println("</table>");
-                       out.println("</p>");
-                       out.println("</form>");
-
-                       out.println("<form action=\"ServiceAdmin\" 
method=\"POST\"> ");
-                       out.println("<p>");
-                       out.println("<table>");
-                       out.println("<tr><th>Choose a propperty to 
remove</th><th/></tr>");
-                       out.println("<tr>");
-                       out.println("<th>Property Name</th><td><select 
name=\"property\">");
-                       it = groupedProperties.keySet().iterator();
-                       while (it.hasNext()) {
-                               String group = (String) it.next();
-                               PerfsonarProperties pr = 
groupedProperties.get(group);
-                               out.println("<optgroup label=\"" + group + 
"\" >");
-                               Iterator propIt = pr.getKeysIterator();
-                               while (propIt.hasNext()) {
-                                       String property = (String) 
propIt.next();
-                                       out.println("<option value=\"" + 
property + "\">"
-                                                       + property + 
"</option>");
-                               }
-                               out.println("</optgroup>");
-                       }
-                       out.println("</select></td>");
-                       out.println("</tr>");
-                       out
-                                       .println("<tr><td><input  "
-                                                       + " type=\"submit\" 
name=\"remove\" value=\"Remove property\" />  </td><td/></tr>");
-                       out.println("</table>");
-                       out.println("</p>");
-                       out.println("</form>");
-               }
-               out.println("</div>");
-               out.println("</body>");
-               out.println("</html>");
-
-       }
-
-       private void preempt(ServletOutputStream out) throws IOException {
-
-               out.println("<html>");
-               out
-                               .println("<head><link rel=\"stylesheet\" 
type=\"text/css\" href=\"default.css\">");
-               out.println("<title>");
-               out.println("perfSONAR service administration page.");
-               out.println("</title>");
-               out.println("</head>");
-               out.println("<body>");
-               out.println("<script src=\"Service_Admin.js\">\n" + 
"</script>\n");
-               out.println("<script src=\"wz_tooltip.js\">\n" + 
"</script>\n");
-
-       }
-
-       /**
         * Method that is used for modifying the properties file
         * 
         * @param properties

Modified: 
branches/WebAdmin/perfSONARWebAdmin/admin/service/soapclient/SoapClient.java
===================================================================
--- 
branches/WebAdmin/perfSONARWebAdmin/admin/service/soapclient/SoapClient.java  
      2008-06-06 10:26:42 UTC (rev 3962)
+++ 
branches/WebAdmin/perfSONARWebAdmin/admin/service/soapclient/SoapClient.java  
      2008-06-06 10:51:26 UTC (rev 3963)
@@ -2,18 +2,12 @@
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.BufferedInputStream;
-import java.io.DataInputStream;
+
 import java.io.ByteArrayInputStream; 
 import java.io.FileWriter;
 import java.io.BufferedWriter;
 
-import java.util.ArrayList;
+
 import java.util.List;
 import java.util.Vector;
 import java.util.Iterator;
@@ -22,10 +16,10 @@
 import org.jdom.output.XMLOutputter;
 import org.jdom.Attribute;
 
-import org.w3c.dom.Element;
+
 import org.w3c.dom.Document;
-import org.w3c.dom.Document;
 
+
 import java.net.URL;
 
 import javax.xml.namespace.QName;
@@ -37,12 +31,10 @@
 import org.apache.axis.client.Service;
 import org.apache.axis.message.SOAPBodyElement;
 
-import org.apache.log4j.Level;
+
 import org.apache.log4j.Logger;
 import org.apache.log4j.FileAppender;
 import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
 import org.apache.log4j.SimpleLayout;
 
        
@@ -417,10 +409,12 @@
  public static void main( String[] args ) throws Exception {
    if (args.length < 2 ) {
       System.out.println("Insufficient arguments");
+      System.out.println((new java.io.File(".")).getCanonicalPath()) ;
       return;
    }
 //   
testDeployment("http://127.0.0.1:8080/xml-ls/services/LookupService",Level.DEBUG,null,args[0],
 args[1]);
    System.out.println("Working directory : " + workingDirectory() );
    System.out.println("Guess ws url : " + guessWebServiceUrl("..") );
+  
  }
 }

Added: branches/WebAdmin/perfSONARWebAdmin/admin/service/soapclient/test.java


Property changes on: 
branches/WebAdmin/perfSONARWebAdmin/admin/service/soapclient/test.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: branches/WebAdmin/perfSONARWebAdmin/admin/service/test.java


Property changes on: 
branches/WebAdmin/perfSONARWebAdmin/admin/service/test.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: 
branches/WebAdmin/perfSONARWebAdmin/admin/stitching/StitchingServlet.java


Property changes on: 
branches/WebAdmin/perfSONARWebAdmin/admin/stitching/StitchingServlet.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: branches/WebAdmin/perfSONARWebAdmin/auxiliary/service/HTMLOutput.java


Property changes on: 
branches/WebAdmin/perfSONARWebAdmin/auxiliary/service/HTMLOutput.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: 
branches/WebAdmin/perfSONARWebAdmin/auxiliary/stitching/ElementParser.java


Property changes on: 
branches/WebAdmin/perfSONARWebAdmin/auxiliary/stitching/ElementParser.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: 
branches/WebAdmin/perfSONARWebAdmin/auxiliary/stitching/MetadataManager.java


Property changes on: 
branches/WebAdmin/perfSONARWebAdmin/auxiliary/stitching/MetadataManager.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: 
branches/WebAdmin/perfSONARWebAdmin/auxiliary/stitching/MetadataManagerImpl.java


Property changes on: 
branches/WebAdmin/perfSONARWebAdmin/auxiliary/stitching/MetadataManagerImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: branches/WebAdmin/perfSONARWebAdmin/auxiliary/stitching/test.java


Property changes on: 
branches/WebAdmin/perfSONARWebAdmin/auxiliary/stitching/test.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native