Author: ulhasbhole
Date: Wed Aug 22 08:19:12 2007
New Revision: 568651
URL: http://svn.apache.org/viewvc?rev=568651&view=rev
Log:
* Applying patch on behalf of Colm O hEigeartaigh related to JIRA
https://issues.apache.org/jira/browse/CXF-934.
Modified:
incubator/cxf/trunk/rt/ws/security/src/test/java/META-INF/cxf/client.properties
incubator/cxf/trunk/rt/ws/security/src/test/java/META-INF/cxf/insecurity.properties
incubator/cxf/trunk/rt/ws/security/src/test/java/META-INF/cxf/outsecurity.properties
Modified:
incubator/cxf/trunk/rt/ws/security/src/test/java/META-INF/cxf/client.properties
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/security/src/test/java/META-INF/cxf/client.properties?rev=568651&r1=568650&r2=568651&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/ws/security/src/test/java/META-INF/cxf/client.properties
(original)
+++
incubator/cxf/trunk/rt/ws/security/src/test/java/META-INF/cxf/client.properties
Wed Aug 22 08:19:12 2007
@@ -21,8 +21,5 @@
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=keystorePass
-org.apache.ws.security.crypto.merlin.alias.password=aliaspass
org.apache.ws.security.crypto.merlin.keystore.alias=alias
org.apache.ws.security.crypto.merlin.file=META-INF/cxf/privatestore.jks
-xfire.security.symmetric.key.algoritm=http://www.w3.org/2001/04/xmlenc#tripledes-cbc
-xfire.security.encrypt.key.algoritm= http://www.w3.org/2001/04/xmlenc#rsa-1_5
\ No newline at end of file
Modified:
incubator/cxf/trunk/rt/ws/security/src/test/java/META-INF/cxf/insecurity.properties
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/security/src/test/java/META-INF/cxf/insecurity.properties?rev=568651&r1=568650&r2=568651&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/ws/security/src/test/java/META-INF/cxf/insecurity.properties
(original)
+++
incubator/cxf/trunk/rt/ws/security/src/test/java/META-INF/cxf/insecurity.properties
Wed Aug 22 08:19:12 2007
@@ -21,6 +21,5 @@
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=keyStorePassword
-org.apache.ws.security.crypto.merlin.alias.password=myAliasPassword
org.apache.ws.security.crypto.merlin.keystore.alias=myalias
-org.apache.ws.security.crypto.merlin.file=META-INF/cxf/privatestore.jks
\ No newline at end of file
+org.apache.ws.security.crypto.merlin.file=META-INF/cxf/privatestore.jks
Modified:
incubator/cxf/trunk/rt/ws/security/src/test/java/META-INF/cxf/outsecurity.properties
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/security/src/test/java/META-INF/cxf/outsecurity.properties?rev=568651&r1=568650&r2=568651&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/ws/security/src/test/java/META-INF/cxf/outsecurity.properties
(original)
+++
incubator/cxf/trunk/rt/ws/security/src/test/java/META-INF/cxf/outsecurity.properties
Wed Aug 22 08:19:12 2007
@@ -21,8 +21,5 @@
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=keyStorePassword
-org.apache.ws.security.crypto.merlin.alias.password=myAliasPassword
org.apache.ws.security.crypto.merlin.keystore.alias=myalias
org.apache.ws.security.crypto.merlin.file=META-INF/cxf/privatestore.jks
-xfire.security.symmetric.key.algoritm=http://www.w3.org/2001/04/xmlenc#tripledes-cbc
-xfire.security.encrypt.key.algoritm= http://www.w3.org/2001/04/xmlenc#rsa-1_5
\ No newline at end of file
