Author: coheigea
Date: Mon Jun 25 11:16:35 2012
New Revision: 1353460
URL: http://svn.apache.org/viewvc?rev=1353460&view=rev
Log:
Merged revisions 1353454 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1353454 | coheigea | 2012-06-25 11:56:27 +0100 (Mon, 25 Jun 2012) | 2 lines
Simplified WS-Security service configuration
........
Modified:
cxf/branches/2.6.x-fixes/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server/server.xml
cxf/branches/2.6.x-fixes/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server/server.xml
cxf/branches/2.6.x-fixes/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server/server.xml
cxf/branches/2.6.x-fixes/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server/server.xml
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server/server.xml
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/client.xml
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/server.xml
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server.xml
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/alice.jks
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/bob.jks
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/restricted/alice.jks
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/restricted/bob.jks
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server.xml
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml
Modified:
cxf/branches/2.6.x-fixes/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server/server.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server/server.xml?rev=1353460&r1=1353459&r2=1353460&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server/server.xml
(original)
+++
cxf/branches/2.6.x-fixes/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server/server.xml
Mon Jun 25 11:16:35 2012
@@ -94,8 +94,7 @@
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="ws-security.signature.properties"
value="bob.properties"/>
- <entry key="ws-security.encryption.properties"
value="alice.properties"/>
- <entry key="ws-security.encryption.username" value="alice"/>
+ <entry key="ws-security.encryption.username" value="useReqSigCert"/>
</jaxws:properties>
</jaxws:endpoint>
@@ -111,8 +110,7 @@
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="ws-security.signature.properties"
value="bob.properties"/>
- <entry key="ws-security.encryption.properties"
value="alice.properties"/>
- <entry key="ws-security.encryption.username" value="alice"/>
+ <entry key="ws-security.encryption.username" value="useReqSigCert"/>
</jaxws:properties>
</jaxws:endpoint>
@@ -128,8 +126,7 @@
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="ws-security.signature.properties"
value="bob.properties"/>
- <entry key="ws-security.encryption.properties"
value="alice.properties"/>
- <entry key="ws-security.encryption.username" value="alice"/>
+ <entry key="ws-security.encryption.username" value="useReqSigCert"/>
</jaxws:properties>
</jaxws:endpoint>
Modified:
cxf/branches/2.6.x-fixes/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server/server.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server/server.xml?rev=1353460&r1=1353459&r2=1353460&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server/server.xml
(original)
+++
cxf/branches/2.6.x-fixes/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server/server.xml
Mon Jun 25 11:16:35 2012
@@ -55,8 +55,7 @@
<entry key="ws-security.callback-handler.sct"
value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="ws-security.signature.properties.sct"
value="bob.properties"/>
- <entry key="ws-security.encryption.properties.sct"
value="alice.properties"/>
- <entry key="ws-security.encryption.username.sct" value="alice"/>
+ <entry key="ws-security.encryption.username.sct"
value="useReqSigCert"/>
</jaxws:properties>
</jaxws:endpoint>
Modified:
cxf/branches/2.6.x-fixes/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server/server.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server/server.xml?rev=1353460&r1=1353459&r2=1353460&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server/server.xml
(original)
+++
cxf/branches/2.6.x-fixes/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server/server.xml
Mon Jun 25 11:16:35 2012
@@ -112,8 +112,7 @@
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="ws-security.signature.properties"
value="bob.properties"/>
- <entry key="ws-security.encryption.properties"
value="alice.properties"/>
- <entry key="ws-security.encryption.username" value="alice"/>
+ <entry key="ws-security.encryption.username" value="useReqSigCert"/>
</jaxws:properties>
</jaxws:endpoint>
Modified:
cxf/branches/2.6.x-fixes/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server/server.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server/server.xml?rev=1353460&r1=1353459&r2=1353460&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server/server.xml
(original)
+++
cxf/branches/2.6.x-fixes/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server/server.xml
Mon Jun 25 11:16:35 2012
@@ -55,8 +55,7 @@
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="ws-security.signature.properties"
value="bob.properties"/>
- <entry key="ws-security.encryption.properties"
value="alice.properties"/>
- <entry key="ws-security.encryption.username" value="alice"/>
+ <entry key="ws-security.encryption.username" value="useReqSigCert"/>
</jaxws:properties>
</jaxws:endpoint>
@@ -72,8 +71,7 @@
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="ws-security.signature.properties"
value="bob.properties"/>
- <entry key="ws-security.encryption.properties"
value="alice.properties"/>
- <entry key="ws-security.encryption.username" value="alice"/>
+ <entry key="ws-security.encryption.username" value="useReqSigCert"/>
</jaxws:properties>
</jaxws:endpoint>
Modified:
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server/server.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server/server.xml?rev=1353460&r1=1353459&r2=1353460&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server/server.xml
(original)
+++
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server/server.xml
Mon Jun 25 11:16:35 2012
@@ -57,9 +57,7 @@
value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
- <entry key="ws-security.encryption.username" value="alice"/>
+ <entry key="ws-security.encryption.username" value="useReqSigCert"/>
</jaxws:properties>
</jaxws:endpoint>
@@ -78,9 +76,7 @@
value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
- <entry key="ws-security.encryption.username" value="alice"/>
+ <entry key="ws-security.encryption.username" value="useReqSigCert"/>
</jaxws:properties>
</jaxws:endpoint>
@@ -99,9 +95,7 @@
value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
- <entry key="ws-security.encryption.username" value="alice"/>
+ <entry key="ws-security.encryption.username" value="useReqSigCert"/>
</jaxws:properties>
</jaxws:endpoint>
Modified:
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/client.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/client.xml?rev=1353460&r1=1353459&r2=1353460&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/client.xml
(original)
+++
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/client.xml
Mon Jun 25 11:16:35 2012
@@ -173,7 +173,6 @@
sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient";>
<wsp:Policy>
<sp:WssX509V3Token10 />
- <sp:RequireIssuerSerialReference />
</wsp:Policy>
</sp:X509Token>
</wsp:Policy>
Modified:
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml?rev=1353460&r1=1353459&r2=1353460&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml
(original)
+++
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml
Mon Jun 25 11:16:35 2012
@@ -79,9 +79,7 @@
value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties" />
- <entry key="ws-security.encryption.username"
value="alice" />
+ <entry key="ws-security.encryption.username"
value="useReqSigCert" />
</jaxws:properties>
<jaxws:features>
<p:policies>
@@ -102,9 +100,7 @@
value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties" />
- <entry key="ws-security.encryption.username" value="alice" />
+ <entry key="ws-security.encryption.username" value="useReqSigCert"
/>
</jaxws:properties>
<jaxws:features>
<p:policies>
@@ -125,9 +121,7 @@
value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties" />
- <entry key="ws-security.encryption.username" value="alice" />
+ <entry key="ws-security.encryption.username" value="useReqSigCert"
/>
</jaxws:properties>
<jaxws:features>
<p:policies>
@@ -148,8 +142,8 @@
depends-on="tls-settings">
<jaxws:properties>
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="ws-security.signature.properties"
+
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
</jaxws:properties>
<jaxws:features>
<p:policies>
@@ -171,8 +165,8 @@
depends-on="tls-settings">
<jaxws:properties>
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="ws-security.signature.properties"
+
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
</jaxws:properties>
@@ -224,7 +218,6 @@
sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient";>
<wsp:Policy>
<sp:WssX509V3Token10 />
-
<sp:RequireIssuerSerialReference />
</wsp:Policy>
</sp:X509Token>
</wsp:Policy>
Modified:
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl?rev=1353460&r1=1353459&r2=1353460&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl
(original)
+++
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl
Mon Jun 25 11:16:35 2012
@@ -703,7 +703,6 @@
sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient";>
<wsp:Policy>
<sp:WssX509V3Token10 />
- <sp:RequireIssuerSerialReference />
</wsp:Policy>
</sp:X509Token>
</wsp:Policy>
@@ -814,7 +813,6 @@
sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient";>
<wsp:Policy>
<sp:WssX509V3Token10 />
- <sp:RequireIssuerSerialReference />
</wsp:Policy>
</sp:X509Token>
</wsp:Policy>
@@ -875,7 +873,6 @@
sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient";>
<wsp:Policy>
<sp:WssX509V3Token10 />
- <sp:RequireIssuerSerialReference />
</wsp:Policy>
</sp:X509Token>
</wsp:Policy>
Modified:
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/server.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/server.xml?rev=1353460&r1=1353459&r2=1353460&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/server.xml
(original)
+++
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/server.xml
Mon Jun 25 11:16:35 2012
@@ -119,9 +119,7 @@
value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
- <entry key="ws-security.encryption.username" value="alice"/>
+ <entry key="ws-security.encryption.username" value="useReqSigCert"/>
<entry key="ws-security.saml2.validator"
value="org.apache.cxf.systest.ws.saml.server.CustomSaml2Validator"/>
</jaxws:properties>
@@ -140,8 +138,8 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="ws-security.signature.properties"
+
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
@@ -158,8 +156,8 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="ws-security.signature.properties"
+
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
@@ -176,8 +174,8 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="ws-security.signature.properties"
+
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
@@ -194,8 +192,8 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="ws-security.signature.properties"
+
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
@@ -215,9 +213,7 @@
value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
- <entry key="ws-security.encryption.username" value="alice"/>
+ <entry key="ws-security.encryption.username" value="useReqSigCert"/>
<entry key="ws-security.saml2.validator"
value="org.apache.cxf.systest.ws.saml.server.CustomSaml2Validator"/>
</jaxws:properties>
@@ -257,9 +253,7 @@
value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
- <entry key="ws-security.encryption.username" value="alice"/>
+ <entry key="ws-security.encryption.username" value="useReqSigCert"/>
<entry key="ws-security.saml2.validator"
value="org.apache.cxf.systest.ws.saml.server.CustomSaml2Validator"/>
</jaxws:properties>
@@ -281,9 +275,7 @@
value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
- <entry key="ws-security.encryption.username" value="alice"/>
+ <entry key="ws-security.encryption.username" value="useReqSigCert"/>
</jaxws:properties>
</jaxws:endpoint>
@@ -300,8 +292,8 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="ws-security.signature.properties"
+
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
@@ -318,8 +310,8 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="ws-security.signature.properties"
+
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
</jaxws:properties>
<jaxws:features>
<p:policies>
Modified:
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server.xml?rev=1353460&r1=1353459&r2=1353460&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server.xml
(original)
+++
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server.xml
Mon Jun 25 11:16:35 2012
@@ -150,8 +150,8 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="ws-security.signature.properties"
+
value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
@@ -169,8 +169,8 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="ws-security.signature.properties"
+
value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
Modified:
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/alice.jks
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/alice.jks?rev=1353460&r1=1353459&r2=1353460&view=diff
==============================================================================
Files
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/alice.jks
(original) and
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/alice.jks
Mon Jun 25 11:16:35 2012 differ
Modified:
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/bob.jks
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/bob.jks?rev=1353460&r1=1353459&r2=1353460&view=diff
==============================================================================
Files
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/bob.jks
(original) and
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/bob.jks
Mon Jun 25 11:16:35 2012 differ
Modified:
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/restricted/alice.jks
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/restricted/alice.jks?rev=1353460&r1=1353459&r2=1353460&view=diff
==============================================================================
Files
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/restricted/alice.jks
(original) and
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/restricted/alice.jks
Mon Jun 25 11:16:35 2012 differ
Modified:
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/restricted/bob.jks
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/restricted/bob.jks?rev=1353460&r1=1353459&r2=1353460&view=diff
==============================================================================
Files
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/restricted/bob.jks
(original) and
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/restricted/bob.jks
Mon Jun 25 11:16:35 2012 differ
Modified:
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server.xml?rev=1353460&r1=1353459&r2=1353460&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server.xml
(original)
+++
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server.xml
Mon Jun 25 11:16:35 2012
@@ -119,7 +119,7 @@
<jaxws:properties>
<entry key="ws-security.username" value="Alice"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
- <entry key="ws-security.encryption.properties"
value="org/apache/cxf/systest/ws/wssec10/server/alice.properties"/>
+ <entry key="ws-security.encryption.username"
value="useReqSigCert"/>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.wssec10.server.KeystorePasswordCallback"/>
</jaxws:properties>
@@ -140,7 +140,7 @@
<jaxws:properties>
<entry key="ws-security.username" value="Alice"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
- <entry key="ws-security.encryption.properties"
value="org/apache/cxf/systest/ws/wssec10/server/alice.properties"/>
+ <entry key="ws-security.encryption.username"
value="useReqSigCert"/>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.wssec10.server.KeystorePasswordCallback"/>
</jaxws:properties>
Modified:
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml?rev=1353460&r1=1353459&r2=1353460&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml
(original)
+++
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml
Mon Jun 25 11:16:35 2012
@@ -121,7 +121,7 @@
<jaxws:properties>
<entry key="ws-security.username" value="Alice"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
- <entry key="ws-security.encryption.properties"
value="org/apache/cxf/systest/ws/wssec10/server/alice.properties"/>
+ <entry key="ws-security.encryption.username"
value="useReqSigCert"/>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.wssec10.server.KeystorePasswordCallback"/>
</jaxws:properties>
@@ -142,7 +142,7 @@
<jaxws:properties>
<entry key="ws-security.username" value="Alice"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
- <entry key="ws-security.encryption.properties"
value="org/apache/cxf/systest/ws/wssec10/server/alice.properties"/>
+ <entry key="ws-security.encryption.username"
value="useReqSigCert"/>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.wssec10.server.KeystorePasswordCallback"/>
</jaxws:properties>
Modified:
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml?rev=1353460&r1=1353459&r2=1353460&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml
(original)
+++
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml
Mon Jun 25 11:16:35 2012
@@ -155,9 +155,7 @@
value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
- <entry key="ws-security.encryption.username" value="alice"/>
+ <entry key="ws-security.encryption.username" value="useReqSigCert"/>
</jaxws:properties>
</jaxws:endpoint>
@@ -176,8 +174,6 @@
value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
</jaxws:properties>
</jaxws:endpoint>
@@ -196,8 +192,6 @@
value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
</jaxws:properties>
</jaxws:endpoint>
@@ -237,9 +231,7 @@
value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
<entry key="ws-security.signature.properties"
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
- <entry key="ws-security.encryption.username" value="alice"/>
+ <entry key="ws-security.encryption.username" value="useReqSigCert"/>
</jaxws:properties>
</jaxws:endpoint>
@@ -273,8 +265,8 @@
depends-on="tls-settings">
<jaxws:properties>
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="ws-security.signature.properties"
+
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
@@ -290,8 +282,8 @@
depends-on="tls-settings">
<jaxws:properties>
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="ws-security.signature.properties"
+
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
@@ -307,8 +299,8 @@
depends-on="tls-settings">
<jaxws:properties>
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="ws-security.signature.properties"
+
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
@@ -324,8 +316,8 @@
depends-on="tls-settings">
<jaxws:properties>
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="ws-security.signature.properties"
+
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
@@ -341,8 +333,8 @@
depends-on="tls-settings">
<jaxws:properties>
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="ws-security.signature.properties"
+
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
@@ -358,8 +350,8 @@
depends-on="tls-settings">
<jaxws:properties>
- <entry key="ws-security.encryption.properties"
-
value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="ws-security.signature.properties"
+
value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
