Author: coheigea
Date: Tue Jul 10 15:12:02 2012
New Revision: 1359719
URL: http://svn.apache.org/viewvc?rev=1359719&view=rev
Log:
More STS updates
Modified:
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-ut.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-ut.xml?rev=1359719&r1=1359718&r2=1359719&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:12:02 2012
@@ -52,7 +52,6 @@
<bean id="utService"
class="org.apache.cxf.sts.service.StaticService">
<property name="endpoints" ref="utEndpoints"/>
- <property name="encryptionName" value="myservicekey"/>
</bean>
<util:list id="utEndpoints">
@@ -64,8 +63,9 @@
<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="issuer" value="DoubleItSTSIssuer"/>
+ <property name="encryptionUsername" value="myservicekey" />
</bean>
<jaxws:endpoint id="UTSTS"
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=1359719&r1=1359718&r2=1359719&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:12:02 2012
@@ -52,7 +52,6 @@
<bean id="x509Service"
class="org.apache.cxf.sts.service.StaticService">
<property name="endpoints" ref="x509Endpoints"/>
- <property name="encryptionName" value="myservicekey"/>
</bean>
<util:list id="x509Endpoints">
@@ -65,8 +64,9 @@
<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="issuer" value="DoubleItSTSIssuer"/>
+ <property name="encryptionUsername" value="myservicekey" />
</bean>
<jaxws:endpoint id="X509STS"