Author: coheigea
Date: Mon Oct 17 16:07:26 2011
New Revision: 1185273
URL: http://svn.apache.org/viewvc?rev=1185273&view=rev
Log:
Adding the ability to the STS war deployment to accept dynamic ports associated
with service endpoints
Added:
cxf/trunk/services/sts/README.txt
Modified:
cxf/trunk/services/sts/pom.xml
cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml
cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-transport.xml
cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-ut.xml
cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-x509.xml
Added: cxf/trunk/services/sts/README.txt
URL:
http://svn.apache.org/viewvc/cxf/trunk/services/sts/README.txt?rev=1185273&view=auto
==============================================================================
--- cxf/trunk/services/sts/README.txt (added)
+++ cxf/trunk/services/sts/README.txt Mon Oct 17 16:07:26 2011
@@ -0,0 +1,12 @@
+
+This folder contains the STS (Security Token Service) implementation of
+Apache CXF. It contains:
+
+sts-core - The core STS implementation
+
+sts-war - A sample war deployment for the STS
+
+systests/basic - System tests that use the STS. An embedded jetty version of
+the STS is used for testing by default. The tests can also be run using the
+war created in the sts-war module by running the tests with "-Pwar".
+
Modified: cxf/trunk/services/sts/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/services/sts/pom.xml?rev=1185273&r1=1185272&r2=1185273&view=diff
==============================================================================
--- cxf/trunk/services/sts/pom.xml (original)
+++ cxf/trunk/services/sts/pom.xml Mon Oct 17 16:07:26 2011
@@ -29,7 +29,7 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf</artifactId>
<version>2.5.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<modules>
Modified:
cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml?rev=1185273&r1=1185272&r2=1185273&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml
(original)
+++ cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml
Mon Oct 17 16:07:26 2011
@@ -66,7 +66,7 @@
</bean>
<util:list id="encryptedUtEndpoints">
-
<value>http://localhost:8082/doubleit/services/doubleitasymmetricsaml1encrypted</value>
+
<value>http://localhost:(\d)*/doubleit/services/doubleitasymmetricsaml1encrypted</value>
</util:list>
<bean id="encryptedUtSTSProperties"
Modified:
cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-transport.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-transport.xml?rev=1185273&r1=1185272&r2=1185273&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-transport.xml
(original)
+++ cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-transport.xml
Mon Oct 17 16:07:26 2011
@@ -90,7 +90,7 @@
</bean>
<util:list id="transportEndpoints">
-
<value>https://localhost:(8081|8083)/doubleit/services/doubleittransport.*</value>
+
<value>https://localhost:(\d)*/doubleit/services/doubleittransport.*</value>
</util:list>
<bean id="transportSTSProperties"
Modified: cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-ut.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-ut.xml?rev=1185273&r1=1185272&r2=1185273&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-ut.xml (original)
+++ cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-ut.xml Mon Oct
17 16:07:26 2011
@@ -72,7 +72,7 @@
</bean>
<util:list id="utEndpoints">
-
<value>http://localhost:(8080|8082)/(doubleit|metrowsp)/services/doubleit(UT|.*symmetric.*|.*)</value>
+
<value>http://localhost:(\d)*/(doubleit|metrowsp)/services/doubleit(UT|.*symmetric.*|.*)</value>
</util:list>
<bean id="utSTSProperties"
Modified: cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-x509.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-x509.xml?rev=1185273&r1=1185272&r2=1185273&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-x509.xml
(original)
+++ cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-x509.xml Mon Oct
17 16:07:26 2011
@@ -72,8 +72,8 @@
</bean>
<util:list id="x509Endpoints">
-
<value>http://localhost:8082/doubleit/services/doubleitsymmetric.*</value>
-
<value>http://localhost:8082/doubleit/services/doubleitasymmetric.*</value>
+
<value>http://localhost:(\d)*/doubleit/services/doubleitsymmetric.*</value>
+
<value>http://localhost:(\d)*/doubleit/services/doubleitasymmetric.*</value>
</util:list>
<bean id="x509STSProperties"
