You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/02/24 23:19:49 UTC

svn commit: r747579 - in /cxf/sandbox/interopfest: wssc/src/main/java/interop/server/Server.java wssec11/src/main/java/interop/client/Client.java wstrust10/src/main/java/interop/client/Client.java

Author: dkulp
Date: Tue Feb 24 22:19:48 2009
New Revision: 747579

URL: http://svn.apache.org/viewvc?rev=747579&view=rev
Log:
Update for complete server side impl of WSSC

Modified:
    cxf/sandbox/interopfest/wssc/src/main/java/interop/server/Server.java
    cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/Client.java
    cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/Client.java

Modified: cxf/sandbox/interopfest/wssc/src/main/java/interop/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssc/src/main/java/interop/server/Server.java?rev=747579&r1=747578&r2=747579&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wssc/src/main/java/interop/server/Server.java (original)
+++ cxf/sandbox/interopfest/wssc/src/main/java/interop/server/Server.java Tue Feb 24 22:19:48 2009
@@ -30,35 +30,38 @@
 protected Server(String baseUrl) throws Exception {
         
         new SpringBusFactory().createBus("etc/server.xml");
-        doPublish(baseUrl + "/AC_IPingService", new AC_IPingService());
+        
+        //"SecureConversation_UserNameOverTransport_IPingService",
+        doPublish(baseUrl + "SecureConversation_MutualCertificate10SignEncrypt_IPingService",
+                  new SCMCSE_IPingService());
+        
+        doPublish(baseUrl + "AC_IPingService", new AC_IPingService());
+        doPublish(baseUrl + "ADC_IPingService", new ADC_IPingService());
+        doPublish(baseUrl + "ADC-ES_IPingService", new ADCES_IPingService()); 
+        doPublish(baseUrl + "_A_IPingService", new A_IPingService());
+        doPublish(baseUrl + "_AD_IPingService", new AD_IPingService());
+        doPublish(baseUrl + "_AD-ES_IPingService", new ADES_IPingService());
+
+        doPublish(baseUrl + "UXC_IPingService", new UXC_IPingService());
+        doPublish(baseUrl + "UXDC_IPingService", new UXDC_IPingService());
+        doPublish(baseUrl + "UXDC-SEES_IPingService", new UXDCSEES_IPingService());
+        doPublish(baseUrl + "_UX_IPingService", new UX_IPingService());
+        doPublish(baseUrl + "_UXD_IPingService", new UXD_IPingService());
+        doPublish(baseUrl + "_UXD-SEES_IPingService", new UXDSEES_IPingService());
+
+        doPublish(baseUrl + "XC_IPingService", new XC_IPingService());
+        doPublish(baseUrl + "XDC_IPingService", new XDC_IPingService());
+        doPublish(baseUrl + "XDC_IPingService1", new XDC1_IPingService());
+        doPublish(baseUrl + "XDC-ES_IPingService", new XDCES_IPingService());
+        doPublish(baseUrl + "XDC-SEES_IPingService", new XDCSEES_IPingService());
+        doPublish(baseUrl + "_X_IPingService", new X_IPingService());
+        doPublish(baseUrl + "_X10_IPingService", new X10_IPingService());
+        doPublish(baseUrl + "_XD_IPingService", new XD_IPingService());
+        doPublish(baseUrl + "_XD-SEES_IPingService", new XDSEES_IPingService());
+        doPublish(baseUrl + "_XD-ES_IPingService",  new XDES_IPingService());
         
         
         /*
-        "SecureConversation_UserNameOverTransport_IPingService",
-        "SecureConversation_MutualCertificate10SignEncrypt_IPingService",
-        "AC_IPingService",
-        "ADC_IPingService",
-        "ADC-ES_IPingService",  
-        "_A_IPingService",
-        "_AD_IPingService",
-        "_AD-ES_IPingService",
-        
-        //"XC_IPingService",
-        //"XDC_IPingService",
-        //"XDC_IPingService1",
-        //"XDC-ES_IPingService",
-        //"XDC-SEES_IPingService",
-        //"_X_IPingService",
-        //"_X10_IPingService",
-        //"_XD_IPingService",
-        //"_XD-SEES_IPingService",
-        //"_XD-ES_IPingService",
-        "UXC_IPingService",
-        "UXDC_IPingService",
-        "UXDC-SEES_IPingService",
-        "_UX_IPingService",
-        "_UXD_IPingService",
-        "_UXD-SEES_IPingService",
         //"KC_IPingService",     //Kerberos token - not sure where the token comes from or how this works
         //"KDC_IPingService",     //Kerberos token - not sure where the token comes from or how this works
         //"KC10_IPingService",     //Kerberos token - not sure where the token comes from or how this works
@@ -70,8 +73,6 @@
         //"_KD-SEES_IPingService",     //Kerberos token - not sure where the token comes from or how this works
         */
         
-        
-        
     }
 
     private final void doPublish(String url, Object obj) {
@@ -82,7 +83,7 @@
     }
     
     public static void main(String args[]) throws Exception {
-        new Server("http://localhost:9001");
+        new Server("http://localhost:9001/");
         System.out.println("Server ready...");
 
         Thread.sleep(60 * 60 * 10000);
@@ -90,6 +91,15 @@
         System.exit(0);
     }
     
