perfsonar development work

Author: rodriguez
Date: 2009-03-11 08:17:49 -0400 (Wed, 11 Mar 2009)
New Revision: 5053

Modified:
   trunk/perfsonar_base/src/main/java/org/perfsonar/base/ant/antlib.xml
Log:
- Axis libraries are located in another directories. Fixed!

Modified: trunk/perfsonar_base/src/main/java/org/perfsonar/base/ant/antlib.xml
===================================================================
--- trunk/perfsonar_base/src/main/java/org/perfsonar/base/ant/antlib.xml      
  2009-03-11 12:08:51 UTC (rev 5052)
+++ trunk/perfsonar_base/src/main/java/org/perfsonar/base/ant/antlib.xml      
  2009-03-11 12:17:49 UTC (rev 5053)
@@ -203,8 +203,9 @@
         <dependency groupId="bouncycastle"        artifactId="bcprov-jdk15"  
      version="124"/>
         <dependency groupId="wss4j"               artifactId="wss4j"         
      version="1.5.1"/>
         <dependency groupId="javolution"          artifactId="javolution"    
      version="3.7"/>
-        <dependency groupId="opensaml"                           
artifactId="opensaml"                    version="2.2.3"/>
-        <dependency groupId="xmltooling"                 
artifactId="xmltooling"          version="1.2.0"/>
+        <dependency groupId="org.opensaml"               
artifactId="opensaml"                    version="2.2.3"/>
+        <dependency groupId="org.opensaml"               
artifactId="xmltooling"          version="1.2.0"/>
+        <dependency groupId="org.slf4j"                  
artifactId="slf4j-log4j12"       version="1.4.2"/>
         <dependency groupId="opensaml"            artifactId="opensaml1"     
      version="1.1"/>
         <dependency groupId="edugain"             artifactId="edugain"       
      version="1.0"/>
         <dependency groupId="sasl-ca"             artifactId="sasl-ca"       
      version="1.0"/>
@@ -226,6 +227,7 @@
 
         <localRepository refid="local.repository"/>
         <remoteRepository refid="remote.repository"/>
+        <remoteRepository refid="remote.repository.3"/>
       </artifact:dependencies>
     </sequential>
   </macrodef>
@@ -704,9 +706,9 @@
     <attribute name="dest-jars-path"/>
     <sequential>
 
-      <copy file="${basedir}/lib/repository/axis/axis/1.4/axis-1.4.jar"      
                                         
todir="@{dest-jars-path}/WEB-INF/lib"/>
-      <copy 
file="${basedir}/lib/repository/axis/axis-jaxrpc/1.4/axis-jaxrpc-1.4.jar"     
                            todir="@{dest-jars-path}/WEB-INF/lib"/>
-      <copy 
file="${basedir}/lib/repository/axis/axis-saaj/1.4/axis-saaj-1.4.jar"         
                            todir="@{dest-jars-path}/WEB-INF/lib"/>
+      <copy 
file="${basedir}/lib/repository/org/apache/axis/axis/1.4/axis-1.4.jar"        
                            todir="@{dest-jars-path}/WEB-INF/lib"/>
+      <copy 
file="${basedir}/lib/repository/org/apache/axis/axis-jaxrpc/1.4/axis-jaxrpc-1.4.jar"
                      todir="@{dest-jars-path}/WEB-INF/lib"/>
+      <copy 
file="${basedir}/lib/repository/org/apache/axis/axis-saaj/1.4/axis-saaj-1.4.jar"
                          todir="@{dest-jars-path}/WEB-INF/lib"/>
       <copy 
file="${basedir}/lib/repository/axis/axis-wsdl4j/1.5.1/axis-wsdl4j-1.5.1.jar" 
                            todir="@{dest-jars-path}/WEB-INF/lib"/>
 
       <copy 
file="${basedir}/lib/repository/xerces/xercesImpl/2.8.0/xercesImpl-2.8.0.jar" 
                            todir="@{dest-jars-path}/WEB-INF/lib"/>
@@ -741,8 +743,14 @@
       <copy 
file="${basedir}/lib/repository/bouncycastle/bcprov-jdk15/124/bcprov-jdk15-124.jar"
                       todir="@{dest-jars-path}/WEB-INF/lib"/>
       <copy 
file="${basedir}/lib/repository/wss4j/wss4j/1.5.1/wss4j-1.5.1.jar"            
                            todir="@{dest-jars-path}/WEB-INF/lib"/>
       <copy 
file="${basedir}/lib/repository/javolution/javolution/3.7/javolution-3.7.jar" 
                            todir="@{dest-jars-path}/WEB-INF/lib"/>
-      <copy 
file="${basedir}/lib/repository/opensaml/opensaml/2.2.3/opensaml-2.2.3.jar"   
                                               
todir="@{dest-jars-path}/WEB-INF/lib"/>
-      <copy 
file="${basedir}/lib/repository/xmltooling/xmltooling/1.2.0/xmltooling-1.2.0.jar"
                                            
todir="@{dest-jars-path}/WEB-INF/lib"/>
+      <copy 
file="${basedir}/lib/repository/org/opensaml/opensaml/2.2.3/opensaml-2.2.3.jar"
                                              
todir="@{dest-jars-path}/WEB-INF/lib"/>
+      <copy 
file="${basedir}/lib/repository/org/opensaml/xmltooling/1.2.0/xmltooling-1.2.0.jar"
                                  todir="@{dest-jars-path}/WEB-INF/lib"/>
+      <copy 
file="${basedir}/lib/repository/velocity/velocity/1.5/velocity-1.5.jar"       
                                                       
todir="@{dest-jars-path}/WEB-INF/lib"/>
+      <copy 
file="${basedir}/lib/repository/org/slf4j/log4j-over-slf4j/1.5.5/log4j-over-slf4j-1.5.5.jar"
                         todir="@{dest-jars-path}/WEB-INF/lib"/>
+      <copy 
file="${basedir}/lib/repository/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"
     todir="@{dest-jars-path}/WEB-INF/lib"/>
+      <copy 
file="${basedir}/lib/repository/org/slf4j/slf4j-api/1.5.5/slf4j-api-1.5.5.jar"
                                                       
todir="@{dest-jars-path}/WEB-INF/lib"/>
+      <copy 
file="${basedir}/lib/repository/org/slf4j/slf4j-log4j12/1.4.2/slf4j-log4j12-1.4.2.jar"
                                       todir="@{dest-jars-path}/WEB-INF/lib"/>
+      <copy 
file="${basedir}/lib/repository/org/opensaml/openws/1.2.2/openws-1.2.2.jar"   
                                               
todir="@{dest-jars-path}/WEB-INF/lib"/>
       <copy 
file="${basedir}/lib/repository/opensaml/opensaml1/1.1/opensaml1-1.1.jar"     
                            todir="@{dest-jars-path}/WEB-INF/lib"/>
       <copy 
file="${basedir}/lib/repository/edugain/edugain/1.0/edugain-1.0.jar"          
                            todir="@{dest-jars-path}/WEB-INF/lib"/>
       <copy 
file="${basedir}/lib/repository/sasl-ca/sasl-ca/1.0/sasl-ca-1.0.jar"          
                            todir="@{dest-jars-path}/WEB-INF/lib"/>