Author: coheigea
Date: Tue Feb 12 16:50:27 2013
New Revision: 1445261
URL: http://svn.apache.org/r1445261
Log:
Using 1.6 Crypto property values
Modified:
webservices/wss4j/trunk/ws-security-common/src/test/resources/alice.properties
webservices/wss4j/trunk/ws-security-common/src/test/resources/crypto.properties
webservices/wss4j/trunk/ws-security-common/src/test/resources/log4j.properties
webservices/wss4j/trunk/ws-security-common/src/test/resources/nofile.properties
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40.properties
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40All.properties
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40CA.properties
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40_client.properties
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40_server.properties
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40badca.properties
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40badcatrust.properties
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40rev.properties
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss86.properties
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/AbstractTestBase.java
webservices/wss4j/trunk/ws-security-stax/src/test/resources/receiver-crypto.properties
webservices/wss4j/trunk/ws-security-stax/src/test/resources/transmitter-crypto.properties
Modified:
webservices/wss4j/trunk/ws-security-common/src/test/resources/alice.properties
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/resources/alice.properties?rev=1445261&r1=1445260&r2=1445261&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-common/src/test/resources/alice.properties
(original)
+++
webservices/wss4j/trunk/ws-security-common/src/test/resources/alice.properties
Tue Feb 12 16:50:27 2013
@@ -1,4 +1,4 @@
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.provider=org.apache.ws.security.common.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=pkcs12
org.apache.ws.security.crypto.merlin.keystore.password=password
org.apache.ws.security.crypto.merlin.keystore.alias=alice
Modified:
webservices/wss4j/trunk/ws-security-common/src/test/resources/crypto.properties
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/resources/crypto.properties?rev=1445261&r1=1445260&r2=1445261&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-common/src/test/resources/crypto.properties
(original)
+++
webservices/wss4j/trunk/ws-security-common/src/test/resources/crypto.properties
Tue Feb 12 16:50:27 2013
@@ -1,4 +1,4 @@
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.provider=org.apache.ws.security.common.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=pkcs12
org.apache.ws.security.crypto.merlin.keystore.password=security
org.apache.ws.security.crypto.merlin.keystore.alias=16c73ab6-b892-458f-abf5-2f875f74882e
Modified:
webservices/wss4j/trunk/ws-security-common/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/resources/log4j.properties?rev=1445261&r1=1445260&r2=1445261&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-common/src/test/resources/log4j.properties
(original)
+++
webservices/wss4j/trunk/ws-security-common/src/test/resources/log4j.properties
Tue Feb 12 16:50:27 2013
@@ -17,7 +17,7 @@
# log4j.logger.org.apache.ws.security.WSSecurityEngine=DEBUG
# log4j.logger.org.apache.ws.security.WSSConfig=DEBUG
#
log4j.logger.org.apache.ws.security.message.token.SecurityTokenReference=DEBUG
-# log4j.logger.org.apache.ws.security.components.crypto.Merlin=DEBUG
+# log4j.logger.org.apache.ws.security.common.crypto.Merlin=DEBUG
# log4j.logger.org.apache.xml.security.encryption.XMLCipher=DEBUG
# log4j.logger.org.apache.xml.security.algorithms.SignatureAlgorithm=INFO
# log4j.logger.org.apache.xml.security.signature.XMLSignature=DEBUG
Modified:
webservices/wss4j/trunk/ws-security-common/src/test/resources/nofile.properties
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/resources/nofile.properties?rev=1445261&r1=1445260&r2=1445261&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-common/src/test/resources/nofile.properties
(original)
+++
webservices/wss4j/trunk/ws-security-common/src/test/resources/nofile.properties
Tue Feb 12 16:50:27 2013
@@ -1,4 +1,4 @@
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.provider=org.apache.ws.security.common.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=pkcs12
org.apache.ws.security.crypto.merlin.keystore.password=security
org.apache.ws.security.crypto.merlin.keystore.alias=16c73ab6-b892-458f-abf5-2f875f74882e
Modified:
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40.properties
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40.properties?rev=1445261&r1=1445260&r2=1445261&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40.properties
(original)
+++
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40.properties
Tue Feb 12 16:50:27 2013
@@ -1,4 +1,4 @@
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.provider=org.apache.ws.security.common.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=security
org.apache.ws.security.crypto.merlin.keystore.alias=wss40
Modified:
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40All.properties
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40All.properties?rev=1445261&r1=1445260&r2=1445261&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40All.properties
(original)
+++
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40All.properties
Tue Feb 12 16:50:27 2013
@@ -1,4 +1,4 @@
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.provider=org.apache.ws.security.common.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=security
org.apache.ws.security.crypto.merlin.keystore.alias=wss40rev
Modified:
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40CA.properties
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40CA.properties?rev=1445261&r1=1445260&r2=1445261&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40CA.properties
(original)
+++
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40CA.properties
Tue Feb 12 16:50:27 2013
@@ -1,4 +1,4 @@
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.provider=org.apache.ws.security.common.crypto.Merlin
org.apache.ws.security.crypto.merlin.truststore.password=security
org.apache.ws.security.crypto.merlin.truststore.file=keys/wss40CA.jks
org.apache.ws.security.crypto.merlin.x509crl.file=keys/wss40CACRL.pem
Modified:
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40_client.properties
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40_client.properties?rev=1445261&r1=1445260&r2=1445261&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40_client.properties
(original)
+++
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40_client.properties
Tue Feb 12 16:50:27 2013
@@ -1,4 +1,4 @@
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.provider=org.apache.ws.security.common.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=password
org.apache.ws.security.crypto.merlin.keystore.alias=Client_CertChain
Modified:
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40_server.properties
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40_server.properties?rev=1445261&r1=1445260&r2=1445261&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40_server.properties
(original)
+++
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40_server.properties
Tue Feb 12 16:50:27 2013
@@ -1,4 +1,4 @@
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.provider=org.apache.ws.security.common.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=password
org.apache.ws.security.crypto.merlin.keystore.alias=CA_Cert
Modified:
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40badca.properties
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40badca.properties?rev=1445261&r1=1445260&r2=1445261&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40badca.properties
(original)
+++
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40badca.properties
Tue Feb 12 16:50:27 2013
@@ -1,4 +1,4 @@
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.provider=org.apache.ws.security.common.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=security
org.apache.ws.security.crypto.merlin.keystore.file=keys/wss40badca.jks
Modified:
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40badcatrust.properties
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40badcatrust.properties?rev=1445261&r1=1445260&r2=1445261&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40badcatrust.properties
(original)
+++
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40badcatrust.properties
Tue Feb 12 16:50:27 2013
@@ -1,4 +1,4 @@
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.provider=org.apache.ws.security.common.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=security
org.apache.ws.security.crypto.merlin.keystore.file=keys/wss40badcatrust.jks
Modified:
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40rev.properties
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40rev.properties?rev=1445261&r1=1445260&r2=1445261&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40rev.properties
(original)
+++
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss40rev.properties
Tue Feb 12 16:50:27 2013
@@ -1,4 +1,4 @@
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.provider=org.apache.ws.security.common.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=security
org.apache.ws.security.crypto.merlin.keystore.alias=wss40rev
Modified:
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss86.properties
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/resources/wss86.properties?rev=1445261&r1=1445260&r2=1445261&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss86.properties
(original)
+++
webservices/wss4j/trunk/ws-security-common/src/test/resources/wss86.properties
Tue Feb 12 16:50:27 2013
@@ -1,4 +1,4 @@
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.provider=org.apache.ws.security.common.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=security
org.apache.ws.security.crypto.merlin.keystore.alias=wss86
Modified:
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/AbstractTestBase.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/AbstractTestBase.java?rev=1445261&r1=1445260&r2=1445261&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/AbstractTestBase.java
(original)
+++
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/AbstractTestBase.java
Tue Feb 12 16:50:27 2013
@@ -165,9 +165,8 @@ public abstract class AbstractTestBase {
messageContext.put(WSHandlerConstants.USER, "transmitter");
Properties sigProperties = new Properties();
- sigProperties.setProperty("org.apache.ws.security.crypto.provider",
"org.apache.ws.security.components.crypto.Merlin");
- sigProperties.setProperty("org.apache.ws.security.crypto.merlin.file",
"transmitter.jks");
-
//sigProperties.setProperty("org.apache.ws.security.crypto.merlin.alias.password",
"default");
+ sigProperties.setProperty("org.apache.ws.security.crypto.provider",
"org.apache.ws.security.common.crypto.Merlin");
+
sigProperties.setProperty("org.apache.ws.security.crypto.merlin.keystore.file",
"transmitter.jks");
sigProperties.setProperty("org.apache.ws.security.crypto.merlin.keystore.password",
"default");
//sigProperties.setProperty("org.apache.ws.security.crypto.merlin.keystore.alias",
"transmitter");
wss4JHandler.setPassword(messageContext, "default");
@@ -175,9 +174,8 @@ public abstract class AbstractTestBase {
messageContext.put("" + sigProperties.hashCode(), sigProperties);
Properties encProperties = new Properties();
- encProperties.setProperty("org.apache.ws.security.crypto.provider",
"org.apache.ws.security.components.crypto.Merlin");
- encProperties.setProperty("org.apache.ws.security.crypto.merlin.file",
"transmitter.jks");
-
//sigProperties.setProperty("org.apache.ws.security.crypto.merlin.alias.password",
"default");
+ encProperties.setProperty("org.apache.ws.security.crypto.provider",
"org.apache.ws.security.common.crypto.Merlin");
+
encProperties.setProperty("org.apache.ws.security.crypto.merlin.keystore.file",
"transmitter.jks");
encProperties.setProperty("org.apache.ws.security.crypto.merlin.keystore.password",
"default");
//sigProperties.setProperty("org.apache.ws.security.crypto.merlin.keystore.alias",
"transmitter");
wss4JHandler.setPassword(messageContext, "default");
Modified:
webservices/wss4j/trunk/ws-security-stax/src/test/resources/receiver-crypto.properties
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/resources/receiver-crypto.properties?rev=1445261&r1=1445260&r2=1445261&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-stax/src/test/resources/receiver-crypto.properties
(original)
+++
webservices/wss4j/trunk/ws-security-stax/src/test/resources/receiver-crypto.properties
Tue Feb 12 16:50:27 2013
@@ -1,5 +1,5 @@
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.file=receiver.jks
-org.apache.ws.security.crypto.merlin.alias.password=default
+org.apache.ws.security.crypto.provider=org.apache.ws.security.common.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.file=receiver.jks
+org.apache.ws.security.crypto.merlin.keystore.alias.password=default
org.apache.ws.security.crypto.merlin.keystore.password=default
org.apache.ws.security.crypto.merlin.keystore.alias=receiver
Modified:
webservices/wss4j/trunk/ws-security-stax/src/test/resources/transmitter-crypto.properties
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/resources/transmitter-crypto.properties?rev=1445261&r1=1445260&r2=1445261&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-stax/src/test/resources/transmitter-crypto.properties
(original)
+++
webservices/wss4j/trunk/ws-security-stax/src/test/resources/transmitter-crypto.properties
Tue Feb 12 16:50:27 2013
@@ -1,5 +1,5 @@
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.file=transmitter.jks
-org.apache.ws.security.crypto.merlin.alias.password=default
+org.apache.ws.security.crypto.provider=org.apache.ws.security.common.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.file=transmitter.jks
+org.apache.ws.security.crypto.merlin.keystore.alias.password=default
org.apache.ws.security.crypto.merlin.keystore.password=default
org.apache.ws.security.crypto.merlin.keystore.alias=transmitter
