You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ru...@apache.org on 2005/09/13 11:43:44 UTC
svn commit: r280524 - in /webservices/axis2/trunk/java/modules: integration/
integration/test-resources/security/ security/src/META-INF/
security/src/org/apache/axis2/security/handler/
Author: ruchithf
Date: Tue Sep 13 02:43:08 2005
New Revision: 280524
URL: http://svn.apache.org/viewcvs?rev=280524&view=rev
Log:
wss4j-module configurations moved to service.xml from the axis2.xml
Added:
webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.xml
Modified:
webservices/axis2/trunk/java/modules/integration/maven.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.service.axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.service.axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.service.axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.service.axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.axis2.xml
webservices/axis2/trunk/java/modules/security/src/META-INF/module.xml
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSDoAllHandler.java
Modified: webservices/axis2/trunk/java/modules/integration/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/maven.xml?rev=280524&r1=280523&r2=280524&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Tue Sep 13 02:43:08 2005
@@ -102,9 +102,15 @@
<copy file="test-resources/security/s1.service.axis2.xml"
tofile="target/test-resources/scenario1_service_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario1_service_repo/modules/security.mar"/>
- <copy file="../security/target/PingPort.aar"
- tofile="target/test-resources/scenario1_service_repo/services/PingPort.aar"/>
+ tofile="target/test-resources/scenario1_service_repo/modules/security.mar"/>
+
+ <!-- Copy service.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/s1.service.xml"
+ tofile="../security/target/interop/classes/META-INF/service.xml" overwrite="true"/>
+
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/scenario1_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes" />
<!-- Scenario 2 -->
<mkdir dir="target/test-resources/scenario2_client_repo"/>
@@ -125,8 +131,14 @@
tofile="target/test-resources/scenario2_service_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario2_service_repo/modules/security.mar"/>
- <copy file="../security/target/PingPort.aar"
- tofile="target/test-resources/scenario2_service_repo/services/PingPort.aar"/>
+
+ <!-- Copy service.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/s2.service.xml"
+ tofile="../security/target/interop/classes/META-INF/service.xml" overwrite="true"/>
+
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/scenario2_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes" />
<!-- Scenario 2a -->
<mkdir dir="target/test-resources/scenario2a_client_repo"/>
@@ -147,8 +159,14 @@
tofile="target/test-resources/scenario2a_service_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario2a_service_repo/modules/security.mar"/>
- <copy file="../security/target/PingPort.aar"
- tofile="target/test-resources/scenario2a_service_repo/services/PingPort.aar"/>
+
+ <!-- Copy service.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/s2a.service.xml"
+ tofile="../security/target/interop/classes/META-INF/service.xml" overwrite="true"/>
+
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/scenario2a_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes" />
<!-- Scenario 3 -->
<mkdir dir="target/test-resources/scenario3_client_repo"/>
@@ -169,8 +187,15 @@
tofile="target/test-resources/scenario3_service_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario3_service_repo/modules/security.mar"/>
- <copy file="../security/target/PingPort.aar"
- tofile="target/test-resources/scenario3_service_repo/services/PingPort.aar"/>
+
+ <!-- Copy service.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/s3.service.xml"
+ tofile="../security/target/interop/classes/META-INF/service.xml" overwrite="true"/>
+
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/scenario3_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes" />
+
<!-- Scenario 4 -->
<mkdir dir="target/test-resources/scenario4_client_repo"/>
@@ -191,8 +216,15 @@
tofile="target/test-resources/scenario4_service_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario4_service_repo/modules/security.mar"/>
- <copy file="../security/target/PingPort.aar"
- tofile="target/test-resources/scenario4_service_repo/services/PingPort.aar"/>
+
+ <!-- Copy service.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/s4.service.xml"
+ tofile="../security/target/interop/classes/META-INF/service.xml" overwrite="true"/>
+
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/scenario4_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes" />
+
<!-- Scenario 5 -->
<mkdir dir="target/test-resources/scenario5_client_repo"/>
@@ -213,8 +245,15 @@
tofile="target/test-resources/scenario5_service_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario5_service_repo/modules/security.mar"/>
- <copy file="../security/target/PingPort.aar"
- tofile="target/test-resources/scenario5_service_repo/services/PingPort.aar"/>
+
+ <!-- Copy service.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/s5.service.xml"
+ tofile="../security/target/interop/classes/META-INF/service.xml" overwrite="true"/>
+
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/scenario5_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes" />
+
<!-- Scenario 6 -->
<mkdir dir="target/test-resources/scenario6_client_repo"/>
@@ -235,8 +274,15 @@
tofile="target/test-resources/scenario6_service_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario6_service_repo/modules/security.mar"/>
- <copy file="../security/target/PingPort.aar"
- tofile="target/test-resources/scenario6_service_repo/services/PingPort.aar"/>
+
+ <!-- Copy service.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/s6.service.xml"
+ tofile="../security/target/interop/classes/META-INF/service.xml" overwrite="true"/>
+
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/scenario6_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes" />
+
<!-- Scenario 7 -->
<mkdir dir="target/test-resources/scenario7_client_repo"/>
@@ -257,15 +303,21 @@
tofile="target/test-resources/scenario7_service_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario7_service_repo/modules/security.mar"/>
- <copy file="../security/target/PingPort.aar"
- tofile="target/test-resources/scenario7_service_repo/services/PingPort.aar"/>
+
+ <!-- Copy service.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/s7.service.xml"
+ tofile="../security/target/interop/classes/META-INF/service.xml" overwrite="true"/>
+
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/scenario7_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes" />
+
<!-- Copying the DOM3 stuff to the endorsed dir -->
<mkdir dir="target/test-resources/endorsed"/>
<copy file="${maven.repo.local}/xerces/jars/xercesImpl-2.6.2.jar" todir="target/test-resources/endorsed"/>
<copy file="${maven.repo.local}/xerces/jars/xmlParserAPIs-2.6.2.jar" todir="target/test-resources/endorsed"/>
-
- <echo>${java.endorsed.dirs}</echo>
+
<!-- Scenario ST1 -->
<mkdir dir="target/test-resources/scenarioST1_client_repo"/>
@@ -286,10 +338,16 @@
tofile="target/test-resources/scenarioST1_service_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenarioST1_service_repo/modules/security.mar"/>
- <copy file="../security/target/PingPort.aar"
- tofile="target/test-resources/scenarioST1_service_repo/services/PingPort.aar"/>
-
+
+ <!-- Copy service.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/sST1.service.xml"
+ tofile="../security/target/interop/classes/META-INF/service.xml" overwrite="true"/>
+
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/scenarioST1_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes" />
+
<!-- MTOM Optimized Security Test -->
<mkdir dir="target/test-resources/mtom_sec_client_repo"/>
<mkdir dir="target/test-resources/mtom_sec_client_repo/modules"/>
@@ -309,8 +367,16 @@
tofile="target/test-resources/mtom_sec_service_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/mtom_sec_service_repo/modules/security.mar"/>
- <copy file="../security/target/PingPort.aar"
- tofile="target/test-resources/mtom_sec_service_repo/services/PingPort.aar"/>
+
+ <!-- Copy service.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/secMtom.service.xml"
+ tofile="../security/target/interop/classes/META-INF/service.xml" overwrite="true"/>
+
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/mtom_sec_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes" />
+
+
<!-- Test with addressing and MTOM -->
<mkdir dir="target/test-resources/complete_client_repo"/>
@@ -333,10 +399,16 @@
tofile="target/test-resources/complete_service_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/complete_service_repo/modules/security.mar"/>
- <copy file="../security/target/PingPort.aar"
- tofile="target/test-resources/complete_service_repo/services/PingPort.aar"/>
<copy file="../addressing/target/addressing.mar"
tofile="target/test-resources/complete_service_repo/modules/addressing.mar"/>
+
+ <!-- Copy service.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/complete.service.xml"
+ tofile="../security/target/interop/classes/META-INF/service.xml" overwrite="true"/>
+
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/complete_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes" />
<!-- Standard repository -->
<mkdir dir="target/Repository"/>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.service.axis2.xml?rev=280524&r1=280523&r2=280524&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.service.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.service.axis2.xml Tue Sep 13 02:43:08 2005
@@ -5,33 +5,11 @@
<messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+ <!-- Engage the addressing module -->
<module ref="addressing"/>
<!-- Engage the security module -->
<module ref="security"/>
-
- <!-- This is only till we get the service specific parameters fixed in service.xml -->
-
- <!-- Test with addressing and MTOM: Service's Configuration: START-->
- <!-- Also we can switch back to hte normal parameter names when we can seperately assign them to the flows -->
-
- <parameter name="InAction" locked="false">Timestamp Signature Encrypt</parameter>
- <parameter name="InPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
- <parameter name="InSignaturePropFile" locked="false">interop.properties</parameter>
-
- <parameter name="OutAction" locked="false">Timestamp Signature Encrypt</parameter>
- <parameter name="user" locked="false">bob</parameter>
- <parameter name="OutPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
- <parameter name="OutSignaturePropFile" locked="false">interop.properties</parameter>
- <parameter name="OutSignatureKeyIdentifier" locked="false">SKIKeyIdentifier</parameter>
- <parameter name="encryptionKeyIdentifier" locked="false">SKIKeyIdentifier</parameter>
- <parameter name="encryptionUser" locked="false">alice</parameter>
- <parameter name="encryptionSymAlgorithm" locked="false">http://www.w3.org/2001/04/xmlenc#aes128-cbc</parameter>
- <parameter name="OutSignatureParts" locked="false">{Element}{http://schemas.xmlsoap.org/ws/2004/08/addressing}To;{Element}{http://schemas.xmlsoap.org/ws/2004/08/addressing}ReplyTo;{Element}{http://schemas.xmlsoap.org/ws/2004/08/addressing}From;{Element}{http://schemas.xmlsoap.org/ws/2004/08/addressing}RelatesTo;{Element}{http://schemas.xmlsoap.org/ws/2004/08/addressing}MessageID;{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp</parameter>
-
- <parameter name="optimizeParts" locked="false">//xenc:EncryptedData/xenc:CipherData/xenc:CipherValue</parameter>
-
- <!-- Test with addressing and MTOM: Service's Configuration: END-->
<!-- ================================================= -->
<!-- Transport Ins -->
Added: webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.service.xml?rev=280524&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.service.xml (added)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.service.xml Tue Sep 13 02:43:08 2005
@@ -0,0 +1,25 @@
+<service name="PingPort">
+ <parameter locked="false" name="ServiceClass">org.apache.axis2.oasis.ping.PingPortSkeleton</parameter>
+ <!--Mounting the method Ping-->
+ <operation name="Ping">
+ <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiver"/>
+ </operation>
+
+ <parameter name="InAction" locked="false">Timestamp Signature Encrypt</parameter>
+ <parameter name="InPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
+ <parameter name="InSignaturePropFile" locked="false">interop.properties</parameter>
+
+ <parameter name="OutAction" locked="false">Timestamp Signature Encrypt</parameter>
+ <parameter name="user" locked="false">bob</parameter>
+ <parameter name="OutPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
+ <parameter name="OutSignaturePropFile" locked="false">interop.properties</parameter>
+ <parameter name="OutSignatureKeyIdentifier" locked="false">SKIKeyIdentifier</parameter>
+ <parameter name="encryptionKeyIdentifier" locked="false">SKIKeyIdentifier</parameter>
+ <parameter name="encryptionUser" locked="false">alice</parameter>
+ <parameter name="encryptionSymAlgorithm" locked="false">http://www.w3.org/2001/04/xmlenc#aes128-cbc</parameter>
+ <parameter name="OutSignatureParts" locked="false">{Element}{http://schemas.xmlsoap.org/ws/2004/08/addressing}To;{Element}{http://schemas.xmlsoap.org/ws/2004/08/addressing}ReplyTo;{Element}{http://schemas.xmlsoap.org/ws/2004/08/addressing}From;{Element}{http://schemas.xmlsoap.org/ws/2004/08/addressing}RelatesTo;{Element}{http://schemas.xmlsoap.org/ws/2004/08/addressing}MessageID;{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp</parameter>
+
+ <parameter name="optimizeParts" locked="false">//xenc:EncryptedData/xenc:CipherData/xenc:CipherValue</parameter>
+
+
+</service>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.axis2.xml?rev=280524&r1=280523&r2=280524&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.axis2.xml Tue Sep 13 02:43:08 2005
@@ -7,18 +7,6 @@
<!-- Engage the security module -->
<module ref="security"/>
- <!-- This is only till we get the service specific parameters fixed in service.xml -->
-
- <!-- Scenario 1: Service's Configuration: START-->
- <!-- Also we can switch back to hte normal parameter names when we can seperately assign them to the flows -->
-
- <parameter name="InAction" locked="false">UsernameToken</parameter>
- <parameter name="InPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
-
- <parameter name="OutAction" locked="false">NoSecurity</parameter> -->
-
- <!-- Scenario 1: Service's Configuration: END-->
-
<!-- ================================================= -->
<!-- Transport Ins -->
<!-- ================================================= -->
Added: webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.xml?rev=280524&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.xml (added)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.xml Tue Sep 13 02:43:08 2005
@@ -0,0 +1,13 @@
+<service name="PingPort">
+ <parameter locked="false" name="ServiceClass">org.apache.axis2.oasis.ping.PingPortSkeleton</parameter>
+ <!--Mounting the method Ping-->
+ <operation name="Ping">
+ <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiver"/>
+ </operation>
+
+ <parameter name="InAction" locked="false">UsernameToken</parameter>
+ <parameter name="InPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
+
+ <parameter name="OutAction" locked="false">NoSecurity</parameter>
+
+</service>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.service.axis2.xml?rev=280524&r1=280523&r2=280524&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.service.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.service.axis2.xml Tue Sep 13 02:43:08 2005
@@ -7,19 +7,6 @@
<!-- Engage the security module -->
<module ref="security"/>
- <!-- This is only till we get the service specific parameters fixed in service.xml -->
-
- <!-- Scenario 2: Service's Configuration: START-->
- <!-- Also we can switch back to the normal parameter names when we can seperately assign them to the flows -->
-
- <parameter name="InAction" locked="false">UsernameToken Encrypt</parameter>
- <parameter name="InPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
- <parameter name="decryptionPropFile" locked="false">interop.properties</parameter>
-
- <parameter name="OutAction" locked="false">NoSecurity</parameter> -->
-
- <!-- Scenario 2: Service's Configuration: END-->
-
<!-- ================================================= -->
<!-- Transport Ins -->
<!-- ================================================= -->
Added: webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.service.xml?rev=280524&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.service.xml (added)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.service.xml Tue Sep 13 02:43:08 2005
@@ -0,0 +1,14 @@
+<service name="PingPort">
+ <parameter locked="false" name="ServiceClass">org.apache.axis2.oasis.ping.PingPortSkeleton</parameter>
+ <!--Mounting the method Ping-->
+ <operation name="Ping">
+ <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiver"/>
+ </operation>
+
+ <parameter name="InAction" locked="false">UsernameToken Encrypt</parameter>
+ <parameter name="InPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
+ <parameter name="decryptionPropFile" locked="false">interop.properties</parameter>
+
+ <parameter name="OutAction" locked="false">NoSecurity</parameter>
+
+</service>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.axis2.xml?rev=280524&r1=280523&r2=280524&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.axis2.xml Tue Sep 13 02:43:08 2005
@@ -7,19 +7,6 @@
<!-- Engage the security module -->
<module ref="security"/>
- <!-- This is only till we get the service specific parameters fixed in service.xml -->
-
- <!-- Scenario 2: Service's Configuration: START-->
- <!-- Also we can switch back to the normal parameter names when we can seperately assign them to the flows -->
-
- <parameter name="InAction" locked="false">UsernameTokenSignature UsernameToken Encrypt Timestamp</parameter>
- <parameter name="InPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
- <parameter name="decryptionPropFile" locked="false">interop.properties</parameter>
-
- <parameter name="OutAction" locked="false">NoSecurity</parameter> -->
-
- <!-- Scenario 2: Service's Configuration: END-->
-
<!-- ================================================= -->
<!-- Transport Ins -->
<!-- ================================================= -->
Added: webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.xml?rev=280524&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.xml (added)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.xml Tue Sep 13 02:43:08 2005
@@ -0,0 +1,13 @@
+<service name="PingPort">
+ <parameter locked="false" name="ServiceClass">org.apache.axis2.oasis.ping.PingPortSkeleton</parameter>
+ <!--Mounting the method Ping-->
+ <operation name="Ping">
+ <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiver"/>
+ </operation>
+
+ <parameter name="InAction" locked="false">UsernameTokenSignature UsernameToken Encrypt Timestamp</parameter>
+ <parameter name="InPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
+ <parameter name="decryptionPropFile" locked="false">interop.properties</parameter>
+
+ <parameter name="OutAction" locked="false">NoSecurity</parameter>
+</service>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.axis2.xml?rev=280524&r1=280523&r2=280524&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.axis2.xml Tue Sep 13 02:43:08 2005
@@ -7,25 +7,6 @@
<!-- Engage the security module -->
<module ref="security"/>
- <!-- This is only till we get the service specific parameters fixed in service.xml -->
-
- <!-- Scenario 3: Service's Configuration: START-->
- <!-- Also we can switch back to hte normal parameter names when we can seperately assign them to the flows -->
-
- <parameter name="InAction" locked="false">Signature Encrypt Timestamp</parameter>
- <parameter name="InPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
- <parameter name="InSignaturePropFile" locked="false">interop.properties</parameter>
-
- <parameter name="OutAction" locked="false">Signature Encrypt Timestamp</parameter>
- <parameter name="user" locked="false">bob</parameter>
- <parameter name="OutPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
- <parameter name="OutSignaturePropFile" locked="false">interop.properties</parameter>
- <parameter name="OutSignatureKeyIdentifier" locked="false">DirectReference</parameter>
- <parameter name="encryptionKeyIdentifier" locked="false">SKIKeyIdentifier</parameter>
- <parameter name="encryptionUser" locked="false">alice</parameter>
-
- <!-- Scenario 3: Service's Configuration: END-->
-
<!-- ================================================= -->
<!-- Transport Ins -->
<!-- ================================================= -->
Added: webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.xml?rev=280524&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.xml (added)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.xml Tue Sep 13 02:43:08 2005
@@ -0,0 +1,20 @@
+<service name="PingPort">
+ <parameter locked="false" name="ServiceClass">org.apache.axis2.oasis.ping.PingPortSkeleton</parameter>
+ <!--Mounting the method Ping-->
+ <operation name="Ping">
+ <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiver"/>
+ </operation>
+
+ <parameter name="InAction" locked="false">Signature Encrypt Timestamp</parameter>
+ <parameter name="InPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
+ <parameter name="InSignaturePropFile" locked="false">interop.properties</parameter>
+
+ <parameter name="OutAction" locked="false">Signature Encrypt Timestamp</parameter>
+ <parameter name="user" locked="false">bob</parameter>
+ <parameter name="OutPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
+ <parameter name="OutSignaturePropFile" locked="false">interop.properties</parameter>
+ <parameter name="OutSignatureKeyIdentifier" locked="false">DirectReference</parameter>
+ <parameter name="encryptionKeyIdentifier" locked="false">SKIKeyIdentifier</parameter>
+ <parameter name="encryptionUser" locked="false">alice</parameter>
+
+</service>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.service.axis2.xml?rev=280524&r1=280523&r2=280524&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.service.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.service.axis2.xml Tue Sep 13 02:43:08 2005
@@ -7,26 +7,6 @@
<!-- Engage the security module -->
<module ref="security"/>
- <!-- This is only till we get the service specific parameters fixed in service.xml -->
-
- <!-- Scenario 4: Service's Configuration: START-->
- <!-- Also we can switch back to hte normal parameter names when we can seperately assign them to the flows -->
-
- <parameter name="InAction" locked="false">Signature Encrypt Timestamp</parameter>
- <parameter name="InSignaturePropFile" locked="false">interop.properties</parameter>
- <parameter name="InPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
-
- <parameter name="OutAction" locked="false">Signature Encrypt Timestamp</parameter>
- <parameter name="user" locked="false">bob</parameter>
- <parameter name="OutPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
- <parameter name="OutSignatureKeyIdentifier" locked="false">SKIKeyIdentifier</parameter>
- <parameter name="encryptionKeyIdentifier" locked="false">EmbeddedKeyName</parameter>
- <parameter name="OutSignaturePropFile" locked="false">interop.properties</parameter>
- <parameter name="EmbeddedKeyCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
- <parameter name="EmbeddedKeyName" locked="false">SessionKey</parameter>
-
- <!-- Scenario 4: Service's Configuration: END-->
-
<!-- ================================================= -->
<!-- Transport Ins -->
<!-- ================================================= -->
Added: webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.service.xml?rev=280524&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.service.xml (added)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.service.xml Tue Sep 13 02:43:08 2005
@@ -0,0 +1,21 @@
+<service name="PingPort">
+ <parameter locked="false" name="ServiceClass">org.apache.axis2.oasis.ping.PingPortSkeleton</parameter>
+ <!--Mounting the method Ping-->
+ <operation name="Ping">
+ <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiver"/>
+ </operation>
+
+ <parameter name="InAction" locked="false">Signature Encrypt Timestamp</parameter>
+ <parameter name="InSignaturePropFile" locked="false">interop.properties</parameter>
+ <parameter name="InPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
+
+ <parameter name="OutAction" locked="false">Signature Encrypt Timestamp</parameter>
+ <parameter name="user" locked="false">bob</parameter>
+ <parameter name="OutPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
+ <parameter name="OutSignatureKeyIdentifier" locked="false">SKIKeyIdentifier</parameter>
+ <parameter name="encryptionKeyIdentifier" locked="false">EmbeddedKeyName</parameter>
+ <parameter name="OutSignaturePropFile" locked="false">interop.properties</parameter>
+ <parameter name="EmbeddedKeyCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
+ <parameter name="EmbeddedKeyName" locked="false">SessionKey</parameter>
+
+</service>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.axis2.xml?rev=280524&r1=280523&r2=280524&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.axis2.xml Tue Sep 13 02:43:08 2005
@@ -7,19 +7,6 @@
<!-- Engage the security module -->
<module ref="security"/>
- <!-- This is only till we get the service specific parameters fixed in service.xml -->
-
- <!-- Scenario 5: Service's Configuration: START-->
- <!-- Also we can switch back to hte normal parameter names when we can seperately assign them to the flows -->
-
- <parameter name="InAction" locked="false">Signature Signature Timestamp</parameter>
- <parameter name="InPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
- <parameter name="InSignaturePropFile" locked="false">interop.properties</parameter>
-
- <parameter name="OutAction" locked="false">NoSecurity</parameter>
-
- <!-- Scenario 5: Service's Configuration: END-->
-
<!-- ================================================= -->
<!-- Transport Ins -->
<!-- ================================================= -->
Added: webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.xml?rev=280524&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.xml (added)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.xml Tue Sep 13 02:43:08 2005
@@ -0,0 +1,13 @@
+<service name="PingPort">
+ <parameter locked="false" name="ServiceClass">org.apache.axis2.oasis.ping.PingPortSkeleton</parameter>
+ <!--Mounting the method Ping-->
+ <operation name="Ping">
+ <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiver"/>
+ </operation>
+
+ <parameter name="InAction" locked="false">Signature Signature Timestamp</parameter>
+ <parameter name="InPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
+ <parameter name="InSignaturePropFile" locked="false">interop.properties</parameter>
+
+ <parameter name="OutAction" locked="false">NoSecurity</parameter>
+</service>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.axis2.xml?rev=280524&r1=280523&r2=280524&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.axis2.xml Tue Sep 13 02:43:08 2005
@@ -7,25 +7,6 @@
<!-- Engage the security module -->
<module ref="security"/>
- <!-- This is only till we get the service specific parameters fixed in service.xml -->
-
- <!-- Scenario 6: Service's Configuration: START-->
- <!-- Also we can switch back to hte normal parameter names when we can seperately assign them to the flows -->
-
- <parameter name="InAction" locked="false">Encrypt Signature Timestamp</parameter>
- <parameter name="InSignaturePropFile" locked="false">interop.properties</parameter>
- <parameter name="InPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
-
- <parameter name="OutAction" locked="false">Encrypt Signature Timestamp</parameter>
- <parameter name="user" locked="false">bob</parameter>
- <parameter name="OutPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
- <parameter name="encryptionKeyIdentifier" locked="false">DirectReference</parameter>
- <parameter name="encryptionUser" locked="false">alice</parameter>
- <parameter name="OutSignatureKeyIdentifier" locked="false">SKIKeyIdentifier</parameter>
- <parameter name="OutSignaturePropFile" locked="false">interop.properties</parameter>
-
- <!-- Scenario 6: Service's Configuration: END-->
-
<!-- ================================================= -->
<!-- Transport Ins -->
<!-- ================================================= -->
Added: webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.xml?rev=280524&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.xml (added)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.xml Tue Sep 13 02:43:08 2005
@@ -0,0 +1,20 @@
+<service name="PingPort">
+ <parameter locked="false" name="ServiceClass">org.apache.axis2.oasis.ping.PingPortSkeleton</parameter>
+ <!--Mounting the method Ping-->
+ <operation name="Ping">
+ <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiver"/>
+ </operation>
+
+ <parameter name="InAction" locked="false">Encrypt Signature Timestamp</parameter>
+ <parameter name="InSignaturePropFile" locked="false">interop.properties</parameter>
+ <parameter name="InPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
+
+ <parameter name="OutAction" locked="false">Encrypt Signature Timestamp</parameter>
+ <parameter name="user" locked="false">bob</parameter>
+ <parameter name="OutPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
+ <parameter name="encryptionKeyIdentifier" locked="false">DirectReference</parameter>
+ <parameter name="encryptionUser" locked="false">alice</parameter>
+ <parameter name="OutSignatureKeyIdentifier" locked="false">SKIKeyIdentifier</parameter>
+ <parameter name="OutSignaturePropFile" locked="false">interop.properties</parameter>
+
+</service>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.axis2.xml?rev=280524&r1=280523&r2=280524&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.axis2.xml Tue Sep 13 02:43:08 2005
@@ -7,26 +7,6 @@
<!-- Engage the security module -->
<module ref="security"/>
- <!-- This is only till we get the service specific parameters fixed in service.xml -->
-
- <!-- Scenario 7: Service's Configuration: START-->
- <!-- Also we can switch back to hte normal parameter names when we can seperately assign them to the flows -->
-
- <parameter name="InAction" locked="false">Signature Encrypt Timestamp</parameter>
- <parameter name="InSignaturePropFile" locked="false">interop.properties</parameter>
- <parameter name="decryptionPropFile" locked="false">interop.properties</parameter>
- <parameter name="InPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
-
- <parameter name="OutAction" locked="false">Signature Encrypt Timestamp</parameter>
- <parameter name="user" locked="false">bob</parameter>
- <parameter name="OutPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
- <parameter name="encryptionKeyIdentifier" locked="false">DirectReference</parameter>
- <parameter name="encryptionUser" locked="false">alice</parameter>
- <parameter name="OutSignatureKeyIdentifier" locked="false">SKIKeyIdentifier</parameter>
- <parameter name="OutSignaturePropFile" locked="false">interop.properties</parameter>
- <parameter name="encryptionPropFile" locked="false">interop.properties</parameter>
-
- <!-- Scenario 71: Service's Configuration: END-->
<!-- ================================================= -->
<!-- Transport Ins -->
Added: webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.xml?rev=280524&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.xml (added)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.xml Tue Sep 13 02:43:08 2005
@@ -0,0 +1,22 @@
+<service name="PingPort">
+ <parameter locked="false" name="ServiceClass">org.apache.axis2.oasis.ping.PingPortSkeleton</parameter>
+ <!--Mounting the method Ping-->
+ <operation name="Ping">
+ <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiver"/>
+ </operation>
+
+ <parameter name="InAction" locked="false">Signature Encrypt Timestamp</parameter>
+ <parameter name="InSignaturePropFile" locked="false">interop.properties</parameter>
+ <parameter name="decryptionPropFile" locked="false">interop.properties</parameter>
+ <parameter name="InPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
+
+ <parameter name="OutAction" locked="false">Signature Encrypt Timestamp</parameter>
+ <parameter name="user" locked="false">bob</parameter>
+ <parameter name="OutPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
+ <parameter name="encryptionKeyIdentifier" locked="false">DirectReference</parameter>
+ <parameter name="encryptionUser" locked="false">alice</parameter>
+ <parameter name="OutSignatureKeyIdentifier" locked="false">SKIKeyIdentifier</parameter>
+ <parameter name="OutSignaturePropFile" locked="false">interop.properties</parameter>
+ <parameter name="encryptionPropFile" locked="false">interop.properties</parameter>
+
+</service>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.service.axis2.xml?rev=280524&r1=280523&r2=280524&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.service.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.service.axis2.xml Tue Sep 13 02:43:08 2005
@@ -7,17 +7,6 @@
<!-- Engage the security module -->
<module ref="security"/>
- <!-- This is only till we get the service specific parameters fixed in service.xml -->
-
- <!-- Scenario ST1: Service's Configuration: START-->
- <!-- Also we can switch back to hte normal parameter names when we can seperately assign them to the flows -->
-
- <parameter name="InAction" locked="false">Timestamp SAMLTokenUnsigned</parameter>
-
- <parameter name="OutAction" locked="false">NoSecurity</parameter> -->
-
- <!-- Scenario ST1: Service's Configuration: END-->
-
<!-- ================================================= -->
<!-- Transport Ins -->
<!-- ================================================= -->
Added: webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.service.xml?rev=280524&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.service.xml (added)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.service.xml Tue Sep 13 02:43:08 2005
@@ -0,0 +1,12 @@
+<service name="PingPort">
+ <parameter locked="false" name="ServiceClass">org.apache.axis2.oasis.ping.PingPortSkeleton</parameter>
+ <!--Mounting the method Ping-->
+ <operation name="Ping">
+ <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiver"/>
+ </operation>
+
+ <parameter name="InAction" locked="false">Timestamp SAMLTokenUnsigned</parameter>
+
+ <parameter name="OutAction" locked="false">NoSecurity</parameter>
+
+</service>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.axis2.xml?rev=280524&r1=280523&r2=280524&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.axis2.xml Tue Sep 13 02:43:08 2005
@@ -8,27 +8,6 @@
<!-- Engage the security module -->
<module ref="security"/>
- <!-- This is only till we get the service specific parameters fixed in service.xml -->
-
- <!-- Scenario 3 with MTOM: Service's Configuration: START-->
- <!-- Also we can switch back to hte normal parameter names when we can seperately assign them to the flows -->
-
- <parameter name="InAction" locked="false">Signature Encrypt Timestamp</parameter>
- <parameter name="InPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
- <parameter name="InSignaturePropFile" locked="false">interop.properties</parameter>
-
- <parameter name="OutAction" locked="false">Signature Encrypt Timestamp</parameter>
- <parameter name="user" locked="false">bob</parameter>
- <parameter name="OutPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
- <parameter name="OutSignaturePropFile" locked="false">interop.properties</parameter>
- <parameter name="OutSignatureKeyIdentifier" locked="false">DirectReference</parameter>
- <parameter name="encryptionKeyIdentifier" locked="false">SKIKeyIdentifier</parameter>
- <parameter name="encryptionUser" locked="false">alice</parameter>
-
- <parameter name="optimizeParts" locked="false">//xenc:EncryptedData/xenc:CipherData/xenc:CipherValue</parameter>
-
- <!-- Scenario 3 with MTOM: Service's Configuration: END-->
-
<!-- ================================================= -->
<!-- Transport Ins -->
<!-- ================================================= -->
Added: webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.xml?rev=280524&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.xml (added)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.xml Tue Sep 13 02:43:08 2005
@@ -0,0 +1,22 @@
+<service name="PingPort">
+ <parameter locked="false" name="ServiceClass">org.apache.axis2.oasis.ping.PingPortSkeleton</parameter>
+ <!--Mounting the method Ping-->
+ <operation name="Ping">
+ <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiver"/>
+ </operation>
+
+ <parameter name="InAction" locked="false">Signature Encrypt Timestamp</parameter>
+ <parameter name="InPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
+ <parameter name="InSignaturePropFile" locked="false">interop.properties</parameter>
+
+ <parameter name="OutAction" locked="false">Signature Encrypt Timestamp</parameter>
+ <parameter name="user" locked="false">bob</parameter>
+ <parameter name="OutPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
+ <parameter name="OutSignaturePropFile" locked="false">interop.properties</parameter>
+ <parameter name="OutSignatureKeyIdentifier" locked="false">DirectReference</parameter>
+ <parameter name="encryptionKeyIdentifier" locked="false">SKIKeyIdentifier</parameter>
+ <parameter name="encryptionUser" locked="false">alice</parameter>
+
+ <parameter name="optimizeParts" locked="false">//xenc:EncryptedData/xenc:CipherData/xenc:CipherValue</parameter>
+
+</service>
Modified: webservices/axis2/trunk/java/modules/security/src/META-INF/module.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/META-INF/module.xml?rev=280524&r1=280523&r2=280524&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 Tue Sep 13 02:43:08 2005
@@ -1,7 +1,7 @@
<module name="security">
<inflow>
<handler name="SecurityInHandler" class="org.apache.axis2.security.WSDoAllReceiver">
- <order phase="PreDispatch"/>
+ <order phase="Dispatch" after="RequestURIBasedDispatcher"/>
</handler>
</inflow>
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSDoAllHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSDoAllHandler.java?rev=280524&r1=280523&r2=280524&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSDoAllHandler.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSDoAllHandler.java Tue Sep 13 02:43:08 2005
@@ -245,7 +245,7 @@
Parameter parameter = this.handlerDesc.getParameter(key);
value = (parameter== null)?null:parameter.getValue();
}
-
+
return value;
}
}