perfsonar development work

Author: roman
Date: 2006-08-24 09:23:52 -0400 (Thu, 24 Aug 2006)
New Revision: 1565

Removed:
   trunk/perfsonar/ant/axis-deploy-targets-2.xml
Modified:
   trunk/perfsonar/ant/axis-deploy-targets.xml
   trunk/perfsonar/ant/build-rrdma.xml
   trunk/perfsonar/ant/build-sqlma.xml
   trunk/perfsonar/ant/build-tcmp.xml
   trunk/perfsonar/ant/build-xmlls.xml
Log:
- The content of axis-deploy-target-2.xml moved to axis-deploy-target.xml.
- axis-deploy-target-2.xml removed.
- References to axis-deploy-target-2.xml updated.

Deleted: trunk/perfsonar/ant/axis-deploy-targets-2.xml

Modified: trunk/perfsonar/ant/axis-deploy-targets.xml
===================================================================
--- trunk/perfsonar/ant/axis-deploy-targets.xml 2006-08-24 12:48:14 UTC (rev 
1564)
+++ trunk/perfsonar/ant/axis-deploy-targets.xml 2006-08-24 13:23:52 UTC (rev 
1565)
@@ -1,12 +1,12 @@
 <!-- ===================================================================
 <description>
 
-   $Id$
-   project: perfSONAR
-   author: romradz
+    $Id$
+    project: perfSONAR
+    author: romradz
 
-Notes:
-   A set of targets for deployment of web service in the Axis.
+    Notes:
+    A set of targets for deployment of web service in the Axis.
 
 </description>
 ==================================================================== -->
@@ -14,7 +14,7 @@
 <project name="axis-deploy-targets">
 
 
-    <taskdef resource="axis-tasks.properties" classpathref="classpath" />
+    <taskdef resource="axis-tasks.properties" classpathref="classpath" 
onerror="ignore"/>
 
 
     <property name="adminService" 
value="http://${target.server}:${target.port}/axis/services/AdminService"; />
@@ -25,45 +25,34 @@
 
     <target name="copy-jars-for-service">
 
-        <copy file="./lib/xml/jdom.jar"               
todir="${axis.home}/WEB-INF/lib"/>
-        <copy file="./lib/xml/resolver.jar"           
todir="${axis.home}/WEB-INF/lib"/>
-        <copy file="./lib/xml/xalan.jar"              
todir="${axis.home}/WEB-INF/lib"/>
-        <copy file="./lib/xml/xercesImpl.jar"         
todir="${axis.home}/WEB-INF/lib"/>
-        <copy file="./lib/xml/xercesSamples.jar"      
todir="${axis.home}/WEB-INF/lib"/>
-        <copy file="./lib/xml/xml-apis.jar"           
todir="${axis.home}/WEB-INF/lib"/>
-        <copy file="./lib/xml/xmlParserAPIs.jar"      
todir="${axis.home}/WEB-INF/lib"/>
+        <copy file="./lib/repository/jdom/jdom/1.0b8/jdom-1.0b8.jar"         
                  todir="${axis.home}/WEB-INF/lib"/>
+        <copy file="./lib/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar"      
                  todir="${axis.home}/WEB-INF/lib"/>
+        <copy 
file="./lib/repository/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"          
   todir="${axis.home}/WEB-INF/lib"/>
+        <copy 
file="./lib/repository/xml-apis/xml-apis/1.3.02/xml-apis-1.3.02.jar"          
   todir="${axis.home}/WEB-INF/lib"/>
+        <copy 
file="./lib/repository/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"    
   todir="${axis.home}/WEB-INF/lib"/>
+        <copy 
file="./lib/repository/commons-pool/commons-pool/1.1/commons-pool-1.1.jar"    
   todir="${axis.home}/WEB-INF/lib"/>
+        <copy 
file="./lib/repository/javax/activation/activation/1.0.2/activation-1.0.2.jar"
   todir="${axis.home}/WEB-INF/lib"/>
+        <copy file="./lib/repository/javax/mail/mail/1.3.2/mail-1.3.2.jar"   
                  todir="${axis.home}/WEB-INF/lib"/>
+        <copy file="./lib/repository/log4j/log4j/1.2.9/log4j-1.2.9.jar"      
                  todir="${axis.home}/WEB-INF/lib"/>
 
-        <copy file="./lib/xml/commons-pool-1.2.jar"   
todir="${axis.home}/WEB-INF/lib"/>
-        <copy file="./lib/xml/exist.jar"              
todir="${axis.home}/WEB-INF/lib"/>
-        <copy file="./lib/xml/xmldb.jar"              
todir="${axis.home}/WEB-INF/lib"/>
-        <copy file="./lib/xml/xmlrpc-1.2-patched.jar" 
todir="${axis.home}/WEB-INF/lib"/>
-
-        <copy file="./lib//misc/activation.jar"       
todir="${axis.home}/WEB-INF/lib"/>
-        <copy file="./lib/misc/mail.jar"              
todir="${axis.home}/WEB-INF/lib"/>
-        <copy file="./lib/misc/xmlsec.jar"            
todir="${axis.home}/WEB-INF/lib"/>
-
     </target>
 
 
     <target name="delete-jars-for-service">
 
