perfsonar development work

Author: stijn
Date: 2006-12-15 03:47:18 -0500 (Fri, 15 Dec 2006)
New Revision: 1831

Modified:
   branches/SSHTelnet-MP-STABLE/ant/build-sshtelnet.xml
   branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-axis-deploy-targets.xml
   branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-java-compile-targets.xml
   branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-libs-download-targets.xml
Log:


Modified: branches/SSHTelnet-MP-STABLE/ant/build-sshtelnet.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/build-sshtelnet.xml        2006-12-15 
08:46:43 UTC (rev 1830)
+++ branches/SSHTelnet-MP-STABLE/ant/build-sshtelnet.xml        2006-12-15 
08:47:18 UTC (rev 1831)
@@ -27,6 +27,9 @@
         <fileset dir="./lib/repository">
             <include name="**/*.jar"/>
         </fileset>
+        <fileset dir="./lib/remote">
+            <include name="**/*.jar"/>
+        </fileset>
         <pathelement location="build"/>
     </path>
 
@@ -56,6 +59,7 @@
     <import file="ssh/sshtelnetMP-axis-deploy-targets.xml"/>
     <import file="ssh/sshtelnetMP-configure-targets.xml"/>
     <import file="ssh/sshtelnetMP-test-targets.xml"/>
+    <import file="ssh/sshtelnetMP-libs-download-targets.xml"/>
 
 
 </project>

Modified: 
branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-axis-deploy-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-axis-deploy-targets.xml  
  2006-12-15 08:46:43 UTC (rev 1830)
+++ branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-axis-deploy-targets.xml  
  2006-12-15 08:47:18 UTC (rev 1831)
@@ -20,25 +20,7 @@
 
     <target name="copy-jars-for-sshtelnetmp" depends="copy-jars-for-service">
 
-        <copy file="./lib/xml/jdom.jar"               
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-        <copy file="./lib/xml/resolver.jar"           
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-        <copy file="./lib/xml/xalan.jar"              
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-        <copy file="./lib/xml/xercesImpl.jar"         
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-        <copy file="./lib/xml/xercesSamples.jar"      
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-        <copy file="./lib/xml/xml-apis.jar"           
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-        <copy file="./lib/xml/xmlParserAPIs.jar"      
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
 
-        <copy file="./lib/xml/commons-pool-1.1.jar"   
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-        <copy file="./lib/xml/exist.jar"              
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-        <copy file="./lib/xml/xmldb.jar"              
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-        <copy file="./lib/xml/xmlrpc-1.2-patched.jar" 
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-
-        <copy file="./lib/misc/activation.jar"       
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-        <copy file="./lib/misc/mail.jar"             
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-        <copy file="./lib/misc/xmlsec.jar"           
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-
-        <copy file="./lib/gui/swing-layout-1.0.jar"         
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-
         <copy file="./lib/remote/j2ssh-ant.jar"                
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
         <copy file="./lib/remote/j2ssh-common.jar"          
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
         <copy file="./lib/remote/j2ssh-core.jar"            
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

Modified: 
branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-java-compile-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-java-compile-targets.xml 
  2006-12-15 08:46:43 UTC (rev 1830)
+++ branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-java-compile-targets.xml 
  2006-12-15 08:47:18 UTC (rev 1831)
@@ -31,11 +31,16 @@
             <include name="org/perfsonar/service/web/**" />
             <classpath refid="classpath"/>
         </javac>
+
+       <echo>${service.home}/${deploy.root}/wsdd/</echo>
+       <echo>src/${package.root}/${wsdd.home}</echo>
+
         <copy failonerror="false" 
todir="${service.home}/${deploy.root}/wsdd/">
             <fileset dir="src/${package.root}/${wsdd.home}">
                 <include name="sshtelnetmp-*.wsdd" />
             </fileset>
         </copy>
+
     </target>
 
     <target name="jar-sshtelnetmp" depends="clean-jar-sshtelnetmp, 
compile-sshtelnetmp"

Modified: 
branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-libs-download-targets.xml
===================================================================
--- 
branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-libs-download-targets.xml  
2006-12-15 08:46:43 UTC (rev 1830)
+++ 
branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-libs-download-targets.xml  
2006-12-15 08:47:18 UTC (rev 1831)
@@ -21,11 +21,15 @@
 <project basedir="../" name="sshtelnetMP-libs-download-targets" 
xmlns:artifact="urn:maven-artifact-ant">
 
 
-
     <target name="libs-for-sshtelnetmp" depends="init-libs">
 
         <artifact:dependencies>
 
+            <dependency groupId="exist"     artifactId="exist-xmldb"    
version="1.0rc"/>
+            <dependency groupId="exist"     artifactId="exist-db"       
version="1.0rc"/>
+            <dependency groupId="exist"     artifactId="exist-xmlrpc"   
version="1.0rc"/>
+            <dependency groupId="exist"     artifactId="exist-optional" 
version="1.0rc"/>
+            
             <localRepository refid="local.repository"/>
             <remoteRepository refid="remote.repository"/>