cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1459767 - in /cxf/branches/2.7.x-fixes/systests/ws-security/src/test: java/org/apache/cxf/systest/ws/x509/ resources/org/apache/cxf/systest/ws/x509/ resources/org/apache/cxf/systest/ws/x509/client/ resources/org/apache/cxf/systest/ws/x509/...
Date Fri, 22 Mar 2013 13:41:15 GMT
Author: coheigea
Date: Fri Mar 22 13:41:15 2013
New Revision: 1459767

URL: http://svn.apache.org/r1459767
Log:
Merged revisions 1459762 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1459762 | coheigea | 2013-03-22 13:35:19 +0000 (Fri, 22 Mar 2013) | 2 lines

  Fixing failing test

........

Modified:
    cxf/branches/2.7.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
    cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl
    cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/client.xml
    cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml

Modified: cxf/branches/2.7.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java?rev=1459767&r1=1459766&r2=1459767&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
(original)
+++ cxf/branches/2.7.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
Fri Mar 22 13:41:15 2013
@@ -679,7 +679,7 @@ public class X509TokenTest extends Abstr
     }
     
     @org.junit.Test
-    public void testEndorsing() throws Exception {
+    public void testNegativeEndorsing() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = X509TokenTest.class.getResource("client/client.xml");
@@ -692,13 +692,13 @@ public class X509TokenTest extends Abstr
         Service service = Service.create(wsdl, SERVICE_QNAME);
        
         // Successful invocation
-        QName portQName = new QName(NAMESPACE, "DoubleItTransportEndorsingPort");
+        QName portQName = new QName(NAMESPACE, "DoubleItTransportNegativeEndorsingPort");
         DoubleItPortType port = service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(port, PORT2);
         port.doubleIt(25);
         
         // This should fail, as the client is not endorsing the token
-        portQName = new QName(NAMESPACE, "DoubleItTransportEndorsingPort2");
+        portQName = new QName(NAMESPACE, "DoubleItTransportNegativeEndorsingPort2");
         port = service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(port, PORT2);
         

Modified: cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl?rev=1459767&r1=1459766&r2=1459767&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl
(original)
+++ cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl
Fri Mar 22 13:41:15 2013
@@ -403,13 +403,13 @@
                    binding="tns:DoubleItNoSecurityBinding">
             <soap:address location="https://localhost:9002/DoubleItX509TransportPKISupportingToken"
/>
         </wsdl:port>
-        <wsdl:port name="DoubleItTransportEndorsingPort" 
+        <wsdl:port name="DoubleItTransportNegativeEndorsingPort" 
                    binding="tns:DoubleItNoSecurityBinding">
-            <soap:address location="https://localhost:9002/DoubleItX509TransportEndorsing"
/>
+            <soap:address location="https://localhost:9002/DoubleItX509TransportNegativeEndorsing"
/>
         </wsdl:port>
-        <wsdl:port name="DoubleItTransportEndorsingPort2" 
+        <wsdl:port name="DoubleItTransportNegativeEndorsingPort2" 
                    binding="tns:DoubleItNoSecurityBinding">
-            <soap:address location="https://localhost:9002/DoubleItX509TransportEndorsing2"
/>
+            <soap:address location="https://localhost:9002/DoubleItX509TransportNegativeEndorsing2"
/>
         </wsdl:port>
     </wsdl:service>
 

Modified: cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/client.xml?rev=1459767&r1=1459766&r2=1459767&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/client.xml
(original)
+++ cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/client.xml
Fri Mar 22 13:41:15 2013
@@ -319,7 +319,7 @@
         </jaxws:features>
     </jaxws:client>
     
-    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportEndorsingPort"

+    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportNegativeEndorsingPort"

                   createdFromAPI="true">
        <jaxws:properties>
            <entry key="ws-security.encryption.properties" 
@@ -339,7 +339,7 @@
         </jaxws:features>
     </jaxws:client>
     
-    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportEndorsingPort2"

+    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportNegativeEndorsingPort2"

                   createdFromAPI="true">
        <jaxws:properties>
            <entry key="ws-security.encryption.properties" 

Modified: cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml?rev=1459767&r1=1459766&r2=1459767&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml
(original)
+++ cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml
Fri Mar 22 13:41:15 2013
@@ -520,10 +520,10 @@
     </jaxws:endpoint> 
     
     <jaxws:endpoint 
-       id="TransportEndorsing"
-       address="https://localhost:${testutil.ports.Server.2}/DoubleItX509TransportEndorsing"

+       id="TransportEndorsingNegativeTest"
+       address="https://localhost:${testutil.ports.Server.2}/DoubleItX509TransportNegativeEndorsing"

        serviceName="s:DoubleItService"
-       endpointName="s:DoubleItTransportEndorsingPort"
+       endpointName="s:DoubleItTransportNegativeEndorsingPort"
        xmlns:s="http://www.example.org/contract/DoubleIt"
        implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
        wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl"
@@ -544,10 +544,10 @@
     </jaxws:endpoint> 
     
     <jaxws:endpoint 
-       id="TransportEndorsing2"
-       address="https://localhost:${testutil.ports.Server.2}/DoubleItX509TransportEndorsing2"

+       id="TransportEndorsingNegativeTest2"
+       address="https://localhost:${testutil.ports.Server.2}/DoubleItX509TransportNegativeEndorsing2"

        serviceName="s:DoubleItService"
-       endpointName="s:DoubleItTransportEndorsingPort2"
+       endpointName="s:DoubleItTransportNegativeEndorsingPort2"
        xmlns:s="http://www.example.org/contract/DoubleIt"
        implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
        wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl"



Mime
View raw message