cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [1/4] cxf git commit: Removing unused config
Date Fri, 20 Jan 2017 16:54:40 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 8d8ae785a -> 8a43e828c


Removing unused config


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

Branch: refs/heads/3.0.x-fixes
Commit: d9a86780898c9d345dc07c614f247313bc1f4380
Parents: 8d8ae78
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Jan 20 11:57:35 2017 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Jan 20 16:22:26 2017 +0000

----------------------------------------------------------------------
 .../org/apache/cxf/systest/ws/action/server.xml | 52 ----------
 .../cxf/systest/ws/action/signature-server.xml  | 99 --------------------
 2 files changed, 151 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/d9a86780/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml
index 0d2f8a5..1d45840 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml
@@ -125,58 +125,6 @@
         </jaxws:inInterceptors>
     </jaxws:endpoint>
     
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Signature"
address="http://localhost:${testutil.ports.action.Server}/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>
-            <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"/>
-                        <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="Signature2"
address="http://localhost:${testutil.ports.action.Server}/DoubleItSignature2" serviceName="s:DoubleItService"
endpointName="s:DoubleItSignaturePort2" 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"/>
-                        <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="Asymmetric"
address="http://localhost:${testutil.ports.action.Server}/DoubleItAsymmetric" serviceName="s:DoubleItService"
endpointName="s:DoubleItAsymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItActionPolicy.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d9a86780/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 8b917dc..4ba1e50 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>


Mime
View raw message