Author: coheigea
Date: Tue Feb 26 21:52:38 2013
New Revision: 1450460
URL: http://svn.apache.org/r1450460
Log:
Merged revisions 1450456 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1450456 | coheigea | 2013-02-26 13:45:25 -0800 (Tue, 26 Feb 2013) | 2 lines
Using updated keystore file property in a few places
........
Modified:
cxf/branches/2.7.x-fixes/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/clientKeystore.properties
cxf/branches/2.7.x-fixes/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/serviceKeystore.properties
cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Encrypt.properties
cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Sign.properties
cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Server_Decrypt.properties
cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Server_SignVerf.properties
Modified:
cxf/branches/2.7.x-fixes/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/clientKeystore.properties
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/clientKeystore.properties?rev=1450460&r1=1450459&r2=1450460&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/clientKeystore.properties
(original)
+++
cxf/branches/2.7.x-fixes/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/clientKeystore.properties
Tue Feb 26 21:52:38 2013
@@ -2,6 +2,6 @@ org.apache.ws.security.crypto.provider=o
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=cspass
org.apache.ws.security.crypto.merlin.keystore.alias=myclientkey
-org.apache.ws.security.crypto.merlin.file=etc/clientKeystore.jks
+org.apache.ws.security.crypto.merlin.keystore.file=etc/clientKeystore.jks
Modified:
cxf/branches/2.7.x-fixes/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/serviceKeystore.properties
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/serviceKeystore.properties?rev=1450460&r1=1450459&r2=1450460&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/serviceKeystore.properties
(original)
+++
cxf/branches/2.7.x-fixes/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/serviceKeystore.properties
Tue Feb 26 21:52:38 2013
@@ -2,4 +2,4 @@ org.apache.ws.security.crypto.provider=o
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=sspass
org.apache.ws.security.crypto.merlin.keystore.alias=myservicekey
-org.apache.ws.security.crypto.merlin.file=etc/serviceKeystore.jks
+org.apache.ws.security.crypto.merlin.keystore.file=etc/serviceKeystore.jks
Modified:
cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Encrypt.properties
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Encrypt.properties?rev=1450460&r1=1450459&r2=1450460&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Encrypt.properties
(original)
+++
cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Encrypt.properties
Tue Feb 26 21:52:38 2013
@@ -20,4 +20,4 @@ org.apache.ws.security.crypto.provider=o
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=storepassword
org.apache.ws.security.crypto.merlin.keystore.alias=serverx509v1
-org.apache.ws.security.crypto.merlin.file=org/apache/cxf/systest/ws/security/handler/client-truststore.jks
\ No newline at end of file
+org.apache.ws.security.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/security/handler/client-truststore.jks
Modified:
cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Sign.properties
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Sign.properties?rev=1450460&r1=1450459&r2=1450460&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Sign.properties
(original)
+++
cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Sign.properties
Tue Feb 26 21:52:38 2013
@@ -20,5 +20,5 @@ org.apache.ws.security.crypto.provider=o
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=storepassword
org.apache.ws.security.crypto.merlin.keystore.alias=clientx509v1
-org.apache.ws.security.crypto.merlin.file=org/apache/cxf/systest/ws/security/handler/client-keystore.jks
+org.apache.ws.security.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/security/handler/client-keystore.jks
Modified:
cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Server_Decrypt.properties
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Server_Decrypt.properties?rev=1450460&r1=1450459&r2=1450460&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Server_Decrypt.properties
(original)
+++
cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Server_Decrypt.properties
Tue Feb 26 21:52:38 2013
@@ -20,4 +20,4 @@ org.apache.ws.security.crypto.provider=o
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=storepassword
org.apache.ws.security.crypto.merlin.keystore.alias=serverx509v1
-org.apache.ws.security.crypto.merlin.file=org/apache/cxf/systest/ws/security/handler/server-keystore.jks
+org.apache.ws.security.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/security/handler/server-keystore.jks
Modified:
cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Server_SignVerf.properties
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Server_SignVerf.properties?rev=1450460&r1=1450459&r2=1450460&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Server_SignVerf.properties
(original)
+++
cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Server_SignVerf.properties
Tue Feb 26 21:52:38 2013
@@ -20,4 +20,4 @@ org.apache.ws.security.crypto.provider=o
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=storepassword
org.apache.ws.security.crypto.merlin.keystore.alias=clientx509v1
-org.apache.ws.security.crypto.merlin.file=org/apache/cxf/systest/ws/security/handler/server-truststore.jks
+org.apache.ws.security.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/security/handler/server-truststore.jks
