Author: midon
Date: Fri Oct 17 17:19:28 2008
New Revision: 705815
URL: http://svn.apache.org/viewvc?rev=705815&view=rev
Log:
ODE-388: add the keystore, and adjust the policies accordingly
Added:
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/client.jks
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/client.properties
Modified:
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample02.xml
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample03.xml
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample04.xml
Added:
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/client.jks
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/client.jks?rev=705815&view=auto
==============================================================================
Files
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/client.jks
(added) and
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/client.jks
Fri Oct 17 17:19:28 2008 differ
Added:
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/client.properties
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/client.properties?rev=705815&view=auto
==============================================================================
---
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/client.properties
(added)
+++
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/client.properties
Fri Oct 17 17:19:28 2008
@@ -0,0 +1,4 @@
+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=apache
+org.apache.ws.security.crypto.merlin.file=TestRampart/client.jks
\ No newline at end of file
Modified:
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample02.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample02.xml?rev=705815&r1=705814&r2=705815&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample02.xml
(original)
+++
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample02.xml
Fri Oct 17 17:19:28 2008
@@ -70,7 +70,7 @@
<ramp:signatureCrypto>
<ramp:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
- <ramp:property
name="org.apache.ws.security.crypto.merlin.file">client.jks</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.file">TestRampart/client.jks</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
</ramp:crypto>
</ramp:signatureCrypto>
Modified:
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample03.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample03.xml?rev=705815&r1=705814&r2=705815&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample03.xml
(original)
+++
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample03.xml
Fri Oct 17 17:19:28 2008
@@ -74,14 +74,14 @@
<ramp:signatureCrypto>
<ramp:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
- <ramp:property
name="org.apache.ws.security.crypto.merlin.file">client.jks</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.file">TestRampart/client.jks</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
</ramp:crypto>
</ramp:signatureCrypto>
<ramp:encryptionCypto>
<ramp:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
- <ramp:property
name="org.apache.ws.security.crypto.merlin.file">client.jks</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.file">TestRampart/client.jks</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
</ramp:crypto>
</ramp:encryptionCypto>
Modified:
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample04.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample04.xml?rev=705815&r1=705814&r2=705815&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample04.xml
(original)
+++
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample04.xml
Fri Oct 17 17:19:28 2008
@@ -132,14 +132,14 @@
<ramp:signatureCrypto>
<ramp:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
- <ramp:property
name="org.apache.ws.security.crypto.merlin.file">client.jks</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.file">TestRampart/client.jks</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
</ramp:crypto>
</ramp:signatureCrypto>
<ramp:encryptionCypto>
<ramp:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
- <ramp:property
name="org.apache.ws.security.crypto.merlin.file">client.jks</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.file">TestRampart/client.jks</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
</ramp:crypto>
</ramp:encryptionCypto>
