cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1209424 - in /cxf/branches/2.4.x-fixes/systests/ws-security: ./ src/test/java/org/apache/cxf/systest/ws/kerberos/ src/test/java/org/apache/cxf/systest/ws/kerberos/server/ src/test/java/org/apache/cxf/systest/ws/spnego/ src/test/java/org/ap...
Date Fri, 02 Dec 2011 11:50:00 GMT
Author: coheigea
Date: Fri Dec  2 11:49:59 2011
New Revision: 1209424

URL: http://svn.apache.org/viewvc?rev=1209424&view=rev
Log:
Refactor of WS-Security systests - part II

Added:
    cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl
      - copied, changed from r1209219, cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/wsdl_systest_wssec/kerberos/DoubleItKerberos.wsdl
    cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/DoubleItSpnego.wsdl
      - copied, changed from r1209219, cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/wsdl_systest_wssec/spnego/DoubleItSpnego.wsdl
Removed:
    cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/server/DoubleItImpl.java
    cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/spnego/server/DoubleItImpl.java
    cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/wsdl_systest_wssec/kerberos/DoubleItKerberos.wsdl
    cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/wsdl_systest_wssec/spnego/DoubleItSpnego.wsdl
Modified:
    cxf/branches/2.4.x-fixes/systests/ws-security/pom.xml
    cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java
    cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/spnego/SpnegoTokenTest.java
    cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/client/client.xml
    cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml
    cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/client/client.xml
    cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/server/server.xml

Modified: cxf/branches/2.4.x-fixes/systests/ws-security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-security/pom.xml?rev=1209424&r1=1209423&r2=1209424&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/ws-security/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/ws-security/pom.xml Fri Dec  2 11:49:59 2011
@@ -72,12 +72,6 @@
                                 <wsdlOption>
                                     <wsdl>${basedir}/src/test/resources/wsdl_systest_wssec/wssc/WSSecureConversation.wsdl</wsdl>
                                 </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/test/resources/wsdl_systest_wssec/kerberos/DoubleItKerberos.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/test/resources/wsdl_systest_wssec/spnego/DoubleItSpnego.wsdl</wsdl>
-                                </wsdlOption>
                             </wsdlOptions>
                         </configuration>
                         <goals>

Modified: cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java?rev=1209424&r1=1209423&r2=1209424&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java
(original)
+++ cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java
Fri Dec  2 11:49:59 2011
@@ -19,22 +19,22 @@
 
 package org.apache.cxf.systest.ws.kerberos;
 
-import java.math.BigInteger;
 import java.net.URL;
 
 import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.systest.ws.kerberos.server.Server;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 
-import org.junit.BeforeClass;
+import org.example.contract.doubleit.DoubleItPortType;
 