+    
+    @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
+                          serviceName = "PingService", 
+                          portName = "SecureConversation_MutualCertificate10SignEncrypt_IPingService", 
+                          endpointInterface = "interopbaseaddress.interop.IPingService",
+                          wsdlLocation = "target/wsdl2/WSSecureConversation.wsdl")        
+    public static class SCMCSE_IPingService extends PingServiceImpl {
+    }
+
     @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
                           serviceName = "PingService", 
                           portName = "AC_IPingService", 
@@ -97,6 +107,155 @@
                           wsdlLocation = "target/wsdl2/WSSecureConversation.wsdl")        
     public static class AC_IPingService extends PingServiceImpl {
     }
+    @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
+                          serviceName = "PingService", 
+                          portName = "ADC_IPingService", 
+                          endpointInterface = "interopbaseaddress.interop.IPingService",
+                          wsdlLocation = "target/wsdl2/WSSecureConversation.wsdl")        
+    public static class ADC_IPingService extends PingServiceImpl {
+    }
+    @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
+                          serviceName = "PingService", 
+                          portName = "ADC-ES_IPingService", 
+                          endpointInterface = "interopbaseaddress.interop.IPingService",
+                          wsdlLocation = "target/wsdl2/WSSecureConversation.wsdl")        
+    public static class ADCES_IPingService extends PingServiceImpl {
+    }
+    @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
+                          serviceName = "PingService", 
+                          portName = "_A_IPingService", 
+                          endpointInterface = "interopbaseaddress.interop.IPingService",
+                          wsdlLocation = "target/wsdl2/WSSecureConversation.wsdl")        
+    public static class A_IPingService extends PingServiceImpl {
+    }
+    @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
+                          serviceName = "PingService", 
+                          portName = "_AD_IPingService", 
+                          endpointInterface = "interopbaseaddress.interop.IPingService",
+                          wsdlLocation = "target/wsdl2/WSSecureConversation.wsdl")        
+    public static class AD_IPingService extends PingServiceImpl {
+    }
+    @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
+                          serviceName = "PingService", 
+                          portName = "_AD-ES_IPingService", 
+                          endpointInterface = "interopbaseaddress.interop.IPingService",
+                          wsdlLocation = "target/wsdl2/WSSecureConversation.wsdl")        
+    public static class ADES_IPingService extends PingServiceImpl {
+    }
+
     
+    @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
+                          serviceName = "PingService", 
+                          portName = "UXC_IPingService", 
+                          endpointInterface = "interopbaseaddress.interop.IPingService",
+                          wsdlLocation = "target/wsdl2/WSSecureConversation.wsdl")        
+    public static class UXC_IPingService extends PingServiceImpl {
+    }
+    @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
+                          serviceName = "PingService", 
+                          portName = "UXDC_IPingService", 
+                          endpointInterface = "interopbaseaddress.interop.IPingService",
+                          wsdlLocation = "target/wsdl2/WSSecureConversation.wsdl")        
+    public static class UXDC_IPingService extends PingServiceImpl {
+    }
+    @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
+                          serviceName = "PingService", 
+                          portName = "UXDC-SEES_IPingService", 
+                          endpointInterface = "interopbaseaddress.interop.IPingService",
+                          wsdlLocation = "target/wsdl2/WSSecureConversation.wsdl")        
+    public static class UXDCSEES_IPingService extends PingServiceImpl {
+    }
+    @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
+                          serviceName = "PingService", 
+                          portName = "_UX_IPingService", 
+                          endpointInterface = "interopbaseaddress.interop.IPingService",
+                          wsdlLocation = "target/wsdl2/WSSecureConversation.wsdl")        
+    public static class UX_IPingService extends PingServiceImpl {
+    }
+    @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
+                          serviceName = "PingService", 
+                          portName = "_UXD_IPingService", 
+                          endpointInterface = "interopbaseaddress.interop.IPingService",
+                          wsdlLocation = "target/wsdl2/WSSecureConversation.wsdl")        
+    public static class UXD_IPingService extends PingServiceImpl {
+    }
+    @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
+                          serviceName = "PingService", 
+                          portName = "_UXD-SEES_IPingService", 
+                          endpointInterface = "interopbaseaddress.interop.IPingService",
+                          wsdlLocation = "target/wsdl2/WSSecureConversation.wsdl")        
+    public static class UXDSEES_IPingService extends PingServiceImpl {
+    }
 
