Author: ruchithf
Date: Tue Feb 6 21:30:45 2007
New Revision: 504439
URL: http://svn.apache.org/viewvc?view=rev&rev=504439
Log:
- We cannot have two modules called rampart and rampart-sts. Therefore
changing rampart-sts to rampart_sts
- Got the SecConv tests working !!! - All test run successfully now :-)
Modified:
webservices/rampart/trunk/java/modules/rampart-integration/pom.xml
webservices/rampart/trunk/java/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rahas/s1-services.xml
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rahas/s3-services.xml
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-sc-1.xml
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-sc-2.xml
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/security/sc/s1-services.xml
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/security/sc/s2-services.xml
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/security/sc/s4-services.xml
webservices/rampart/trunk/java/modules/rampart-trust-mar/module.xml
webservices/rampart/trunk/java/modules/rampart-trust-mar/pom.xml
Modified: webservices/rampart/trunk/java/modules/rampart-integration/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/pom.xml?view=diff&rev=504439&r1=504438&r2=504439
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-integration/pom.xml
(original)
+++ webservices/rampart/trunk/java/modules/rampart-integration/pom.xml Tue Feb
6 21:30:45 2007
@@ -53,7 +53,7 @@
</artifactItem>
<artifactItem>
<groupId>org.apache.rampart</groupId>
- <artifactId>rampart-sts</artifactId>
+ <artifactId>rampart_sts</artifactId>
<version>${pom.version}</version>
<type>mar</type>
<overWrite>true</overWrite>
@@ -142,14 +142,14 @@
<mkdir dir="target/test-resources/rampart_client_repo/conf"/>
<mkdir dir="target/test-resources/rampart_client_repo/modules"/>
<copy file="target/artifacts/rampart-SNAPSHOT.mar"
tofile="target/test-resources/rampart_client_repo/modules/rampart-SNAPSHOT.mar"/>
-<copy file="target/artifacts/rampart-sts-SNAPSHOT.mar"
tofile="target/test-resources/rampart_client_repo/modules/rampart-sts-SNAPSHOT.mar"/>
+<copy file="target/artifacts/rampart_sts-SNAPSHOT.mar"
tofile="target/test-resources/rampart_client_repo/modules/rampart_sts-SNAPSHOT.mar"/>
<copy file="target/artifacts/addressing-SNAPSHOT.mar"
tofile="target/test-resources/rampart_client_repo/modules/addressing-SNAPSHOT.mar"/>
<mkdir dir="target/test-resources/rampart_service_repo"/>
<mkdir dir="target/test-resources/rampart_service_repo/conf"/>
<mkdir dir="target/test-resources/rampart_service_repo/services"/>
<mkdir dir="target/test-resources/rampart_service_repo/modules"/>
<copy file="target/artifacts/rampart-SNAPSHOT.mar"
tofile="target/test-resources/rampart_service_repo/modules/rampart-SNAPSHOT.mar"/>
-<copy file="target/artifacts/rampart-sts-SNAPSHOT.mar"
tofile="target/test-resources/rampart_service_repo/modules/rampart-sts-SNAPSHOT.mar"/>
+<copy file="target/artifacts/rampart_sts-SNAPSHOT.mar"
tofile="target/test-resources/rampart_service_repo/modules/rampart_sts-SNAPSHOT.mar"/>
<copy file="target/artifacts/addressing-SNAPSHOT.mar"
tofile="target/test-resources/rampart_service_repo/modules/addressing-SNAPSHOT.mar"/>
<!-- Service 1 -->
@@ -210,7 +210,7 @@
<mkdir dir="target/test-resources/sc_service_repo_1/services"/>
<mkdir dir="target/test-resources/sc_service_repo_1/modules"/>
<copy file="target/artifacts/rampart-SNAPSHOT.mar"
tofile="target/test-resources/sc_service_repo_1/modules/rampart-SNAPSHOT.mar"/>
-<copy file="target/artifacts/rampart-sts-SNAPSHOT.mar"
tofile="target/test-resources/sc_service_repo_1/modules/rahas-SNAPSHOT.mar"/>
+<copy file="target/artifacts/rampart_sts-SNAPSHOT.mar"
tofile="target/test-resources/sc_service_repo_1/modules/rampart_sts-SNAPSHOT.mar"/>
<copy file="target/artifacts/addressing-SNAPSHOT.mar"
tofile="target/test-resources/sc_service_repo_1/modules/addressing-SNAPSHOT.mar"/>
<!-- copy the services.xml and create the aar -->
<copy overwrite="yes" file="src/test/resources/security/sc/s1-services.xml"
tofile="target/temp-sc/META-INF/services.xml"/>
@@ -222,7 +222,7 @@
<mkdir dir="target/test-resources/sc_service_repo_2/services"/>
<mkdir dir="target/test-resources/sc_service_repo_2/modules"/>
<copy file="target/artifacts/rampart-SNAPSHOT.mar"
tofile="target/test-resources/sc_service_repo_2/modules/rampart-SNAPSHOT.mar"/>
-<copy file="target/artifacts/rampart-sts-SNAPSHOT.mar"
tofile="target/test-resources/sc_service_repo_2/modules/rahas-SNAPSHOT.mar"/>
+<copy file="target/artifacts/rampart_sts-SNAPSHOT.mar"
tofile="target/test-resources/sc_service_repo_2/modules/rampart_sts-SNAPSHOT.mar"/>
<copy file="target/artifacts/addressing-SNAPSHOT.mar"
tofile="target/test-resources/sc_service_repo_2/modules/addressing-SNAPSHOT.mar"/>
<!-- copy the services.xml and create the aar -->
<copy overwrite="yes" file="src/test/resources/security/sc/s2-services.xml"
tofile="target/temp-sc/META-INF/services.xml"/>
@@ -245,7 +245,7 @@
<mkdir dir="target/test-resources/sc_service_repo_4/services"/>
<mkdir dir="target/test-resources/sc_service_repo_4/modules"/>
<copy file="target/artifacts/rampart-SNAPSHOT.mar"
tofile="target/test-resources/sc_service_repo_4/modules/rampart-SNAPSHOT.mar"/>
-<copy file="target/artifacts/rampart-sts-SNAPSHOT.mar"
tofile="target/test-resources/sc_service_repo_4/modules/rahas-SNAPSHOT.mar"/>
+<copy file="target/artifacts/rampart_sts-SNAPSHOT.mar"
tofile="target/test-resources/sc_service_repo_4/modules/rampart_sts-SNAPSHOT.mar"/>
<copy file="target/artifacts/addressing-SNAPSHOT.mar"
tofile="target/test-resources/sc_service_repo_4/modules/addressing-SNAPSHOT.mar"/>
<!-- copy the services.xml and create the aar -->
<copy overwrite="yes" file="src/test/resources/security/sc/s4-services.xml"
tofile="target/temp-sc/META-INF/services.xml"/>
@@ -283,7 +283,7 @@
<mkdir dir="target/test-resources/rahas_service_repo_1/services"/>
<mkdir dir="target/test-resources/rahas_service_repo_1/modules"/>
<copy file="target/artifacts/rampart-SNAPSHOT.mar"
tofile="target/test-resources/rahas_service_repo_1/modules/rampart-SNAPSHOT.mar"/>
-<copy file="target/artifacts/rampart-sts-SNAPSHOT.mar"
tofile="target/test-resources/rahas_service_repo_1/modules/rahas-SNAPSHOT.mar"/>
+<copy file="target/artifacts/rampart_sts-SNAPSHOT.mar"
tofile="target/test-resources/rahas_service_repo_1/modules/rampart_sts-SNAPSHOT.mar"/>
<copy file="target/artifacts/addressing-SNAPSHOT.mar"
tofile="target/test-resources/rahas_service_repo_1/modules/addressing-SNAPSHOT.mar"/>
<!-- copy the services.xml and create the aar -->
<copy overwrite="yes" file="src/test/resources/rahas/s1-services.xml"
tofile="target/temp-rahas/META-INF/services.xml"/>
@@ -297,7 +297,7 @@
<mkdir dir="target/test-resources/rahas_service_repo_3/services"/>
<mkdir dir="target/test-resources/rahas_service_repo_3/modules"/>
<copy file="target/artifacts/rampart-SNAPSHOT.mar"
tofile="target/test-resources/rahas_service_repo_3/modules/rampart-SNAPSHOT.mar"/>
-<copy file="target/artifacts/rampart-sts-SNAPSHOT.mar"
tofile="target/test-resources/rahas_service_repo_3/modules/rahas-SNAPSHOT.mar"/>
+<copy file="target/artifacts/rampart_sts-SNAPSHOT.mar"
tofile="target/test-resources/rahas_service_repo_3/modules/rampart_sts-SNAPSHOT.mar"/>
<copy file="target/artifacts/addressing-SNAPSHOT.mar"
tofile="target/test-resources/rahas_service_repo_3/modules/addressing-SNAPSHOT.mar"/>
<!-- copy the services.xml and create the aar -->
<copy overwrite="yes" file="src/test/resources/rahas/s3-services.xml"
tofile="target/temp-rahas/META-INF/services.xml"/>
@@ -552,7 +552,7 @@
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
- <artifactId>rampart-sts</artifactId>
+ <artifactId>rampart_sts</artifactId>
<type>mar</type>
<version>${pom.version}</version>
</dependency>
Modified:
webservices/rampart/trunk/java/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java?view=diff&rev=504439&r1=504438&r2=504439
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
Tue Feb 6 21:30:45 2007
@@ -40,7 +40,7 @@
public class RampartTest extends TestCase {
- public final static int PORT = UtilServer.TESTING_PORT;
+ public final static int PORT = 5556;//UtilServer.TESTING_PORT;
public RampartTest(String name) {
super(name);
@@ -96,29 +96,29 @@
serviceClient.sendReceive(getEchoElement());
}
-//
-// for (int i = 1; i <= 2; i++) { //<-The number of tests we have
-//
-// Options options = new Options();
-// System.out.println("Testing WS-SecConv: custom scenario " +
i);
-// options.setAction("urn:echo");
-// options.setTo(new EndpointReference("http://127.0.0.1:"; +
PORT + "/axis2/services/SecureServiceSC" + i));
-// options.setProperty(RampartMessageData.KEY_RAMPART_POLICY,
loadPolicy("/rampart/policy/sc-" + i + ".xml"));
-// serviceClient.setOptions(options);
-//
-// //Blocking invocation
-// serviceClient.sendReceive(getEchoElement());
-// serviceClient.sendReceive(getEchoElement());
-//
-// //Cancel the token
-// options.setProperty(RampartMessageData.CANCEL_REQUEST,
Constants.VALUE_TRUE);
-// serviceClient.sendReceive(getEchoElement());
-//
-// options.setProperty(RampartMessageData.CANCEL_REQUEST,
Constants.VALUE_FALSE);
-// serviceClient.sendReceive(getEchoElement());
-// options.setProperty(RampartMessageData.CANCEL_REQUEST,
Constants.VALUE_TRUE);
-// serviceClient.sendReceive(getEchoElement());
-// }
+
+ for (int i = 1; i <= 2; i++) { //<-The number of tests we have
+
+ Options options = new Options();
+ System.out.println("Testing WS-SecConv: custom scenario " + i);
+ options.setAction("urn:echo");
+ options.setTo(new EndpointReference("http://127.0.0.1:"; + PORT
+ "/axis2/services/SecureServiceSC" + i));
+ options.setProperty(RampartMessageData.KEY_RAMPART_POLICY,
loadPolicy("/rampart/policy/sc-" + i + ".xml"));
+ serviceClient.setOptions(options);
+
+ //Blocking invocation
+ serviceClient.sendReceive(getEchoElement());
+ serviceClient.sendReceive(getEchoElement());
+
+ //Cancel the token
+ options.setProperty(RampartMessageData.CANCEL_REQUEST,
Constants.VALUE_TRUE);
+ serviceClient.sendReceive(getEchoElement());
+
+ options.setProperty(RampartMessageData.CANCEL_REQUEST,
Constants.VALUE_FALSE);
+ serviceClient.sendReceive(getEchoElement());
+ options.setProperty(RampartMessageData.CANCEL_REQUEST,
Constants.VALUE_TRUE);
+ serviceClient.sendReceive(getEchoElement());
+ }
} catch (Exception e) {
e.printStackTrace();
Modified:
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rahas/s1-services.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rahas/s1-services.xml?view=diff&rev=504439&r1=504438&r2=504439
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rahas/s1-services.xml
(original)
+++
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rahas/s1-services.xml
Tue Feb 6 21:30:45 2007
@@ -1,7 +1,7 @@
<service name="SecureService">
<module ref="rampart"/>
- <module ref="rahas"/>
+ <module ref="rampart_sts"/>
<parameter locked="false"
name="ServiceClass">org.apache.rahas.Service</parameter>
Modified:
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rahas/s3-services.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rahas/s3-services.xml?view=diff&rev=504439&r1=504438&r2=504439
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rahas/s3-services.xml
(original)
+++
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rahas/s3-services.xml
Tue Feb 6 21:30:45 2007
@@ -1,7 +1,7 @@
<service name="SecureService">
<module ref="rampart"/>
- <module ref="rahas"/>
+ <module ref="rampart_sts"/>
<parameter locked="false"
name="ServiceClass">org.apache.rahas.Service</parameter>
Modified:
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-sc-1.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-sc-1.xml?view=diff&rev=504439&r1=504438&r2=504439
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-sc-1.xml
(original)
+++
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-sc-1.xml
Tue Feb 6 21:30:45 2007
@@ -2,7 +2,7 @@
<module ref="addressing"/>
<module ref="rampart"/>
- <module ref="rampart-sts"/>
+ <module ref="rampart_sts"/>
<parameter locked="false"
name="ServiceClass">org.apache.rampart.Service</parameter>
Modified:
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-sc-2.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-sc-2.xml?view=diff&rev=504439&r1=504438&r2=504439
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-sc-2.xml
(original)
+++
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-sc-2.xml
Tue Feb 6 21:30:45 2007
@@ -2,7 +2,7 @@
<module ref="addressing"/>
<module ref="rampart"/>
- <module ref="rampart-sts"/>
+ <module ref="rampart_sts"/>
<parameter locked="false"
name="ServiceClass">org.apache.rampart.Service</parameter>
Modified:
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/security/sc/s1-services.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/security/sc/s1-services.xml?view=diff&rev=504439&r1=504438&r2=504439
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/security/sc/s1-services.xml
(original)
+++
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/security/sc/s1-services.xml
Tue Feb 6 21:30:45 2007
@@ -1,7 +1,7 @@
<service name="SecureService">
<module ref="rampart"/>
- <module ref="rahas"/>
+ <module ref="rampart_sts"/>
<parameter locked="false"
name="ServiceClass">org.apache.axis2.security.sc.Service</parameter>
Modified:
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/security/sc/s2-services.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/security/sc/s2-services.xml?view=diff&rev=504439&r1=504438&r2=504439
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/security/sc/s2-services.xml
(original)
+++
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/security/sc/s2-services.xml
Tue Feb 6 21:30:45 2007
@@ -1,7 +1,7 @@
<service name="SecureService">
<module ref="rampart"/>
- <module ref="rahas"/>
+ <module ref="rampart_sts"/>
<parameter locked="false"
name="ServiceClass">org.apache.axis2.security.sc.Service</parameter>
Modified:
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/security/sc/s4-services.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/security/sc/s4-services.xml?view=diff&rev=504439&r1=504438&r2=504439
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/security/sc/s4-services.xml
(original)
+++
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/security/sc/s4-services.xml
Tue Feb 6 21:30:45 2007
@@ -1,7 +1,7 @@
<service name="SecureService">
<module ref="rampart"/>
- <module ref="rahas"/>
+ <module ref="rampart_sts"/>
<parameter locked="false"
name="ServiceClass">org.apache.axis2.security.sc.Service</parameter>
Modified: webservices/rampart/trunk/java/modules/rampart-trust-mar/module.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-trust-mar/module.xml?view=diff&rev=504439&r1=504438&r2=504439
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-trust-mar/module.xml
(original)
+++ webservices/rampart/trunk/java/modules/rampart-trust-mar/module.xml Tue Feb
6 21:30:45 2007
@@ -4,7 +4,7 @@
<supported-policy-namespaces
namespaces="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"/>
- <operation name="RequestSecurityToken"
mep="http://www.w3.org/2004/08/wsdl/in-out";>
+ <operation name="RequestSecurityToken"
mep="http://www.w3.org/2006/01/wsdl/in-out";>
<messageReceiver class="org.apache.rahas.STSMessageReceiver"/>
<!-- Action mapping to accept SCT requests -->
Modified: webservices/rampart/trunk/java/modules/rampart-trust-mar/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-trust-mar/pom.xml?view=diff&rev=504439&r1=504438&r2=504439
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-trust-mar/pom.xml (original)
+++ webservices/rampart/trunk/java/modules/rampart-trust-mar/pom.xml Tue Feb 6
21:30:45 2007
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.rampart</groupId>
- <artifactId>rampart-sts</artifactId>
+ <artifactId>rampart_sts</artifactId>
<packaging>mar</packaging>
<version>SNAPSHOT</version>
<name>Rampart Trust-Mar</name>
@@ -40,47 +40,47 @@
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.rampart</groupId>
- <artifactId>rampart-policy</artifactId>
- <version>${pom.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-policy</artifactId>
+ <version>${pom.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.rampart</groupId>
- <artifactId>rampart-trust</artifactId>
- <version>${pom.version}</version>
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-trust</artifactId>
+ <version>${pom.version}</version>
</dependency>
</dependencies>
- <pluginRepositories>
- <pluginRepository>
- <id>apache-m2</id>
- <name>Apache M2 Repository</name>
-
<url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </pluginRepository>
- <pluginRepository>
- <id>apache-snapshots</id>
- <name>Apache Snapshots Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <layout>default</layout>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>apache-m2</id>
+ <name>Apache M2 Repository</name>
+
<url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>daily</updatePolicy>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
+ <pluginRepository>
+ <id>apache-snapshots</id>
+ <name>Apache Snapshots Repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>daily</updatePolicy>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
</project>
