http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client.xml index ac7d934..11535a3 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client.xml @@ -29,7 +29,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -44,7 +44,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -59,7 +59,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -74,7 +74,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -89,7 +89,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -104,7 +104,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -119,7 +119,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -134,7 +134,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -149,7 +149,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -164,7 +164,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -179,7 +179,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -194,7 +194,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -209,7 +209,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -224,7 +224,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -239,7 +239,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -254,7 +254,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -269,7 +269,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -285,7 +285,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -301,7 +301,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -317,7 +317,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -333,7 +333,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties>
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml index 40f10f1..c8604c5 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml @@ -29,7 +29,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -42,7 +42,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -55,7 +55,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -68,7 +68,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -81,7 +81,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -94,7 +94,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -107,7 +107,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -120,7 +120,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -133,7 +133,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -146,7 +146,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="alice"/> + <entry key="security.encryption.username" value="alice"/> <entry key="ws-security.encryption.properties" value="alice.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -160,7 +160,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="alice"/> + <entry key="security.encryption.username" value="alice"/> <entry key="ws-security.encryption.properties" value="alice.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -174,7 +174,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="alice"/> + <entry key="security.encryption.username" value="alice"/> <entry key="ws-security.encryption.properties" value="alice.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -188,7 +188,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="alice"/> + <entry key="security.encryption.username" value="alice"/> <entry key="ws-security.encryption.properties" value="alice.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -202,7 +202,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="alice"/> + <entry key="security.encryption.username" value="alice"/> <entry key="ws-security.encryption.properties" value="alice.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -216,7 +216,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="alice"/> + <entry key="security.encryption.username" value="alice"/> <entry key="ws-security.encryption.properties" value="alice.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -230,7 +230,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="alice"/> + <entry key="security.encryption.username" value="alice"/> <entry key="ws-security.encryption.properties" value="alice.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -244,7 +244,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="alice"/> + <entry key="security.encryption.username" value="alice"/> <entry key="ws-security.encryption.properties" value="alice.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -263,7 +263,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -281,7 +281,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -299,7 +299,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -317,7 +317,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml index 5c3b577..8bca0e8 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml @@ -29,7 +29,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -43,7 +43,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -57,7 +57,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -71,7 +71,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -85,7 +85,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -99,7 +99,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -113,7 +113,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -127,7 +127,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -141,7 +141,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -155,7 +155,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="alice"/> + <entry key="security.encryption.username" value="alice"/> <entry key="ws-security.encryption.properties" value="alice.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -170,7 +170,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="alice"/> + <entry key="security.encryption.username" value="alice"/> <entry key="ws-security.encryption.properties" value="alice.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -185,7 +185,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="alice"/> + <entry key="security.encryption.username" value="alice"/> <entry key="ws-security.encryption.properties" value="alice.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -200,7 +200,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="alice"/> + <entry key="security.encryption.username" value="alice"/> <entry key="ws-security.encryption.properties" value="alice.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -215,7 +215,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="alice"/> + <entry key="security.encryption.username" value="alice"/> <entry key="ws-security.encryption.properties" value="alice.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -230,7 +230,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="alice"/> + <entry key="security.encryption.username" value="alice"/> <entry key="ws-security.encryption.properties" value="alice.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -245,7 +245,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="alice"/> + <entry key="security.encryption.username" value="alice"/> <entry key="ws-security.encryption.properties" value="alice.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -265,7 +265,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -284,7 +284,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -303,7 +303,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -322,7 +322,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client.xml index 6a3164a..2ab79a4 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client.xml @@ -29,7 +29,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -44,7 +44,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -54,7 +54,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml index 473485b..23d8aed 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml @@ -43,7 +43,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -56,7 +56,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -69,7 +69,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml index 533e9ca..08bfc4c 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml @@ -45,20 +45,20 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSaml2SymmetricPort"; createdFromAPI="true"> <jaxws:properties> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSaml2SymmetricSupportingPort"; createdFromAPI="true"> <jaxws:properties> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSaml2AsymmetricPort"; createdFromAPI="true"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -67,7 +67,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -109,7 +109,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -117,14 +117,14 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSaml2SymmetricSignedElementsPort"; createdFromAPI="true"> <jaxws:properties> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSaml2AsymmetricSignedEncryptedPort"; createdFromAPI="true"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -133,7 +133,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -142,7 +142,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -214,7 +214,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSaml2PEPPort"; createdFromAPI="true"> <jaxws:properties> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> </beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml index 4c9dffc..0ee0a06 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml @@ -75,7 +75,7 @@ <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.saml2.validator" value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/> </jaxws:properties> </jaxws:endpoint> @@ -85,7 +85,7 @@ <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.saml2.validator" value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/> </jaxws:properties> <jaxws:features> @@ -127,7 +127,7 @@ <entry key="security.username" value="bob"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.saml2.validator" value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/> </jaxws:properties> @@ -144,7 +144,7 @@ <entry key="security.username" value="bob"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.saml2.validator" value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/> </jaxws:properties> @@ -154,7 +154,7 @@ <entry key="security.username" value="bob"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.saml2.validator" value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/> </jaxws:properties> @@ -164,7 +164,7 @@ <entry key="security.username" value="bob"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> </jaxws:endpoint> http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml index d12560c..2f426ca 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml @@ -80,7 +80,7 @@ <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <!--<entry key="ws-security.saml2.validator" value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/>--> <entry key="ws-security.enable.streaming" value="true"/> @@ -92,7 +92,7 @@ <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <!--<entry key="ws-security.saml2.validator" value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/>--> <entry key="ws-security.enable.streaming" value="true"/> @@ -140,7 +140,7 @@ <entry key="security.username" value="bob"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <!--<entry key="ws-security.saml2.validator" value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/>--> @@ -160,7 +160,7 @@ <entry key="security.username" value="bob"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <!--<entry key="ws-security.saml2.validator" value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/>--> @@ -172,7 +172,7 @@ <entry key="security.username" value="bob"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <!--<entry key="ws-security.saml2.validator" value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/>--> @@ -184,7 +184,7 @@ <entry key="security.username" value="bob"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-client.xml index 1839fee..2df76f3 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-client.xml @@ -28,35 +28,35 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSWASignatureContentPolicyPort"; createdFromAPI="true"> <jaxws:properties> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSWASignatureCompletePolicyPort"; createdFromAPI="true"> <jaxws:properties> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSWAEncryptionPolicyPort"; createdFromAPI="true"> <jaxws:properties> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSWACombinedPolicyPort"; createdFromAPI="true"> <jaxws:properties> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSWACombinedAsymmetricPolicyPort"; createdFromAPI="true"> <jaxws:properties> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml index 6918d55..0444566 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml @@ -79,7 +79,7 @@ <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <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="security.encryption.username" value="alice"/> </jaxws:properties> </jaxws:endpoint> http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml index 9201cd8..1fa417d 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml @@ -83,7 +83,7 @@ <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <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="security.encryption.username" value="alice"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client.xml index a5b7d36..bd76688 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client.xml @@ -29,7 +29,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> <entry key="ws-security.username-token.always.encrypted" value="false"/> @@ -45,7 +45,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> <entry key="ws-security.username-token.always.encrypted" value="false"/> @@ -61,7 +61,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> <entry key="ws-security.username-token.always.encrypted" value="false"/> @@ -77,7 +77,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> <entry key="ws-security.username-token.always.encrypted" value="false"/> @@ -93,7 +93,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> <entry key="ws-security.username-token.always.encrypted" value="false"/> @@ -109,7 +109,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> <entry key="ws-security.username-token.always.encrypted" value="false"/> @@ -125,7 +125,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> <entry key="ws-security.username-token.always.encrypted" value="false"/> @@ -141,7 +141,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> <entry key="ws-security.username-token.always.encrypted" value="false"/> @@ -157,7 +157,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> <entry key="ws-security.username-token.always.encrypted" value="false"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-client.xml index dc4126d..d963a92 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-client.xml @@ -29,7 +29,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -44,7 +44,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -59,7 +59,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -74,7 +74,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -89,7 +89,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> @@ -104,7 +104,7 @@ <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> + <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-server.xml index 3368137..30e64e0 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-server.xml @@ -29,7 +29,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -42,7 +42,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -55,7 +55,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -68,7 +68,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -81,7 +81,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -94,7 +94,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml index 95bb15e..be3064f 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml @@ -29,7 +29,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -42,7 +42,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -55,7 +55,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -68,7 +68,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -81,7 +81,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -94,7 +94,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -107,7 +107,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -120,7 +120,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -133,7 +133,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-endorsing-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-endorsing-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-endorsing-server.xml index e4d787a..209436e 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-endorsing-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-endorsing-server.xml @@ -29,7 +29,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -43,7 +43,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -57,7 +57,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -71,7 +71,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -85,7 +85,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -99,7 +99,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties>