-        <delete file="${axis.home}/WEB-INF/lib/jdom.jar"/>
-        <delete file="${axis.home}/WEB-INF/lib/resolver.jar"/>
-        <delete file="${axis.home}/WEB-INF/lib/xalan.jar"/>
-        <delete file="${axis.home}/WEB-INF/lib/xercesImpl.jar"/>
-        <delete file="${axis.home}/WEB-INF/lib/xercesSamples.jar"/>
-        <delete file="${axis.home}/WEB-INF/lib/xml-apis.jar"/>
-        <delete file="${axis.home}/WEB-INF/lib/xmlParserAPIs.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/jdom-1.0b8.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/xalan-2.7.0.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/xercesImpl-2.6.2.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/xml-apis-1.3.02.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/xmlParserAPIs-2.6.2.jar"/>
 
-        <delete file="${axis.home}/WEB-INF/lib/commons-pool-1.2.jar"/>
-        <delete file="${axis.home}/WEB-INF/lib/exist.jar"/>
-        <delete file="${axis.home}/WEB-INF/lib/xmldb.jar"/>
-        <delete file="${axis.home}/WEB-INF/lib/xmlrpc-1.2-patched.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/commons-pool-1.1.jar"/>
 
-        <delete file="${axis.home}/WEB-INF/lib/activation.jar"/>
-        <delete file="${axis.home}/WEB-INF/lib/mail.jar"/>
-        <delete file="${axis.home}/WEB-INF/lib/xmlsec.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/activation-1.0.2.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/mail-1.3.2.jar"/>
 
+        <delete file="${axis.home}/WEB-INF/lib/log4j-1.2.9.jar"/>
+
     </target>
 
 

Modified: trunk/perfsonar/ant/build-rrdma.xml
===================================================================
--- trunk/perfsonar/ant/build-rrdma.xml 2006-08-24 12:48:14 UTC (rev 1564)
+++ trunk/perfsonar/ant/build-rrdma.xml 2006-08-24 13:23:52 UTC (rev 1565)
@@ -43,7 +43,7 @@
     <import file="javadoc-targets.xml"/>
     <import file="webservice-env-targets.xml"/>
     <import file="java-compile-targets.xml"/>
-    <import file="axis-deploy-targets-2.xml"/>
+    <import file="axis-deploy-targets.xml"/>
     <import file="libs-download-targets.xml"/>
 
 

Modified: trunk/perfsonar/ant/build-sqlma.xml
===================================================================
--- trunk/perfsonar/ant/build-sqlma.xml 2006-08-24 12:48:14 UTC (rev 1564)
+++ trunk/perfsonar/ant/build-sqlma.xml 2006-08-24 13:23:52 UTC (rev 1565)
@@ -43,7 +43,7 @@
     <import file="javadoc-targets.xml"/>
     <import file="webservice-env-targets.xml"/>
     <import file="java-compile-targets.xml"/>
-    <import file="axis-deploy-targets-2.xml"/>
+    <import file="axis-deploy-targets.xml"/>
     <import file="libs-download-targets.xml"/>
 
 

Modified: trunk/perfsonar/ant/build-tcmp.xml
===================================================================
--- trunk/perfsonar/ant/build-tcmp.xml  2006-08-24 12:48:14 UTC (rev 1564)
+++ trunk/perfsonar/ant/build-tcmp.xml  2006-08-24 13:23:52 UTC (rev 1565)
@@ -42,7 +42,7 @@
         <import file="javadoc-targets.xml"/>
         <import file="webservice-env-targets.xml"/>
         <import file="java-compile-targets.xml"/>
-        <import file="axis-deploy-targets-2.xml"/>
+        <import file="axis-deploy-targets.xml"/>
         <import file="libs-download-targets.xml"/>
 
 

Modified: trunk/perfsonar/ant/build-xmlls.xml
===================================================================
--- trunk/perfsonar/ant/build-xmlls.xml 2006-08-24 12:48:14 UTC (rev 1564)
+++ trunk/perfsonar/ant/build-xmlls.xml 2006-08-24 13:23:52 UTC (rev 1565)
@@ -41,7 +41,7 @@
     <import file="javadoc-targets.xml"/>
     <import file="webservice-env-targets.xml"/>
     <import file="java-compile-targets.xml"/>
-    <import file="axis-deploy-targets-2.xml"/>
+    <import file="axis-deploy-targets.xml"/>
     <import file="libs-download-targets.xml"/>