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/08/30 11:12:14 UTC
svn commit: r264746 - in /webservices/axis/trunk/java/modules: integration/
integration/test-resources/security/
integration/test/org/apache/axis2/security/ security/ security/interop/
Author: ruchithf
Date: Tue Aug 30 02:11:45 2005
New Revision: 264746
URL: http://svn.apache.org/viewcvs?rev=264746&view=rev
Log:
checking in WS-Security interop Scenario2 testcase
Added:
webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario2Test.java
webservices/axis/trunk/java/modules/security/interop/interop.properties
webservices/axis/trunk/java/modules/security/interop/interop2.jks (with props)
Modified:
webservices/axis/trunk/java/modules/integration/maven.xml
webservices/axis/trunk/java/modules/integration/project.xml
webservices/axis/trunk/java/modules/integration/test-resources/security/s2.client.axis2.xml
webservices/axis/trunk/java/modules/integration/test-resources/security/s2.service.axis2.xml
webservices/axis/trunk/java/modules/integration/test-resources/security/s2a.client.axis2.xml
webservices/axis/trunk/java/modules/integration/test-resources/security/s2a.service.axis2.xml
webservices/axis/trunk/java/modules/integration/test-resources/security/s3.client.axis2.xml
webservices/axis/trunk/java/modules/integration/test-resources/security/s3.service.axis2.xml
webservices/axis/trunk/java/modules/integration/test-resources/security/s4.client.axis2.xml
webservices/axis/trunk/java/modules/integration/test-resources/security/s4.service.axis2.xml
webservices/axis/trunk/java/modules/integration/test-resources/security/s5.client.axis2.xml
webservices/axis/trunk/java/modules/integration/test-resources/security/s5.service.axis2.xml
webservices/axis/trunk/java/modules/integration/test-resources/security/s6.client.axis2.xml
webservices/axis/trunk/java/modules/integration/test-resources/security/s6.service.axis2.xml
webservices/axis/trunk/java/modules/integration/test-resources/security/s7.client.axis2.xml
webservices/axis/trunk/java/modules/integration/test-resources/security/s7.service.axis2.xml
webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java
webservices/axis/trunk/java/modules/security/maven.xml
Modified: webservices/axis/trunk/java/modules/integration/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/maven.xml?rev=264746&r1=264745&r2=264746&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis/trunk/java/modules/integration/maven.xml Tue Aug 30 02:11:45 2005
@@ -92,6 +92,9 @@
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario1_client_repo/modules/security.mar"/>
+ <!-- This is to add the PWCallback in to the classpath for the client to pick
+ the password callback class.
+ -->
<ant:path id="sec.interop.service.jar" location="../security/target/PingPort.aar"/>
<maven:addPath id="maven.dependency.classpath" refid="sec.interop.service.jar"/>
@@ -103,6 +106,28 @@
<copy file="../security/target/PingPort.aar"
tofile="target/test-resources/scenario1_service_repo/services/PingPort.aar"/>
+ <!-- Scenario 2 -->
+ <mkdir dir="target/test-resources/scenario2_client_repo"/>
+ <mkdir dir="target/test-resources/scenario2_client_repo/modules"/>
+ <mkdir dir="target/test-resources/scenario2_client_repo/classes"/>
+
+ <mkdir dir="target/test-resources/scenario2_service_repo"/>
+ <mkdir dir="target/test-resources/scenario2_service_repo/services"/>
+ <mkdir dir="target/test-resources/scenario2_service_repo/modules"/>
+
+ <!-- setup scenario2 client repository-->
+ <copy file="test-resources/security/s2.client.axis2.xml"
+ tofile="target/test-resources/scenario2_client_repo/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/scenario2_client_repo/modules/security.mar"/>
+
+ <!-- setup scenario2 service repository-->
+ <copy file="test-resources/security/s2.service.axis2.xml"
+ 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"/>
<!-- Standard repository -->
<mkdir dir="target/Repository"/>
Modified: webservices/axis/trunk/java/modules/integration/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/project.xml?rev=264746&r1=264745&r2=264746&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/project.xml (original)
+++ webservices/axis/trunk/java/modules/integration/project.xml Tue Aug 30 02:11:45 2005
@@ -97,6 +97,14 @@
<properties>
<module>true</module>
</properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ <version>0.2</version>
+ <properties>
+ <module>true</module>
+ </properties>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
Modified: webservices/axis/trunk/java/modules/integration/test-resources/security/s2.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test-resources/security/s2.client.axis2.xml?rev=264746&r1=264745&r2=264746&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test-resources/security/s2.client.axis2.xml (original)
+++ webservices/axis/trunk/java/modules/integration/test-resources/security/s2.client.axis2.xml Tue Aug 30 02:11:45 2005
@@ -8,18 +8,24 @@
<module ref="security"/>
<!-- This is only till we get the service specific parameters fixed in service.xml -->
- <!-- Also we can switch back to hte normal parameter names when we can seperately assign them to the flows -->
+ <!-- Also we can switch back to the normal parameter names when we can seperately assign them to the flows -->
- <!-- Scenario 1: Client's Configuration:START-->
+ <!-- Scenario 2: Client's Configuration:START-->
- <parameter name="OutAction" locked="xsd:false">UsernameToken</parameter>
- <parameter name="user" locked="xsd:false">alice</parameter>
+ <parameter name="OutAction" locked="xsd:false">UsernameToken Encrypt</parameter>
+ <parameter name="user" locked="xsd:false">Chris</parameter>
+ <parameter name="addUTElements" locked="xsd:false">Nonce Created</parameter>
+ <parameter name="encryptionParts" locked="xsd:false">{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}UsernameToken</parameter>
+ <parameter name="encryptionUser" locked="xsd:false">bob</parameter>
+ <parameter name="encryptionPropFile" locked="xsd:false">interop.properties</parameter>
<parameter name="OutPasswordCallbackClass" locked="xsd:false">org.apache.axis2.security.PWCallback</parameter>
- <parameter name="passwordType" locked="xsd:false">PasswordDigest</parameter>
+ <parameter name="passwordType" locked="xsd:false">PasswordText</parameter>
+ <parameter name="encryptionKeyIdentifier" locked="xsd:false">SKIKeyIdentifier</parameter>
<parameter name="InAction" locked="xsd:false">NoSecurity</parameter>
- <!-- Scenario 1: Client's Configuration:END-->
+ <!-- Scenario 2: Client's Configuration:END-->
+
<transportReceiver name="http">
Modified: webservices/axis/trunk/java/modules/integration/test-resources/security/s2.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test-resources/security/s2.service.axis2.xml?rev=264746&r1=264745&r2=264746&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test-resources/security/s2.service.axis2.xml (original)
+++ webservices/axis/trunk/java/modules/integration/test-resources/security/s2.service.axis2.xml Tue Aug 30 02:11:45 2005
@@ -9,15 +9,59 @@
<!-- 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 -->
+ <!-- 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="xsd:false">UsernameToken</parameter>
+ <parameter name="InAction" locked="xsd:false">UsernameToken Encrypt</parameter>
<parameter name="InPasswordCallbackClass" locked="xsd:false">org.apache.axis2.security.PWCallback</parameter>
+ <parameter name="decryptionPropFile" locked="xsd:false">interop.properties</parameter>
<parameter name="OutAction" locked="xsd:false">NoSecurity</parameter> -->
- <!-- Scenario 1: Service's Configuration: END-->
+ <!-- Scenario 2: Service's Configuration: END-->
+
+ <!-- ================================================= -->
+ <!-- Transport Ins -->
+ <!-- ================================================= -->
+ <transportReceiver name="http" class="org.apache.axis2.transport.http.SimpleHTTPServer">
+ <parameter name="port" locked="xsd:false">6060</parameter>
+ </transportReceiver>
+
+ <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
+ <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
+ <parameter name="transport.mail.pop3.host" locked="xsd:false">127.0.0.1</parameter>
+ <parameter name="transport.mail.pop3.user" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.pop3.password" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.pop3.port" locked="xsd:false">110</parameter>
+ <parameter name="transport.mail.replyToAddress" locked="xsd:false">axis2@127.0.0.1</parameter>
+ </transportReceiver> -->
+
+ <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
+ <parameter name="port" locked="xsd:false">6060</parameter>
+ </transportReceiver>
+
+ <!-- ================================================= -->
+ <!-- Transport Outs -->
+ <!-- ================================================= -->
+
+ <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
+ <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
+ <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.0</parameter>
+ </transportSender>
+ <transportSender name="https" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.1</parameter>
+ </transportSender>
+
+ <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
+ <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
+ <parameter name="transport.mail.smtp.host" locked="xsd:false">127.0.0.1</parameter>
+ <parameter name="transport.mail.smtp.user" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.smtp.password" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.smtp.port" locked="xsd:false">25</parameter>
+ </transportSender>
+ -->
+
<phaseOrder type="inflow">
<!-- System pre defined phases -->
Modified: webservices/axis/trunk/java/modules/integration/test-resources/security/s2a.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test-resources/security/s2a.client.axis2.xml?rev=264746&r1=264745&r2=264746&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test-resources/security/s2a.client.axis2.xml (original)
+++ webservices/axis/trunk/java/modules/integration/test-resources/security/s2a.client.axis2.xml Tue Aug 30 02:11:45 2005
@@ -13,9 +13,9 @@
<!-- Scenario 1: Client's Configuration:START-->
<parameter name="OutAction" locked="xsd:false">UsernameToken</parameter>
- <parameter name="user" locked="xsd:false">alice</parameter>
+ <parameter name="user" locked="xsd:false">Chris</parameter>
<parameter name="OutPasswordCallbackClass" locked="xsd:false">org.apache.axis2.security.PWCallback</parameter>
- <parameter name="passwordType" locked="xsd:false">PasswordDigest</parameter>
+ <parameter name="passwordType" locked="xsd:false">PasswordText</parameter>
<parameter name="InAction" locked="xsd:false">NoSecurity</parameter>
Modified: webservices/axis/trunk/java/modules/integration/test-resources/security/s2a.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test-resources/security/s2a.service.axis2.xml?rev=264746&r1=264745&r2=264746&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test-resources/security/s2a.service.axis2.xml (original)
+++ webservices/axis/trunk/java/modules/integration/test-resources/security/s2a.service.axis2.xml Tue Aug 30 02:11:45 2005
@@ -18,6 +18,49 @@
<parameter name="OutAction" locked="xsd:false">NoSecurity</parameter> -->
<!-- Scenario 1: Service's Configuration: END-->
+
+ <!-- ================================================= -->
+ <!-- Transport Ins -->
+ <!-- ================================================= -->
+ <transportReceiver name="http" class="org.apache.axis2.transport.http.SimpleHTTPServer">
+ <parameter name="port" locked="xsd:false">6060</parameter>
+ </transportReceiver>
+
+ <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
+ <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
+ <parameter name="transport.mail.pop3.host" locked="xsd:false">127.0.0.1</parameter>
+ <parameter name="transport.mail.pop3.user" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.pop3.password" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.pop3.port" locked="xsd:false">110</parameter>
+ <parameter name="transport.mail.replyToAddress" locked="xsd:false">axis2@127.0.0.1</parameter>
+ </transportReceiver> -->
+
+ <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
+ <parameter name="port" locked="xsd:false">6060</parameter>
+ </transportReceiver>
+
+ <!-- ================================================= -->
+ <!-- Transport Outs -->
+ <!-- ================================================= -->
+
+ <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
+ <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
+ <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.0</parameter>
+ </transportSender>
+ <transportSender name="https" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.1</parameter>
+ </transportSender>
+
+ <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
+ <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
+ <parameter name="transport.mail.smtp.host" locked="xsd:false">127.0.0.1</parameter>
+ <parameter name="transport.mail.smtp.user" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.smtp.password" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.smtp.port" locked="xsd:false">25</parameter>
+ </transportSender>
+ -->
+
<phaseOrder type="inflow">
<!-- System pre defined phases -->
Modified: webservices/axis/trunk/java/modules/integration/test-resources/security/s3.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test-resources/security/s3.client.axis2.xml?rev=264746&r1=264745&r2=264746&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test-resources/security/s3.client.axis2.xml (original)
+++ webservices/axis/trunk/java/modules/integration/test-resources/security/s3.client.axis2.xml Tue Aug 30 02:11:45 2005
@@ -13,9 +13,9 @@
<!-- Scenario 1: Client's Configuration:START-->
<parameter name="OutAction" locked="xsd:false">UsernameToken</parameter>
- <parameter name="user" locked="xsd:false">alice</parameter>
+ <parameter name="user" locked="xsd:false">Chris</parameter>
<parameter name="OutPasswordCallbackClass" locked="xsd:false">org.apache.axis2.security.PWCallback</parameter>
- <parameter name="passwordType" locked="xsd:false">PasswordDigest</parameter>
+ <parameter name="passwordType" locked="xsd:false">PasswordText</parameter>
<parameter name="InAction" locked="xsd:false">NoSecurity</parameter>
Modified: webservices/axis/trunk/java/modules/integration/test-resources/security/s3.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test-resources/security/s3.service.axis2.xml?rev=264746&r1=264745&r2=264746&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test-resources/security/s3.service.axis2.xml (original)
+++ webservices/axis/trunk/java/modules/integration/test-resources/security/s3.service.axis2.xml Tue Aug 30 02:11:45 2005
@@ -18,6 +18,49 @@
<parameter name="OutAction" locked="xsd:false">NoSecurity</parameter> -->
<!-- Scenario 1: Service's Configuration: END-->
+
+ <!-- ================================================= -->
+ <!-- Transport Ins -->
+ <!-- ================================================= -->
+ <transportReceiver name="http" class="org.apache.axis2.transport.http.SimpleHTTPServer">
+ <parameter name="port" locked="xsd:false">6060</parameter>
+ </transportReceiver>
+
+ <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
+ <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
+ <parameter name="transport.mail.pop3.host" locked="xsd:false">127.0.0.1</parameter>
+ <parameter name="transport.mail.pop3.user" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.pop3.password" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.pop3.port" locked="xsd:false">110</parameter>
+ <parameter name="transport.mail.replyToAddress" locked="xsd:false">axis2@127.0.0.1</parameter>
+ </transportReceiver> -->
+
+ <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
+ <parameter name="port" locked="xsd:false">6060</parameter>
+ </transportReceiver>
+
+ <!-- ================================================= -->
+ <!-- Transport Outs -->
+ <!-- ================================================= -->
+
+ <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
+ <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
+ <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.0</parameter>
+ </transportSender>
+ <transportSender name="https" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.1</parameter>
+ </transportSender>
+
+ <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
+ <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
+ <parameter name="transport.mail.smtp.host" locked="xsd:false">127.0.0.1</parameter>
+ <parameter name="transport.mail.smtp.user" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.smtp.password" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.smtp.port" locked="xsd:false">25</parameter>
+ </transportSender>
+ -->
+
<phaseOrder type="inflow">
<!-- System pre defined phases -->
Modified: webservices/axis/trunk/java/modules/integration/test-resources/security/s4.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test-resources/security/s4.client.axis2.xml?rev=264746&r1=264745&r2=264746&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test-resources/security/s4.client.axis2.xml (original)
+++ webservices/axis/trunk/java/modules/integration/test-resources/security/s4.client.axis2.xml Tue Aug 30 02:11:45 2005
@@ -13,9 +13,9 @@
<!-- Scenario 1: Client's Configuration:START-->
<parameter name="OutAction" locked="xsd:false">UsernameToken</parameter>
- <parameter name="user" locked="xsd:false">alice</parameter>
+ <parameter name="user" locked="xsd:false">Chris</parameter>
<parameter name="OutPasswordCallbackClass" locked="xsd:false">org.apache.axis2.security.PWCallback</parameter>
- <parameter name="passwordType" locked="xsd:false">PasswordDigest</parameter>
+ <parameter name="passwordType" locked="xsd:false">PasswordText</parameter>
<parameter name="InAction" locked="xsd:false">NoSecurity</parameter>
Modified: webservices/axis/trunk/java/modules/integration/test-resources/security/s4.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test-resources/security/s4.service.axis2.xml?rev=264746&r1=264745&r2=264746&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test-resources/security/s4.service.axis2.xml (original)
+++ webservices/axis/trunk/java/modules/integration/test-resources/security/s4.service.axis2.xml Tue Aug 30 02:11:45 2005
@@ -18,6 +18,49 @@
<parameter name="OutAction" locked="xsd:false">NoSecurity</parameter> -->
<!-- Scenario 1: Service's Configuration: END-->
+
+ <!-- ================================================= -->
+ <!-- Transport Ins -->
+ <!-- ================================================= -->
+ <transportReceiver name="http" class="org.apache.axis2.transport.http.SimpleHTTPServer">
+ <parameter name="port" locked="xsd:false">6060</parameter>
+ </transportReceiver>
+
+ <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
+ <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
+ <parameter name="transport.mail.pop3.host" locked="xsd:false">127.0.0.1</parameter>
+ <parameter name="transport.mail.pop3.user" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.pop3.password" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.pop3.port" locked="xsd:false">110</parameter>
+ <parameter name="transport.mail.replyToAddress" locked="xsd:false">axis2@127.0.0.1</parameter>
+ </transportReceiver> -->
+
+ <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
+ <parameter name="port" locked="xsd:false">6060</parameter>
+ </transportReceiver>
+
+ <!-- ================================================= -->
+ <!-- Transport Outs -->
+ <!-- ================================================= -->
+
+ <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
+ <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
+ <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.0</parameter>
+ </transportSender>
+ <transportSender name="https" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.1</parameter>
+ </transportSender>
+
+ <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
+ <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
+ <parameter name="transport.mail.smtp.host" locked="xsd:false">127.0.0.1</parameter>
+ <parameter name="transport.mail.smtp.user" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.smtp.password" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.smtp.port" locked="xsd:false">25</parameter>
+ </transportSender>
+ -->
+
<phaseOrder type="inflow">
<!-- System pre defined phases -->
Modified: webservices/axis/trunk/java/modules/integration/test-resources/security/s5.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test-resources/security/s5.client.axis2.xml?rev=264746&r1=264745&r2=264746&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test-resources/security/s5.client.axis2.xml (original)
+++ webservices/axis/trunk/java/modules/integration/test-resources/security/s5.client.axis2.xml Tue Aug 30 02:11:45 2005
@@ -13,9 +13,9 @@
<!-- Scenario 1: Client's Configuration:START-->
<parameter name="OutAction" locked="xsd:false">UsernameToken</parameter>
- <parameter name="user" locked="xsd:false">alice</parameter>
+ <parameter name="user" locked="xsd:false">Chris</parameter>
<parameter name="OutPasswordCallbackClass" locked="xsd:false">org.apache.axis2.security.PWCallback</parameter>
- <parameter name="passwordType" locked="xsd:false">PasswordDigest</parameter>
+ <parameter name="passwordType" locked="xsd:false">PasswordText</parameter>
<parameter name="InAction" locked="xsd:false">NoSecurity</parameter>
Modified: webservices/axis/trunk/java/modules/integration/test-resources/security/s5.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test-resources/security/s5.service.axis2.xml?rev=264746&r1=264745&r2=264746&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test-resources/security/s5.service.axis2.xml (original)
+++ webservices/axis/trunk/java/modules/integration/test-resources/security/s5.service.axis2.xml Tue Aug 30 02:11:45 2005
@@ -18,6 +18,49 @@
<parameter name="OutAction" locked="xsd:false">NoSecurity</parameter> -->
<!-- Scenario 1: Service's Configuration: END-->
+
+ <!-- ================================================= -->
+ <!-- Transport Ins -->
+ <!-- ================================================= -->
+ <transportReceiver name="http" class="org.apache.axis2.transport.http.SimpleHTTPServer">
+ <parameter name="port" locked="xsd:false">6060</parameter>
+ </transportReceiver>
+
+ <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
+ <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
+ <parameter name="transport.mail.pop3.host" locked="xsd:false">127.0.0.1</parameter>
+ <parameter name="transport.mail.pop3.user" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.pop3.password" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.pop3.port" locked="xsd:false">110</parameter>
+ <parameter name="transport.mail.replyToAddress" locked="xsd:false">axis2@127.0.0.1</parameter>
+ </transportReceiver> -->
+
+ <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
+ <parameter name="port" locked="xsd:false">6060</parameter>
+ </transportReceiver>
+
+ <!-- ================================================= -->
+ <!-- Transport Outs -->
+ <!-- ================================================= -->
+
+ <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
+ <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
+ <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.0</parameter>
+ </transportSender>
+ <transportSender name="https" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.1</parameter>
+ </transportSender>
+
+ <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
+ <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
+ <parameter name="transport.mail.smtp.host" locked="xsd:false">127.0.0.1</parameter>
+ <parameter name="transport.mail.smtp.user" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.smtp.password" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.smtp.port" locked="xsd:false">25</parameter>
+ </transportSender>
+ -->
+
<phaseOrder type="inflow">
<!-- System pre defined phases -->
Modified: webservices/axis/trunk/java/modules/integration/test-resources/security/s6.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test-resources/security/s6.client.axis2.xml?rev=264746&r1=264745&r2=264746&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test-resources/security/s6.client.axis2.xml (original)
+++ webservices/axis/trunk/java/modules/integration/test-resources/security/s6.client.axis2.xml Tue Aug 30 02:11:45 2005
@@ -13,9 +13,9 @@
<!-- Scenario 1: Client's Configuration:START-->
<parameter name="OutAction" locked="xsd:false">UsernameToken</parameter>
- <parameter name="user" locked="xsd:false">alice</parameter>
+ <parameter name="user" locked="xsd:false">Chris</parameter>
<parameter name="OutPasswordCallbackClass" locked="xsd:false">org.apache.axis2.security.PWCallback</parameter>
- <parameter name="passwordType" locked="xsd:false">PasswordDigest</parameter>
+ <parameter name="passwordType" locked="xsd:false">PasswordText</parameter>
<parameter name="InAction" locked="xsd:false">NoSecurity</parameter>
Modified: webservices/axis/trunk/java/modules/integration/test-resources/security/s6.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test-resources/security/s6.service.axis2.xml?rev=264746&r1=264745&r2=264746&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test-resources/security/s6.service.axis2.xml (original)
+++ webservices/axis/trunk/java/modules/integration/test-resources/security/s6.service.axis2.xml Tue Aug 30 02:11:45 2005
@@ -18,6 +18,49 @@
<parameter name="OutAction" locked="xsd:false">NoSecurity</parameter> -->
<!-- Scenario 1: Service's Configuration: END-->
+
+ <!-- ================================================= -->
+ <!-- Transport Ins -->
+ <!-- ================================================= -->
+ <transportReceiver name="http" class="org.apache.axis2.transport.http.SimpleHTTPServer">
+ <parameter name="port" locked="xsd:false">6060</parameter>
+ </transportReceiver>
+
+ <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
+ <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
+ <parameter name="transport.mail.pop3.host" locked="xsd:false">127.0.0.1</parameter>
+ <parameter name="transport.mail.pop3.user" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.pop3.password" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.pop3.port" locked="xsd:false">110</parameter>
+ <parameter name="transport.mail.replyToAddress" locked="xsd:false">axis2@127.0.0.1</parameter>
+ </transportReceiver> -->
+
+ <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
+ <parameter name="port" locked="xsd:false">6060</parameter>
+ </transportReceiver>
+
+ <!-- ================================================= -->
+ <!-- Transport Outs -->
+ <!-- ================================================= -->
+
+ <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
+ <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
+ <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.0</parameter>
+ </transportSender>
+ <transportSender name="https" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.1</parameter>
+ </transportSender>
+
+ <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
+ <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
+ <parameter name="transport.mail.smtp.host" locked="xsd:false">127.0.0.1</parameter>
+ <parameter name="transport.mail.smtp.user" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.smtp.password" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.smtp.port" locked="xsd:false">25</parameter>
+ </transportSender>
+ -->
+
<phaseOrder type="inflow">
<!-- System pre defined phases -->
Modified: webservices/axis/trunk/java/modules/integration/test-resources/security/s7.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test-resources/security/s7.client.axis2.xml?rev=264746&r1=264745&r2=264746&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test-resources/security/s7.client.axis2.xml (original)
+++ webservices/axis/trunk/java/modules/integration/test-resources/security/s7.client.axis2.xml Tue Aug 30 02:11:45 2005
@@ -13,9 +13,9 @@
<!-- Scenario 1: Client's Configuration:START-->
<parameter name="OutAction" locked="xsd:false">UsernameToken</parameter>
- <parameter name="user" locked="xsd:false">alice</parameter>
+ <parameter name="user" locked="xsd:false">Chris</parameter>
<parameter name="OutPasswordCallbackClass" locked="xsd:false">org.apache.axis2.security.PWCallback</parameter>
- <parameter name="passwordType" locked="xsd:false">PasswordDigest</parameter>
+ <parameter name="passwordType" locked="xsd:false">PasswordText</parameter>
<parameter name="InAction" locked="xsd:false">NoSecurity</parameter>
Modified: webservices/axis/trunk/java/modules/integration/test-resources/security/s7.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test-resources/security/s7.service.axis2.xml?rev=264746&r1=264745&r2=264746&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test-resources/security/s7.service.axis2.xml (original)
+++ webservices/axis/trunk/java/modules/integration/test-resources/security/s7.service.axis2.xml Tue Aug 30 02:11:45 2005
@@ -18,6 +18,49 @@
<parameter name="OutAction" locked="xsd:false">NoSecurity</parameter> -->
<!-- Scenario 1: Service's Configuration: END-->
+
+ <!-- ================================================= -->
+ <!-- Transport Ins -->
+ <!-- ================================================= -->
+ <transportReceiver name="http" class="org.apache.axis2.transport.http.SimpleHTTPServer">
+ <parameter name="port" locked="xsd:false">6060</parameter>
+ </transportReceiver>
+
+ <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
+ <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
+ <parameter name="transport.mail.pop3.host" locked="xsd:false">127.0.0.1</parameter>
+ <parameter name="transport.mail.pop3.user" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.pop3.password" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.pop3.port" locked="xsd:false">110</parameter>
+ <parameter name="transport.mail.replyToAddress" locked="xsd:false">axis2@127.0.0.1</parameter>
+ </transportReceiver> -->
+
+ <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
+ <parameter name="port" locked="xsd:false">6060</parameter>
+ </transportReceiver>
+
+ <!-- ================================================= -->
+ <!-- Transport Outs -->
+ <!-- ================================================= -->
+
+ <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
+ <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
+ <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.0</parameter>
+ </transportSender>
+ <transportSender name="https" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.1</parameter>
+ </transportSender>
+
+ <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
+ <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
+ <parameter name="transport.mail.smtp.host" locked="xsd:false">127.0.0.1</parameter>
+ <parameter name="transport.mail.smtp.user" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.smtp.password" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.smtp.port" locked="xsd:false">25</parameter>
+ </transportSender>
+ -->
+
<phaseOrder type="inflow">
<!-- System pre defined phases -->
Modified: webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java?rev=264746&r1=264745&r2=264746&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java (original)
+++ webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java Tue Aug 30 02:11:45 2005
@@ -68,9 +68,8 @@
private String clientRepo;
private String targetEpr = "http://127.0.0.1:" +
- //UtilServer.TESTING_PORT +
- 5556 +
- "/axis2/services/PingPort";
+ UtilServer.TESTING_PORT +
+ "/axis2/services/PingPort";
public InteropTestBase() {
super();
Added: webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario2Test.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario2Test.java?rev=264746&view=auto
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario2Test.java (added)
+++ webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario2Test.java Tue Aug 30 02:11:45 2005
@@ -0,0 +1,30 @@
+/*
+* Copyright 2004,2005 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.
+*/
+
+package org.apache.axis2.security;
+
+/**
+ *
+ * @author Ruchith Fernando (ruchith.fernando@gmail.com)
+ */
+public class Scenario2Test extends InteropTestBase {
+
+ protected void setUp() throws Exception {
+ this.setClientRepo(SCENARIO2_CLIENT_REPOSITORY);
+ this.setServiceRepo(SCENARIO2_SERVICE_REPOSITORY);
+ super.setUp();
+ }
+}
Added: webservices/axis/trunk/java/modules/security/interop/interop.properties
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/security/interop/interop.properties?rev=264746&view=auto
==============================================================================
--- webservices/axis/trunk/java/modules/security/interop/interop.properties (added)
+++ webservices/axis/trunk/java/modules/security/interop/interop.properties Tue Aug 30 02:11:45 2005
@@ -0,0 +1,5 @@
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.password=password
+org.apache.ws.security.crypto.merlin.file=interop2.jks
+
Added: webservices/axis/trunk/java/modules/security/interop/interop2.jks
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/security/interop/interop2.jks?rev=264746&view=auto
==============================================================================
Binary file - no diff available.
Propchange: webservices/axis/trunk/java/modules/security/interop/interop2.jks
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: webservices/axis/trunk/java/modules/security/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/security/maven.xml?rev=264746&r1=264745&r2=264746&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/security/maven.xml (original)
+++ webservices/axis/trunk/java/modules/security/maven.xml Tue Aug 30 02:11:45 2005
@@ -111,9 +111,15 @@
<!-- Create the META-INF directory -->
<mkdir dir="${class.dir}/META-INF"/>
- <!-- copy the service.xml-->
+ <!-- copy the service.xml-->
<copy file="interop/service.xml"
- tofile="${class.dir}/META-INF/service.xml" overwrite="yes"/>
+ tofile="${class.dir}/META-INF/service.xml" overwrite="yes"/>
+ <!-- Copy interop.properties-->
+ <copy file="interop/interop.properties"
+ tofile="${class.dir}/interop.properties" overwrite="yes"/>
+ <!-- Copy interop.jks -->
+ <copy file="interop/interop2.jks"
+ tofile="${class.dir}/interop2.jks" overwrite="yes"/>
<jar jarfile="target/PingPort.aar" basedir="target/interop/classes">
<include name="**/*"/>