perfsonar development work

Author: rodriguez
Date: 2007-06-05 05:29:39 -0400 (Tue, 05 Jun 2007)
New Revision: 2452

Modified:
   branches/as/ant/as/build-targets.xml
   branches/as/ant/as/client-run-targets.xml
   branches/as/ant/as/test-run-targets.xml
Log:
Updating the ant scripts for the AS

Modified: branches/as/ant/as/build-targets.xml
===================================================================
--- branches/as/ant/as/build-targets.xml        2007-06-05 09:24:43 UTC (rev 
2451)
+++ branches/as/ant/as/build-targets.xml        2007-06-05 09:29:39 UTC (rev 
2452)
@@ -26,6 +26,7 @@
         <javac srcdir="src" destdir="${build}" deprecation="yes">
             <include name="org/perfsonar/service/authService/**" />
             <include name="org/perfsonar/service/web/**" />
+            <include name="org/perfsonar/service/testHarness/authService/**" 
/>
             <classpath refid="classpath"/>
         </javac>
         <copy failonerror="false" 
todir="${build}/${package.root}/${wsdd.home}">
@@ -41,6 +42,7 @@
             <fileset dir="${build}">
                 <include name="org/perfsonar/service/authService/**" />
                 <include name="org/perfsonar/service/web/**" />
+                <include 
name="org/perfsonar/service/testHarness/authService/**" />
             </fileset>
         </jar>
     </target>

Modified: branches/as/ant/as/client-run-targets.xml
===================================================================
--- branches/as/ant/as/client-run-targets.xml   2007-06-05 09:24:43 UTC (rev 
2451)
+++ branches/as/ant/as/client-run-targets.xml   2007-06-05 09:29:39 UTC (rev 
2452)
@@ -27,4 +27,26 @@
 
     </target>
 
+    <target name="run-psr-x509-service" description="Runs Java client2">
+
+        <java 
classname="org.perfsonar.service.testHarness.authService.AuthNRequestTest"
+                classpathref="classpath" fork="true">
+            <arg value="${as.local}"/>
+            <arg 
value="${basedir}/schema/example-instances/perfSONAR/AS/test/AuthNRequest.xml"/>
+            <arg value="${basedir}/conf/test-eduGAIN.key"/>
+            <arg value="${basedir}/conf/test-eduGAIN.pem"/>
+            <arg value="${basedir}/src/objects.config"/>
+
+            <classpath>
+                <pathelement location="build/perfSONAR-generic.jar"/>
+                <pathelement location="build/perfSONAR-as.jar"/>
+            </classpath>
+
+        </java>
+
+       <echo>Test ended successfully.</echo>
+       <echo>Message used for request: 
${basedir}/schema/example-instances/perfSONAR/AS/test/AuthNRequest.xml</echo>
+
+    </target>
+
 </project>
\ No newline at end of file

Modified: branches/as/ant/as/test-run-targets.xml
===================================================================
--- branches/as/ant/as/test-run-targets.xml     2007-06-05 09:24:43 UTC (rev 
2451)
+++ branches/as/ant/as/test-run-targets.xml     2007-06-05 09:29:39 UTC (rev 
2452)
@@ -2,6 +2,7 @@
 
     <target name="test">
         <antcall target="run-psr-x509-client"/>
+        <antcall target="run-psr-x509-service"/>
     </target>
 
 </project>
\ No newline at end of file