perfsonar development work

Author: roman
Date: 2008-02-13 08:56:00 -0500 (Wed, 13 Feb 2008)
New Revision: 3352

Modified:
   trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml
   trunk/geant2_java-rrd-ma/ant/libs-download-targets.xml
   trunk/geant2_java-rrd-ma/conf/servlet.properties
   trunk/geant2_java-rrd-ma/conf/wizard.properties
Log:

- web admin library updated
- the wizard now does not ask for usage of xml db (it's default)




Modified: trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml        2008-02-13 
12:48:40 UTC (rev 3351)
+++ trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml        2008-02-13 
13:56:00 UTC (rev 3352)
@@ -47,7 +47,7 @@
 
     <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar" 
                          todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080207/perfsonar-base-1.0.20080207.jar"
  todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.5b/perfsonar-web-admin-0.5b.jar"
        todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.6b/perfsonar-web-admin-0.6b.jar"
        todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
 
     <copy 
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"       
                          todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
 
@@ -246,7 +246,7 @@
 
     <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar" 
                          todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080207/perfsonar-base-1.0.20080207.jar"
  todir="${tmpdir}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.5b/perfsonar-web-admin-0.5b.jar"
        todir="${tmpdir}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.6b/perfsonar-web-admin-0.6b.jar"
        todir="${tmpdir}/WEB-INF/lib"/>
 
     <copy 
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"       
                          todir="${tmpdir}/WEB-INF/lib"/>
 

Modified: trunk/geant2_java-rrd-ma/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2_java-rrd-ma/ant/libs-download-targets.xml      2008-02-13 
12:48:40 UTC (rev 3351)
+++ trunk/geant2_java-rrd-ma/ant/libs-download-targets.xml      2008-02-13 
13:56:00 UTC (rev 3352)
@@ -56,7 +56,7 @@
 
       <dependency groupId="rrdjtool"   artifactId="rrdjtool"             
version="1.0"/>
       <dependency groupId="perfsonar"  artifactId="perfsonar-base"       
version="1.0.20080207"/>
-      <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="0.5b"/>
+      <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="0.6b"/>
       <dependency groupId="nmwg"       artifactId="nmwg"                 
version="1.0.20071008"/>
 
 

Modified: trunk/geant2_java-rrd-ma/conf/servlet.properties
===================================================================
--- trunk/geant2_java-rrd-ma/conf/servlet.properties    2008-02-13 12:48:40 
UTC (rev 3351)
+++ trunk/geant2_java-rrd-ma/conf/servlet.properties    2008-02-13 13:56:00 
UTC (rev 3352)
@@ -16,3 +16,7 @@
 
 #The property inside the service.properties file that holds the location of 
the eXist db 
 servlet.exist_location.property=component.ma.xmldb.db_uri
+
+
+#Controls the use of advanced features in the properties management servlet. 
Default value is “off”
+servlet.extra_functionalities=off
\ No newline at end of file

Modified: trunk/geant2_java-rrd-ma/conf/wizard.properties
===================================================================
--- trunk/geant2_java-rrd-ma/conf/wizard.properties     2008-02-13 12:48:40 
UTC (rev 3351)
+++ trunk/geant2_java-rrd-ma/conf/wizard.properties     2008-02-13 13:56:00 
UTC (rev 3352)
@@ -28,15 +28,6 @@
 
 
   <property>
-    <entry key="component.ma.xmldb.db_status" required="true">on</entry>
-    <Comment>Would you like to use eXist DB?</Comment>
-    <ProposedValue>on</ProposedValue>
-    <Group order="1" check="true">eXist</Group>
-    <AcceptedValue>on</AcceptedValue>
-    <AcceptedValue>off</AcceptedValue>
-  </property>
-
-  <property>
     <entry key="component.ma.xmldb.db_uri" 
required="true">xmldb:exist://localhost:8080/exist/xmlrpc</entry>
     <Comment>Enter the location of the eXist database:</Comment>
     <ProposedValue>xmldb:exist://localhost:8080/exist/xmlrpc</ProposedValue>