cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject cxf git commit: Removing test
Date Thu, 18 Jun 2015 16:11:10 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 26aba8ecb -> 25d02a2a0


Removing test


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

Branch: refs/heads/master
Commit: 25d02a2a04b8552faf88fd0879423618f15be8ee
Parents: 26aba8e
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Thu Jun 18 17:10:52 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Thu Jun 18 17:11:06 2015 +0100

----------------------------------------------------------------------
 .../cxf/systest/ws/swa/SWAPolicyTest.java       | 30 ---------
 .../apache/cxf/systest/ws/swa/DoubleItSwa.wsdl  | 71 --------------------
 .../apache/cxf/systest/ws/swa/policy-client.xml | 10 ---
 .../apache/cxf/systest/ws/swa/policy-server.xml | 13 ----
 .../cxf/systest/ws/swa/stax-policy-server.xml   | 14 ----
 5 files changed, 138 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/25d02a2a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java
index a76f002..99ef60e 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java
@@ -262,36 +262,6 @@ public class SWAPolicyTest extends AbstractBusClientServerTestBase {
         bus.shutdown(true);
     }
     
-    @org.junit.Test
-    @org.junit.Ignore
-    public void testSWACombinedAsymmetricDerivedPolicy() throws Exception {
-
-        SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = SWAPolicyTest.class.getResource("policy-client.xml");
-
-        Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
-        
-        URL wsdl = SWAPolicyTest.class.getResource("DoubleItSwa.wsdl");
-        Service service = Service.create(wsdl, SERVICE_QNAME);
-        QName portQName = new QName(NAMESPACE, "DoubleItSWACombinedAsymmetricDerivedPolicyPort");
-        DoubleItSwaPortType port = 
-                service.getPort(portQName, DoubleItSwaPortType.class);
-        updateAddressPort(port, test.getPort());
-        
-        if (test.isStreaming()) {
-            enableStreaming(port);
-        }
-        
-        DoubleIt3 doubleIt = new DoubleIt3();
-        doubleIt.setNumberToDouble(25);
-        port.doubleIt3(doubleIt, "12345".getBytes());
-        
-        ((java.io.Closeable)port).close();
-        bus.shutdown(true);
-    }
-    
     static void enableStreaming(DoubleItSwaPortType port) {
         ((BindingProvider)port).getRequestContext().put(
             SecurityConstants.ENABLE_STREAMING_SECURITY, "true"

http://git-wip-us.apache.org/repos/asf/cxf/blob/25d02a2a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl
index b37b162..d48f2c7 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl
@@ -191,31 +191,6 @@
             </wsdl:fault>
         </wsdl:operation>
     </wsdl:binding>
-    <wsdl:binding name="DoubleItCombinedAsymmetricDerivedBinding" type="tns:DoubleItSwaPortType">
-        <wsp:PolicyReference URI="#DoubleItAsymmetricDerivedPolicy"/>
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="DoubleIt3">
-            <soap:operation soapAction=""/>
-            <wsdl:input>
-                 <mime:multipartRelated>
-                    <mime:part>
-                        <soap:body use="literal"/>
-                    </mime:part>
-                    <mime:part>
-                        <mime:content part="attachment" type="image/jpeg"/>
-                    </mime:part>
-                </mime:multipartRelated>
-                <wsp:PolicyReference URI="#Combined_Policy"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-                <wsp:PolicyReference URI="#Combined_Policy"/>
-            </wsdl:output>
-            <wsdl:fault name="DoubleItFault">
-                <soap:body use="literal" name="DoubleItFault"/>
-            </wsdl:fault>
-        </wsdl:operation>
-    </wsdl:binding>
     
     <wsdl:service name="DoubleItService">
         <wsdl:port name="DoubleItSWASignatureContentActionPort" binding="tns:DoubleItNoSecurityBinding">
@@ -248,9 +223,6 @@
         <wsdl:port name="DoubleItSWACombinedAsymmetricPolicyPort" binding="tns:DoubleItCombinedAsymmetricBinding">
             <soap:address location="http://localhost:9001/DoubleItSWACombinedAsymmetricPolicy"/>
         </wsdl:port>
-        <wsdl:port name="DoubleItSWACombinedAsymmetricDerivedPolicyPort" binding="tns:DoubleItCombinedAsymmetricDerivedBinding">
-            <soap:address location="http://localhost:9001/DoubleItSWACombinedAsymmetricDerivedPolicy"/>
-        </wsdl:port>
     </wsdl:service>
     
     <wsp:Policy wsu:Id="DoubleItSymmetricPolicy">
@@ -359,49 +331,6 @@
         </wsp:ExactlyOne>
     </wsp:Policy>
     
-    <wsp:Policy wsu:Id="DoubleItAsymmetricDerivedPolicy">
-        <wsp:ExactlyOne>
-            <wsp:All>
-                <sp:AsymmetricBinding>
-                    <wsp:Policy>
-                        <sp:InitiatorToken>
-                            <wsp:Policy>
-                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
-                                    <wsp:Policy>
-                                        <sp:WssX509V3Token10/>
-                                        <sp:RequireDerivedKeys/>
-                                    </wsp:Policy>
-                                </sp:X509Token>
-                            </wsp:Policy>
-                        </sp:InitiatorToken>
-                        <sp:RecipientToken>
-                            <wsp:Policy>
-                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
-                                    <wsp:Policy>
-                                        <sp:WssX509V3Token10/>
-                                        <sp:RequireDerivedKeys/>
-                                    </wsp:Policy>
-                                </sp:X509Token>
-                            </wsp:Policy>
-                        </sp:RecipientToken>
-                        <sp:Layout>
-                            <wsp:Policy>
-                                <sp:Lax/>
-                            </wsp:Policy>
-                        </sp:Layout>
-                        <sp:IncludeTimestamp/>
-                        <sp:OnlySignEntireHeadersAndBody/>
-                        <sp:AlgorithmSuite>
-                            <wsp:Policy>
-                                <sp:Basic128/>
-                            </wsp:Policy>
-                        </sp:AlgorithmSuite>
-                    </wsp:Policy>
-                </sp:AsymmetricBinding>
-            </wsp:All>
-        </wsp:ExactlyOne>
-    </wsp:Policy>
-    
     <wsp:Policy wsu:Id="Signature_Content_Policy">
         <wsp:ExactlyOne>
             <wsp:All>

http://git-wip-us.apache.org/repos/asf/cxf/blob/25d02a2a/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 f064390..0c66531 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
@@ -70,14 +70,4 @@
         </jaxws:properties>
     </jaxws:client>
     
-    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSWACombinedAsymmetricDerivedPolicyPort"
createdFromAPI="true">
-         <jaxws:properties>
-            <entry key="security.encryption.properties" value="bob.properties"/>
-            <entry key="security.encryption.username" value="bob"/>
-            <entry key="security.signature.properties" value="alice.properties"/>
-            <entry key="security.signature.username" value="alice"/>
-            <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
-        </jaxws:properties>
-    </jaxws:client>
-    
 </beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/25d02a2a/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 a264ffd..540f958 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
@@ -94,17 +94,4 @@
         </jaxws:properties>
     </jaxws:endpoint>
     
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="CombinedAsymmetricDerivedPolicy"

-        address="http://localhost:${testutil.ports.swa.PolicyServer}/DoubleItSWACombinedAsymmetricDerivedPolicy"

-        serviceName="s:DoubleItService" endpointName="s:DoubleItSWACombinedAsymmetricDerivedPolicyPort"

-        implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl" 
-        wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl">
-        <jaxws:properties>
-            <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
-            <entry key="security.signature.properties" value="bob.properties"/>
-            <entry key="security.encryption.properties" value="alice.properties"/>
-            <entry key="security.encryption.username" value="alice"/>
-        </jaxws:properties>
-    </jaxws:endpoint>
-    
 </beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/25d02a2a/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 6f5d94f..034ae3a 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
@@ -100,18 +100,4 @@
         </jaxws:properties>
     </jaxws:endpoint>
     
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="CombinedAsymmetricDerivedPolicy"

-        address="http://localhost:${testutil.ports.swa.StaxPolicyServer}/DoubleItSWACombinedAsymmetricDerivedPolicy"

-        serviceName="s:DoubleItService" endpointName="s:DoubleItSWACombinedAsymmetricDerivedPolicyPort"

-        implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl" 
-        wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl">
-        <jaxws:properties>
-            <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
-            <entry key="security.signature.properties" value="bob.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>
-    </jaxws:endpoint>
-    
 </beans>


Mime
View raw message