perfsonar development work

Author: pgerakios
Date: 2008-12-15 11:22:02 -0500 (Mon, 15 Dec 2008)
New Revision: 4790

Modified:
   branches/WebAdmin/CHANGELOG
   branches/WebAdmin/ant/const.properties
   branches/WebAdmin/perfSONARWebAdmin/auxiliary/PerfsonarPropertiesImpl.java
   
branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/ConfigurationHandler.java
   branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/WizardProperty.java
Log:
0.9.3.c

Modified: branches/WebAdmin/CHANGELOG
===================================================================
--- branches/WebAdmin/CHANGELOG 2008-12-15 15:49:21 UTC (rev 4789)
+++ branches/WebAdmin/CHANGELOG 2008-12-15 16:22:02 UTC (rev 4790)
@@ -27,3 +27,6 @@
 0.9.1c:
 
 Fixed the blank page issue when clicking on the "Metadata Configuration file"
+0.9.3c
+
+Fixed the "Internals" issue at the Service Properties Table page. Now 
service.sax_parse.config and service.log.log4j.config are not grouped under 
the default "Internals" group but instead WA uses a user-specified group name.

Modified: branches/WebAdmin/ant/const.properties
===================================================================
--- branches/WebAdmin/ant/const.properties      2008-12-15 15:49:21 UTC (rev 
4789)
+++ branches/WebAdmin/ant/const.properties      2008-12-15 16:22:02 UTC (rev 
4790)
@@ -9,7 +9,7 @@
 target.server=127.0.0.1
 service.name=perfsonar-web-admin
 jarfilename=perfsonar-web-admin
-version=0.9.2c
+version=0.9.3c
 
 antcontrib.jar=${basedir}/lib/misc/ant-contrib-1.0b3.jar
 antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20080303.jar

Modified: 
branches/WebAdmin/perfSONARWebAdmin/auxiliary/PerfsonarPropertiesImpl.java
===================================================================
--- 
branches/WebAdmin/perfSONARWebAdmin/auxiliary/PerfsonarPropertiesImpl.java  
2008-12-15 15:49:21 UTC (rev 4789)
+++ 
branches/WebAdmin/perfSONARWebAdmin/auxiliary/PerfsonarPropertiesImpl.java  
2008-12-15 16:22:02 UTC (rev 4790)
@@ -247,7 +247,7 @@
                PerfsonarProperties properties = new 
PerfsonarPropertiesImpl();
                try {
                        properties.loadProperties(new FileInputStream(
-                                       "service_mod.properties"));
+                                       args[0]));
 
                        Iterator it = properties.getKeysIterator();
                        while (it.hasNext()) {
@@ -257,7 +257,7 @@
                                System.out.println("#Description=" + 
pr.getDescription());
                                System.out.println(pr.getKey() + "=" + 
pr.getValue() + "\n\n");
                        }
-                       properties.storeProperties(new 
FileOutputStream("test_service3.properties"));
+//                     properties.storeProperties(new 
FileOutputStream(argv[0]));
                        //PerfsonarProperty pro = new PerfsonarProperty();
                        //pro.setDescription("A test property");
                        //pro.setGroup("Test");

Modified: 
branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/ConfigurationHandler.java
===================================================================
--- 
branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/ConfigurationHandler.java
      2008-12-15 15:49:21 UTC (rev 4789)
+++ 
branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/ConfigurationHandler.java
      2008-12-15 16:22:02 UTC (rev 4790)
@@ -50,11 +50,17 @@
                
                  protected static HTMLOutput output = null;
 
+//               protected static boolean override_internals = false;
 
                  private  static final String log4j_key = 
"servlet.log4j_path";
        
                  private  static String log4j_keyprop = 
"service.log.log4j.config";
 
+//              protected void overrideInternals( boolean b)
+//              {
+//                             override_internals = b;
+//              }
+
                 private void updateLoggingPath( String str ) throws 
MaskedException
                 {
                         if( str != null )
@@ -149,11 +155,18 @@
 
            try 
            {
-                       PerfsonarPropertiesImpl.
-                                update(ServicePath + ServicePropertiesPath,
-                         new 
PerfsonarProperty("service.sax_parser.config",ServicePath + 
ObjectsConfigPath,"Sax parser configuration parameter","Internals"),
-                          new PerfsonarProperty(log4j_keyprop, 
LoggingPropertiesPath,"Logging Properties path","Internals") 
+                        /*
+                               if(!override_internals)
+                                       PerfsonarPropertiesImpl.
+                                                update(ServicePath + 
ServicePropertiesPath,
+                                 new 
PerfsonarProperty("service.sax_parser.config",
+                                                                             
                                          ServicePath+ObjectsConfigPath,
+                                                                             
                                          "Sax parser configuration 
parameter",
+                                                                             
                                          "Internals"),
+                          new PerfsonarProperty(log4j_keyprop, 
LoggingPropertiesPath,
+                                                                             
                          "Logging Properties path","Internals") 
                     );
+                                        */
        } 
            catch (Exception e) 
            {

Modified: 
branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/WizardProperty.java
===================================================================
--- branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/WizardProperty.java  
  2008-12-15 15:49:21 UTC (rev 4789)
+++ branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/WizardProperty.java  
  2008-12-15 16:22:02 UTC (rev 4790)
@@ -9,7 +9,7 @@
  * @author Michalis Michael,CyNet
  * 
  */
-public class WizardProperty {
+public class WizardProperty implements java.io.Serializable  {
 
        // 
-----------------------------------------------------------------------
        // class fields