cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject git commit: Fixing test
Date Wed, 28 May 2014 16:45:50 GMT
Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 9cba7b8f1 -> 0a9e2782d


Fixing test


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0a9e2782
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0a9e2782
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0a9e2782

Branch: refs/heads/2.7.x-fixes
Commit: 0a9e2782d0f038e993b592f6f861d1ae9ecc3182
Parents: 9cba7b8
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Wed May 28 17:45:21 2014 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Wed May 28 17:45:42 2014 +0100

----------------------------------------------------------------------
 .../cxf/systest/ws/action/signature-server.xml  | 111 +------------------
 1 file changed, 6 insertions(+), 105 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/0a9e2782/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/signature-server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/signature-server.xml
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/signature-server.xml
index 0bfe4ad..e5c2804 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/signature-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/signature-server.xml
@@ -25,105 +25,6 @@
             <cxf:logging/>
         </cxf:features>
     </cxf:bus>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TripleDESEncryption"
address="http://localhost:${testutil.ports.SignatureServer}/DoubleIt3DESEncryption" serviceName="s:DoubleItService"
endpointName="s:DoubleIt3DESEncryptionPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
-        <jaxws:outInterceptors>
-            <bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
-                <constructor-arg>
-                    <map>
-                        <entry key="action" value="Encrypt"/>
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.action.SecretKeyPasswordCallback"/>
-                        <entry key="encryptSymmetricEncryptionKey" value="false"/>
-                        <entry key="encryptionSymAlgorithm" value="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-                    </map>
-                </constructor-arg>
-            </bean>
-        </jaxws:outInterceptors>
-        <jaxws:inInterceptors>
-            <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
-                <constructor-arg>
-                    <map>
-                        <entry key="action" value="Encrypt"/>
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.action.SecretKeyPasswordCallback"/>
-                        <entry key="isBSPCompliant" value="false"/>
-                    </map>
-                </constructor-arg>
-            </bean>
-        </jaxws:inInterceptors>
-    </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="UsernameToken"
address="http://localhost:${testutil.ports.SignatureServer}/DoubleItUsernameToken" serviceName="s:DoubleItService"
endpointName="s:DoubleItUsernameTokenPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
-        <jaxws:inInterceptors>
-            <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
-                <constructor-arg>
-                    <map>
-                        <entry key="action" value="UsernameToken"/>
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
-                    </map>
-                </constructor-arg>
-            </bean>
-        </jaxws:inInterceptors>
-    </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="UsernameToken2"
address="http://localhost:${testutil.ports.SignatureServer}/DoubleItUsernameToken2" serviceName="s:DoubleItService"
endpointName="s:DoubleItUsernameTokenPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
-        <jaxws:inInterceptors>
-            <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
-                <constructor-arg>
-                    <map>
-                        <entry key="action" value="UsernameToken"/>
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
-                    </map>
-                </constructor-arg>
-            </bean>
-        </jaxws:inInterceptors>
-    </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedPassword"
address="http://localhost:${testutil.ports.SignatureServer}/DoubleItEncryptedPassword" serviceName="s:DoubleItService"
endpointName="s:DoubleItEncryptedPasswordPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
-        <jaxws:outInterceptors>
-            <bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
-                <constructor-arg>
-                    <map>
-                        <entry key="action" value="Encrypt"/>
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
-                        <entry key="encryptionPropFile" value="alice-enc.properties"/>
-                        <entry key="encryptionUser" value="alice"/>
-                    </map>
-                </constructor-arg>
-            </bean>
-        </jaxws:outInterceptors>
-        <jaxws:inInterceptors>
-            <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
-                <constructor-arg>
-                    <map>
-                        <entry key="action" value="Encrypt"/>
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
-                        <entry key="decryptionPropFile" value="bob-enc.properties"/>
-                    </map>
-                </constructor-arg>
-            </bean>
-        </jaxws:inInterceptors>
-    </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedTimestamp"
address="http://localhost:${testutil.ports.SignatureServer}/DoubleItSignedTimestamp" serviceName="s:DoubleItService"
endpointName="s:DoubleItSignedTimestampPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
-        <jaxws:outInterceptors>
-            <bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
-                <constructor-arg>
-                    <map>
-                        <entry key="action" value="Signature"/>
-                        <entry key="signatureUser" value="bob"/>
-                        <entry key="signaturePropFile" value="bob.properties"/>
-                        <entry key="signatureKeyIdentifier" value="DirectReference"/>
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
-                    </map>
-                </constructor-arg>
-            </bean>
-        </jaxws:outInterceptors>
-        <jaxws:inInterceptors>
-            <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
-                <constructor-arg>
-                    <map>
-                        <entry key="action" value="Signature Timestamp"/>
-                        <entry key="signatureVerificationPropFile" value="bob.properties"/>
-                    </map>
-                </constructor-arg>
-            </bean>
-        </jaxws:inInterceptors>
-    </jaxws:endpoint>
     
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Signature"
address="http://localhost:${testutil.ports.SignatureServer}/DoubleItSignature" serviceName="s:DoubleItService"
endpointName="s:DoubleItSignaturePort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
         <jaxws:outInterceptors>
@@ -132,9 +33,9 @@
                     <map>
                         <entry key="action" value="Signature"/>
                         <entry key="signatureUser" value="bob"/>
-                        <entry key="signaturePropFile" value="bob.properties"/>
+                        <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
                         <entry key="signatureKeyIdentifier" value="DirectReference"/>
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
+                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.wssec10.server.KeystorePasswordCallback"/>
                     </map>
                 </constructor-arg>
             </bean>
@@ -144,7 +45,7 @@
                 <constructor-arg>
                     <map>
                         <entry key="action" value="Signature"/>
-                        <entry key="signatureVerificationPropFile" value="bob.properties"/>
+                        <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
                     </map>
                 </constructor-arg>
             </bean>
@@ -158,9 +59,9 @@
                     <map>
                         <entry key="action" value="Signature"/>
                         <entry key="signatureUser" value="bob"/>
-                        <entry key="signaturePropFile" value="bob.properties"/>
+                        <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
                         <entry key="signatureKeyIdentifier" value="DirectReference"/>
-                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
+                        <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.wssec10.server.KeystorePasswordCallback"/>
                     </map>
                 </constructor-arg>
             </bean>
@@ -170,7 +71,7 @@
                 <constructor-arg>
                     <map>
                         <entry key="action" value="Signature"/>
-                        <entry key="signatureVerificationPropFile" value="bob.properties"/>
+                        <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/wssec10/server/bob.properties"/>
                     </map>
                 </constructor-arg>
             </bean>


Mime
View raw message