perfsonar-dev - perfsonar: r2933 - in branches/new-structure/trunk/geant2_java-as: ant conf lib/misc
Subject: perfsonar development work
List archive
perfsonar: r2933 - in branches/new-structure/trunk/geant2_java-as: ant conf lib/misc
Chronological Thread
- From:
- To:
- Subject: perfsonar: r2933 - in branches/new-structure/trunk/geant2_java-as: ant conf lib/misc
- Date: Tue, 9 Oct 2007 07:05:18 -0400
Author: rodriguez
Date: 2007-10-09 07:05:17 -0400 (Tue, 09 Oct 2007)
New Revision: 2933
Added:
branches/new-structure/trunk/geant2_java-as/lib/misc/perfsonar-base-ant-1.0.20071008.jar
Removed:
branches/new-structure/trunk/geant2_java-as/lib/misc/perfsonar-base-ant-1.0.20070911.jar
Modified:
branches/new-structure/trunk/geant2_java-as/ant/axis-deploy-targets.xml
branches/new-structure/trunk/geant2_java-as/ant/const.properties.template
branches/new-structure/trunk/geant2_java-as/ant/libs-download-targets.xml
branches/new-structure/trunk/geant2_java-as/ant/test-targets.xml
branches/new-structure/trunk/geant2_java-as/conf/ASValidComponentsFile
Log:
Adding full support of UbC in the AuthServer. Also, it's using the last
eduGAIN library
Modified:
branches/new-structure/trunk/geant2_java-as/ant/axis-deploy-targets.xml
===================================================================
--- branches/new-structure/trunk/geant2_java-as/ant/axis-deploy-targets.xml
2007-10-09 11:02:07 UTC (rev 2932)
+++ branches/new-structure/trunk/geant2_java-as/ant/axis-deploy-targets.xml
2007-10-09 11:05:17 UTC (rev 2933)
@@ -30,7 +30,7 @@
depends="copy-dep-base-service-jars">
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20070814/nmwg-1.0.20070814.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20070911/perfsonar-base-1.0.20070911.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20071008/perfsonar-base-1.0.20071008.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy file="${basedir}/conf/wsdd/${wsdd.file.deploy}"
todir="${service.home}/${deploy.root}/wsdd"/>
<copy file="${basedir}/conf/wsdd/${wsdd.file.undeploy}"
todir="${service.home}/${deploy.root}/wsdd"/>
@@ -198,4 +198,4 @@
</target>
-</project>
\ No newline at end of file
+</project>
Modified:
branches/new-structure/trunk/geant2_java-as/ant/const.properties.template
===================================================================
--- branches/new-structure/trunk/geant2_java-as/ant/const.properties.template
2007-10-09 11:02:07 UTC (rev 2932)
+++ branches/new-structure/trunk/geant2_java-as/ant/const.properties.template
2007-10-09 11:05:17 UTC (rev 2933)
@@ -6,7 +6,7 @@
build=build
-target.server=localhost
+target.server=homer.rediris.es
service.name=perfSONAR-AS
@@ -17,7 +17,7 @@
wsdd.file.undeploy=service-undeploy.wsdd
antcontrib.jar=${basedir}/lib/misc/ant-contrib-1.0b3.jar
-antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20070911.jar
+antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20071008.jar
api.location=doc/api
api.title=perfSONAR
Modified:
branches/new-structure/trunk/geant2_java-as/ant/libs-download-targets.xml
===================================================================
--- branches/new-structure/trunk/geant2_java-as/ant/libs-download-targets.xml
2007-10-09 11:02:07 UTC (rev 2932)
+++ branches/new-structure/trunk/geant2_java-as/ant/libs-download-targets.xml
2007-10-09 11:05:17 UTC (rev 2933)
@@ -54,7 +54,7 @@
<artifact:dependencies>
- <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20070911"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20071008"/>
<dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20070814"/>
<localRepository refid="local.repository"/>
Modified: branches/new-structure/trunk/geant2_java-as/ant/test-targets.xml
===================================================================
--- branches/new-structure/trunk/geant2_java-as/ant/test-targets.xml
2007-10-09 11:02:07 UTC (rev 2932)
+++ branches/new-structure/trunk/geant2_java-as/ant/test-targets.xml
2007-10-09 11:05:17 UTC (rev 2933)
@@ -21,6 +21,9 @@
<fileset dir="${basedir}/lib/repository">
<include name="**/*.jar"/>
</fileset>
+ <fileset dir="${basedir}/build">
+ <include name="**/*.jar"/>
+ </fileset>
</path>
@@ -28,6 +31,8 @@
<property file="${basedir}/ant/const.properties"/>
<property name="as.local"
value="http://${target.server}:${target.port}/${deploy.root}/services/AuthService"/>
+ <property name="new.endorsed.libraries"
+
value="${basedir}/lib/repository/xalan/xalan/2.7.0/:${basedir}/lib/repository/xalan/xalan-serializer/2.7.0/:${basedir}/lib/repository/xerces/xercesImpl/2.8.0/:${basedir}/lib/repository/xerces/xerces-xml-apis/2.8.0/"/>
</target>
@@ -36,22 +41,17 @@
<java classname="org.perfsonar.client.testHarness.SOAPX509Client"
classpathref="classpath" fork="true">
<arg value="${as.local}"/>
- <arg
value="${basedir}/schema/example-instances/perfSONAR/AS/test/AuthNRequest.xml"/>
- <arg
value="${basedir}/schema/example-instances/perfSONAR/AS/test/AuthNResponse.xml"/>
+ <arg value="${basedir}/samples/AuthNRequest.xml"/>
+ <arg value="${basedir}/samples/AuthNResponse.xml"/>
<arg value="${basedir}/conf/test-eduGAIN.key"/>
<arg value="${basedir}/conf/test-eduGAIN.pem"/>
- <classpath>
- <pathelement location="build/perfSONAR-generic.jar"/>
- </classpath>
-
</java>
<echo>Test ended successfully.</echo>
- <echo>Message used for request:
${basedir}/schema/example-instances/perfSONAR/AS/test/AuthNRequest.xml</echo>
- <echo>SOAP Message used for request:
${basedir}/schema/example-instances/perfSONAR/AS/test/AuthNRequest.xml.soap</echo>
- <echo>You can check the response at:
${basedir}/schema/example-instances/perfSONAR/AS/test/AuthNResponse.xml</echo>
- <echo>SOAP response at:
${basedir}/schema/example-instances/perfSONAR/AS/test/AuthNResponse.xml.soap</echo>
+ <echo>SOAP Message used for request:
${basedir}/samples/AuthNRequest.xml.soap</echo>
+ <echo>You can check the response at:
${basedir}/samples/AuthNResponse.xml</echo>
+ <echo>SOAP response at:
${basedir}/samples/AuthNResponse.xml.soap</echo>
</target>
@@ -62,13 +62,8 @@
<arg value="${as.local}"/>
<arg value="${basedir}/conf/test-eduGAIN.key"/>
<arg value="${basedir}/conf/test-eduGAIN.pem"/>
- <arg value="${basedir}/src/objects.config"/>
+ <arg value="${basedir}/conf/objects.config"/>
- <classpath>
- <pathelement location="build/perfSONAR-generic.jar"/>
- <pathelement location="build/perfSONAR-as.jar"/>
- </classpath>
-
</java>
<echo>Test ended successfully.</echo>
@@ -76,7 +71,38 @@
</target>
+ <target name="run-ubc-mds" description="Runs Java client2">
+ <property name="new.endorsed.libraries"
+
value="${basedir}/lib/repository/xalan/xalan/2.7.0/:${basedir}/lib/repository/xalan/xalan-serializer/2.7.0/:${basedir}/lib/repository/xerces/xercesImpl/2.8.0/:${basedir}/lib/repository/xerces/xerces-xml-apis/2.8.0/"/>
+ <echo message="Executing test using endorsed directory
${new.endorsed.libraries}" />
+ <java classname="org.perfsonar.client.testHarness.UbCMDSTest"
+ classpathref="classpath" fork="true">
+ <jvmarg
value="-Djava.endorsed.dirs=${new.endorsed.libraries}"/>
+ </java>
+
+ <echo>Test ended successfully.</echo>
+
+ </target>
+
+ <target name="run-ubc-saslca" description="Runs Java client2">
+ <java classname="org.perfsonar.client.testHarness.UbCSaslTest"
+ classpathref="classpath" fork="true">
+ <jvmarg value="-DuseSubjectCredsOnly=true"/>
+ <arg value="homer.rediris.es"/>
+ <arg value="4088"/>
+ <arg value="/Users/kan/Projects/workspace/RedIRIS - perfSONAR
- SASL CA/apps/server/handle.jks"/>
+ <arg value="petete"/>
+ <arg value="jceks"/>
+ <arg value="perfsonar"/>
+ <arg value="perfsonar"/>
+
+ </java>
+
+ <echo>Test ended successfully.</echo>
+
+ </target>
+
<!--
===================================================================================
-->
<!-- main target -->
@@ -85,6 +111,8 @@
<antcall target="run-psr-x509-client"/>
<antcall target="run-psr-x509-service"/>
+ <antcall target="run-ubc-mds"/>
+ <antcall target="run-ubc-saslca"/>
</target>
Modified:
branches/new-structure/trunk/geant2_java-as/conf/ASValidComponentsFile
===================================================================
--- branches/new-structure/trunk/geant2_java-as/conf/ASValidComponentsFile
2007-10-09 11:02:07 UTC (rev 2932)
+++ branches/new-structure/trunk/geant2_java-as/conf/ASValidComponentsFile
2007-10-09 11:05:17 UTC (rev 2933)
@@ -1,2 +1 @@
-urn:geant:edugain:component
-urn:geant:edugain:component:sp:test-as
+urn:geant:edugain:component:.*
\ No newline at end of file
Deleted:
branches/new-structure/trunk/geant2_java-as/lib/misc/perfsonar-base-ant-1.0.20070911.jar
Added:
branches/new-structure/trunk/geant2_java-as/lib/misc/perfsonar-base-ant-1.0.20071008.jar
Property changes on:
branches/new-structure/trunk/geant2_java-as/lib/misc/perfsonar-base-ant-1.0.20071008.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
- perfsonar: r2933 - in branches/new-structure/trunk/geant2_java-as: ant conf lib/misc, svnlog, 10/09/2007
Archive powered by MHonArc 2.6.16.