-import wssec.kerberos.DoubleItPortType;
-import wssec.kerberos.DoubleItService;
+import org.junit.BeforeClass;
 
 /**
  * A set of tests for Kerberos Tokens. The tests are @Ignore'd, as they require a running
KDC. To run the
@@ -52,6 +52,9 @@ import wssec.kerberos.DoubleItService;
 public class KerberosTokenTest extends AbstractBusClientServerTestBase {
     static final String PORT = allocatePort(Server.class);
     static final String PORT2 = allocatePort(Server.class, 2);
+    
+    private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
+    private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
 
     private boolean unrestrictedPoliciesInstalled = checkUnrestrictedPoliciesInstalled();
     
@@ -76,12 +79,15 @@ public class KerberosTokenTest extends A
         SpringBusFactory.setDefaultBus(bus);
         SpringBusFactory.setThreadDefaultBus(bus);
 
-        DoubleItService service = new DoubleItService();
+        URL wsdl = KerberosTokenTest.class.getResource("DoubleItKerberos.wsdl");
+        Service service = Service.create(wsdl, SERVICE_QNAME);
+        QName portQName = new QName(NAMESPACE, "DoubleItKerberosTransportPort");
+        DoubleItPortType kerberosPort = 
+                service.getPort(portQName, DoubleItPortType.class);
         
-        DoubleItPortType kerberosPort = service.getDoubleItKerberosTransportPort();
         updateAddressPort(kerberosPort, PORT2);
-        BigInteger result = kerberosPort.doubleIt(BigInteger.valueOf(25));
-        assertTrue(result.equals(BigInteger.valueOf(50)));
+        int result = kerberosPort.doubleIt(25);
+        assertTrue(result == 50);
     }
     
     @org.junit.Test
@@ -99,13 +105,16 @@ public class KerberosTokenTest extends A
         SpringBusFactory.setDefaultBus(bus);
         SpringBusFactory.setThreadDefaultBus(bus);
 
-        DoubleItService service = new DoubleItService();
-        
-        DoubleItPortType kerberosPort = service.getDoubleItKerberosSymmetricPort();
+        URL wsdl = KerberosTokenTest.class.getResource("DoubleItKerberos.wsdl");
+        Service service = Service.create(wsdl, SERVICE_QNAME);
+        QName portQName = new QName(NAMESPACE, "DoubleItKerberosSymmetricPort");
+        DoubleItPortType kerberosPort = 
+                service.getPort(portQName, DoubleItPortType.class);
+
         updateAddressPort(kerberosPort, PORT);
         
-        BigInteger result = kerberosPort.doubleIt(BigInteger.valueOf(25));
-        assertTrue(result.equals(BigInteger.valueOf(50)));
+        int result = kerberosPort.doubleIt(25);
+        assertTrue(result == 50);
     }
     
     @org.junit.Test
@@ -123,13 +132,16 @@ public class KerberosTokenTest extends A
         SpringBusFactory.setDefaultBus(bus);
         SpringBusFactory.setThreadDefaultBus(bus);
 
-        DoubleItService service = new DoubleItService();
-        
-        DoubleItPortType kerberosPort = service.getDoubleItKerberosSymmetricSupportingPort();
+        URL wsdl = KerberosTokenTest.class.getResource("DoubleItKerberos.wsdl");
+        Service service = Service.create(wsdl, SERVICE_QNAME);
+        QName portQName = new QName(NAMESPACE, "DoubleItKerberosSymmetricSupportingPort");
+        DoubleItPortType kerberosPort = 
+                service.getPort(portQName, DoubleItPortType.class);
+
         updateAddressPort(kerberosPort, PORT);
         
-        BigInteger result = kerberosPort.doubleIt(BigInteger.valueOf(25));
-        assertTrue(result.equals(BigInteger.valueOf(50)));
+        int result = kerberosPort.doubleIt(25);
+        assertTrue(result == 50);
     }
     
     @org.junit.Test
@@ -147,13 +159,16 @@ public class KerberosTokenTest extends A
         SpringBusFactory.setDefaultBus(bus);
         SpringBusFactory.setThreadDefaultBus(bus);
 
-        DoubleItService service = new DoubleItService();
-        
-        DoubleItPortType kerberosPort = service.getDoubleItKerberosAsymmetricPort();
+        URL wsdl = KerberosTokenTest.class.getResource("DoubleItKerberos.wsdl");
+        Service service = Service.create(wsdl, SERVICE_QNAME);
+        QName portQName = new QName(NAMESPACE, "DoubleItKerberosAsymmetricPort");
+        DoubleItPortType kerberosPort = 
+                service.getPort(portQName, DoubleItPortType.class);
+
         updateAddressPort(kerberosPort, PORT);
         
-        BigInteger result = kerberosPort.doubleIt(BigInteger.valueOf(25));
-        assertTrue(result.equals(BigInteger.valueOf(50)));
+        int result = kerberosPort.doubleIt(25);
+        assertTrue(result == 50);
     }
     
     @org.junit.Test
@@ -167,12 +182,15 @@ public class KerberosTokenTest extends A
         SpringBusFactory.setDefaultBus(bus);
         SpringBusFactory.setThreadDefaultBus(bus);
 
-        DoubleItService service = new DoubleItService();
-        
-        DoubleItPortType kerberosPort = service.getDoubleItKerberosTransportEndorsingPort();
+        URL wsdl = KerberosTokenTest.class.getResource("DoubleItKerberos.wsdl");
+        Service service = Service.create(wsdl, SERVICE_QNAME);
+        QName portQName = new QName(NAMESPACE, "DoubleItKerberosTransportEndorsingPort");
+        DoubleItPortType kerberosPort = 
+                service.getPort(portQName, DoubleItPortType.class);
+
         updateAddressPort(kerberosPort, PORT2);
-        BigInteger result = kerberosPort.doubleIt(BigInteger.valueOf(25));
-        assertTrue(result.equals(BigInteger.valueOf(50)));
+        int result = kerberosPort.doubleIt(25);
+        assertTrue(result == 50);
     }
     
     @org.junit.Test
@@ -186,12 +204,15 @@ public class KerberosTokenTest extends A
         SpringBusFactory.setDefaultBus(bus);
         SpringBusFactory.setThreadDefaultBus(bus);
 
-        DoubleItService service = new DoubleItService();
-        
-        DoubleItPortType kerberosPort = service.getDoubleItKerberosAsymmetricEndorsingPort();
+        URL wsdl = KerberosTokenTest.class.getResource("DoubleItKerberos.wsdl");
+        Service service = Service.create(wsdl, SERVICE_QNAME);
+        QName portQName = new QName(NAMESPACE, "DoubleItKerberosAsymmetricEndorsingPort");
+        DoubleItPortType kerberosPort = 
+                service.getPort(portQName, DoubleItPortType.class);
+
         updateAddressPort(kerberosPort, PORT);
-        BigInteger result = kerberosPort.doubleIt(BigInteger.valueOf(25));
-        assertTrue(result.equals(BigInteger.valueOf(50)));
+        int result = kerberosPort.doubleIt(25);
+        assertTrue(result == 50);
     }
     
     @org.junit.Test
@@ -205,12 +226,15 @@ public class KerberosTokenTest extends A
         SpringBusFactory.setDefaultBus(bus);
         SpringBusFactory.setThreadDefaultBus(bus);
 
-        DoubleItService service = new DoubleItService();
+        URL wsdl = KerberosTokenTest.class.getResource("DoubleItKerberos.wsdl");
+        Service service = Service.create(wsdl, SERVICE_QNAME);
+        QName portQName = new QName(NAMESPACE, "DoubleItKerberosSymmetricProtectionPort");
+        DoubleItPortType kerberosPort = 
+                service.getPort(portQName, DoubleItPortType.class);
         
-        DoubleItPortType kerberosPort = service.getDoubleItKerberosSymmetricProtectionPort();
         updateAddressPort(kerberosPort, PORT);
-        BigInteger result = kerberosPort.doubleIt(BigInteger.valueOf(25));
-        assertTrue(result.equals(BigInteger.valueOf(50)));
+        int result = kerberosPort.doubleIt(25);
+        assertTrue(result == 50);
     }
     
     
@@ -225,12 +249,15 @@ public class KerberosTokenTest extends A
         SpringBusFactory.setDefaultBus(bus);
         SpringBusFactory.setThreadDefaultBus(bus);
 
-        DoubleItService service = new DoubleItService();
+        URL wsdl = KerberosTokenTest.class.getResource("DoubleItKerberos.wsdl");
+        Service service = Service.create(wsdl, SERVICE_QNAME);
+        QName portQName = new QName(NAMESPACE, "DoubleItKerberosSymmetricDerivedProtectionPort");
+        DoubleItPortType kerberosPort = 
+                service.getPort(portQName, DoubleItPortType.class);
         
-        DoubleItPortType kerberosPort = service.getDoubleItKerberosSymmetricDerivedProtectionPort();
         updateAddressPort(kerberosPort, PORT);
-        BigInteger result = kerberosPort.doubleIt(BigInteger.valueOf(25));
-        assertTrue(result.equals(BigInteger.valueOf(50)));
+        int result = kerberosPort.doubleIt(25);
+        assertTrue(result == 50);
     }
     
     @org.junit.Test
@@ -248,13 +275,16 @@ public class KerberosTokenTest extends A
         SpringBusFactory.setDefaultBus(bus);
         SpringBusFactory.setThreadDefaultBus(bus);
 
-        DoubleItService service = new DoubleItService();
+        URL wsdl = KerberosTokenTest.class.getResource("DoubleItKerberos.wsdl");
+        Service service = Service.create(wsdl, SERVICE_QNAME);
+        QName portQName = new QName(NAMESPACE, "DoubleItKerberosAsymmetricSignedEndorsingPort");
+        DoubleItPortType kerberosPort = 
+                service.getPort(portQName, DoubleItPortType.class);
         
-        DoubleItPortType kerberosPort = service.getDoubleItKerberosAsymmetricSignedEndorsingPort();
         updateAddressPort(kerberosPort, PORT);
         
-        BigInteger result = kerberosPort.doubleIt(BigInteger.valueOf(25));
-        assertTrue(result.equals(BigInteger.valueOf(50)));
+        int result = kerberosPort.doubleIt(25);
+        assertTrue(result == 50);
     }
     
     @org.junit.Test
@@ -272,13 +302,16 @@ public class KerberosTokenTest extends A
         SpringBusFactory.setDefaultBus(bus);
         SpringBusFactory.setThreadDefaultBus(bus);
 
-        DoubleItService service = new DoubleItService();
+        URL wsdl = KerberosTokenTest.class.getResource("DoubleItKerberos.wsdl");
+        Service service = Service.create(wsdl, SERVICE_QNAME);
+        QName portQName = new QName(NAMESPACE, "DoubleItKerberosAsymmetricSignedEncryptedPort");
+        DoubleItPortType kerberosPort = 
+                service.getPort(portQName, DoubleItPortType.class);
         
-        DoubleItPortType kerberosPort = service.getDoubleItKerberosAsymmetricSignedEncryptedPort();
         updateAddressPort(kerberosPort, PORT);
         
-        BigInteger result = kerberosPort.doubleIt(BigInteger.valueOf(25));
-        assertTrue(result.equals(BigInteger.valueOf(50)));
+        int result = kerberosPort.doubleIt(25);
+        assertTrue(result == 50);
     }
     
     @org.junit.Test
@@ -296,13 +329,16 @@ public class KerberosTokenTest extends A
         SpringBusFactory.setDefaultBus(bus);
         SpringBusFactory.setThreadDefaultBus(bus);
 
-        DoubleItService service = new DoubleItService();
+        URL wsdl = KerberosTokenTest.class.getResource("DoubleItKerberos.wsdl");
+        Service service = Service.create(wsdl, SERVICE_QNAME);
+        QName portQName = new QName(NAMESPACE, "DoubleItKerberosSymmetricEndorsingEncryptedPort");
+        DoubleItPortType kerberosPort = 
+                service.getPort(portQName, DoubleItPortType.class);
         
-        DoubleItPortType kerberosPort = service.getDoubleItKerberosSymmetricEndorsingEncryptedPort();
         updateAddressPort(kerberosPort, PORT);
         
-        BigInteger result = kerberosPort.doubleIt(BigInteger.valueOf(25));
-        assertTrue(result.equals(BigInteger.valueOf(50)));
+        int result = kerberosPort.doubleIt(25);
+        assertTrue(result == 50);
     }
     
     @org.junit.Test
@@ -320,13 +356,16 @@ public class KerberosTokenTest extends A
         SpringBusFactory.setDefaultBus(bus);
         SpringBusFactory.setThreadDefaultBus(bus);
 
-        DoubleItService service = new DoubleItService();
+        URL wsdl = KerberosTokenTest.class.getResource("DoubleItKerberos.wsdl");
+        Service service = Service.create(wsdl, SERVICE_QNAME);
+        QName portQName = new QName(NAMESPACE, "DoubleItKerberosSymmetricSignedEndorsingEncryptedPort");
+        DoubleItPortType kerberosPort = 
+                service.getPort(portQName, DoubleItPortType.class);
         
-        DoubleItPortType kerberosPort = service.getDoubleItKerberosSymmetricSignedEndorsingEncryptedPort();
         updateAddressPort(kerberosPort, PORT);
         
-        BigInteger result = kerberosPort.doubleIt(BigInteger.valueOf(25));
-        assertTrue(result.equals(BigInteger.valueOf(50)));
+        int result = kerberosPort.doubleIt(25);
+        assertTrue(result == 50);
     }
     
     

Modified: cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/spnego/SpnegoTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/spnego/SpnegoTokenTest.java?rev=1209424&r1=1209423&r2=1209424&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/spnego/SpnegoTokenTest.java
(original)
+++ cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/spnego/SpnegoTokenTest.java
Fri Dec  2 11:49:59 2011
@@ -19,22 +19,22 @@
 
 package org.apache.cxf.systest.ws.spnego;
 
-import java.math.BigInteger;
 import java.net.URL;
 
 import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.systest.ws.spnego.server.Server;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 
-import org.junit.BeforeClass;
+import org.example.contract.doubleit.DoubleItPortType;
 
-import wssec.spnego.DoubleItPortType;
-import wssec.spnego.DoubleItService;
+import org.junit.BeforeClass;
 
 /**
  * A set of tests for Spnego Tokens. The tests are @Ignore'd, as they require a running KDC.
To run the
@@ -50,6 +50,9 @@ import wssec.spnego.DoubleItService;
 public class SpnegoTokenTest extends AbstractBusClientServerTestBase {
     static final String PORT = allocatePort(Server.class);
 
+    private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
+    private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
+    
     private boolean unrestrictedPoliciesInstalled = checkUnrestrictedPoliciesInstalled();
     
     @BeforeClass
@@ -77,13 +80,15 @@ public class SpnegoTokenTest extends Abs
         SpringBusFactory.setDefaultBus(bus);
         SpringBusFactory.setThreadDefaultBus(bus);
 
-        DoubleItService service = new DoubleItService();
-        
-        DoubleItPortType spnegoPort = service.getDoubleItSpnegoSymmetricPort();
+        URL wsdl = SpnegoTokenTest.class.getResource("DoubleItSpnego.wsdl");
+        Service service = Service.create(wsdl, SERVICE_QNAME);
+        QName portQName = new QName(NAMESPACE, "DoubleItSpnegoSymmetricPort");
+        DoubleItPortType spnegoPort = 
+                service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(spnegoPort, PORT);
         
-        BigInteger result = spnegoPort.doubleIt(BigInteger.valueOf(25));
-        assertTrue(result.equals(BigInteger.valueOf(50)));
+        int result = spnegoPort.doubleIt(25);
+        assertTrue(result == 50);
     }
     
     @org.junit.Test
@@ -101,13 +106,15 @@ public class SpnegoTokenTest extends Abs
         SpringBusFactory.setDefaultBus(bus);
         SpringBusFactory.setThreadDefaultBus(bus);
 
-        DoubleItService service = new DoubleItService();
-        
-        DoubleItPortType spnegoPort = service.getDoubleItSpnegoSymmetricDerivedPort();
+        URL wsdl = SpnegoTokenTest.class.getResource("DoubleItSpnego.wsdl");
+        Service service = Service.create(wsdl, SERVICE_QNAME);
+        QName portQName = new QName(NAMESPACE, "DoubleItSpnegoSymmetricDerivedPort");
+        DoubleItPortType spnegoPort = 
+                service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(spnegoPort, PORT);
         
-        BigInteger result = spnegoPort.doubleIt(BigInteger.valueOf(25));
-        assertTrue(result.equals(BigInteger.valueOf(50)));
+        int result = spnegoPort.doubleIt(25);
+        assertTrue(result == 50);
     }
     
     

Copied: cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl
(from r1209219, cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/wsdl_systest_wssec/kerberos/DoubleItKerberos.wsdl)
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl?p2=cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl&p1=cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/wsdl_systest_wssec/kerberos/DoubleItKerberos.wsdl&r1=1209219&r2=1209424&rev=1209424&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/wsdl_systest_wssec/kerberos/DoubleItKerberos.wsdl
(original)
+++ cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl
Fri Dec  2 11:49:59 2011
@@ -19,61 +19,17 @@
 -->
 <wsdl:definitions name="DoubleIt"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://WSSec/kerberos"
-    targetNamespace="http://WSSec/kerberos" 
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/contract/DoubleIt"
+    targetNamespace="http://www.example.org/contract/DoubleIt" 
     xmlns:wsp="http://www.w3.org/ns/ws-policy"
     xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
     xmlns:wsaws="http://www.w3.org/2005/08/addressing" 
     xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
     xmlns:sp13="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200802">
-    <wsdl:types>
-        <xsd:schema targetNamespace="http://WSSec/kerberos">
-            <xsd:element name="DoubleIt">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="numberToDouble">
-                            <xsd:simpleType>
-                                <xsd:restriction base="xsd:integer">
-                                    <xsd:minInclusive value="0"/>
-                                </xsd:restriction>
-                            </xsd:simpleType>
-                        </xsd:element>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="DoubleItResponse">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="doubledNumber" type="xsd:integer" />
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="DoubleItFault">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="reason" type="xsd:string" />
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="DoubleItRequest">
-        <wsdl:part element="tns:DoubleIt" name="parameters" />
-    </wsdl:message>
-    <wsdl:message name="DoubleItResponse">
-        <wsdl:part element="tns:DoubleItResponse" name="parameters" />
-    </wsdl:message>
-    <wsdl:message name="DoubleItFault">
-        <wsdl:part element="tns:DoubleItFault" name="fault" />
-    </wsdl:message>
-    <wsdl:portType name="DoubleItPortType">
-        <wsdl:operation name="DoubleIt">
-            <wsdl:input message="tns:DoubleItRequest" />
-            <wsdl:output message="tns:DoubleItResponse" />
-            <wsdl:fault name="DoubleItFault" message="tns:DoubleItFault" />
-        </wsdl:operation>
-    </wsdl:portType>
-    
+
+    <wsdl:import location="src/test/resources/DoubleItLogical.wsdl" 
+                 namespace="http://www.example.org/contract/DoubleIt"/>
+                     
     <wsdl:binding name="DoubleItKerberosTransportBinding" type="tns:DoubleItPortType">
         <wsp:PolicyReference URI="#DoubleItKerberosTransportPolicy" />
         <soap:binding style="document"

Modified: cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/client/client.xml?rev=1209424&r1=1209423&r2=1209424&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/client/client.xml
(original)
+++ cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/client/client.xml
Fri Dec  2 11:49:59 2011
@@ -52,7 +52,7 @@
         </http:tlsClientParameters>
     </http:conduit>  
     
-    <jaxws:client name="{http://WSSec/kerberos}DoubleItKerberosTransportPort" 
+    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosTransportPort"

                   createdFromAPI="true">
        <jaxws:properties>
            <entry key="ws-security.kerberos.client">
@@ -65,7 +65,7 @@
        </jaxws:properties>
     </jaxws:client>
     
-    <jaxws:client name="{http://WSSec/kerberos}DoubleItKerberosSymmetricPort" 
+    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosSymmetricPort"

                   createdFromAPI="true">
        <jaxws:properties>
            <entry key="ws-security.encryption.properties" 
@@ -81,7 +81,7 @@
        </jaxws:properties>
     </jaxws:client>
     
-    <jaxws:client name="{http://WSSec/kerberos}DoubleItKerberosSymmetricSupportingPort"

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

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

                   createdFromAPI="true">
        <jaxws:properties>
            <entry key="ws-security.callback-handler" 
@@ -118,7 +118,7 @@
        </jaxws:properties>
     </jaxws:client>
     
-    <jaxws:client name="{http://WSSec/kerberos}DoubleItKerberosTransportEndorsingPort"

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

                   createdFromAPI="true">
        <jaxws:properties>
            <entry key="ws-security.kerberos.client">
@@ -131,7 +131,7 @@
        </jaxws:properties>
     </jaxws:client>
     
-    <jaxws:client name="{http://WSSec/kerberos}DoubleItKerberosAsymmetricEndorsingPort"

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

                   createdFromAPI="true">
        <jaxws:properties>
            <entry key="ws-security.callback-handler" 
@@ -152,7 +152,7 @@
        </jaxws:properties>
     </jaxws:client>
     
-    <jaxws:client name="{http://WSSec/kerberos}DoubleItKerberosSymmetricProtectionPort"

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

                   createdFromAPI="true">
        <jaxws:properties>
            <entry key="ws-security.encryption.properties" 
@@ -168,7 +168,7 @@
        </jaxws:properties>
     </jaxws:client>
     
-    <jaxws:client name="{http://WSSec/kerberos}DoubleItKerberosSymmetricDerivedProtectionPort"

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

                   createdFromAPI="true">
        <jaxws:properties>
            <entry key="ws-security.encryption.properties" 
@@ -184,7 +184,7 @@
        </jaxws:properties>
     </jaxws:client>
     
-    <jaxws:client name="{http://WSSec/kerberos}DoubleItKerberosAsymmetricSignedEndorsingPort"

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

                   createdFromAPI="true">
        <jaxws:properties>
            <entry key="ws-security.callback-handler" 
@@ -205,7 +205,7 @@
        </jaxws:properties>
     </jaxws:client>
     
-    <jaxws:client name="{http://WSSec/kerberos}DoubleItKerberosAsymmetricSignedEncryptedPort"

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

                   createdFromAPI="true">
        <jaxws:properties>
            <entry key="ws-security.callback-handler" 
@@ -226,7 +226,7 @@
        </jaxws:properties>
     </jaxws:client>
     
-    <jaxws:client name="{http://WSSec/kerberos}DoubleItKerberosSymmetricEndorsingEncryptedPort"

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

                   createdFromAPI="true">
        <jaxws:properties>
            <entry key="ws-security.encryption.properties" 
@@ -242,7 +242,7 @@
        </jaxws:properties>
     </jaxws:client>
     
-    <jaxws:client name="{http://WSSec/kerberos}DoubleItKerberosSymmetricSignedEndorsingEncryptedPort"

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

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

Modified: cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml?rev=1209424&r1=1209423&r2=1209424&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml
(original)
+++ cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml
Fri Dec  2 11:49:59 2011
@@ -86,9 +86,9 @@
        address="https://localhost:${testutil.ports.Server.2}/DoubleItKerberosTransport" 
        serviceName="s:DoubleItService"
        endpointName="s:DoubleItKerberosTransportPort"
-       xmlns:s="http://WSSec/kerberos"
-       implementor="org.apache.cxf.systest.ws.kerberos.server.DoubleItImpl"
-       wsdlLocation="wsdl_systest_wssec/kerberos/DoubleItKerberos.wsdl"
+       xmlns:s="http://www.example.org/contract/DoubleIt"
+       implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
+       wsdlLocation="org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl"
        depends-on="tls-settings">
         
        <jaxws:properties>
@@ -103,9 +103,9 @@
        address="http://localhost:${testutil.ports.Server}/DoubleItKerberosSymmetric" 
        serviceName="s:DoubleItService"
        endpointName="s:DoubleItKerberosSymmetricPort"
-       xmlns:s="http://WSSec/kerberos"
-       implementor="org.apache.cxf.systest.ws.kerberos.server.DoubleItImpl"
-       wsdlLocation="wsdl_systest_wssec/kerberos/DoubleItKerberos.wsdl">
+       xmlns:s="http://www.example.org/contract/DoubleIt"
+       implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
+       wsdlLocation="org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl">
         
        <jaxws:properties>
            <entry key="ws-security.callback-handler" 
@@ -122,9 +122,9 @@
        address="http://localhost:${testutil.ports.Server}/DoubleItKerberosSymmetricSupporting"

        serviceName="s:DoubleItService"
        endpointName="s:DoubleItKerberosSymmetricSupportingPort"
-       xmlns:s="http://WSSec/kerberos"
-       implementor="org.apache.cxf.systest.ws.kerberos.server.DoubleItImpl"
-       wsdlLocation="wsdl_systest_wssec/kerberos/DoubleItKerberos.wsdl">
+       xmlns:s="http://www.example.org/contract/DoubleIt"
+       implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
+       wsdlLocation="org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl">
         
        <jaxws:properties>
            <entry key="ws-security.callback-handler" 
@@ -141,9 +141,9 @@
        address="http://localhost:${testutil.ports.Server}/DoubleItKerberosAsymmetric" 
        serviceName="s:DoubleItService"
        endpointName="s:DoubleItKerberosAsymmetricPort"
-       xmlns:s="http://WSSec/kerberos"
-       implementor="org.apache.cxf.systest.ws.kerberos.server.DoubleItImpl"
-       wsdlLocation="wsdl_systest_wssec/kerberos/DoubleItKerberos.wsdl">
+       xmlns:s="http://www.example.org/contract/DoubleIt"
+       implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
+       wsdlLocation="org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl">
         
        <jaxws:properties>
            <entry key="ws-security.username" value="bob"/>
@@ -165,9 +165,9 @@
        address="https://localhost:${testutil.ports.Server.2}/DoubleItKerberosTransportEndorsing"

        serviceName="s:DoubleItService"
        endpointName="s:DoubleItKerberosTransportEndorsingPort"
-       xmlns:s="http://WSSec/kerberos"
-       implementor="org.apache.cxf.systest.ws.kerberos.server.DoubleItImpl"
-       wsdlLocation="wsdl_systest_wssec/kerberos/DoubleItKerberos.wsdl"
+       xmlns:s="http://www.example.org/contract/DoubleIt"
+       implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
+       wsdlLocation="org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl"
        depends-on="tls-settings">
         
        <jaxws:properties>
@@ -182,9 +182,9 @@
        address="http://localhost:${testutil.ports.Server}/DoubleItKerberosAsymmetricEndorsing"

        serviceName="s:DoubleItService"
        endpointName="s:DoubleItKerberosAsymmetricEndorsingPort"
-       xmlns:s="http://WSSec/kerberos"
-       implementor="org.apache.cxf.systest.ws.kerberos.server.DoubleItImpl"
-       wsdlLocation="wsdl_systest_wssec/kerberos/DoubleItKerberos.wsdl">
+       xmlns:s="http://www.example.org/contract/DoubleIt"
+       implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
+       wsdlLocation="org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl">
         
        <jaxws:properties>
            <entry key="ws-security.username" value="bob"/>
@@ -206,9 +206,9 @@
        address="http://localhost:${testutil.ports.Server}/DoubleItKerberosSymmetricProtection"

        serviceName="s:DoubleItService"
        endpointName="s:DoubleItKerberosSymmetricProtectionPort"
-       xmlns:s="http://WSSec/kerberos"
-       implementor="org.apache.cxf.systest.ws.kerberos.server.DoubleItImpl"
-       wsdlLocation="wsdl_systest_wssec/kerberos/DoubleItKerberos.wsdl">
+       xmlns:s="http://www.example.org/contract/DoubleIt"
+       implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
+       wsdlLocation="org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl">
         
        <jaxws:properties>
            <entry key="ws-security.callback-handler" 
@@ -225,9 +225,9 @@
        address="http://localhost:${testutil.ports.Server}/DoubleItKerberosSymmetricDerivedProtection"

        serviceName="s:DoubleItService"
        endpointName="s:DoubleItKerberosSymmetricDerivedProtectionPort"
-       xmlns:s="http://WSSec/kerberos"
-       implementor="org.apache.cxf.systest.ws.kerberos.server.DoubleItImpl"
-       wsdlLocation="wsdl_systest_wssec/kerberos/DoubleItKerberos.wsdl">
+       xmlns:s="http://www.example.org/contract/DoubleIt"
+       implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
+       wsdlLocation="org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl">
         
        <jaxws:properties>
            <entry key="ws-security.callback-handler" 
@@ -244,9 +244,9 @@
        address="http://localhost:${testutil.ports.Server}/DoubleItKerberosAsymmetricSignedEndorsing"

        serviceName="s:DoubleItService"
        endpointName="s:DoubleItKerberosAsymmetricSignedEndorsingPort"
-       xmlns:s="http://WSSec/kerberos"
-       implementor="org.apache.cxf.systest.ws.kerberos.server.DoubleItImpl"
-       wsdlLocation="wsdl_systest_wssec/kerberos/DoubleItKerberos.wsdl">
+       xmlns:s="http://www.example.org/contract/DoubleIt"
+       implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
+       wsdlLocation="org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl">
         
        <jaxws:properties>
            <entry key="ws-security.username" value="bob"/>
@@ -268,9 +268,9 @@
        address="http://localhost:${testutil.ports.Server}/DoubleItKerberosAsymmetricSignedEncrypted"

        serviceName="s:DoubleItService"
        endpointName="s:DoubleItKerberosAsymmetricSignedEncryptedPort"
-       xmlns:s="http://WSSec/kerberos"
-       implementor="org.apache.cxf.systest.ws.kerberos.server.DoubleItImpl"
-       wsdlLocation="wsdl_systest_wssec/kerberos/DoubleItKerberos.wsdl">
+       xmlns:s="http://www.example.org/contract/DoubleIt"
+       implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
+       wsdlLocation="org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl">
         
        <jaxws:properties>
            <entry key="ws-security.username" value="bob"/>
@@ -292,9 +292,9 @@
        address="http://localhost:${testutil.ports.Server}/DoubleItKerberosSymmetricEndorsingEncrypted"

        serviceName="s:DoubleItService"
        endpointName="s:DoubleItKerberosSymmetricEndorsingEncryptedPort"
-       xmlns:s="http://WSSec/kerberos"
-       implementor="org.apache.cxf.systest.ws.kerberos.server.DoubleItImpl"
-       wsdlLocation="wsdl_systest_wssec/kerberos/DoubleItKerberos.wsdl">
+       xmlns:s="http://www.example.org/contract/DoubleIt"
+       implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
+       wsdlLocation="org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl">
         
        <jaxws:properties>
            <entry key="ws-security.callback-handler" 
@@ -311,9 +311,9 @@
        address="http://localhost:${testutil.ports.Server}/DoubleItKerberosSymmetricSignedEndorsingEncrypted"

        serviceName="s:DoubleItService"
        endpointName="s:DoubleItKerberosSymmetricSignedEndorsingEncryptedPort"
-       xmlns:s="http://WSSec/kerberos"
-       implementor="org.apache.cxf.systest.ws.kerberos.server.DoubleItImpl"
-       wsdlLocation="wsdl_systest_wssec/kerberos/DoubleItKerberos.wsdl">
+       xmlns:s="http://www.example.org/contract/DoubleIt"
+       implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
+       wsdlLocation="org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl">
         
        <jaxws:properties>
            <entry key="ws-security.callback-handler" 

Copied: cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/DoubleItSpnego.wsdl
(from r1209219, cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/wsdl_systest_wssec/spnego/DoubleItSpnego.wsdl)
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/DoubleItSpnego.wsdl?p2=cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/DoubleItSpnego.wsdl&p1=cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/wsdl_systest_wssec/spnego/DoubleItSpnego.wsdl&r1=1209219&r2=1209424&rev=1209424&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/wsdl_systest_wssec/spnego/DoubleItSpnego.wsdl
(original)
+++ cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/DoubleItSpnego.wsdl
Fri Dec  2 11:49:59 2011
@@ -19,60 +19,16 @@
 -->
 <wsdl:definitions name="DoubleIt"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://WSSec/spnego"
-    targetNamespace="http://WSSec/spnego" 
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/contract/DoubleIt"
+    targetNamespace="http://www.example.org/contract/DoubleIt" 
     xmlns:wsp="http://www.w3.org/ns/ws-policy"
     xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
     xmlns:wsaws="http://www.w3.org/2005/08/addressing" 
     xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
     xmlns:sp13="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200802">
-    <wsdl:types>
-        <xsd:schema targetNamespace="http://WSSec/spnego">
-            <xsd:element name="DoubleIt">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="numberToDouble">
-                            <xsd:simpleType>
-                                <xsd:restriction base="xsd:integer">
-                                    <xsd:minInclusive value="0"/>
-                                </xsd:restriction>
-                            </xsd:simpleType>
-                        </xsd:element>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="DoubleItResponse">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="doubledNumber" type="xsd:integer" />
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="DoubleItFault">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="reason" type="xsd:string" />
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="DoubleItRequest">
-        <wsdl:part element="tns:DoubleIt" name="parameters" />
-    </wsdl:message>
-    <wsdl:message name="DoubleItResponse">
-        <wsdl:part element="tns:DoubleItResponse" name="parameters" />
-    </wsdl:message>
-    <wsdl:message name="DoubleItFault">
-        <wsdl:part element="tns:DoubleItFault" name="fault" />
-    </wsdl:message>
-    <wsdl:portType name="DoubleItPortType">
-        <wsdl:operation name="DoubleIt">
-            <wsdl:input message="tns:DoubleItRequest" />
-            <wsdl:output message="tns:DoubleItResponse" />
-            <wsdl:fault name="DoubleItFault" message="tns:DoubleItFault" />
-        </wsdl:operation>
-    </wsdl:portType>
+
+    <wsdl:import location="src/test/resources/DoubleItLogical.wsdl" 
+                 namespace="http://www.example.org/contract/DoubleIt"/>
     
     <wsdl:binding name="DoubleItSpnegoSymmetricProtectionBinding" type="tns:DoubleItPortType">
         <wsp:PolicyReference URI="#DoubleItSpnegoSymmetricProtectionPolicy" />

Modified: cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/client/client.xml?rev=1209424&r1=1209423&r2=1209424&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/client/client.xml
(original)
+++ cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/client/client.xml
Fri Dec  2 11:49:59 2011
@@ -41,7 +41,7 @@
         </cxf:features>
     </cxf:bus>
     
-    <jaxws:client name="{http://WSSec/spnego}DoubleItSpnegoSymmetricPort" 
+    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSpnegoSymmetricPort"

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

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

Modified: cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/server/server.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/server/server.xml?rev=1209424&r1=1209423&r2=1209424&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/server/server.xml
(original)
+++ cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/server/server.xml
Fri Dec  2 11:49:59 2011
@@ -57,9 +57,9 @@
        address="http://localhost:${testutil.ports.Server}/DoubleItSpnegoSymmetric" 
        serviceName="s:DoubleItService"
        endpointName="s:DoubleItSpnegoSymmetricPort"
-       xmlns:s="http://WSSec/spnego"
-       implementor="org.apache.cxf.systest.ws.spnego.server.DoubleItImpl"
-       wsdlLocation="wsdl_systest_wssec/spnego/DoubleItSpnego.wsdl">
+       xmlns:s="http://www.example.org/contract/DoubleIt"
+       implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
+       wsdlLocation="org/apache/cxf/systest/ws/spnego/DoubleItSpnego.wsdl">
         
        <jaxws:properties>
            <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>
@@ -72,9 +72,9 @@
        address="http://localhost:${testutil.ports.Server}/DoubleItSpnegoSymmetricDerived"

        serviceName="s:DoubleItService"
        endpointName="s:DoubleItSpnegoSymmetricDerivedPort"
-       xmlns:s="http://WSSec/spnego"
-       implementor="org.apache.cxf.systest.ws.spnego.server.DoubleItImpl"
-       wsdlLocation="wsdl_systest_wssec/spnego/DoubleItSpnego.wsdl">
+       xmlns:s="http://www.example.org/contract/DoubleIt"
+       implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
+       wsdlLocation="org/apache/cxf/systest/ws/spnego/DoubleItSpnego.wsdl">
         
        <jaxws:properties>
            <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>



Mime
View raw message