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/31 10:09:29 UTC
svn commit: r264966 - in /webservices/axis2/trunk/java/modules/integration:
./ test-resources/security/ test/org/apache/axis2/security/
Author: ruchithf
Date: Wed Aug 31 01:09:04 2005
New Revision: 264966
URL: http://svn.apache.org/viewcvs?rev=264966&view=rev
Log:
WS-Security interop test 4
Added:
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario4Test.java
Modified:
webservices/axis2/trunk/java/modules/integration/maven.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.client.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.client.axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.axis2.xml
Modified: webservices/axis2/trunk/java/modules/integration/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/maven.xml?rev=264966&r1=264965&r2=264966&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Wed Aug 31 01:09:04 2005
@@ -86,7 +86,7 @@
<mkdir dir="target/test-resources/scenario1_service_repo/services"/>
<mkdir dir="target/test-resources/scenario1_service_repo/modules"/>
- <!-- setup scenario1 client repository-->
+ <!-- setup scenario 1 client repository-->
<copy file="test-resources/security/s1.client.axis2.xml"
tofile="target/test-resources/scenario1_client_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
@@ -98,7 +98,7 @@
<ant:path id="sec.interop.service.jar" location="../security/target/PingPort.aar"/>
<maven:addPath id="maven.dependency.classpath" refid="sec.interop.service.jar"/>
- <!-- setup scenario1 service repository-->
+ <!-- setup scenario 1 service repository-->
<copy file="test-resources/security/s1.service.axis2.xml"
tofile="target/test-resources/scenario1_service_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
@@ -114,13 +114,13 @@
<mkdir dir="target/test-resources/scenario2_service_repo/services"/>
<mkdir dir="target/test-resources/scenario2_service_repo/modules"/>
- <!-- setup scenario2 client repository-->
+ <!-- setup scenario 2 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-->
+ <!-- setup scenario 2 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"
@@ -136,13 +136,13 @@
<mkdir dir="target/test-resources/scenario2a_service_repo/services"/>
<mkdir dir="target/test-resources/scenario2a_service_repo/modules"/>
- <!-- setup scenario2a client repository-->
+ <!-- setup scenario 2a client repository-->
<copy file="test-resources/security/s2a.client.axis2.xml"
tofile="target/test-resources/scenario2a_client_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario2a_client_repo/modules/security.mar"/>
- <!-- setup scenario2a service repository-->
+ <!-- setup scenario 2a service repository-->
<copy file="test-resources/security/s2a.service.axis2.xml"
tofile="target/test-resources/scenario2a_service_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
@@ -158,13 +158,13 @@
<mkdir dir="target/test-resources/scenario3_service_repo/services"/>
<mkdir dir="target/test-resources/scenario3_service_repo/modules"/>
- <!-- setup scenario3 client repository-->
+ <!-- setup scenario 3 client repository-->
<copy file="test-resources/security/s3.client.axis2.xml"
tofile="target/test-resources/scenario3_client_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario3_client_repo/modules/security.mar"/>
- <!-- setup scenario3 service repository-->
+ <!-- setup scenario 3 service repository-->
<copy file="test-resources/security/s3.service.axis2.xml"
tofile="target/test-resources/scenario3_service_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
@@ -172,6 +172,49 @@
<copy file="../security/target/PingPort.aar"
tofile="target/test-resources/scenario3_service_repo/services/PingPort.aar"/>
+ <!-- Scenario 4 -->
+ <mkdir dir="target/test-resources/scenario4_client_repo"/>
+ <mkdir dir="target/test-resources/scenario4_client_repo/modules"/>
+
+ <mkdir dir="target/test-resources/scenario4_service_repo"/>
+ <mkdir dir="target/test-resources/scenario4_service_repo/services"/>
+ <mkdir dir="target/test-resources/scenario4_service_repo/modules"/>
+
+ <!-- setup scenario 4 client repository-->
+ <copy file="test-resources/security/s4.client.axis2.xml"
+ tofile="target/test-resources/scenario4_client_repo/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/scenario4_client_repo/modules/security.mar"/>
+
+ <!-- setup scenario 4 service repository-->
+ <copy file="test-resources/security/s4.service.axis2.xml"
+ 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"/>
+
+ <!-- Scenario 5 -->
+ <mkdir dir="target/test-resources/scenario5_client_repo"/>
+ <mkdir dir="target/test-resources/scenario5_client_repo/modules"/>
+
+ <mkdir dir="target/test-resources/scenario5_service_repo"/>
+ <mkdir dir="target/test-resources/scenario5_service_repo/services"/>
+ <mkdir dir="target/test-resources/scenario5_service_repo/modules"/>
+
+ <!-- setup scenario 5 client repository-->
+ <copy file="test-resources/security/s5.client.axis2.xml"
+ tofile="target/test-resources/scenario5_client_repo/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/scenario5_client_repo/modules/security.mar"/>
+
+ <!-- setup scenario 5 service repository-->
+ <copy file="test-resources/security/s5.service.axis2.xml"
+ 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"/>
<!-- Standard repository -->
<mkdir dir="target/Repository"/>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.client.axis2.xml?rev=264966&r1=264965&r2=264966&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.client.axis2.xml Wed Aug 31 01:09:04 2005
@@ -10,16 +10,22 @@
<!-- 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 -->
- <!-- Scenario 1: Client's Configuration:START-->
+ <!-- Scenario 4: Client's Configuration:START-->
- <parameter name="OutAction" locked="xsd:false">UsernameToken</parameter>
- <parameter name="user" locked="xsd:false">Chris</parameter>
+ <parameter name="OutAction" locked="xsd:false">Signature Encrypt Timestamp</parameter>
+ <parameter name="user" locked="xsd:false">alice</parameter>
<parameter name="OutPasswordCallbackClass" locked="xsd:false">org.apache.axis2.security.PWCallback</parameter>
- <parameter name="passwordType" locked="xsd:false">PasswordText</parameter>
+ <parameter name="OutSignatureKeyIdentifier" locked="xsd:false">DirectReference</parameter>
+ <parameter name="encryptionKeyIdentifier" locked="xsd:false">EmbeddedKeyName</parameter>
+ <parameter name="OutSignaturePropFile" locked="xsd:false">interop.properties</parameter>
+ <parameter name="EmbeddedKeyCallbackClass" locked="xsd:false">org.apache.axis2.security.PWCallback</parameter>
+ <parameter name="EmbeddedKeyName" locked="xsd:false">SessionKey</parameter>
- <parameter name="InAction" locked="xsd:false">NoSecurity</parameter>
+ <parameter name="InAction" locked="xsd:false">Signature Encrypt Timestamp</parameter>
+ <parameter name="InSignaturePropFile" locked="xsd:false">interop.properties</parameter>
+ <parameter name="InPasswordCallbackClass" locked="xsd:false">org.apache.axis2.security.PWCallback</parameter>
- <!-- Scenario 1: Client's Configuration:END-->
+ <!-- Scenario 4: Client's Configuration:END-->
<transportReceiver name="http">
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=264966&r1=264965&r2=264966&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 Wed Aug 31 01:09:04 2005
@@ -9,15 +9,23 @@
<!-- This is only till we get the service specific parameters fixed in service.xml -->
- <!-- Scenario 1: Service's Configuration: START-->
+ <!-- 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="xsd:false">UsernameToken</parameter>
+ <parameter name="InAction" locked="xsd:false">Signature Encrypt Timestamp</parameter>
+ <parameter name="InSignaturePropFile" locked="xsd:false">interop.properties</parameter>
<parameter name="InPasswordCallbackClass" locked="xsd:false">org.apache.axis2.security.PWCallback</parameter>
- <parameter name="OutAction" locked="xsd:false">NoSecurity</parameter> -->
+ <parameter name="OutAction" locked="xsd:false">Signature Encrypt Timestamp</parameter>
+ <parameter name="user" locked="xsd:false">bob</parameter>
+ <parameter name="OutPasswordCallbackClass" locked="xsd:false">org.apache.axis2.security.PWCallback</parameter>
+ <parameter name="OutSignatureKeyIdentifier" locked="xsd:false">SKIKeyIdentifier</parameter>
+ <parameter name="encryptionKeyIdentifier" locked="xsd:false">EmbeddedKeyName</parameter>
+ <parameter name="OutSignaturePropFile" locked="xsd:false">interop.properties</parameter>
+ <parameter name="EmbeddedKeyCallbackClass" locked="xsd:false">org.apache.axis2.security.PWCallback</parameter>
+ <parameter name="EmbeddedKeyName" locked="xsd:false">SessionKey</parameter>
- <!-- Scenario 1: Service's Configuration: END-->
+ <!-- Scenario 4: Service's Configuration: END-->
<!-- ================================================= -->
<!-- Transport Ins -->
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.client.axis2.xml?rev=264966&r1=264965&r2=264966&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.client.axis2.xml Wed Aug 31 01:09:04 2005
@@ -13,7 +13,7 @@
<!-- Scenario 1: Client's Configuration:START-->
<parameter name="OutAction" locked="xsd:false">UsernameToken</parameter>
- <parameter name="user" locked="xsd:false">Chris</parameter>
+ <parameter name="user" locked="xsd:false">alice</parameter>
<parameter name="OutPasswordCallbackClass" locked="xsd:false">org.apache.axis2.security.PWCallback</parameter>
<parameter name="passwordType" locked="xsd:false">PasswordText</parameter>
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=264966&r1=264965&r2=264966&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 Wed Aug 31 01:09:04 2005
@@ -15,7 +15,7 @@
<parameter name="InAction" locked="xsd:false">UsernameToken</parameter>
<parameter name="InPasswordCallbackClass" locked="xsd:false">org.apache.axis2.security.PWCallback</parameter>
- <parameter name="OutAction" locked="xsd:false">NoSecurity</parameter> -->
+ <parameter name="OutAction" locked="xsd:false">NoSecurity</parameter>
<!-- Scenario 1: Service's Configuration: END-->
Added: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario4Test.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario4Test.java?rev=264966&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario4Test.java (added)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario4Test.java Wed Aug 31 01:09:04 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;
+/**
+ * WS-Security interop scenario 4
+ * @author Ruchith Fernando (ruchith.fernando@gmail.com)
+ */
+public class Scenario4Test extends InteropTestBase {
+
+ protected void setUp() throws Exception {
+ this.setClientRepo(SCENARIO3_CLIENT_REPOSITORY);
+ this.setServiceRepo(SCENARIO3_SERVICE_REPOSITORY);
+ super.setUp();
+ }
+
+}