perfsonar development work

Author: roman
Date: 2007-03-13 06:15:51 -0400 (Tue, 13 Mar 2007)
New Revision: 2219

Added:
   branches/JAVA-RRD-MA-STABLE/contrib/ant-bundle/
   branches/JAVA-RRD-MA-STABLE/contrib/ant-bundle/ant-contrib-1.0b3.jar
   branches/JAVA-RRD-MA-STABLE/contrib/ant-bundle/build-bundle.xml
   branches/JAVA-RRD-MA-STABLE/contrib/ant-bundle/service-locations.properties
Removed:
   branches/JAVA-RRD-MA-STABLE/contrib/ant-bundle/ant-contrib-1.0b3.jar
   branches/JAVA-RRD-MA-STABLE/contrib/ant-bundle/build-bundle.xml
   branches/JAVA-RRD-MA-STABLE/contrib/ant-bundle/service-locations.properties
Modified:
   branches/JAVA-RRD-MA-STABLE/ant/pre-install-targets.xml
   branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-exist-xmldb-targets.xml
   branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-pre-install-targets.xml
   branches/JAVA-RRD-MA-STABLE/schema/
Log:

merged with the trunk

  svn merge -r 2185:2217 
https://svn.perfsonar.net/svn/perfsonar/trunk/perfsonar




Modified: branches/JAVA-RRD-MA-STABLE/ant/pre-install-targets.xml
===================================================================
--- branches/JAVA-RRD-MA-STABLE/ant/pre-install-targets.xml     2007-03-13 
10:13:07 UTC (rev 2218)
+++ branches/JAVA-RRD-MA-STABLE/ant/pre-install-targets.xml     2007-03-13 
10:15:51 UTC (rev 2219)
@@ -17,14 +17,14 @@
 
 
 
-    <!-- Download URLs -->
+    <!-- properties -->
 
+
     <property name="_tomcat.download.url"
-        
value="http://apache.forall.pl/tomcat/tomcat-6/v6.0.7/bin/apache-tomcat-6.0.7.tar.gz";
 />
+        
value="http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=tomcat&amp;version=6.0.7";
 />
+
     <property name="tomcat.dir" value="apache-tomcat-6.0.7" />
 
-    <property name="exist.war.file" value="exist-1.0.1.war" />
-
     <property file="ant/const.properties" />
 
 
@@ -134,7 +134,7 @@
 
     <target name="get-tomcat" depends="get-tomcat-download-url">
 
-        <basename property="tomcat.name" file="${tomcat.download.url}" />
+        <basename property="tomcat.name" file="tomcat.tar.gz" />
         <get src="${tomcat.download.url}"
             dest="${tomcat.name}"
             verbose="true"

Modified: branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-exist-xmldb-targets.xml
===================================================================
--- branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-exist-xmldb-targets.xml 
2007-03-13 10:13:07 UTC (rev 2218)
+++ branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-exist-xmldb-targets.xml 
2007-03-13 10:15:51 UTC (rev 2219)
@@ -241,13 +241,16 @@
             defaultvalue=""/>
 
         <input message="Enter eXist username []?"
-            addproperty="username"/>
+            addproperty="username"
+            defaultvalue=""/>
 
         <input message="Enter new password for ${username} []?"
-            addproperty="password"/>
+            addproperty="password"
+            defaultvalue=""/>
 
         <input message="Enter the URL of eXist 
[xmldb:exist://${target.server}:${target.port}/exist/xmlrpc/db]?"
-            addproperty="url"/>
+            addproperty="url"
+            
defaultvalue="xmldb:exist://${target.server}:${target.port}/exist/xmlrpc/db"/>
 
         <xquery
             uri="${url}"

Modified: branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-pre-install-targets.xml
===================================================================
--- branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-pre-install-targets.xml 
2007-03-13 10:13:07 UTC (rev 2218)
+++ branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-pre-install-targets.xml 
2007-03-13 10:15:51 UTC (rev 2219)
@@ -18,11 +18,15 @@
 
 
 
+       <!-- properties -->
+
+
     <property name="service.name" value="perfSONAR-RRD-MA-2.0-beta" />
 
 
     <property name="_exist.war.download.url"
-              
value="http://prdownloads.sourceforge.net/exist/exist-1.0.1.war"; />
+              
value="http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=exist-war&amp;version=1.0.1";
 />
+
     <property name="exist.war.file" value="exist-1.0.1.war" />
 
     <property file="ant/const.properties" />

Copied: branches/JAVA-RRD-MA-STABLE/contrib/ant-bundle (from rev 2217, 
trunk/perfsonar/contrib/ant-bundle)

Deleted: branches/JAVA-RRD-MA-STABLE/contrib/ant-bundle/ant-contrib-1.0b3.jar

Copied: branches/JAVA-RRD-MA-STABLE/contrib/ant-bundle/ant-contrib-1.0b3.jar 
(from rev 2217, trunk/perfsonar/contrib/ant-bundle/ant-contrib-1.0b3.jar)

Deleted: branches/JAVA-RRD-MA-STABLE/contrib/ant-bundle/build-bundle.xml

Copied: branches/JAVA-RRD-MA-STABLE/contrib/ant-bundle/build-bundle.xml (from 
rev 2217, trunk/perfsonar/contrib/ant-bundle/build-bundle.xml)

Deleted: 
branches/JAVA-RRD-MA-STABLE/contrib/ant-bundle/service-locations.properties

Copied: 
branches/JAVA-RRD-MA-STABLE/contrib/ant-bundle/service-locations.properties 
(from rev 2217, 
trunk/perfsonar/contrib/ant-bundle/service-locations.properties)


Property changes on: branches/JAVA-RRD-MA-STABLE/schema
___________________________________________________________________
Name: svn:externals
   + nmwg http://anonsvn.internet2.edu/svn/nmwg/trunk/nmwg/schema/