cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [24/38] cxf git commit: Switching encryption cfg
Date Fri, 17 Apr 2015 10:11:34 GMT
http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
index 9d82ceb..b275629 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
@@ -115,7 +115,7 @@
         <jaxws:properties>
             <entry key="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="security.encryption.properties" value="alice.properties"/>
             <entry key="security.encryption.username" value="alice"/>
         </jaxws:properties>
     </jaxws:endpoint>
@@ -123,7 +123,7 @@
         <jaxws:properties>
             <entry key="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="security.encryption.properties" value="alice.properties"/>
             <entry key="security.encryption.username" value="alice"/>
         </jaxws:properties>
     </jaxws:endpoint>
@@ -131,7 +131,7 @@
         <jaxws:properties>
             <entry key="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="security.encryption.properties" value="alice.properties"/>
             <entry key="security.encryption.username" value="alice"/>
         </jaxws:properties>
     </jaxws:endpoint>
@@ -139,7 +139,7 @@
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.signature.properties" value="bob-enc.properties"/>
-            <entry key="ws-security.encryption.properties" value="alice-enc.properties"/>
+            <entry key="security.encryption.properties" value="alice-enc.properties"/>
             <entry key="security.encryption.username" value="alice"/>
         </jaxws:properties>
     </jaxws:endpoint>
@@ -147,7 +147,7 @@
         <jaxws:properties>
             <entry key="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="security.encryption.properties" value="alice.properties"/>
             <entry key="security.encryption.username" value="alice"/>
             <entry key="ws-security.asymmetric.signature.algorithm" value="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
         </jaxws:properties>
@@ -210,7 +210,7 @@
         <jaxws:properties>
             <entry key="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="security.encryption.properties" value="alice.properties"/>
             <entry key="security.encryption.username" value="alice"/>
         </jaxws:properties>
     </jaxws:endpoint>
@@ -301,7 +301,7 @@
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportKVT"
address="https://localhost:${testutil.ports.Server.2}/DoubleItX509TransportKVT" serviceName="s:DoubleItService"
endpointName="s:DoubleItTransportKVTPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
         <jaxws:properties>
-            <entry key="ws-security.encryption.properties" value="alice.properties"/>
+            <entry key="security.encryption.properties" value="alice.properties"/>
             <entry key="ws-security.is-bsp-compliant" value="false"/>
         </jaxws:properties>
     </jaxws:endpoint>

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml
index 344d69e..fb70a0a 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml
@@ -126,7 +126,7 @@
         <jaxws:properties>
             <entry key="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="security.encryption.properties" value="alice.properties"/>
             <entry key="security.encryption.username" value="alice"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>
@@ -135,7 +135,7 @@
         <jaxws:properties>
             <entry key="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="security.encryption.properties" value="alice.properties"/>
             <entry key="security.encryption.username" value="alice"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>
@@ -144,7 +144,7 @@
         <jaxws:properties>
             <entry key="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="security.encryption.properties" value="alice.properties"/>
             <entry key="security.encryption.username" value="alice"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>
@@ -153,7 +153,7 @@
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.signature.properties" value="bob-enc.properties"/>
-            <entry key="ws-security.encryption.properties" value="alice-enc.properties"/>
+            <entry key="security.encryption.properties" value="alice-enc.properties"/>
             <entry key="security.encryption.username" value="alice"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>
@@ -162,7 +162,7 @@
         <jaxws:properties>
             <entry key="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="security.encryption.properties" value="alice.properties"/>
             <entry key="security.encryption.username" value="alice"/>
             <entry key="ws-security.asymmetric.signature.algorithm" value="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
         </jaxws:properties>
@@ -232,7 +232,7 @@
         <jaxws:properties>
             <entry key="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="security.encryption.properties" value="alice.properties"/>
             <entry key="security.encryption.username" value="alice"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>
@@ -337,7 +337,7 @@
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportKVT"
address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItX509TransportKVT" serviceName="s:DoubleItService"
endpointName="s:DoubleItTransportKVTPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
         <jaxws:properties>
-            <entry key="ws-security.encryption.properties" value="alice.properties"/>
+            <entry key="security.encryption.properties" value="alice.properties"/>
             <entry key="ws-security.is-bsp-compliant" value="false"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml
index 5329993..ac67efe 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml
@@ -54,7 +54,7 @@
     </bean>
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricPort"
createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.encryption.crypto" value-ref="xkmsCrypto"/>
+            <entry key="security.encryption.crypto" value-ref="xkmsCrypto"/>
             <entry key="security.encryption.username" value="CN=bob, OU=eng, O=apache.org"/>
         </jaxws:properties>
     </jaxws:client>
@@ -75,7 +75,7 @@
     </bean>
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricPort"
createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.encryption.crypto" value-ref="xkmsAsymmetricCrypto"/>
+            <entry key="security.encryption.crypto" value-ref="xkmsAsymmetricCrypto"/>
             <entry key="security.encryption.username" value="CN=bob, OU=eng, O=apache.org"/>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="security.signature.username" value="alice"/>


Mime
View raw message