You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2016/09/30 11:10:50 UTC
cxf-fediz git commit: Removing some unneeded stuff from the STS
configuration
Repository: cxf-fediz
Updated Branches:
refs/heads/master cf0712206 -> efec7de91
Removing some unneeded stuff from the STS configuration
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/efec7de9
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/efec7de9
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/efec7de9
Branch: refs/heads/master
Commit: efec7de91d17e3228e66389d3f5781572b4eb9d6
Parents: cf07122
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Sep 30 12:10:36 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Sep 30 12:10:36 2016 +0100
----------------------------------------------------------------------
services/sts/src/main/resources/sts.properties | 1 -
.../src/main/resources/stsEncryption.properties | 5 -----
services/sts/src/main/resources/stsencrypt.jks | Bin 32 -> 0 bytes
.../sts/src/main/webapp/WEB-INF/cxf-transport.xml | 2 --
.../src/test/resources/sts/cxf-transport.xml | 17 -----------------
5 files changed, 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/efec7de9/services/sts/src/main/resources/sts.properties
----------------------------------------------------------------------
diff --git a/services/sts/src/main/resources/sts.properties b/services/sts/src/main/resources/sts.properties
index 4bb5c7e..c0cb92b 100644
--- a/services/sts/src/main/resources/sts.properties
+++ b/services/sts/src/main/resources/sts.properties
@@ -17,6 +17,5 @@
# under the License.
#
signature.properties=stsTruststore.properties
-encryption.properties=stsEncryption.properties
issuer=Fediz STS
callback.handler=org.apache.cxf.fediz.service.sts.PasswordCallbackHandler
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/efec7de9/services/sts/src/main/resources/stsEncryption.properties
----------------------------------------------------------------------
diff --git a/services/sts/src/main/resources/stsEncryption.properties b/services/sts/src/main/resources/stsEncryption.properties
deleted file mode 100644
index 9badcdc..0000000
--- a/services/sts/src/main/resources/stsEncryption.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=storepass
-org.apache.ws.security.crypto.merlin.keystore.file=stsencrypt.jks
-
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/efec7de9/services/sts/src/main/resources/stsencrypt.jks
----------------------------------------------------------------------
diff --git a/services/sts/src/main/resources/stsencrypt.jks b/services/sts/src/main/resources/stsencrypt.jks
deleted file mode 100644
index 7bac48a..0000000
Binary files a/services/sts/src/main/resources/stsencrypt.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/efec7de9/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
----------------------------------------------------------------------
diff --git a/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml b/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
index 0cac6a7..b8d7b68 100644
--- a/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
+++ b/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
@@ -78,7 +78,6 @@
<property name="tokenValidators" ref="transportTokenValidators" />
<property name="eventListener" ref="loggerListener" />
<property name="delegationHandlers" ref="delegationHandlers" />
- <property name="encryptIssuedToken" value="true"/>
</bean>
<bean id="transportValidateDelegate" class="org.apache.cxf.sts.operation.TokenValidateOperation">
@@ -163,7 +162,6 @@
<property name="issuer" value="${issuer}" />
<property name="realmParser" ref="customRealmParser" />
<property name="signatureCryptoProperties" value="${signature.properties}" />
- <property name="encryptionCryptoProperties" value="${encryption.properties}"/>
<property name="relationships" ref="relationships" />
</bean>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/efec7de9/systests/kerberos/src/test/resources/sts/cxf-transport.xml
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/resources/sts/cxf-transport.xml b/systests/kerberos/src/test/resources/sts/cxf-transport.xml
index 85d9ca3..be3fe02 100644
--- a/systests/kerberos/src/test/resources/sts/cxf-transport.xml
+++ b/systests/kerberos/src/test/resources/sts/cxf-transport.xml
@@ -78,7 +78,6 @@
<property name="tokenValidators" ref="transportTokenValidators" />
<property name="eventListener" ref="loggerListener" />
<property name="delegationHandlers" ref="delegationHandlers" />
- <property name="encryptIssuedToken" value="true"/>
</bean>
<bean id="transportValidateDelegate" class="org.apache.cxf.sts.operation.TokenValidateOperation">
@@ -174,7 +173,6 @@
</bean>
<util:list id="transportServices">
- <ref bean="myEncryptionService" />
<ref bean="transportService" />
</util:list>
@@ -185,20 +183,6 @@
</util:list>
</property>
</bean>
-
- <bean id="myEncryptionService" class="org.apache.cxf.sts.service.StaticService">
- <property name="endpoints">
- <util:list>
- <value>myServiceB.*</value>
- </util:list>
- </property>
- <property name="encryptionProperties">
- <bean class="org.apache.cxf.sts.service.EncryptionProperties">
- <property name="encryptionName" value="serviceB"/>
- <property name="encryptionAlgorithm" value="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- </bean>
- </property>
- </bean>
<bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
<property name="callbackHandlerClass"
@@ -206,7 +190,6 @@
<property name="issuer" value="Fediz STS" />
<property name="realmParser" ref="customRealmParser" />
<property name="signatureCryptoProperties" value="stsTruststore.properties" />
- <property name="encryptionCryptoProperties" value="stsEncryption.properties"/>
<property name="relationships" ref="relationships" />
</bean>