Author: ruchithf
Date: Wed Jun 14 04:07:17 2006
New Revision: 414193
URL: http://svn.apache.org/viewvc?rev=414193&view=rev
Log:
naming WS-SecConv stuff sc
Added:
webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/
- copied from r414164,
webservices/axis2/trunk/java/modules/integration/test-resources/security/rahas/
webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s1-services.xml
- copied, changed from r414185,
webservices/axis2/trunk/java/modules/integration/test-resources/security/rahas/s1-services.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s2-services.xml
- copied, changed from r414185,
webservices/axis2/trunk/java/modules/integration/test-resources/security/rahas/s2-services.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s3-services.xml
- copied, changed from r414185,
webservices/axis2/trunk/java/modules/integration/test-resources/security/rahas/s3-services.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s4-services.xml
- copied, changed from r414185,
webservices/axis2/trunk/java/modules/integration/test-resources/security/rahas/s4-services.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/sctIssuer.properties
- copied unchanged from r414185,
webservices/axis2/trunk/java/modules/integration/test-resources/security/rahas/sctIssuer.properties
webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/sec.jks
- copied unchanged from r414185,
webservices/axis2/trunk/java/modules/integration/test-resources/security/rahas/sec.jks
webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/sec.properties
- copied unchanged from r414185,
webservices/axis2/trunk/java/modules/integration/test-resources/security/rahas/sec.properties
webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/sts.jks
- copied unchanged from r414185,
webservices/axis2/trunk/java/modules/integration/test-resources/security/rahas/sts.jks
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/
- copied from r414119,
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/ConversationScenario1Test.java
- copied, changed from r414185,
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/ConversationScenario1Test.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/ConversationScenario2Test.java
- copied, changed from r414185,
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/ConversationScenario2Test.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/ConversationScenario3Test.java
- copied, changed from r414185,
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/ConversationScenario3Test.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/ConversationScenario4Test.java
- copied, changed from r414185,
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/ConversationScenario4Test.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/PWCallback.java
- copied, changed from r414185,
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/PWCallback.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/Service.java
- copied, changed from r414185,
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/Service.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/TestClient.java
- copied, changed from r414185,
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/TestClient.java
Removed:
webservices/axis2/trunk/java/modules/integration/test-resources/security/rahas/
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/
Modified:
webservices/axis2/trunk/java/modules/integration/maven.xml
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/ConversationConfiguration.java
Modified: webservices/axis2/trunk/java/modules/integration/maven.xml
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/maven.xml?rev=414193&r1=414192&r2=414193&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Wed Jun 14
04:07:17 2006
@@ -115,119 +115,120 @@
<postGoal name="test:compile">
<j:if test="${context.getVariable('maven.test.skip') != 'true'}">
- <!-- Service classes for the Rahas tests -->
- <mkdir dir="target/temp-rahas"/>
- <mkdir dir="target/temp-rahas/META-INF"/>
+ <!-- Service classes for the SecConv tests -->
+ <mkdir dir="target/temp-sc"/>
+ <mkdir dir="target/temp-sc/META-INF"/>
- <copy overwrite="yes"
file="target/test-classes/org/apache/axis2/security/rahas/Service.class"
-
tofile="target/temp-rahas/org/apache/axis2/security/rahas/Service.class"/>
- <copy overwrite="yes"
file="target/test-classes/org/apache/axis2/security/rahas/PWCallback.class"
-
tofile="target/temp-rahas/org/apache/axis2/security/rahas/PWCallback.class"/>
+ <copy overwrite="yes"
file="target/test-classes/org/apache/axis2/security/sc/Service.class"
+
tofile="target/temp-sc/org/apache/axis2/security/sc/Service.class"/>
+ <copy overwrite="yes"
file="target/test-classes/org/apache/axis2/security/sc/PWCallback.class"
+
tofile="target/temp-sc/org/apache/axis2/security/sc/PWCallback.class"/>
- <copy overwrite="yes" todir="target/temp-rahas">
- <fileset dir="test-resources/security/rahas">
+ <copy overwrite="yes" todir="target/temp-sc">
+ <fileset dir="test-resources/security">
<include name="sctIssuer.properties"/>
<include name="sts.jks"/>
</fileset>
</copy>
- <ant:path id="rahas.client.props"
location="test-resources/security/rahas"/>
- <maven:addPath id="maven.dependency.classpath"
refid="rahas.client.props"/>
+ <ant:path id="sc.client.props"
location="test-resources/security/sc"/>
+ <maven:addPath id="maven.dependency.classpath"
refid="sc.client.props"/>
- <mkdir dir="target/test-resources/rahas_client_repo"/>
- <mkdir dir="target/test-resources/rahas_client_repo/conf"/>
- <mkdir dir="target/test-resources/rahas_client_repo/modules"/>
+ <mkdir dir="target/test-resources/sc_client_repo"/>
+ <mkdir dir="target/test-resources/sc_client_repo/conf"/>
+ <mkdir dir="target/test-resources/sc_client_repo/modules"/>
<copy
file="../addressing/target/addressing-${addressing_version}.mar"
-
tofile="target/test-resources/rahas_client_repo/modules/addressing-${addressing_version}.mar"/>
+
tofile="target/test-resources/sc_client_repo/modules/addressing-${addressing_version}.mar"/>
<copy
file="../security/target/rampart-${rampart_version}.mar"
-
tofile="target/test-resources/rahas_client_repo/modules/rampart-${rampart_version}.mar"/>
+
tofile="target/test-resources/sc_client_repo/modules/rampart-${rampart_version}.mar"/>
- <!-- Rahas Test - 1 -->
+ <!-- SecConv Test - 1 -->
- <mkdir dir="target/test-resources/rahas_service_repo_1"/>
- <mkdir dir="target/test-resources/rahas_service_repo_1/conf"/>
- <mkdir dir="target/test-resources/rahas_service_repo_1/services"/>
- <mkdir dir="target/test-resources/rahas_service_repo_1/modules"/>
+ <mkdir dir="target/test-resources/sc/_service_repo_1"/>
+ <mkdir dir="target/test-resources/sc_service_repo_1/conf"/>
+ <mkdir dir="target/test-resources/sc_service_repo_1/services"/>
+ <mkdir dir="target/test-resources/sc_service_repo_1/modules"/>
+
<copy file="../security/target/rampart-${rampart_version}.mar"
-
tofile="target/test-resources/rahas_service_repo_1/modules/rampart-${rampart_version}.mar"/>
+
tofile="target/test-resources/sc_service_repo_1/modules/rampart-${rampart_version}.mar"/>
<copy
file="../addressing/target/addressing-${addressing_version}.mar"
-
tofile="target/test-resources/rahas_service_repo_1/modules/addressing-${addressing_version}.mar"/>
+
tofile="target/test-resources/sc_service_repo_1/modules/addressing-${addressing_version}.mar"/>
<!-- copy the services.xml and create the aar -->
- <copy overwrite="yes"
file="test-resources/security/rahas/s1-services.xml"
- tofile="target/temp-rahas/META-INF/services.xml"/>
+ <copy overwrite="yes"
file="test-resources/security/sc/s1-services.xml"
+ tofile="target/temp-sc/META-INF/services.xml"/>
- <jar
jarfile="target/test-resources/rahas_service_repo_1/services/SecureService.aar"
- basedir="target/temp-rahas"/>
+ <jar
jarfile="target/test-resources/sc_service_repo_1/services/SecureService.aar"
+ basedir="target/temp-sc"/>
<!-- Rahas Test - 1 :END -->
<!-- Rahas Test - 2 -->
- <mkdir dir="target/test-resources/rahas_service_repo_2"/>
- <mkdir dir="target/test-resources/rahas_service_repo_2/conf"/>
- <mkdir dir="target/test-resources/rahas_service_repo_2/services"/>
- <mkdir dir="target/test-resources/rahas_service_repo_2/modules"/>
+ <mkdir dir="target/test-resources/sc_service_repo_2"/>
+ <mkdir dir="target/test-resources/sc_service_repo_2/conf"/>
+ <mkdir dir="target/test-resources/sc_service_repo_2/services"/>
+ <mkdir dir="target/test-resources/sc_service_repo_2/modules"/>
<copy file="../security/target/rampart-${rampart_version}.mar"
-
tofile="target/test-resources/rahas_service_repo_2/modules/rampart-${rampart_version}.mar"/>
+
tofile="target/test-resources/sc_service_repo_2/modules/rampart-${rampart_version}.mar"/>
<copy
file="../addressing/target/addressing-${addressing_version}.mar"
-
tofile="target/test-resources/rahas_service_repo_2/modules/addressing-${addressing_version}.mar"/>
+
tofile="target/test-resources/sc_service_repo_2/modules/addressing-${addressing_version}.mar"/>
<!-- copy the services.xml and create the aar -->
- <copy overwrite="yes"
file="test-resources/security/rahas/s2-services.xml"
- tofile="target/temp-rahas/META-INF/services.xml"/>
+ <copy overwrite="yes"
file="test-resources/security/sc/s2-services.xml"
+ tofile="target/temp-sc/META-INF/services.xml"/>
- <jar overwrite="yes"
jarfile="target/test-resources/rahas_service_repo_2/services/SecureService.aar"
- basedir="target/temp-rahas"/>
+ <jar overwrite="yes"
jarfile="target/test-resources/sc_service_repo_2/services/SecureService.aar"
+ basedir="target/temp-sc"/>
<!-- Rahas Test - 2 :END -->
<!-- Rahas Test - 3 -->
- <mkdir dir="target/test-resources/rahas_service_repo_3"/>
- <mkdir dir="target/test-resources/rahas_service_repo_3/conf"/>
- <mkdir dir="target/test-resources/rahas_service_repo_3/services"/>
- <mkdir dir="target/test-resources/rahas_service_repo_3/modules"/>
+ <mkdir dir="target/test-resources/sc_service_repo_3"/>
+ <mkdir dir="target/test-resources/sc_service_repo_3/conf"/>
+ <mkdir dir="target/test-resources/sc_service_repo_3/services"/>
+ <mkdir dir="target/test-resources/sc_service_repo_3/modules"/>
<copy file="../security/target/rampart-${rampart_version}.mar"
-
tofile="target/test-resources/rahas_service_repo_3/modules/rampart-${rampart_version}.mar"/>
+
tofile="target/test-resources/sc_service_repo_3/modules/rampart-${rampart_version}.mar"/>
<copy
file="../addressing/target/addressing-${addressing_version}.mar"
-
tofile="target/test-resources/rahas_service_repo_3/modules/addressing-${addressing_version}.mar"/>
+
tofile="target/test-resources/sc_service_repo_3/modules/addressing-${addressing_version}.mar"/>
<!-- copy the services.xml and create the aar -->
- <copy overwrite="yes"
file="test-resources/security/rahas/s3-services.xml"
- tofile="target/temp-rahas/META-INF/services.xml"/>
+ <copy overwrite="yes"
file="test-resources/security/sc/s3-services.xml"
+ tofile="target/temp-sc/META-INF/services.xml"/>
- <jar overwrite="yes"
jarfile="target/test-resources/rahas_service_repo_3/services/SecureService.aar"
- basedir="target/temp-rahas"/>
+ <jar overwrite="yes"
jarfile="target/test-resources/sc_service_repo_3/services/SecureService.aar"
+ basedir="target/temp-sc"/>
<!-- Rahas Test - 3 :END -->
<!-- Rahas Test - 4 -->
- <mkdir dir="target/test-resources/rahas_service_repo_4"/>
- <mkdir dir="target/test-resources/rahas_service_repo_4/conf"/>
- <mkdir dir="target/test-resources/rahas_service_repo_4/services"/>
- <mkdir dir="target/test-resources/rahas_service_repo_4/modules"/>
+ <mkdir dir="target/test-resources/sc_service_repo_4"/>
+ <mkdir dir="target/test-resources/sc_service_repo_4/conf"/>
+ <mkdir dir="target/test-resources/sc_service_repo_4/services"/>
+ <mkdir dir="target/test-resources/sc_service_repo_4/modules"/>
<copy file="../security/target/rampart-${rampart_version}.mar"
-
tofile="target/test-resources/rahas_service_repo_4/modules/rampart-${rampart_version}.mar"/>
+
tofile="target/test-resources/sc_service_repo_4/modules/rampart-${rampart_version}.mar"/>
<copy
file="../addressing/target/addressing-${addressing_version}.mar"
-
tofile="target/test-resources/rahas_service_repo_4/modules/addressing-${addressing_version}.mar"/>
+
tofile="target/test-resources/sc_service_repo_4/modules/addressing-${addressing_version}.mar"/>
<!-- copy the services.xml and create the aar -->
- <copy overwrite="yes"
file="test-resources/security/rahas/s4-services.xml"
- tofile="target/temp-rahas/META-INF/services.xml"/>
+ <copy overwrite="yes"
file="test-resources/security/sc/s4-services.xml"
+ tofile="target/temp-sc/META-INF/services.xml"/>
- <jar overwrite="yes"
jarfile="target/test-resources/rahas_service_repo_4/services/SecureService.aar"
- basedir="target/temp-rahas"/>
+ <jar overwrite="yes"
jarfile="target/test-resources/sc_service_repo_4/services/SecureService.aar"
+ basedir="target/temp-sc"/>
<!-- Rahas Test - 4 :END -->
- <!-- clean up temp rahas stuff -->
- <delete dir="target/temp-rahas"/>
+ <!-- clean up temp sc stuff -->
+ <delete dir="target/temp-sc"/>
<mkdir dir="target/test-resources/samples/modules"/>
Copied:
webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s1-services.xml
(from r414185,
webservices/axis2/trunk/java/modules/integration/test-resources/security/rahas/s1-services.xml)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s1-services.xml?p2=webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s1-services.xml&p1=webservices/axis2/trunk/java/modules/integration/test-resources/security/rahas/s1-services.xml&r1=414185&r2=414193&rev=414193&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/integration/test-resources/security/rahas/s1-services.xml
(original)
+++
webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s1-services.xml
Wed Jun 14 04:07:17 2006
@@ -2,7 +2,7 @@
<module ref="rampart"/>
- <parameter locked="false"
name="ServiceClass">org.apache.axis2.security.rahas.Service</parameter>
+ <parameter locked="false"
name="ServiceClass">org.apache.axis2.security.sc.Service</parameter>
<operation name="echo">
<messageReceiver
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
@@ -17,12 +17,12 @@
</sct-issuer-config>
</parameter>
- <parameter xmlns="" name="rahas-configuration">
- <rahas-configuration xmlns="">
+ <parameter xmlns="" name="sc-configuration">
+ <sc-configuration xmlns="">
<scope xmlns="">service</scope>
- <passwordCallbackClass
xmlns="">org.apache.axis2.security.rahas.PWCallback</passwordCallbackClass>
+ <passwordCallbackClass
xmlns="">org.apache.axis2.security.sc.PWCallback</passwordCallbackClass>
<cryptoProperties
xmlns="">sctIssuer.properties</cryptoProperties>
- </rahas-configuration>
+ </sc-configuration>
</parameter>
<parameter name="InflowSecurity">
@@ -38,7 +38,7 @@
<encryptionUser>useReqSigCert</encryptionUser>
<user>sts</user>
<signaturePropFile xmlns="">sctIssuer.properties</signaturePropFile>
- <passwordCallbackClass
xmlns="">org.apache.axis2.security.rahas.PWCallback</passwordCallbackClass>
+ <passwordCallbackClass
xmlns="">org.apache.axis2.security.sc.PWCallback</passwordCallbackClass>
</action>
</parameter>
Copied:
webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s2-services.xml
(from r414185,
webservices/axis2/trunk/java/modules/integration/test-resources/security/rahas/s2-services.xml)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s2-services.xml?p2=webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s2-services.xml&p1=webservices/axis2/trunk/java/modules/integration/test-resources/security/rahas/s2-services.xml&r1=414185&r2=414193&rev=414193&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/integration/test-resources/security/rahas/s2-services.xml
(original)
+++
webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s2-services.xml
Wed Jun 14 04:07:17 2006
@@ -2,7 +2,7 @@
<module ref="rampart"/>
- <parameter locked="false"
name="ServiceClass">org.apache.axis2.security.rahas.Service</parameter>
+ <parameter locked="false"
name="ServiceClass">org.apache.axis2.security.sc.Service</parameter>
<operation name="echo">
<messageReceiver
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
@@ -18,12 +18,12 @@
</sct-issuer-config>
</parameter>
- <parameter xmlns="" name="rahas-configuration">
- <rahas-configuration xmlns="">
+ <parameter xmlns="" name="sc-configuration">
+ <sc-configuration xmlns="">
<scope xmlns="">service</scope>
- <passwordCallbackClass
xmlns="">org.apache.axis2.security.rahas.PWCallback</passwordCallbackClass>
+ <passwordCallbackClass
xmlns="">org.apache.axis2.security.sc.PWCallback</passwordCallbackClass>
<cryptoProperties
xmlns="">sctIssuer.properties</cryptoProperties>
- </rahas-configuration>
+ </sc-configuration>
</parameter>
<parameter name="InflowSecurity">
Copied:
webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s3-services.xml
(from r414185,
webservices/axis2/trunk/java/modules/integration/test-resources/security/rahas/s3-services.xml)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s3-services.xml?p2=webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s3-services.xml&p1=webservices/axis2/trunk/java/modules/integration/test-resources/security/rahas/s3-services.xml&r1=414185&r2=414193&rev=414193&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/integration/test-resources/security/rahas/s3-services.xml
(original)
+++
webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s3-services.xml
Wed Jun 14 04:07:17 2006
@@ -2,7 +2,7 @@
<module ref="rampart"/>
- <parameter locked="false"
name="ServiceClass">org.apache.axis2.security.rahas.Service</parameter>
+ <parameter locked="false"
name="ServiceClass">org.apache.axis2.security.sc.Service</parameter>
<operation name="echo">
<messageReceiver
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
@@ -17,12 +17,12 @@
</sct-issuer-config>
</parameter>
- <parameter xmlns="" name="rahas-configuration">
- <rahas-configuration xmlns="">
+ <parameter xmlns="" name="sc-configuration">
+ <sc-configuration xmlns="">
<scope xmlns="">service</scope>
- <passwordCallbackClass
xmlns="">org.apache.axis2.security.rahas.PWCallback</passwordCallbackClass>
+ <passwordCallbackClass
xmlns="">org.apache.axis2.security.sc.PWCallback</passwordCallbackClass>
<cryptoProperties
xmlns="">sctIssuer.properties</cryptoProperties>
- </rahas-configuration>
+ </sc-configuration>
</parameter>
<parameter name="InflowSecurity">
@@ -38,7 +38,7 @@
<encryptionUser>useReqSigCert</encryptionUser>
<user>sts</user>
<signaturePropFile xmlns="">sctIssuer.properties</signaturePropFile>
- <passwordCallbackClass
xmlns="">org.apache.axis2.security.rahas.PWCallback</passwordCallbackClass>
+ <passwordCallbackClass
xmlns="">org.apache.axis2.security.sc.PWCallback</passwordCallbackClass>
</action>
</parameter>
Copied:
webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s4-services.xml
(from r414185,
webservices/axis2/trunk/java/modules/integration/test-resources/security/rahas/s4-services.xml)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s4-services.xml?p2=webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s4-services.xml&p1=webservices/axis2/trunk/java/modules/integration/test-resources/security/rahas/s4-services.xml&r1=414185&r2=414193&rev=414193&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/integration/test-resources/security/rahas/s4-services.xml
(original)
+++
webservices/axis2/trunk/java/modules/integration/test-resources/security/sc/s4-services.xml
Wed Jun 14 04:07:17 2006
@@ -2,7 +2,7 @@
<module ref="rampart"/>
- <parameter locked="false"
name="ServiceClass">org.apache.axis2.security.rahas.Service</parameter>
+ <parameter locked="false"
name="ServiceClass">org.apache.axis2.security.sc.Service</parameter>
<operation name="echo">
<messageReceiver
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
@@ -17,12 +17,12 @@
</sct-issuer-config>
</parameter>
- <parameter xmlns="" name="rahas-configuration">
- <rahas-configuration xmlns="">
+ <parameter xmlns="" name="sc-configuration">
+ <sc-configuration xmlns="">
<scope xmlns="">service</scope>
- <passwordCallbackClass
xmlns="">org.apache.axis2.security.rahas.PWCallback</passwordCallbackClass>
+ <passwordCallbackClass
xmlns="">org.apache.axis2.security.sc.PWCallback</passwordCallbackClass>
<cryptoProperties
xmlns="">sctIssuer.properties</cryptoProperties>
- </rahas-configuration>
+ </sc-configuration>
</parameter>
<parameter name="InflowSecurity">
@@ -38,7 +38,7 @@
<encryptionUser>useReqSigCert</encryptionUser>
<user>sts</user>
<signaturePropFile xmlns="">sctIssuer.properties</signaturePropFile>
- <passwordCallbackClass
xmlns="">org.apache.axis2.security.rahas.PWCallback</passwordCallbackClass>
+ <passwordCallbackClass
xmlns="">org.apache.axis2.security.sc.PWCallback</passwordCallbackClass>
</action>
</parameter>
Copied:
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/ConversationScenario1Test.java
(from r414185,
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/ConversationScenario1Test.java)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/ConversationScenario1Test.java?p2=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/ConversationScenario1Test.java&p1=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/ConversationScenario1Test.java&r1=414185&r2=414193&rev=414193&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/ConversationScenario1Test.java
(original)
+++
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/ConversationScenario1Test.java
Wed Jun 14 04:07:17 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.axis2.security.rahas;
+package org.apache.axis2.security.sc;
import org.apache.axis2.description.Parameter;
import org.apache.rampart.conversation.ConversationConfiguration;
@@ -66,7 +66,7 @@
}
public String getServiceRepo() {
- return "rahas_service_repo_1";
+ return "sc_service_repo_1";
}
}
Copied:
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/ConversationScenario2Test.java
(from r414185,
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/ConversationScenario2Test.java)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/ConversationScenario2Test.java?p2=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/ConversationScenario2Test.java&p1=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/ConversationScenario2Test.java&r1=414185&r2=414193&rev=414193&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/ConversationScenario2Test.java
(original)
+++
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/ConversationScenario2Test.java
Wed Jun 14 04:07:17 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.axis2.security.rahas;
+package org.apache.axis2.security.sc;
/**
* The RSTR will hold a RequestedProofToken with a base64 encoded
@@ -27,7 +27,7 @@
}
public String getServiceRepo() {
- return "rahas_service_repo_2";
+ return "sc_service_repo_2";
}
Copied:
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/ConversationScenario3Test.java
(from r414185,
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/ConversationScenario3Test.java)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/ConversationScenario3Test.java?p2=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/ConversationScenario3Test.java&p1=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/ConversationScenario3Test.java&r1=414185&r2=414193&rev=414193&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/ConversationScenario3Test.java
(original)
+++
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/ConversationScenario3Test.java
Wed Jun 14 04:07:17 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.axis2.security.rahas;
+package org.apache.axis2.security.sc;
import org.apache.axis2.description.Parameter;
import org.apache.rampart.conversation.ConversationConfiguration;
@@ -54,7 +54,7 @@
}
public String getServiceRepo() {
- return "rahas_service_repo_3";
+ return "sc_service_repo_3";
}
}
Copied:
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/ConversationScenario4Test.java
(from r414185,
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/ConversationScenario4Test.java)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/ConversationScenario4Test.java?p2=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/ConversationScenario4Test.java&p1=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/ConversationScenario4Test.java&r1=414185&r2=414193&rev=414193&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/ConversationScenario4Test.java
(original)
+++
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/ConversationScenario4Test.java
Wed Jun 14 04:07:17 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.axis2.security.rahas;
+package org.apache.axis2.security.sc;
import org.apache.axis2.description.Parameter;
import org.apache.rampart.conversation.ConversationConfiguration;
@@ -64,7 +64,7 @@
}
public String getServiceRepo() {
- return "rahas_service_repo_4";
+ return "sc_service_repo_4";
}
Copied:
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/PWCallback.java
(from r414185,
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/PWCallback.java)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/PWCallback.java?p2=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/PWCallback.java&p1=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/PWCallback.java&r1=414185&r2=414193&rev=414193&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/PWCallback.java
(original)
+++
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/PWCallback.java
Wed Jun 14 04:07:17 2006
@@ -1,4 +1,4 @@
-package org.apache.axis2.security.rahas;
+package org.apache.axis2.security.sc;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
Copied:
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/Service.java
(from r414185,
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/Service.java)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/Service.java?p2=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/Service.java&p1=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/Service.java&r1=414185&r2=414193&rev=414193&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/Service.java
(original)
+++
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/Service.java
Wed Jun 14 04:07:17 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.axis2.security.rahas;
+package org.apache.axis2.security.sc;
import org.apache.axiom.om.OMElement;
public class Service {
Copied:
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/TestClient.java
(from r414185,
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/TestClient.java)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/TestClient.java?p2=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/TestClient.java&p1=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/TestClient.java&r1=414185&r2=414193&rev=414193&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/TestClient.java
(original)
+++
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/TestClient.java
Wed Jun 14 04:07:17 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.axis2.security.rahas;
+package org.apache.axis2.security.sc;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -61,7 +61,7 @@
try {
// Get the repository location from the args
- String repo = Constants.TESTING_PATH + "rahas_client_repo";
+ String repo = Constants.TESTING_PATH + "sc_client_repo";
OMElement payload = getEchoElement();
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(repo,
@@ -80,7 +80,7 @@
if(clientInflowConfiguration != null) {
options.setProperty(WSSHandlerConstants.INFLOW_SECURITY,
clientInflowConfiguration.getProperty());
}
- options.setProperty(ConversationConfiguration.RAHAS_CONFIG,
getClientConversationConfiguration());
+ options.setProperty(ConversationConfiguration.SC_CONFIG,
getClientConversationConfiguration());
options.setAction("urn:echo");
Modified:
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/ConversationConfiguration.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/ConversationConfiguration.java?rev=414193&r1=414192&r2=414193&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/ConversationConfiguration.java
(original)
+++
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/ConversationConfiguration.java
Wed Jun 14 04:07:17 2006
@@ -45,7 +45,7 @@
*/
public class ConversationConfiguration {
- public final static String RAHAS_CONFIG = "rahas-configuration";
+ public final static String SC_CONFIG = "sc-configuration";
public final static String SCOPE_SERVICE = "service";
@@ -101,7 +101,7 @@
* This is the <code>Crypto</code> impl class name.
*
* This will ONLY be set via the message context as a property using
- *
<code>org.apache.axis2.security.rahas.WSSHandlerConstants#CRYPTO_PROPERTIES_KEY<code>.
+ *
<code>org.apache.rampart.WSSHandlerConstants#CRYPTO_PROPERTIES_KEY<code>.
*
* @see org.apache.ws.security.components.crypto.Crypto
* @see org.apache.ws.security.components.crypto.Merlin
@@ -159,14 +159,14 @@
if (elem != null
&& elem.getFirstElement() != null
&& elem.getFirstElement().getLocalName().equals(
- RAHAS_CONFIG)) {
+ SC_CONFIG)) {
OMElement confElem = elem.getFirstElement();
ConversationConfiguration config = new
ConversationConfiguration();
config.msgCtx = msgCtx;
- msgCtx.setProperty(RAHAS_CONFIG, config);
+ msgCtx.setProperty(SC_CONFIG, config);
config.scope =
getStringValue(confElem.getFirstChildWithName(SCOPE));
@@ -229,7 +229,7 @@
MessageContext inMsgCtx;
ConversationConfiguration inConfig = null;
if(opCtx != null && (inMsgCtx =
opCtx.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE)) != null) {
- inConfig =
(ConversationConfiguration)inMsgCtx.getProperty(RAHAS_CONFIG);
+ inConfig =
(ConversationConfiguration)inMsgCtx.getProperty(SC_CONFIG);
}
if(inConfig != null && inConfig.contextIdentifier !=
null) {
config.contextIdentifier =
inConfig.contextIdentifier;
@@ -259,7 +259,7 @@
return config;
} else {
throw new RampartException("missingConfiguration",
- new String[] { RAHAS_CONFIG });
+ new String[] { SC_CONFIG });
}
} else {
//If there's no configuration return null
@@ -273,9 +273,9 @@
* @return
*/
public static Parameter getParameter(MessageContext msgCtx) {
- Parameter param = msgCtx.getParameter(RAHAS_CONFIG);
+ Parameter param = msgCtx.getParameter(SC_CONFIG);
if(param == null) {
- param = (Parameter)msgCtx.getProperty(RAHAS_CONFIG);
+ param = (Parameter)msgCtx.getProperty(SC_CONFIG);
}
return param;
}
@@ -300,7 +300,7 @@
Parameter param = new Parameter();
OMElement element = this.getOMElement();
OMElement paramElem =
element.getOMFactory().createOMElement("parameter", null);
- paramElem.addAttribute("name", ConversationConfiguration.RAHAS_CONFIG,
null);
+ paramElem.addAttribute("name", ConversationConfiguration.SC_CONFIG,
null);
paramElem.addChild(element);
param.setParameterElement(paramElem);
return param;
@@ -308,7 +308,7 @@
private OMElement getOMElement() {
OMFactory factory = OMAbstractFactory.getOMFactory();
- OMElement elem = factory.createOMElement(RAHAS_CONFIG, null);
+ OMElement elem = factory.createOMElement(SC_CONFIG, null);
if (this.scope != null) {
OMElement tempElem = factory.createOMElement(SCOPE, elem);
tempElem.setText(this.scope);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
