You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2013/07/09 11:37:15 UTC
svn commit: r1501164 [5/5] - in /cxf/trunk/systests/ws-security/src/test:
java/org/apache/cxf/systest/ws/coverage_checker/
java/org/apache/cxf/systest/ws/fault/ java/org/apache/cxf/systest/ws/httpget/
java/org/apache/cxf/systest/ws/saml/client/ java/or...
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml?rev=1501164&r1=1501163&r2=1501164&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml Tue Jul 9 09:37:13 2013
@@ -90,7 +90,7 @@
factory-method="getInstance">
<constructor-arg>
<util:properties id="cryptoProperties"
- location="classpath:org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+ location="classpath:bob.properties"/>
</constructor-arg>
</bean>
@@ -106,8 +106,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+ <entry key="ws-security.signature.properties" value="bob.properties"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
@@ -125,8 +124,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+ <entry key="ws-security.signature.properties" value="bob.properties"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
@@ -144,8 +142,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+ <entry key="ws-security.signature.properties" value="bob.properties"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
@@ -163,8 +160,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+ <entry key="ws-security.signature.properties" value="bob.properties"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
@@ -182,10 +178,8 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.common.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.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.enable.streaming" value="true"/>
</jaxws:properties>
@@ -204,8 +198,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+ <entry key="ws-security.signature.properties" value="bob.properties"/>
<entry key="ws-security.encryption.username" value="useReqSigCert"/>
<entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
@@ -225,8 +218,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+ <entry key="ws-security.signature.properties" value="bob.properties"/>
<entry key="ws-security.encryption.username" value="useReqSigCert"/>
<entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
@@ -246,8 +238,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+ <entry key="ws-security.signature.properties" value="bob.properties"/>
<entry key="ws-security.encryption.username" value="useReqSigCert"/>
<entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
@@ -267,8 +258,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+ <entry key="ws-security.signature.properties" value="bob.properties"/>
<entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
@@ -287,8 +277,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+ <entry key="ws-security.signature.properties" value="bob.properties"/>
<entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
@@ -307,10 +296,8 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.common.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.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.enable.streaming" value="true"/>
</jaxws:properties>
@@ -329,8 +316,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+ <entry key="ws-security.signature.properties" value="bob.properties"/>
<entry key="ws-security.encryption.username" value="useReqSigCert"/>
<entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
@@ -350,8 +336,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+ <entry key="ws-security.signature.properties" value="bob.properties"/>
<entry key="ws-security.encryption.username" value="useReqSigCert"/>
<entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
@@ -371,8 +356,7 @@
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+ <entry key="ws-security.signature.properties" value="bob.properties"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
@@ -389,8 +373,7 @@
depends-on="tls-settings">
<jaxws:properties>
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+ <entry key="ws-security.signature.properties" value="bob.properties"/>
<entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
@@ -408,8 +391,7 @@
depends-on="tls-settings">
<jaxws:properties>
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+ <entry key="ws-security.signature.properties" value="bob.properties"/>
<entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
@@ -427,8 +409,7 @@
depends-on="tls-settings">
<jaxws:properties>
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+ <entry key="ws-security.signature.properties" value="bob.properties"/>
<entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
@@ -446,8 +427,7 @@
depends-on="tls-settings">
<jaxws:properties>
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+ <entry key="ws-security.signature.properties" value="bob.properties"/>
<entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
@@ -465,8 +445,7 @@
depends-on="tls-settings">
<jaxws:properties>
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+ <entry key="ws-security.signature.properties" value="bob.properties"/>
<entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
@@ -484,8 +463,7 @@
depends-on="tls-settings">
<jaxws:properties>
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+ <entry key="ws-security.signature.properties" value="bob.properties"/>
<entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
@@ -503,8 +481,7 @@
depends-on="tls-settings">
<jaxws:properties>
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/cxfca.properties"/>
+ <entry key="ws-security.signature.properties" value="cxfca.properties"/>
<entry key="ws-security.subject.cert.constraints" value=".*CN=alice.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
@@ -522,8 +499,7 @@
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.encryption.properties" value="alice.properties"/>
<entry key="ws-security.is-bsp-compliant" value="false"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
@@ -541,8 +517,7 @@
depends-on="tls-settings">
<jaxws:properties>
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+ <entry key="ws-security.signature.properties" value="bob.properties"/>
<entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
@@ -566,8 +541,7 @@
depends-on="tls-settings">
<jaxws:properties>
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+ <entry key="ws-security.signature.properties" value="bob.properties"/>
<entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
@@ -591,8 +565,7 @@
depends-on="tls-settings">
<jaxws:properties>
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+ <entry key="ws-security.signature.properties" value="bob.properties"/>
<entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
@@ -616,8 +589,7 @@
depends-on="tls-settings">
<jaxws:properties>
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+ <entry key="ws-security.signature.properties" value="bob.properties"/>
<entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
@@ -641,8 +613,7 @@
depends-on="tls-settings">
<jaxws:properties>
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+ <entry key="ws-security.signature.properties" value="bob.properties"/>
<entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
Copied: cxf/trunk/systests/ws-security/src/test/resources/restricted/alice.properties (from r1500925, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/server/alice.properties)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/restricted/alice.properties?p2=cxf/trunk/systests/ws-security/src/test/resources/restricted/alice.properties&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/server/alice.properties&r1=1500925&r2=1501164&rev=1501164&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/server/alice.properties (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/restricted/alice.properties Tue Jul 9 09:37:13 2013
@@ -18,4 +18,4 @@ org.apache.ws.security.crypto.provider=o
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=password
org.apache.ws.security.crypto.merlin.keystore.alias=alice
-org.apache.ws.security.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/wssc/certs/alice.jks
+org.apache.ws.security.crypto.merlin.keystore.file=../certs/restricted/alice.jks
Copied: cxf/trunk/systests/ws-security/src/test/resources/restricted/bob.properties (from r1500925, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/server/bob.properties)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/restricted/bob.properties?p2=cxf/trunk/systests/ws-security/src/test/resources/restricted/bob.properties&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/server/bob.properties&r1=1500925&r2=1501164&rev=1501164&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/server/bob.properties (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/restricted/bob.properties Tue Jul 9 09:37:13 2013
@@ -18,4 +18,4 @@ org.apache.ws.security.crypto.provider=o
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=password
org.apache.ws.security.crypto.merlin.keystore.alias=bob
-org.apache.ws.security.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/wssc/certs/bob.jks
+org.apache.ws.security.crypto.merlin.keystore.file=../certs/restricted/bob.jks