+    @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
+                          serviceName = "PingService", 
+                          portName = "XC_IPingService", 
+                          endpointInterface = "interopbaseaddress.interop.IPingService",
+                          wsdlLocation = "target/wsdl2/WSSecureConversation.wsdl")        
+    public static class XC_IPingService extends PingServiceImpl {
+    }
+    @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
+                          serviceName = "PingService", 
+                          portName = "XDC_IPingService", 
+                          endpointInterface = "interopbaseaddress.interop.IPingService",
+                          wsdlLocation = "target/wsdl2/WSSecureConversation.wsdl")        
+    public static class XDC_IPingService extends PingServiceImpl {
+    }
+    @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
+                          serviceName = "PingService", 
+                          portName = "XDC_IPingService1", 
+                          endpointInterface = "interopbaseaddress.interop.IPingService",
+                          wsdlLocation = "target/wsdl2/WSSecureConversation.wsdl")        
+    public static class XDC1_IPingService extends PingServiceImpl {
+    }
+    @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
+                          serviceName = "PingService", 
+                          portName = "XDC-ES_IPingService", 
+                          endpointInterface = "interopbaseaddress.interop.IPingService",
+                          wsdlLocation = "target/wsdl2/WSSecureConversation.wsdl")        
+    public static class XDCES_IPingService extends PingServiceImpl {
+    }
+    @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
+                          serviceName = "PingService", 
+                          portName = "XDC-SEES_IPingService", 
+                          endpointInterface = "interopbaseaddress.interop.IPingService",
+                          wsdlLocation = "target/wsdl2/WSSecureConversation.wsdl")        
+    public static class XDCSEES_IPingService extends PingServiceImpl {
+    }
+    
+    @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
+                          serviceName = "PingService", 
+                          portName = "_X_IPingService", 
+                          endpointInterface = "interopbaseaddress.interop.IPingService",
+                          wsdlLocation = "target/wsdl2/WSSecureConversation.wsdl")        
+    public static class X_IPingService extends PingServiceImpl {
+    }
+    @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
+                          serviceName = "PingService", 
+                          portName = "_X10_IPingService", 
+                          endpointInterface = "interopbaseaddress.interop.IPingService",
+                          wsdlLocation = "target/wsdl2/WSSecureConversation.wsdl")        
+    public static class X10_IPingService extends PingServiceImpl {
+    }
+    @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
+                          serviceName = "PingService", 
+                          portName = "_XD_IPingService", 
+                          endpointInterface = "interopbaseaddress.interop.IPingService",
+                          wsdlLocation = "target/wsdl2/WSSecureConversation.wsdl")        
+    public static class XD_IPingService extends PingServiceImpl {
+    }
+    @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
+                          serviceName = "PingService", 
+                          portName = "_XD-SEES_IPingService", 
+                          endpointInterface = "interopbaseaddress.interop.IPingService",
+                          wsdlLocation = "target/wsdl2/WSSecureConversation.wsdl")        
+    public static class XDSEES_IPingService extends PingServiceImpl {
+    }
+    @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
+                          serviceName = "PingService", 
+                          portName = "_XD-ES_IPingService", 
+                          endpointInterface = "interopbaseaddress.interop.IPingService",
+                          wsdlLocation = "target/wsdl2/WSSecureConversation.wsdl")        
+    public static class XDES_IPingService extends PingServiceImpl {
+    }
 }

Modified: cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/Client.java?rev=747579&r1=747578&r2=747579&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/Client.java (original)
+++ cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/Client.java Tue Feb 24 22:19:48 2009
@@ -77,7 +77,7 @@
                                  //"KD-ES"   //NOT YET WORKING  [1]
             };
         }
-        //argv = new String[] {argv[0]};
+        //argv = new String[] {argv[2]};
         URL wsdlLocation = null;
 
         new SpringBusFactory().createBus("etc/client.xml");

Modified: cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/Client.java?rev=747579&r1=747578&r2=747579&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/Client.java (original)
+++ cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/Client.java Tue Feb 24 22:19:48 2009
@@ -103,7 +103,7 @@
         }
         
         SecurityToken responseToken = stsClient.requestSecurityToken();
-        ((BindingProvider)port).getRequestContext().put(SecurityConstants.TRUST_TOKEN, responseToken);
+        ((BindingProvider)port).getRequestContext().put(SecurityConstants.TOKEN, responseToken);
 
         //TODO: stick security token into the RequestContext/TokenStore
         final String output = port.echo(INPUT);