Author: coheigea
Date: Tue Jul 10 15:08:15 2012
New Revision: 1359717
URL: http://svn.apache.org/viewvc?rev=1359717&view=rev
Log:
Updating STS config
Modified:
cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml
cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-servlet.xml
cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-ut.xml
cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-x509.xml
Modified:
cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml?rev=1359717&r1=1359716&r2=1359717&view=diff
==============================================================================
--- cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml
(original)
+++ cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml
Tue Jul 10 15:08:15 2012
@@ -15,7 +15,6 @@
http://cxf.apache.org/schemas/jaxws.xsd
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util-2.0.xsd";>
- <import resource="cxf-transport.xml"/>
<cxf:bus>
<cxf:features>
@@ -47,20 +46,26 @@
<bean id="encryptedUtService"
class="org.apache.cxf.sts.service.StaticService">
<property name="endpoints" ref="encryptedUtEndpoints"/>
- <property name="encryptionName" value="myservicekey"/>
</bean>
<util:list id="encryptedUtEndpoints">
<value>http://localhost:(\d)*/doubleit/services/doubleitasymmetricsaml1encrypted</value>
</util:list>
+ <bean id="encProperties"
class="org.apache.cxf.sts.service.EncryptionProperties">
+ <property name="encryptionAlgorithm"
value="http://www.w3.org/2001/04/xmlenc#aes128-cbc"; />
+ <property name="keyWrapAlgorithm"
value="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"; />
+ </bean>
+
<bean id="encryptedUtSTSProperties"
class="org.apache.cxf.sts.StaticSTSProperties">
<property name="signatureProperties"
value="stsKeystore.properties"/>
<property name="signatureUsername" value="mystskey"/>
<property name="callbackHandlerClass"
value="org.apache.cxf.sts.war.PasswordCallbackHandler"/>
- <property name="encryptionProperties"
value="stsKeystore.properties"/>
+ <property name="encryptionPropertiesFile"
value="stsKeystore.properties"/>
+ <property name="encryptionProperties" ref="encProperties" />
<property name="issuer" value="DoubleItSTSIssuer"/>
+ <property name="encryptionUsername" value="myservicekey"/>
</bean>
<jaxws:endpoint id="EncryptedUTSTS"
Modified: cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-servlet.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-servlet.xml?rev=1359717&r1=1359716&r2=1359717&view=diff
==============================================================================
--- cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-servlet.xml
(original)
+++ cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-servlet.xml Tue
Jul 10 15:08:15 2012
@@ -15,6 +15,7 @@
http://cxf.apache.org/schemas/jaxws.xsd
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util-2.0.xsd";>
+ <import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="cxf-transport.xml"/>
<!--
<import resource="cxf-ut.xml"/>
Modified: cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml?rev=1359717&r1=1359716&r2=1359717&view=diff
==============================================================================
--- cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
(original)
+++ cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml Tue
Jul 10 15:08:15 2012
@@ -18,8 +18,6 @@
http://cxf.apache.org/configuration/security
http://cxf.apache.org/schemas/configuration/security.xsd";>
- <import resource="classpath:META-INF/cxf/cxf.xml" />
-
<cxf:bus>
<cxf:features>
<cxf:logging />
Modified: cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-ut.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-ut.xml?rev=1359717&r1=1359716&r2=1359717&view=diff
==============================================================================
--- cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-ut.xml (original)
+++ cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-ut.xml Tue Jul 10
15:08:15 2012
@@ -15,7 +15,6 @@
http://cxf.apache.org/schemas/jaxws.xsd
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util-2.0.xsd";>
- <import resource="cxf-transport.xml"/>
<cxf:bus>
<cxf:features>
Modified: cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-x509.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-x509.xml?rev=1359717&r1=1359716&r2=1359717&view=diff
==============================================================================
--- cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-x509.xml (original)
+++ cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-x509.xml Tue Jul
10 15:08:15 2012
@@ -15,7 +15,6 @@
http://cxf.apache.org/schemas/jaxws.xsd
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util-2.0.xsd";>
- <import resource="cxf-transport.xml"/>
<cxf:bus>
<cxf:features>
