Author: ruchithf
Date: Thu Jun 15 01:27:17 2006
New Revision: 414504
URL: http://svn.apache.org/viewvc?rev=414504&view=rev
Log:
Use rahas.mar to provide STS suport in the sec conv test cases when the STS
functionality is required in the service
Modified:
webservices/axis2/trunk/java/modules/integration/maven.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s1-services.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s2-services.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s4-services.xml
webservices/axis2/trunk/java/modules/rahas/maven.xml
webservices/axis2/trunk/java/modules/security/src/META-INF/module.xml
Modified: webservices/axis2/trunk/java/modules/integration/maven.xml
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/maven.xml?rev=414504&r1=414503&r2=414504&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Thu Jun 15
01:27:17 2006
@@ -153,6 +153,8 @@
<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="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/sc_service_repo_1/modules/addressing-${addressing_version}.mar"/>
@@ -174,7 +176,9 @@
<copy file="../security/target/rampart-${rampart_version}.mar"
tofile="target/test-resources/sc_service_repo_2/modules/rampart-${rampart_version}.mar"/>
- <copy
file="../addressing/target/addressing-${addressing_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="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/sc_service_repo_2/modules/addressing-${addressing_version}.mar"/>
<!-- copy the services.xml and create the aar -->
@@ -215,6 +219,8 @@
<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="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/sc_service_repo_4/modules/addressing-${addressing_version}.mar"/>
Modified:
webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s1-services.xml
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s1-services.xml?rev=414504&r1=414503&r2=414504&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s1-services.xml
(original)
+++
webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s1-services.xml
Thu Jun 15 01:27:17 2006
@@ -1,6 +1,7 @@
<service name="SecureService">
<module ref="rampart"/>
+ <module ref="rahas"/>
<parameter locked="false"
name="ServiceClass">org.apache.axis2.security.sc.Service</parameter>
Modified:
webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s2-services.xml
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s2-services.xml?rev=414504&r1=414503&r2=414504&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s2-services.xml
(original)
+++
webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s2-services.xml
Thu Jun 15 01:27:17 2006
@@ -1,6 +1,7 @@
<service name="SecureService">
<module ref="rampart"/>
+ <module ref="rahas"/>
<parameter locked="false"
name="ServiceClass">org.apache.axis2.security.sc.Service</parameter>
Modified:
webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s4-services.xml
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s4-services.xml?rev=414504&r1=414503&r2=414504&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s4-services.xml
(original)
+++
webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s4-services.xml
Thu Jun 15 01:27:17 2006
@@ -1,6 +1,7 @@
<service name="SecureService">
<module ref="rampart"/>
+ <module ref="rahas"/>
<parameter locked="false"
name="ServiceClass">org.apache.axis2.security.sc.Service</parameter>
Modified: webservices/axis2/trunk/java/modules/rahas/maven.xml
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/maven.xml?rev=414504&r1=414503&r2=414504&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/rahas/maven.xml Thu Jun 15 01:27:17
2006
@@ -38,17 +38,19 @@
<copy file="src/META-INF/module.xml"
toFile="target/sts/META-INF/module.xml"/>
- <jar jarfile="target/sts.mar" basedir="target/sts/">
+ <jar jarfile="target/rahas-${rahas_version}.mar"
basedir="target/sts/">
<include name="**/*"/>
</jar>
- <copy file="test-resources/trust/impl/sts-services.xml"
toFile="target/sts/META-INF/services.xml" overwrite="yes"/>
+ <delete file="target/sts/META-INF/module.xml"/>
+ <copy file="test-resources/trust/impl/sts-services.xml"
toFile="target/sts/META-INF/services.xml"/>
+
<copy file="test-resources/trust/impl/sct-issuer-config.xml"
toFile="target/sts/sct-issuer-config.xml"/>
<copy
file="test-resources/trust/impl/token-dispatcher-configuration.xml"
toFile="target/sts/token-dispatcher-configuration.xml"/>
<copy file="test-resources/trust/impl/sctIssuer.properties"
toFile="target/sts/sctIssuer.properties"/>
<copy file="test-resources/trust/impl/sts.jks"
toFile="target/sts/sts.jks"/>
- <jar jarfile="target/SecurityTokenService.aar" basedir="target/sts/">
+ <jar jarfile="target/rahas-${rahas_version}.aar" basedir="target/sts/">
<include name="**/*"/>
</jar>
Modified: webservices/axis2/trunk/java/modules/security/src/META-INF/module.xml
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/META-INF/module.xml?rev=414504&r1=414503&r2=414504&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/META-INF/module.xml
(original)
+++ webservices/axis2/trunk/java/modules/security/src/META-INF/module.xml Thu
Jun 15 01:27:17 2006
@@ -12,27 +12,4 @@
</handler>
</outflow>
<supported-policy-namespaces
namespaces="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"/>
-
- <operation name="RequestSecurityToken"
mep="http://www.w3.org/2004/08/wsdl/in-out";>
- <messageReceiver class="org.apache.rahas.STSMessageReceiver"/>
-
- <!-- Action mapping to accept SCT requests -->
-
<actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/SCT</actionMapping>
-
-
<actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Issue</actionMapping>
-
<actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Renew</actionMapping>
-
<actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Cancel</actionMapping>
-
<actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Validate</actionMapping>
-
- <parameter name="token-dispatcher-configuration">
- <token-dispatcher-configuration>
- <issuer class="org.apache.rahas.impl.SCTIssuer"
default="true">
-
<configuration-param>sct-issuer-config</configuration-param>
-
<tokenType>http://schemas.xmlsoap.org/ws/2005/02/sc/sct</tokenType>
- </issuer>
- </token-dispatcher-configuration>
- </parameter>
-
- </operation>
-
</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
