You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ru...@apache.org on 2006/12/13 15:21:50 UTC
svn commit: r486667 [1/6] - in /webservices/axis2/trunk/java: ./ etc/
modules/integration/ modules/integration/test/org/apache/rampart/
modules/rahas/ modules/rahas/src/org/apache/rahas/
modules/rahas/src/org/apache/rahas/client/ modules/rahas/src/org/...
Author: ruchithf
Date: Wed Dec 13 06:21:47 2006
New Revision: 486667
URL: http://svn.apache.org/viewvc?view=rev&rev=486667
Log:
Merging rampart/rahas/secpolicy changes from 1.1 branch
Added:
webservices/axis2/trunk/java/modules/security/release-docs/build.xml
Removed:
webservices/axis2/trunk/java/modules/samples/security/rahas/
Modified:
webservices/axis2/trunk/java/etc/project.properties
webservices/axis2/trunk/java/maven.xml
webservices/axis2/trunk/java/modules/integration/maven.xml
webservices/axis2/trunk/java/modules/integration/test/org/apache/rampart/PWCallback.java
webservices/axis2/trunk/java/modules/rahas/maven.xml
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenCanceler.java
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenRenewer.java
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenRequestDispatcher.java
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenStorage.java
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenValidator.java
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TrustUtil.java
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/client/STSClient.java
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SAMLTokenIssuer.java
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/TokenCancelerImpl.java
webservices/axis2/trunk/java/modules/samples/security/README.txt
webservices/axis2/trunk/java/modules/samples/security/basic/build.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample01/client.axis2.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample01/services.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample02/client.axis2.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample02/services.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample03/client.axis2.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample03/services.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample04/client.axis2.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample04/services.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample05/client.axis2.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample05/services.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample06/client.axis2.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample06/services.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample07/client.axis2.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample07/services.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample08/client.axis2.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample08/services.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample09/client.axis2.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample09/services.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample10/client.axis2.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample10/services.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample11/client.axis2.xml
webservices/axis2/trunk/java/modules/samples/security/basic/sample11/services.xml
webservices/axis2/trunk/java/modules/samples/security/build.xml
webservices/axis2/trunk/java/modules/samples/security/policy/build.xml
webservices/axis2/trunk/java/modules/samples/security/policy/sample01/README.txt
webservices/axis2/trunk/java/modules/samples/security/policy/sample01/policy.xml
webservices/axis2/trunk/java/modules/samples/security/policy/sample01/services.xml
webservices/axis2/trunk/java/modules/samples/security/policy/sample01/src/org/apache/rampart/samples/policy/sample01/PWCBHandler.java
webservices/axis2/trunk/java/modules/samples/security/policy/sample02/README.txt
webservices/axis2/trunk/java/modules/samples/security/policy/sample02/policy.xml
webservices/axis2/trunk/java/modules/samples/security/policy/sample02/services.xml
webservices/axis2/trunk/java/modules/samples/security/policy/sample03/README.txt
webservices/axis2/trunk/java/modules/samples/security/policy/sample03/policy.xml
webservices/axis2/trunk/java/modules/samples/security/policy/sample03/services.xml
webservices/axis2/trunk/java/modules/samples/security/policy/sample04/README.txt
webservices/axis2/trunk/java/modules/samples/security/policy/sample04/policy.xml
webservices/axis2/trunk/java/modules/samples/security/policy/sample04/services.xml
webservices/axis2/trunk/java/modules/secpolicy/src/org/apache/ws/secpolicy/model/X509Token.java
webservices/axis2/trunk/java/modules/security/maven.xml
webservices/axis2/trunk/java/modules/security/release-docs/README.txt
webservices/axis2/trunk/java/modules/security/release-docs/release-notes.html
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/PolicyBasedResultsValidator.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/RampartEngine.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/RampartMessageData.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/builder/AsymmetricBindingBuilder.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/builder/BindingBuilder.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/builder/TransportBindingBuilder.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/ConversationCallbackHandler.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/ConversationConfiguration.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/STSRequester.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/Util.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/errors.properties
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/RampartReceiver.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllReceiver.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllSender.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/config/InflowConfiguration.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/config/OutflowConfiguration.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/policy/RampartPolicyData.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/RampartUtil.java
Modified: webservices/axis2/trunk/java/etc/project.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/etc/project.properties?view=diff&rev=486667&r1=486666&r2=486667
==============================================================================
--- webservices/axis2/trunk/java/etc/project.properties (original)
+++ webservices/axis2/trunk/java/etc/project.properties Wed Dec 13 06:21:47 2006
@@ -22,8 +22,11 @@
#version_affix=
axis2_version=${version_number}
addressing_version=${axis2_version}
-rampart_version=${axis2_version}
-rahas_version=${axis2_version}
+rampart_version=SNAPSHOT
+rahas_version=SNAPSHOT
+secpolicy_version=SNAPSHOT
+rampart_module_version=SNAPSHOT
+rahas_module_version=SNAPSHOT
soapmonitor_version=${axis2_version}
savan_version=${axis2_version}
Modified: webservices/axis2/trunk/java/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/maven.xml?view=diff&rev=486667&r1=486666&r2=486667
==============================================================================
--- webservices/axis2/trunk/java/maven.xml (original)
+++ webservices/axis2/trunk/java/maven.xml Wed Dec 13 06:21:47 2006
@@ -1021,10 +1021,11 @@
</goal>
+
<!-- ================================================================ -->
<!--- Create Apache Rampart Release Artifacts -->
<!-- ================================================================ -->
- <goal name="rampart-release" prereqs="jar">
+ <goal name="rampart-release" prereqs="create-lib">
<ant:echo>+----------------------------------------------</ant:echo>
<ant:echo>| Creating: Rampart Release</ant:echo>
@@ -1035,8 +1036,9 @@
<attainGoal name="rampart-dist-bin"/>
<attainGoal name="rampart-dist-src"/>
-
- <!--<attainGoal name="rampart-dist-doc"/> -->
+
+ <attainGoal name="rampart-javadocs"/>
+
</goal>
<!-- ================================================================ -->
@@ -1048,29 +1050,27 @@
<ant:echo>| Creating: Rampart Binary Distribution</ant:echo>
<ant:echo>+----------------------------------------------</ant:echo>
- <ant:property name="moddir"
- value="target/temp-rampart-bin/rampart-${rampart_version}/modules"/>
+ <ant:property name="destdir" value="target/temp-rampart-bin/rampart-${rampart_version}"/>
<ant:property name="libdir" value="target/temp-rampart-bin/rampart-${rampart_version}/lib"/>
<ant:property name="samplesdir"
value="target/temp-rampart-bin/rampart-${rampart_version}/samples"/>
- <ant:mkdir dir="${moddir}"/>
<ant:mkdir dir="${libdir}"/>
<ant:mkdir dir="${samplesdir}"/>
- <ant:copy toDir="${moddir}">
- <ant:fileset file="modules/security/target/rampart-${rampart_version}.mar"/>
- <ant:fileset file="modules/rahas/target/rahas-${rahas_version}.mar"/>
- <ant:fileset file="modules/rahas/target/rahas-${rahas_version}.aar"/>
+ <ant:copy toDir="target/temp-rampart-bin/rampart-${rampart_version}">
+ <ant:fileset file="modules/security/target/rampart-${rampart_module_version}.mar"/>
+ <ant:fileset file="modules/rahas/target/rahas-${rahas_module_version}.mar"/>
+ <ant:fileset file="modules/rahas/target/rahas-${rahas_version}.zip"/>
</ant:copy>
<ant:copy toDir="${libdir}">
- <ant:fileset file="modules/security/target/axis2-security-${pom.currentVersion}.jar"/>
- <ant:fileset file="modules/rahas/target/axis2-rahas-${pom.currentVersion}.jar"/>
- <ant:fileset file="modules/secpolicy/target/axis2-secpolicy-${pom.currentVersion}.jar"/>
<ant:fileset file="${maven.repo.local}/wss4j/jars/wss4j-${wss4j.version}.jar"/>
<ant:fileset file="${maven.repo.local}/xml-security/jars/xmlsec-${xmlsec.version}.jar"/>
<ant:fileset file="${maven.repo.local}/opensaml/jars/opensaml-${opensaml.version}.jar"/>
<ant:fileset file="${maven.repo.local}/bouncycastle/jars/bcprov-${bcprov.version}.jar"/>
+ <ant:fileset file="${maven.repo.local}/org.apache.ws.commons.axiom/jars/axiom-api-${axiom.version}.jar"/>
+ <ant:fileset file="${maven.repo.local}/org.apache.ws.commons.axiom/jars/axiom-impl-${axiom.version}.jar"/>
+ <ant:fileset file="${maven.repo.local}/org.apache.ws.commons.axiom/jars/axiom-dom-${axiom.version}.jar"/>
<ant:fileset
file="${maven.repo.local}/commons-codec/jars/commons-codec-${commons.codec.version}.jar"/>
@@ -1083,11 +1083,20 @@
<ant:fileset file="LICENSE.txt"/>
</ant:copy>
+
+ <!-- copy axis2-security.jar, axis2-secpolicy.jar and axis2-rahas.jar -->
+ <copy file="modules/security/target/axis2-security-${axis2_version}.jar"
+ tofile="${libdir}/axis2-security-${rampart_version}.jar" overwrite="true"/>
+ <copy file="modules/rahas/target/axis2-rahas-${axis2_version}.jar"
+ tofile="${libdir}/axis2-rahas-${rahas_version}.jar" overwrite="true"/>
+ <copy file="modules/secpolicy/target/axis2-secpolicy-${axis2_version}.jar"
+ tofile="${libdir}/axis2-secpolicy-${secpolicy_version}.jar" overwrite="true"/>
<ant:copy toDir="${samplesdir}">
<ant:fileset dir="modules/samples/security/"/>
</ant:copy>
+
<ant:copy toDir="${destdir}">
<ant:fileset dir="modules/security/release-docs"/>
</ant:copy>
@@ -1160,6 +1169,46 @@
</ant:zip>
<ant:delete dir="target/temp-rampart-src"/>
</goal>
+
+
+ <!-- ================================================================ -->
+ <!--- Create Rampart Java Docs -->
+ <!-- ================================================================ -->
+ <goal name="rampart-javadocs">
+ <ant:javadoc packagenames="org.apache.rampart.*, org.apache.rahas.*,org.apache.ws.secpolicy.*"
+ defaultexcludes="yes"
+ destdir="target/dist/rampart/docs/rampart-${rampart_version}-apidocs"
+ author="true"
+ breakiterator="true"
+ version="true"
+ use="true"
+ windowtitle="Apache Rampart ${rampart_version} API">
+ <ant:arg
+ line="-J-Dhttp.proxy.port=${maven.proxy.port} -J-Dhttp.proxy.host=${maven.proxy.host}"/>
+ <ant:sourcepath>
+ <ant:pathelement location="modules/security/src"/>
+ <ant:pathelement location="modules/rahas/src"/>
+ <ant:pathelement location="modules/secpolicy/src"/>
+ </ant:sourcepath>
+ <ant:classpath>
+ <ant:fileset dir="target/lib">
+ <ant:include name="**/*.jar"/>
+ </ant:fileset>
+ </ant:classpath>
+ <ant:link href="http://java.sun.com/j2se/1.4.2/docs/api/"/>
+ <ant:link href="http://java.sun.com/webservices/docs/1.5/api/"/>
+ <ant:link href="http://xerces.apache.org/xerces-j/apiDocs/"/>
+ <ant:link href="http://xml.apache.org/xalan-j/apidocs/"/>
+ <ant:link href="http://xmlbeans.apache.org/docs/2.1.0/reference/"/>
+ </ant:javadoc>
+
+ <ant:zip file="target/dist/rampart/rampart-${rampart_version}-docs.zip">
+ <ant:fileset dir="target/dist/rampart/docs"/>
+ </ant:zip>
+ <ant:delete dir="target/dist/rampart/docs"/>
+
+ </goal>
+
<define:taglib uri="macros">
<define:tag name="copy-deps">
Modified: webservices/axis2/trunk/java/modules/integration/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/maven.xml?view=diff&rev=486667&r1=486666&r2=486667
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Wed Dec 13 06:21:47 2006
@@ -24,8 +24,8 @@
<!-- copy the mars so that they are available on the test classpath -->
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-classes/modules/addressing-${addressing_version}.mar"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-classes/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-classes/modules/rampart-${rampart_module_version}.mar"/>
<j:set var="axis2.home" value="${basedir}/target"/>
@@ -208,10 +208,10 @@
<mkdir dir="target/test-resources/rampart_client_repo/conf"/>
<mkdir dir="target/test-resources/rampart_client_repo/modules"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/rampart_client_repo/modules/rampart-${rampart_version}.mar"/>
- <copy file="../rahas/target/rahas-${rahas_version}.mar"
- tofile="target/test-resources/rampart_client_repo/modules/rahas-${rahas_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/rampart_client_repo/modules/rampart-${rampart_module_version}.mar"/>
+ <copy file="../rahas/target/rahas-${rahas_module_version}.mar"
+ tofile="target/test-resources/rampart_client_repo/modules/rahas-${rahas_module_version}.mar"/>
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/rampart_client_repo/modules/addressing-${addressing_version}.mar"/>
@@ -220,10 +220,10 @@
<mkdir dir="target/test-resources/rampart_service_repo/services"/>
<mkdir dir="target/test-resources/rampart_service_repo/modules"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/rampart_service_repo/modules/rampart-${rampart_version}.mar"/>
- <copy file="../rahas/target/rahas-${rahas_version}.mar"
- tofile="target/test-resources/rampart_service_repo/modules/rahas-${rahas_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/rampart_service_repo/modules/rampart-${rampart_module_version}.mar"/>
+ <copy file="../rahas/target/rahas-${rahas_module_version}.mar"
+ tofile="target/test-resources/rampart_service_repo/modules/rahas-${rahas_module_version}.mar"/>
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/rampart_service_repo/modules/addressing-${addressing_version}.mar"/>
@@ -334,8 +334,8 @@
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/sc_client_repo/modules/addressing-${addressing_version}.mar"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/sc_client_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/sc_client_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- SecConv Test - 1 -->
@@ -345,10 +345,10 @@
<mkdir dir="target/test-resources/sc_service_repo_1/modules"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/sc_service_repo_1/modules/rampart-${rampart_version}.mar"/>
- <copy file="../rahas/target/rahas-${rahas_version}.mar"
- tofile="target/test-resources/sc_service_repo_1/modules/rahas-${rahas_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/sc_service_repo_1/modules/rampart-${rampart_module_version}.mar"/>
+ <copy file="../rahas/target/rahas-${rahas_module_version}.mar"
+ tofile="target/test-resources/sc_service_repo_1/modules/rahas-${rahas_module_version}.mar"/>
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/sc_service_repo_1/modules/addressing-${addressing_version}.mar"/>
@@ -368,10 +368,10 @@
<mkdir dir="target/test-resources/sc_service_repo_2/services"/>
<mkdir dir="target/test-resources/sc_service_repo_2/modules"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/sc_service_repo_2/modules/rampart-${rampart_version}.mar"/>
- <copy file="../rahas/target/rahas-${rahas_version}.mar"
- tofile="target/test-resources/sc_service_repo_2/modules/rahas-${rahas_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/sc_service_repo_2/modules/rampart-${rampart_module_version}.mar"/>
+ <copy file="../rahas/target/rahas-${rahas_module_version}.mar"
+ tofile="target/test-resources/sc_service_repo_2/modules/rahas-${rahas_module_version}.mar"/>
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/sc_service_repo_2/modules/addressing-${addressing_version}.mar"/>
@@ -391,8 +391,8 @@
<mkdir dir="target/test-resources/sc_service_repo_3/services"/>
<mkdir dir="target/test-resources/sc_service_repo_3/modules"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/sc_service_repo_3/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/sc_service_repo_3/modules/rampart-${rampart_module_version}.mar"/>
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/sc_service_repo_3/modules/addressing-${addressing_version}.mar"/>
<!-- copy the services.xml and create the aar -->
@@ -411,10 +411,10 @@
<mkdir dir="target/test-resources/sc_service_repo_4/services"/>
<mkdir dir="target/test-resources/sc_service_repo_4/modules"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/sc_service_repo_4/modules/rampart-${rampart_version}.mar"/>
- <copy file="../rahas/target/rahas-${rahas_version}.mar"
- tofile="target/test-resources/sc_service_repo_4/modules/rahas-${rahas_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/sc_service_repo_4/modules/rampart-${rampart_module_version}.mar"/>
+ <copy file="../rahas/target/rahas-${rahas_module_version}.mar"
+ tofile="target/test-resources/sc_service_repo_4/modules/rahas-${rahas_module_version}.mar"/>
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/sc_service_repo_4/modules/addressing-${addressing_version}.mar"/>
@@ -456,8 +456,8 @@
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/rahas_client_repo/modules/addressing-${addressing_version}.mar"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/rahas_client_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/rahas_client_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- Copying the DOM3 stuff to the endorsed dir -->
<mkdir dir="target/test-resources/endorsed"/>
@@ -480,10 +480,10 @@
<mkdir dir="target/test-resources/rahas_service_repo_1/services"/>
<mkdir dir="target/test-resources/rahas_service_repo_1/modules"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/rahas_service_repo_1/modules/rampart-${rampart_version}.mar"/>
- <copy file="../rahas/target/rahas-${rahas_version}.mar"
- tofile="target/test-resources/rahas_service_repo_1/modules/rahas-${rahas_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/rahas_service_repo_1/modules/rampart-${rampart_module_version}.mar"/>
+ <copy file="../rahas/target/rahas-${rahas_module_version}.mar"
+ tofile="target/test-resources/rahas_service_repo_1/modules/rahas-${rahas_module_version}.mar"/>
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/rahas_service_repo_1/modules/addressing-${addressing_version}.mar"/>
@@ -504,10 +504,10 @@
<mkdir dir="target/test-resources/rahas_service_repo_3/services"/>
<mkdir dir="target/test-resources/rahas_service_repo_3/modules"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/rahas_service_repo_3/modules/rampart-${rampart_version}.mar"/>
- <copy file="../rahas/target/rahas-${rahas_version}.mar"
- tofile="target/test-resources/rahas_service_repo_3/modules/rahas-${rahas_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/rahas_service_repo_3/modules/rampart-${rampart_module_version}.mar"/>
+ <copy file="../rahas/target/rahas-${rahas_module_version}.mar"
+ tofile="target/test-resources/rahas_service_repo_3/modules/rahas-${rahas_module_version}.mar"/>
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/rahas_service_repo_3/modules/addressing-${addressing_version}.mar"/>
@@ -654,8 +654,8 @@
<mkdir dir="target/test-resources/default_security_client_repo"/>
<mkdir dir="target/test-resources/default_security_client_repo/conf"/>
<mkdir dir="target/test-resources/default_security_client_repo/modules"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/default_security_client_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/default_security_client_repo/modules/rampart-${rampart_module_version}.mar"/>
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/default_security_client_repo/modules/addressing-${addressing_version}.mar"/>
<copy file="conf/axis2.xml"
@@ -675,8 +675,8 @@
<!-- setup scenario 1 client repository-->
<copy file="test-resources/security/s1.client.axis2.xml"
tofile="target/test-resources/scenario1_client_repo/conf/axis2.xml"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario1_client_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario1_client_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- This is to add the PWCallback in to the classpath for the client to pick
the password callback class.
@@ -687,8 +687,8 @@
<!-- setup scenario 1 service repository-->
<copy file="test-resources/security/s1.service.axis2.xml"
tofile="target/test-resources/scenario1_service_repo/conf/axis2.xml"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario1_service_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario1_service_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s1.service.xml"
@@ -712,14 +712,14 @@
<!-- setup scenario 2 client repository-->
<copy file="test-resources/security/s2.client.axis2.xml"
tofile="target/test-resources/scenario2_client_repo/conf/axis2.xml"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario2_client_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario2_client_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- setup scenario 2 service repository-->
<copy file="test-resources/security/s2.service.axis2.xml"
tofile="target/test-resources/scenario2_service_repo/conf/axis2.xml"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario2_service_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario2_service_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s2.service.xml"
@@ -743,14 +743,14 @@
<!-- setup scenario 2a client repository-->
<copy file="test-resources/security/s2a.client.axis2.xml"
tofile="target/test-resources/scenario2a_client_repo/conf/axis2.xml"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario2a_client_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario2a_client_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- setup scenario 2a service repository-->
<copy file="test-resources/security/s2a.service.axis2.xml"
tofile="target/test-resources/scenario2a_service_repo/conf/axis2.xml"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario2a_service_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario2a_service_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s2a.service.xml"
@@ -774,14 +774,14 @@
<!-- setup scenario 3 client repository-->
<copy file="test-resources/security/s3.client.axis2.xml"
tofile="target/test-resources/scenario3_client_repo/conf/axis2.xml"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario3_client_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario3_client_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- setup scenario 3 service repository-->
<copy file="test-resources/security/s3.service.axis2.xml"
tofile="target/test-resources/scenario3_service_repo/conf/axis2.xml"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario3_service_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario3_service_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s3.service.xml"
@@ -806,14 +806,14 @@
<!-- setup scenario 4 client repository-->
<copy file="test-resources/security/s4.client.axis2.xml"
tofile="target/test-resources/scenario4_client_repo/conf/axis2.xml"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario4_client_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario4_client_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- setup scenario 4 service repository-->
<copy file="test-resources/security/s4.service.axis2.xml"
tofile="target/test-resources/scenario4_service_repo/conf/axis2.xml"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario4_service_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario4_service_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s4.service.xml"
@@ -838,14 +838,14 @@
<!-- setup scenario 5 client repository-->
<copy file="test-resources/security/s5.client.axis2.xml"
tofile="target/test-resources/scenario5_client_repo/conf/axis2.xml"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario5_client_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario5_client_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- setup scenario 5 service repository-->
<copy file="test-resources/security/s5.service.axis2.xml"
tofile="target/test-resources/scenario5_service_repo/conf/axis2.xml"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario5_service_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario5_service_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s5.service.xml"
@@ -870,14 +870,14 @@
<!-- setup scenario 6 client repository-->
<copy file="test-resources/security/s6.client.axis2.xml"
tofile="target/test-resources/scenario6_client_repo/conf/axis2.xml"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario6_client_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario6_client_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- setup scenario 6 service repository-->
<copy file="test-resources/security/s6.service.axis2.xml"
tofile="target/test-resources/scenario6_service_repo/conf/axis2.xml"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario6_service_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario6_service_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s6.service.xml"
@@ -902,14 +902,14 @@
<!-- setup scenario 7 client repository-->
<copy file="test-resources/security/s7.client.axis2.xml"
tofile="target/test-resources/scenario7_client_repo/conf/axis2.xml"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario7_client_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario7_client_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- setup scenario 7 service repository-->
<copy file="test-resources/security/s7.service.axis2.xml"
tofile="target/test-resources/scenario7_service_repo/conf/axis2.xml"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario7_service_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario7_service_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s7.service.xml"
@@ -933,14 +933,14 @@
<!-- setup scenario ST1 client repository-->
<copy file="test-resources/security/sST1.client.axis2.xml"
tofile="target/test-resources/scenarioST1_client_repo/conf/axis2.xml"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenarioST1_client_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenarioST1_client_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- setup scenario ST1 service repository-->
<copy file="test-resources/security/sST1.service.axis2.xml"
tofile="target/test-resources/scenarioST1_service_repo/conf/axis2.xml"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenarioST1_service_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenarioST1_service_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/sST1.service.xml"
@@ -965,14 +965,14 @@
<!-- MTOM Optimized Security Test client repository-->
<copy file="test-resources/security/secMtom.client.axis2.xml"
tofile="target/test-resources/mtom_sec_client_repo/conf/axis2.xml"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/mtom_sec_client_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/mtom_sec_client_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- MTOM Optimized Security Test service repository-->
<copy file="test-resources/security/secMtom.service.axis2.xml"
tofile="target/test-resources/mtom_sec_service_repo/conf/axis2.xml"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/mtom_sec_service_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/mtom_sec_service_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/secMtom.service.xml"
@@ -1008,16 +1008,16 @@
<!-- Test with addressing and MTOM client repository-->
<copy file="test-resources/security/complete.client.axis2.xml"
tofile="target/test-resources/complete_client_repo/conf/axis2.xml"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/complete_client_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/complete_client_repo/modules/rampart-${rampart_module_version}.mar"/>
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/complete_client_repo/modules/addressing-${addressing_version}.mar"/>
<!-- Test with addressing and MTOMservice repository-->
<copy file="test-resources/security/complete.service.axis2.xml"
tofile="target/test-resources/complete_service_repo/conf/axis2.xml"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/complete_service_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/complete_service_repo/modules/rampart-${rampart_module_version}.mar"/>
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/complete_service_repo/modules/addressing-${addressing_version}.mar"/>
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/rampart/PWCallback.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/rampart/PWCallback.java?view=diff&rev=486667&r1=486666&r2=486667
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/rampart/PWCallback.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/rampart/PWCallback.java Wed Dec 13 06:21:47 2006
@@ -124,7 +124,11 @@
return;
- }
+ }
+
+ if(pc.getIdentifer().equals("alice") && pc.getPassword().equals("password")) {
+ return;
+ }
throw new UnsupportedCallbackException(callbacks[i],
Modified: webservices/axis2/trunk/java/modules/rahas/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/maven.xml?view=diff&rev=486667&r1=486666&r2=486667
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/rahas/maven.xml Wed Dec 13 06:21:47 2006
@@ -13,49 +13,49 @@
<!-- Create the sts.aar : STATRT -->
- <mkdir dir="target/sts"/>
- <mkdir dir="target/sts/lib"/>
+ <mkdir dir="target/sts/rahas-${rahas_version}/"/>
+ <mkdir dir="target/sts/rahas-${rahas_version}/lib"/>
<!-- Copy classes -->
- <copy todir="target/sts">
+ <copy todir="target/sts/rahas-${rahas_version}/">
<fileset dir="target/classes">
<include name="**/*.class"/>
</fileset>
</copy>
<!-- copy jars -->
<j:if test="${context.getVariable('maven.jar.override').toString().trim().equalsIgnoreCase('on')}">
- <copy file="${dependencies.dir}/xmlsec-${xmlsec.version}.jar" todir="target/sts/lib"/>
- <copy file="${dependencies.dir}/bcprov-${bcprov.version}.jar" todir="target/sts/lib"/>
- <copy file="${dependencies.dir}/opensaml-${opensaml.version}.jar" todir="target/sts/lib"/>
- <copy file="${dependencies.dir}/wss4j-${wss4j.version}.jar" todir="target/sts/lib"/>
+ <copy file="${dependencies.dir}/xmlsec-${xmlsec.version}.jar" todir="target/sts/rahas-${rahas_version}/lib"/>
+ <copy file="${dependencies.dir}/bcprov-${bcprov.version}.jar" todir="target/sts/rahas-${rahas_version}/lib"/>
+ <copy file="${dependencies.dir}/opensaml-${opensaml.version}.jar" todir="target/sts/rahas-${rahas_version}/lib"/>
+ <copy file="${dependencies.dir}/wss4j-${wss4j.version}.jar" todir="target/sts/rahas-${rahas_version}/lib"/>
</j:if>
<j:if test="${context.getVariable('maven.jar.override').toString().trim().equalsIgnoreCase('off')}">
- <copy file="${maven.repo.local}/xml-security/jars/xmlsec-${xmlsec.version}.jar" todir="target/sts/lib"/>
- <copy file="${maven.repo.local}/bouncycastle/jars/bcprov-${bcprov.version}.jar" todir="target/sts/lib"/>
- <copy file="${maven.repo.local}/opensaml/jars/opensaml-${opensaml.version}.jar" todir="target/sts/lib"/>
- <copy file="${maven.repo.local}/wss4j/jars/wss4j-${wss4j.version}.jar" todir="target/sts/lib"/>
+ <copy file="${maven.repo.local}/xml-security/jars/xmlsec-${xmlsec.version}.jar" todir="target/sts/rahas-${rahas_version}/lib"/>
+ <copy file="${maven.repo.local}/bouncycastle/jars/bcprov-${bcprov.version}.jar" todir="target/sts/rahas-${rahas_version}/lib"/>
+ <copy file="${maven.repo.local}/opensaml/jars/opensaml-${opensaml.version}.jar" todir="target/sts/rahas-${rahas_version}/lib"/>
+ <copy file="${maven.repo.local}/wss4j/jars/wss4j-${wss4j.version}.jar" todir="target/sts/rahas-${rahas_version}/lib"/>
</j:if>
- <copy file="src/META-INF/module.xml" toFile="target/sts/META-INF/module.xml"/>
+ <copy file="src/META-INF/module.xml" toFile="target/sts/rahas-${rahas_version}/META-INF/module.xml"/>
- <jar jarfile="target/rahas-${rahas_version}.mar" basedir="target/sts/">
+ <jar jarfile="target/rahas-${rahas_module_version}.mar" basedir="target/sts/rahas-${rahas_version}/">
<include name="**/*"/>
</jar>
<delete file="target/sts/META-INF/module.xml"/>
<delete includeEmptyDirs="true">
- <fileset dir="target/sts/org/apache/rahas/client"/>
+ <fileset dir="target/sts/rahas-${rahas_version}/org/apache/rahas/client"/>
</delete>
- <copy file="sts-aar-resources/services.xml" toFile="target/sts/META-INF/services.xml"/>
- <copy file="sts-aar-resources/sct-issuer-config.xml" toFile="target/sts/META-INF/sct-issuer-config.xml"/>
- <copy file="sts-aar-resources/saml-issuer-config.xml" toFile="target/sts/META-INF/saml-issuer-config.xml"/>
- <copy file="sts-aar-resources/token-canceler-config.xml" toFile="target/sts/META-INF/token-canceler-config.xml"/>
- <copy file="sts-aar-resources/token-dispatcher-configuration.xml" toFile="target/sts/META-INF/token-dispatcher-configuration.xml"/>
+ <copy file="sts-aar-resources/services.xml" toFile="target/sts/rahas-${rahas_version}/META-INF/services.xml"/>
+ <copy file="sts-aar-resources/sct-issuer-config.xml" toFile="target/sts/rahas-${rahas_version}/META-INF/sct-issuer-config.xml"/>
+ <copy file="sts-aar-resources/saml-issuer-config.xml" toFile="target/sts/rahas-${rahas_version}/META-INF/saml-issuer-config.xml"/>
+ <copy file="sts-aar-resources/token-canceler-config.xml" toFile="target/sts/rahas-${rahas_version}/META-INF/token-canceler-config.xml"/>
+ <copy file="sts-aar-resources/token-dispatcher-configuration.xml" toFile="target/sts/rahas-${rahas_version}/META-INF/token-dispatcher-configuration.xml"/>
<copy file="sts-aar-resources/rahas-sts.jks" toFile="target/sts/META-INF/rahas-sts.jks"/>
- <jar jarfile="target/rahas-${rahas_version}.aar" basedir="target/sts/">
+ <zip zipfile="target/rahas-${rahas_version}.zip" basedir="target/sts/">
<include name="**/*"/>
- </jar>
+ </zip>
<delete includeEmptyDirs="true">
<fileset dir="target/sts"/>
@@ -65,7 +65,7 @@
</postGoal>
<postGoal name="test:compile">
- <copy file="target/rahas-${rahas_version}.mar" tofile="target/modules/rahas-${rahas_version}.mar"/>
- <copy file="target/rahas-${rahas_version}.mar" tofile="${maven.repo.local}/org.apache.axis2/mars/rahas-${rahas_version}.mar"/>
+ <copy file="target/rahas-${rahas_module_version}.mar" tofile="target/modules/rahas-${rahas_module_version}.mar"/>
+ <copy file="target/rahas-${rahas_module_version}.mar" tofile="${maven.repo.local}/org.apache.axis2/mars/rahas-${rahas_module_version}.mar"/>
</postGoal>
</project>
Modified: webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenCanceler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenCanceler.java?view=diff&rev=486667&r1=486666&r2=486667
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenCanceler.java (original)
+++ webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenCanceler.java Wed Dec 13 06:21:47 2006
@@ -25,7 +25,7 @@
* Cancel the token specified in the request.
*
* @param data A populated <code>RahasData</code> instance
- * @return
+ * @return Response SOAPEnveloper
* @throws TrustException
*/
SOAPEnvelope cancel(RahasData data) throws TrustException;
Modified: webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenRenewer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenRenewer.java?view=diff&rev=486667&r1=486666&r2=486667
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenRenewer.java (original)
+++ webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenRenewer.java Wed Dec 13 06:21:47 2006
@@ -25,7 +25,7 @@
*
* @param data
* A populated <code>RahasData</code> instance
- * @return
+ * @return Response SOAPEnveloper
* @throws TrustException
*/
public SOAPEnvelope renew(RahasData data) throws TrustException;
Modified: webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenRequestDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenRequestDispatcher.java?view=diff&rev=486667&r1=486666&r2=486667
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenRequestDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenRequestDispatcher.java Wed Dec 13 06:21:47 2006
@@ -38,7 +38,7 @@
/**
* Processes the incoming request and returns a SOAPEnvelope
* @param inMsgCtx
- * @return
+ * @return The response SOAPEnvelope
* @throws TrustException
*/
public SOAPEnvelope handle(MessageContext inMsgCtx,
Modified: webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenStorage.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenStorage.java?view=diff&rev=486667&r1=486666&r2=486667
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenStorage.java (original)
+++ webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenStorage.java Wed Dec 13 06:21:47 2006
@@ -41,7 +41,7 @@
/**
* Return the list of all token identifiers.
- * @return
+ * @return As array of token identifiers
* @throws TrustException
*/
String[] getTokenIdentifiers() throws TrustException;
@@ -50,28 +50,28 @@
* Return the list of <code>EXPIRED</code> tokens.
* If there are no <code>EXPIRED</code> tokens <code>null</code> will be
* returned
- * @return
+ * @return An array of expired <code>Tokens</code>
* @throws TrustException
*/
Token[] getExpiredTokens() throws TrustException;
/**
* Return the list of ISSUED and RENEWED tokens.
- * @return
+ * @return An array of ISSUED and RENEWED <code>Tokens</code>.
* @throws TrustException
*/
Token[] getValidTokens() throws TrustException;
/**
* Return the list of RENEWED tokens.
- * @return
+ * @return An array of RENEWED <code>Tokens</code>
* @throws TrustException
*/
Token[] getRenewedTokens() throws TrustException;
/**
* Return the list of CANCELLED tokens
- * @return
+ * @return An array of CANCELLED <code>Tokens</code>
* @throws TrustException
*/
Token[] getCancelledTokens() throws TrustException;
@@ -79,7 +79,7 @@
/**
* Returns the <code>Token</code> of the given id
* @param id
- * @return
+ * @return The requested <code>Token</code> identified by the give id
* @throws TrustException
*/
Token getToken(String id) throws TrustException;
Modified: webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenValidator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenValidator.java?view=diff&rev=486667&r1=486666&r2=486667
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenValidator.java (original)
+++ webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenValidator.java Wed Dec 13 06:21:47 2006
@@ -25,7 +25,7 @@
*
* @param data
* A populated <code>RahasData</code> instance
- * @return
+ * @return Response SOAPEnveloper
* @throws TrustException
*/
public SOAPEnvelope validate(RahasData data) throws TrustException;
Modified: webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TrustUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TrustUtil.java?view=diff&rev=486667&r1=486666&r2=486667
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TrustUtil.java (original)
+++ webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TrustUtil.java Wed Dec 13 06:21:47 2006
@@ -399,7 +399,7 @@
/**
* Create an ephemeral key
*
- * @return
+ * @return The generated ephemeral key
* @throws TrustException
*/
protected byte[] generateEphemeralKey(int keySize) throws TrustException {
@@ -416,7 +416,7 @@
/**
* Create an ephemeral key
*
- * @return
+ * @return The generated ephemeral key
* @throws TrustException
*/
protected byte[] generateEphemeralKey(byte[] reqEnt,
Modified: webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/client/STSClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/client/STSClient.java?view=diff&rev=486667&r1=486666&r2=486667
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/client/STSClient.java (original)
+++ webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/client/STSClient.java Wed Dec 13 06:21:47 2006
@@ -87,6 +87,8 @@
private String addressingNs = AddressingConstants.Final.WSA_NAMESPACE;
private int keySize;
+
+ private String soapVersion = SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI;
/**
* Life time in seconds
@@ -117,8 +119,7 @@
ServiceClient client = getServiceClient(rstQn, issuerAddress);
client.getOptions().setProperty(RAMPART_POLICY, issuerPolicy);
- client.getOptions().setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
- //TODO : Get the soap version from config
+ client.getOptions().setSoapVersionURI(this.soapVersion);
//Process the STS and service policy policy
this.processPolicy(issuerPolicy, servicePolicy);
@@ -146,8 +147,6 @@
String action) throws TrustException {
try {
QName rstQn = new QName("cancelSecurityToken");
- String requestType =
- TrustUtil.getWSTNamespace(version) + RahasConstants.REQ_TYPE_CANCEL;
ServiceClient client = getServiceClient(rstQn, issuerAddress);
if(action != null) {
client.getOptions().setAction(action);
@@ -610,6 +609,10 @@
*/
public void setVersion(int version) {
this.version = version;
+ }
+
+ public void setSoapVersion(String soapVersion) {
+ this.soapVersion = soapVersion;
}
}
Modified: webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SAMLTokenIssuer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SAMLTokenIssuer.java?view=diff&rev=486667&r1=486666&r2=486667
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SAMLTokenIssuer.java (original)
+++ webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SAMLTokenIssuer.java Wed Dec 13 06:21:47 2006
@@ -553,7 +553,7 @@
/**
* Create an ephemeral key
*
- * @return
+ * @return The generated key as a byte array
* @throws TrustException
*/
protected byte[] generateEphemeralKey(int keySize) throws TrustException {
Modified: webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/TokenCancelerImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/TokenCancelerImpl.java?view=diff&rev=486667&r1=486666&r2=486667
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/TokenCancelerImpl.java (original)
+++ webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/TokenCancelerImpl.java Wed Dec 13 06:21:47 2006
@@ -51,7 +51,7 @@
* Cancel the token specified in the request.
*
* @param data A populated <code>RahasData</code> instance
- * @return
+ * @return Response SOAPEnveloper
* @throws org.apache.rahas.TrustException
*
*/
Modified: webservices/axis2/trunk/java/modules/samples/security/README.txt
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/security/README.txt?view=diff&rev=486667&r1=486666&r2=486667
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/security/README.txt (original)
+++ webservices/axis2/trunk/java/modules/samples/security/README.txt Wed Dec 13 06:21:47 2006
@@ -9,15 +9,3 @@
- policy - A set of samples that uses rampart with WS-SecurityPolicy
- - rahas - A set of samples demonstrating WS-Trust features provided by Rahas
-
-IMPORTANT: Before you try any of the samples makesure you
-
-1.) Have the Axis2 standard binary distribution downloaded and extracted.
-2.) Set the AXIS2_HOME envirenment variable
-3.) Run ant from the "samples" directory to copy the required libraries and
- modules to relevant directories in AXIS2_HOME.
-4.) Download xalan-2.7.0.jar from here[1] and put under AXIS2_HOME\lib folder,
- if you use JDK 1.5.
-
-[1] http://www.apache.org/dist/java-repository/xalan/jars/
\ No newline at end of file
Modified: webservices/axis2/trunk/java/modules/samples/security/basic/build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/security/basic/build.xml?view=diff&rev=486667&r1=486666&r2=486667
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/security/basic/build.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/security/basic/build.xml Wed Dec 13 06:21:47 2006
@@ -1,242 +1,259 @@
-<project basedir="." default="clean">
-
- <property name="service.repos.dir" value="build/service_repositories"/>
- <property name="client.repos.dir" value="build/client_repositories"/>
- <property name="temp.dir" value="build/temp"/>
- <property name="keys.dir" value="../keys"/>
- <property name="temp.client.dir" value="build/temp_client"/>
-
- <property name="addressing.mar" value="addressing-1.1-SNAPSHOT.mar"/>
- <property name="rampart.mar" value="rampart-1.1-SNAPSHOT.mar"/>
-
- <property name="client.port" value="8080"/>
- <property name="server.port" value="8080"/>
-
- <property name="sample.services.url" value="http://localhost:${client.port}/axis2/services"/>
-
- <property environment="env"/>
-
- <target name="check.dependency" unless="env.AXIS2_HOME">
- <echo message="AXIS2_HOME must be set"/>
- </target>
-
- <!-- Sample Service 01 -->
- <target name="service.01" if="env.AXIS2_HOME" depends="check.dependency">
- <create.service.repo sample.number="01"/>
- </target>
-
- <!-- Sample Client 01 -->
- <target name="client.01" if="env.AXIS2_HOME" depends="check.dependency">
- <create.and.run.client sample.number="01"/>
- </target>
-
- <!-- Sample Service 02 -->
- <target name="service.02" if="env.AXIS2_HOME" depends="check.dependency">
- <create.service.repo sample.number="02"/>
- </target>
-
- <!-- Sample Client 02 -->
- <target name="client.02" if="env.AXIS2_HOME" depends="check.dependency">
- <create.and.run.client sample.number="02"/>
- </target>
-
- <!-- Sample Service 03 -->
- <target name="service.03" if="env.AXIS2_HOME" depends="check.dependency">
- <create.service.repo sample.number="03"/>
- </target>
-
- <!-- Sample Client 03 -->
- <target name="client.03" if="env.AXIS2_HOME" depends="check.dependency">
- <create.and.run.client sample.number="03"/>
- </target>
-
- <!-- Sample Service 04 -->
- <target name="service.04" if="env.AXIS2_HOME" depends="check.dependency">
- <create.service.repo sample.number="04"/>
- </target>
-
- <!-- Sample Client 04 -->
- <target name="client.04" if="env.AXIS2_HOME" depends="check.dependency">
- <create.and.run.client sample.number="04"/>
- </target>
-
- <!-- Sample Service 05 -->
- <target name="service.05" if="env.AXIS2_HOME" depends="check.dependency">
- <create.service.repo sample.number="05"/>
- </target>
-
- <!-- Sample Client 05 -->
- <target name="client.05" if="env.AXIS2_HOME" depends="check.dependency">
- <create.and.run.client sample.number="05"/>
- </target>
-
- <!-- Sample Service 06 -->
- <target name="service.06" if="env.AXIS2_HOME" depends="check.dependency">
- <create.service.repo sample.number="06"/>
- </target>
-
- <!-- Sample Client 06 -->
- <target name="client.06" if="env.AXIS2_HOME" depends="check.dependency">
- <create.and.run.client sample.number="06"/>
- </target>
-
- <!-- Sample Service 07 -->
- <target name="service.07" if="env.AXIS2_HOME" depends="check.dependency">
- <create.service.repo sample.number="07"/>
- </target>
-
- <!-- Sample Client 07 -->
- <target name="client.07" if="env.AXIS2_HOME" depends="check.dependency">
- <create.and.run.client sample.number="07"/>
- </target>
-
- <!-- Sample Service 08 -->
- <target name="service.08" if="env.AXIS2_HOME" depends="check.dependency">
- <create.service.repo sample.number="08"/>
- </target>
-
- <!-- Sample Client 08 -->
- <target name="client.08" if="env.AXIS2_HOME" depends="check.dependency">
- <create.and.run.client sample.number="08"/>
- </target>
-
- <!-- Sample Service 09 -->
- <target name="service.09" if="env.AXIS2_HOME" depends="check.dependency">
- <create.service.repo sample.number="09"/>
- </target>
-
- <!-- Sample Client 09 -->
- <target name="client.09" if="env.AXIS2_HOME" depends="check.dependency">
- <create.and.run.client sample.number="09"/>
- </target>
-
- <!-- Sample Service 10 -->
- <target name="service.10" if="env.AXIS2_HOME" depends="check.dependency">
- <create.service.repo sample.number="10"/>
- </target>
-
- <!-- Sample Client 10 -->
- <target name="client.10" if="env.AXIS2_HOME" depends="check.dependency">
- <create.and.run.client sample.number="10"/>
- </target>
-
- <!-- Sample Service 11 -->
- <target name="service.11" if="env.AXIS2_HOME" depends="check.dependency">
- <create.service.repo sample.number="11"/>
- </target>
-
- <!-- Sample Client 11 -->
- <target name="client.11" if="env.AXIS2_HOME" depends="check.dependency">
- <create.and.run.client sample.number="11"/>
- </target>
-
-
- <target name="clean">
- <delete dir="build" />
- </target>
-
- <!-- Macro to create a service repo for a given sample -->
- <macrodef name="create.service.repo">
- <attribute name="sample.number" default="sample"/>
- <sequential>
-
- <property name="modules.dir" value="${env.AXIS2_HOME}/repository/modules/"/>
- <property name="lib.dir" value="${env.AXIS2_HOME}/lib"/>
-
- <mkdir dir="${service.repos.dir}/sample@{sample.number}"/>
- <mkdir dir="${service.repos.dir}/sample@{sample.number}/services"/>
- <mkdir dir="${service.repos.dir}/sample@{sample.number}/modules"/>
-
- <!-- copy modules -->
- <copy file="${modules.dir}/${addressing.mar}" tofile="${service.repos.dir}/sample@{sample.number}/modules/${addressing.mar}" overwrite="true"/>
- <copy file="${modules.dir}/${rampart.mar}" tofile="${service.repos.dir}/sample@{sample.number}/modules/${rampart.mar}" overwrite="true"/>
-
- <!-- create service -->
- <mkdir dir="${temp.dir}"/>
- <mkdir dir="${temp.dir}/META-INF"/>
-
- <!-- Compile service -->
- <javac srcdir="sample@{sample.number}/src" destdir="${temp.dir}">
- <classpath>
- <fileset dir="${lib.dir}">
- <include name="**/*.jar"/>
- </fileset>
- </classpath>
- <exclude name="**/Client.java"/>
- </javac>
-
- <copy file="sample@{sample.number}/services.xml" tofile="${temp.dir}/META-INF/services.xml" overwrite="true"/>
- <copy file="${keys.dir}/service.jks" tofile="${temp.dir}/service.jks" overwrite="true"/>
- <copy file="${keys.dir}/service.properties" tofile="${temp.dir}/service.properties" overwrite="true"/>
-
- <jar destfile="${service.repos.dir}/sample@{sample.number}/services/sample@{sample.number}.aar">
- <fileset dir="${temp.dir}"></fileset>
- </jar>
-
- <delete dir="${temp.dir}" />
- <!-- start SimpleHTTPserver -->
- <java classname="org.apache.axis2.transport.http.SimpleHTTPServer" fork="true">
- <arg value="${service.repos.dir}/sample@{sample.number}"/>
- <arg value="-p${server.port}"/>
- <classpath>
- <fileset dir="${lib.dir}">
- <include name="**/*.jar"/>
- </fileset>
- </classpath>
- </java>
-
- </sequential>
- </macrodef>
-
- <macrodef name="create.and.run.client">
- <attribute name="sample.number" default="sample"/>
- <sequential>
-
- <property name="modules.dir" value="${env.AXIS2_HOME}/repository/modules/"/>
- <property name="lib.dir" value="${env.AXIS2_HOME}/lib"/>
-
- <!-- Create the client repo -->
- <mkdir dir="${client.repos.dir}/sample@{sample.number}"/>
- <mkdir dir="${client.repos.dir}/sample@{sample.number}/conf"/>
- <mkdir dir="${client.repos.dir}/sample@{sample.number}/modules"/>
-
- <!-- Copy axis2.xml file -->
- <copy file="sample@{sample.number}/client.axis2.xml" tofile="${client.repos.dir}/sample@{sample.number}/conf/axis2.xml" overwrite="true"/>
-
- <!-- copy modules -->
- <copy file="${modules.dir}/${addressing.mar}" tofile="${client.repos.dir}/sample@{sample.number}/modules/${addressing.mar}" overwrite="true"/>
- <copy file="${modules.dir}/${rampart.mar}" tofile="${client.repos.dir}/sample@{sample.number}/modules/${rampart.mar}" overwrite="true"/>
-
- <mkdir dir="${temp.client.dir}"/>
-
- <!-- Compile client -->
- <javac srcdir="sample@{sample.number}/src" destdir="${temp.client.dir}">
- <classpath>
- <fileset dir="${lib.dir}">
- <include name="**/*.jar"/>
- </fileset>
- </classpath>
- <exclude name="**/SimpleService.java"/>
- </javac>
-
- <copy file="${keys.dir}/client.jks" tofile="${temp.client.dir}/client.jks" overwrite="true"/>
- <copy file="${keys.dir}/client.properties" tofile="${temp.client.dir}/client.properties" overwrite="true"/>
-
-
- <!-- Run client -->
- <java classname="org.apache.rampart.samples.sample@{sample.number}.Client" fork="true">
- <arg value="${sample.services.url}/sample@{sample.number}"/>
- <arg value="${client.repos.dir}/sample@{sample.number}"/>
- <classpath>
- <fileset dir="${lib.dir}">
- <include name="**/*.jar"/>
- </fileset>
- <dirset dir="${temp.client.dir}" />
- </classpath>
- </java>
-
-<!-- <delete dir="${temp.client.dir}"/> -->
- </sequential>
- </macrodef>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ !
+ ! Copyright 2006 The Apache Software Foundation.
+ !
+ ! Licensed under the Apache License, Version 2.0 (the "License");
+ ! you may not use this file except in compliance with the License.
+ ! You may obtain a copy of the License at
+ !
+ ! http://www.apache.org/licenses/LICENSE-2.0
+ !
+ ! Unless required by applicable law or agreed to in writing, software
+ ! distributed under the License is distributed on an "AS IS" BASIS,
+ ! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ! See the License for the specific language governing permissions and
+ ! limitations under the License.
+ !-->
+<project basedir="." default="clean">
+
+ <property name="service.repos.dir" value="build/service_repositories"/>
+ <property name="client.repos.dir" value="build/client_repositories"/>
+ <property name="temp.dir" value="build/temp"/>
+ <property name="keys.dir" value="../keys"/>
+ <property name="temp.client.dir" value="build/temp_client"/>
+
+ <property name="addressing.mar" value="addressing-1.1.mar"/>
+ <property name="rampart.mar" value="rampart-1.1.mar"/>
+
+ <property name="client.port" value="8080"/>
+ <property name="server.port" value="8080"/>
+
+ <property name="sample.services.url" value="http://localhost:${client.port}/axis2/services"/>
+
+ <property environment="env"/>
+
+ <target name="check.dependency" unless="env.AXIS2_HOME">
+ <echo message="AXIS2_HOME must be set"/>
+ </target>
+
+ <!-- Sample Service 01 -->
+ <target name="service.01" if="env.AXIS2_HOME" depends="check.dependency">
+ <create.service.repo sample.number="01"/>
+ </target>
+
+ <!-- Sample Client 01 -->
+ <target name="client.01" if="env.AXIS2_HOME" depends="check.dependency">
+ <create.and.run.client sample.number="01"/>
+ </target>
+
+ <!-- Sample Service 02 -->
+ <target name="service.02" if="env.AXIS2_HOME" depends="check.dependency">
+ <create.service.repo sample.number="02"/>
+ </target>
+
+ <!-- Sample Client 02 -->
+ <target name="client.02" if="env.AXIS2_HOME" depends="check.dependency">
+ <create.and.run.client sample.number="02"/>
+ </target>
+
+ <!-- Sample Service 03 -->
+ <target name="service.03" if="env.AXIS2_HOME" depends="check.dependency">
+ <create.service.repo sample.number="03"/>
+ </target>
+
+ <!-- Sample Client 03 -->
+ <target name="client.03" if="env.AXIS2_HOME" depends="check.dependency">
+ <create.and.run.client sample.number="03"/>
+ </target>
+
+ <!-- Sample Service 04 -->
+ <target name="service.04" if="env.AXIS2_HOME" depends="check.dependency">
+ <create.service.repo sample.number="04"/>
+ </target>
+
+ <!-- Sample Client 04 -->
+ <target name="client.04" if="env.AXIS2_HOME" depends="check.dependency">
+ <create.and.run.client sample.number="04"/>
+ </target>
+
+ <!-- Sample Service 05 -->
+ <target name="service.05" if="env.AXIS2_HOME" depends="check.dependency">
+ <create.service.repo sample.number="05"/>
+ </target>
+
+ <!-- Sample Client 05 -->
+ <target name="client.05" if="env.AXIS2_HOME" depends="check.dependency">
+ <create.and.run.client sample.number="05"/>
+ </target>
+
+ <!-- Sample Service 06 -->
+ <target name="service.06" if="env.AXIS2_HOME" depends="check.dependency">
+ <create.service.repo sample.number="06"/>
+ </target>
+
+ <!-- Sample Client 06 -->
+ <target name="client.06" if="env.AXIS2_HOME" depends="check.dependency">
+ <create.and.run.client sample.number="06"/>
+ </target>
+
+ <!-- Sample Service 07 -->
+ <target name="service.07" if="env.AXIS2_HOME" depends="check.dependency">
+ <create.service.repo sample.number="07"/>
+ </target>
+
+ <!-- Sample Client 07 -->
+ <target name="client.07" if="env.AXIS2_HOME" depends="check.dependency">
+ <create.and.run.client sample.number="07"/>
+ </target>
+
+ <!-- Sample Service 08 -->
+ <target name="service.08" if="env.AXIS2_HOME" depends="check.dependency">
+ <create.service.repo sample.number="08"/>
+ </target>
+
+ <!-- Sample Client 08 -->
+ <target name="client.08" if="env.AXIS2_HOME" depends="check.dependency">
+ <create.and.run.client sample.number="08"/>
+ </target>
+
+ <!-- Sample Service 09 -->
+ <target name="service.09" if="env.AXIS2_HOME" depends="check.dependency">
+ <create.service.repo sample.number="09"/>
+ </target>
+
+ <!-- Sample Client 09 -->
+ <target name="client.09" if="env.AXIS2_HOME" depends="check.dependency">
+ <create.and.run.client sample.number="09"/>
+ </target>
+
+ <!-- Sample Service 10 -->
+ <target name="service.10" if="env.AXIS2_HOME" depends="check.dependency">
+ <create.service.repo sample.number="10"/>
+ </target>
+
+ <!-- Sample Client 10 -->
+ <target name="client.10" if="env.AXIS2_HOME" depends="check.dependency">
+ <create.and.run.client sample.number="10"/>
+ </target>
+
+ <!-- Sample Service 11 -->
+ <target name="service.11" if="env.AXIS2_HOME" depends="check.dependency">
+ <create.service.repo sample.number="11"/>
+ </target>
+
+ <!-- Sample Client 11 -->
+ <target name="client.11" if="env.AXIS2_HOME" depends="check.dependency">
+ <create.and.run.client sample.number="11"/>
+ </target>
+
+
+ <target name="clean">
+ <delete dir="build" />
+ </target>
+
+ <!-- Macro to create a service repo for a given sample -->
+ <macrodef name="create.service.repo">
+ <attribute name="sample.number" default="sample"/>
+ <sequential>
+
+ <property name="modules.dir" value="${env.AXIS2_HOME}/repository/modules/"/>
+ <property name="lib.dir" value="${env.AXIS2_HOME}/lib"/>
+
+ <mkdir dir="${service.repos.dir}/sample@{sample.number}"/>
+ <mkdir dir="${service.repos.dir}/sample@{sample.number}/services"/>
+ <mkdir dir="${service.repos.dir}/sample@{sample.number}/modules"/>
+
+ <!-- copy modules -->
+ <copy file="${modules.dir}/${addressing.mar}" tofile="${service.repos.dir}/sample@{sample.number}/modules/${addressing.mar}" overwrite="true"/>
+ <copy file="${modules.dir}/${rampart.mar}" tofile="${service.repos.dir}/sample@{sample.number}/modules/${rampart.mar}" overwrite="true"/>
+
+ <!-- create service -->
+ <mkdir dir="${temp.dir}"/>
+ <mkdir dir="${temp.dir}/META-INF"/>
+
+ <!-- Compile service -->
+ <javac srcdir="sample@{sample.number}/src" destdir="${temp.dir}">
+ <classpath>
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ </classpath>
+ <exclude name="**/Client.java"/>
+ </javac>
+
+ <copy file="sample@{sample.number}/services.xml" tofile="${temp.dir}/META-INF/services.xml" overwrite="true"/>
+ <copy file="${keys.dir}/service.jks" tofile="${temp.dir}/service.jks" overwrite="true"/>
+ <copy file="${keys.dir}/service.properties" tofile="${temp.dir}/service.properties" overwrite="true"/>
+
+ <jar destfile="${service.repos.dir}/sample@{sample.number}/services/sample@{sample.number}.aar">
+ <fileset dir="${temp.dir}"></fileset>
+ </jar>
+
+ <delete dir="${temp.dir}" />
+ <!-- start SimpleHTTPserver -->
+ <java classname="org.apache.axis2.transport.http.SimpleHTTPServer" fork="true">
+ <arg value="${service.repos.dir}/sample@{sample.number}"/>
+ <arg value="-p${server.port}"/>
+ <classpath>
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ </classpath>
+ </java>
+
+ </sequential>
+ </macrodef>
+
+ <macrodef name="create.and.run.client">
+ <attribute name="sample.number" default="sample"/>
+ <sequential>
+
+ <property name="modules.dir" value="${env.AXIS2_HOME}/repository/modules/"/>
+ <property name="lib.dir" value="${env.AXIS2_HOME}/lib"/>
+
+ <!-- Create the client repo -->
+ <mkdir dir="${client.repos.dir}/sample@{sample.number}"/>
+ <mkdir dir="${client.repos.dir}/sample@{sample.number}/conf"/>
+ <mkdir dir="${client.repos.dir}/sample@{sample.number}/modules"/>
+
+ <!-- Copy axis2.xml file -->
+ <copy file="sample@{sample.number}/client.axis2.xml" tofile="${client.repos.dir}/sample@{sample.number}/conf/axis2.xml" overwrite="true"/>
+
+ <!-- copy modules -->
+ <copy file="${modules.dir}/${addressing.mar}" tofile="${client.repos.dir}/sample@{sample.number}/modules/${addressing.mar}" overwrite="true"/>
+ <copy file="${modules.dir}/${rampart.mar}" tofile="${client.repos.dir}/sample@{sample.number}/modules/${rampart.mar}" overwrite="true"/>
+
+ <mkdir dir="${temp.client.dir}"/>
+
+ <!-- Compile client -->
+ <javac srcdir="sample@{sample.number}/src" destdir="${temp.client.dir}">
+ <classpath>
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ </classpath>
+ <exclude name="**/SimpleService.java"/>
+ </javac>
+
+ <copy file="${keys.dir}/client.jks" tofile="${temp.client.dir}/client.jks" overwrite="true"/>
+ <copy file="${keys.dir}/client.properties" tofile="${temp.client.dir}/client.properties" overwrite="true"/>
+
+
+ <!-- Run client -->
+ <java classname="org.apache.rampart.samples.sample@{sample.number}.Client" fork="true">
+ <arg value="${sample.services.url}/sample@{sample.number}"/>
+ <arg value="${client.repos.dir}/sample@{sample.number}"/>
+ <classpath>
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <dirset dir="${temp.client.dir}" />
+ </classpath>
+ </java>
+
+<!-- <delete dir="${temp.client.dir}"/> -->
+ </sequential>
+ </macrodef>
+
+</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org