perfsonar development work

Author: trzaszcz
Date: 2009-12-31 06:49:00 -0500 (Thu, 31 Dec 2009)
New Revision: 5448

Added:
   branches/new-structure-with-base2/ps-mdm-web-admin/conf/configuration.xml
   branches/new-structure-with-base2/ps-mdm-web-admin/conf/webAdminConfig.xml
Removed:
   branches/new-structure-with-base2/ps-mdm-web-admin/conf/configls.xml
   branches/new-structure-with-base2/ps-mdm-web-admin/conf/wa.xml
Modified:
   branches/new-structure-with-base2/ps-mdm-web-admin/ant/const.properties
   
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/servlet/util/ConfigurationServletHelper.java
   
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/util/XMLUtil.java
Log:
change naming convention - config files

Modified: 
branches/new-structure-with-base2/ps-mdm-web-admin/ant/const.properties
===================================================================
--- branches/new-structure-with-base2/ps-mdm-web-admin/ant/const.properties   
  2009-12-31 11:34:34 UTC (rev 5447)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/ant/const.properties   
  2009-12-31 11:49:00 UTC (rev 5448)
@@ -5,7 +5,7 @@
 libext=${basedir}/lib/libext
 
 schema=${basedir}/schema
-xml.file=../conf/wa.xml
+xml.file=../conf/webAdminConfig.xml
 
 version=0.1
 wa.version=20090201

Deleted: branches/new-structure-with-base2/ps-mdm-web-admin/conf/configls.xml

Added: 
branches/new-structure-with-base2/ps-mdm-web-admin/conf/configuration.xml


Property changes on: 
branches/new-structure-with-base2/ps-mdm-web-admin/conf/configuration.xml
___________________________________________________________________
Name: svn:executable
   + *

Deleted: branches/new-structure-with-base2/ps-mdm-web-admin/conf/wa.xml

Added: 
branches/new-structure-with-base2/ps-mdm-web-admin/conf/webAdminConfig.xml

Modified: 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/servlet/util/ConfigurationServletHelper.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/servlet/util/ConfigurationServletHelper.java
  2009-12-31 11:34:34 UTC (rev 5447)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/servlet/util/ConfigurationServletHelper.java
  2009-12-31 11:49:00 UTC (rev 5448)
@@ -29,7 +29,7 @@
        /**
         * file name of the wa.xml file
         */
-       public static final String WA_FILE_NAME = "wa.xml";
+       public static final String WA_FILE_NAME = "webAdminConfig.xml";
 
        private HttpServletRequest request;
        private HttpServletResponse response;

Modified: 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/util/XMLUtil.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/util/XMLUtil.java
     2009-12-31 11:34:34 UTC (rev 5447)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/util/XMLUtil.java
     2009-12-31 11:49:00 UTC (rev 5448)
@@ -141,11 +141,4 @@
                        throw new RuntimeException("Invalid query");
                return new Tuple<String, String>(filename, query);
        }
-
-       public static void main(String[] args) throws 
ParserConfigurationException,
-                       SAXException, IOException, XPathExpressionException,
-                       javax.xml.xpath.XPathFactoryConfigurationException {
-               String prefix = 
"http://service.perfsonar.org/ns/config/base/0.9/";;
-               String q = 
"doc(\"tmp/configls.xml\")//ns1:configuration/ns1:service[@name=\"SimpleService\"]/ns1:lookupInformation/ns1:option[@name=\"accessPoint\"]/@value";
-       }
 };