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/03/09 17:24:11 UTC

svn commit: r751725 - in /cxf/sandbox/interopfest/wssc: ./ src/main/java/interop/client/ src/main/java/interop/server/

Author: dkulp
Date: Mon Mar  9 16:24:10 2009
New Revision: 751725

URL: http://svn.apache.org/viewvc?rev=751725&view=rev
Log:
Update for checkstyle

Modified:
    cxf/sandbox/interopfest/wssc/   (props changed)
    cxf/sandbox/interopfest/wssc/src/main/java/interop/client/Client.java
    cxf/sandbox/interopfest/wssc/src/main/java/interop/client/KeystorePasswordCallback.java
    cxf/sandbox/interopfest/wssc/src/main/java/interop/client/UTPasswordCallback.java
    cxf/sandbox/interopfest/wssc/src/main/java/interop/server/PingServiceImpl.java
    cxf/sandbox/interopfest/wssc/src/main/java/interop/server/Server.java

Propchange: cxf/sandbox/interopfest/wssc/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Mar  9 16:24:10 2009
@@ -0,0 +1,10 @@
+.pmd
+.checkstyle
+.ruleset
+target
+eclipse-classes
+.settings
+.classpath
+.project
+.wtpmodules
+

Modified: cxf/sandbox/interopfest/wssc/src/main/java/interop/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssc/src/main/java/interop/client/Client.java?rev=751725&r1=751724&r2=751725&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wssc/src/main/java/interop/client/Client.java (original)
+++ cxf/sandbox/interopfest/wssc/src/main/java/interop/client/Client.java Mon Mar  9 16:24:10 2009
@@ -1,8 +1,4 @@
 /**
- * Copyright (c) 1993-2007 IONA Technologies PLC.
- *            All Rights Reserved.
- */
-/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
@@ -20,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package interop.client;
 
 import java.net.URL;
@@ -53,12 +48,13 @@
      */
     public static void main(String argv[])
         throws Exception {
-    	
-    	boolean useLocalWCFServices = false;
 
-    	if (argv.length < 1 || "".equals(argv[0]) || argv[0] == null) {
+        boolean useLocalWCFServices = false;
+
+        if (argv.length < 1 || "".equals(argv[0]) || argv[0] == null) {
             argv = new String[] {
-                //"SecureConversation_UserNameOverTransport_IPingService",  //service not running on the https port
+                //"SecureConversation_UserNameOverTransport_IPingService", 
+                             //service not running on the https port
                 "SecureConversation_MutualCertificate10SignEncrypt_IPingService",
                 "AC_IPingService",
                 "ADC_IPingService",
@@ -86,16 +82,16 @@
                 "_XD-SEES_IPingService", 
                 "_XD-ES_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
-                //"KDC10_IPingService",     //Kerberos token - not sure where the token comes from or how this works
-                //"_K10_IPingService",     //Kerberos token - not sure where the token comes from or how this works
-                //"_KD10_IPingService",     //Kerberos token - not sure where the token comes from or how this works
-                //"_K_IPingService",     //Kerberos token - not sure where the token comes from or how this works
-                //"_KD_IPingService",     //Kerberos token - not sure where the token comes from or how this works
-                //"_KD-SEES_IPingService",     //Kerberos token - not sure where the token comes from or how this works
+                //Kerberos token - not sure where the token comes from or how these works
+                //"KC_IPingService", 
+                //"KDC_IPingService",
+                //"KC10_IPingService",
+                //"KDC10_IPingService",
+                //"_K10_IPingService",
+                //"_KD10_IPingService",
+                //"_K_IPingService",
+                //"_KD_IPingService",
+                //"_KD-SEES_IPingService",
             };
         }
         //argv = new String[] {argv[0]};
@@ -169,11 +165,12 @@
 
 
     private static String getEndpointName(String testName) {
-    	if ("SecureConversation_UserNameOverTransport_IPingService".equals(testName)) {
-    		return "https://localhost/Security_WsSecurity_Service_Indigo/WSSecureConversation.svc/SecureConversation_UserNameOverTransport";
-    	}
-	    return "http://localhost/Security_WsSecurity_Service_Indigo/WSSecureConversation.svc/" 
-	       + testName.substring(0, testName.indexOf("_IPingService"));
+        if ("SecureConversation_UserNameOverTransport_IPingService".equals(testName)) {
+            return "https://localhost/Security_WsSecurity_Service_Indigo/WSSecureConversation.svc"
+                + "/SecureConversation_UserNameOverTransport";
+        }
+        return "http://localhost/Security_WsSecurity_Service_Indigo/WSSecureConversation.svc/" 
+            + testName.substring(0, testName.indexOf("_IPingService"));
     }    
 }
 

Modified: cxf/sandbox/interopfest/wssc/src/main/java/interop/client/KeystorePasswordCallback.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssc/src/main/java/interop/client/KeystorePasswordCallback.java?rev=751725&r1=751724&r2=751725&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wssc/src/main/java/interop/client/KeystorePasswordCallback.java (original)
+++ cxf/sandbox/interopfest/wssc/src/main/java/interop/client/KeystorePasswordCallback.java Mon Mar  9 16:24:10 2009
@@ -1,7 +1,22 @@
 /**
- *        Copyright (c) 1993-2006 IONA Technologies PLC.
- *                       All Rights Reserved.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
+
 package interop.client;
 
 import java.io.IOException;
@@ -38,17 +53,17 @@
         for (int i = 0; i < callbacks.length; i++) {
             WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
             try {
-            	Integer.parseInt(pc.getIdentifier());
-            	//Its an alias generated for a pfx file,
-            	//this seems to be the way sun seem to load
-            	//.pfc files into keystores, assigning an int value
-            	//as the key aliases,
-            	//The above is an issue when doing encrypt or signing only.
-            	//Perhaps using a more suitable keystore format like .jks would be better
-            	pc.setPassword("password");
+                Integer.parseInt(pc.getIdentifier());
+                //Its an alias generated for a pfx file,
+                //this seems to be the way sun seem to load
+                //.pfc files into keystores, assigning an int value
+                //as the key aliases,
+                //The above is an issue when doing encrypt or signing only.
+                //Perhaps using a more suitable keystore format like .jks would be better
+                pc.setPassword("password");
                 return;
             } catch (NumberFormatException nfe) {
-            	//not a pfx alias, carry on to next
+                //not a pfx alias, carry on to next
             }
 
             String pass = passwords.get(pc.getIdentifier());

Modified: cxf/sandbox/interopfest/wssc/src/main/java/interop/client/UTPasswordCallback.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssc/src/main/java/interop/client/UTPasswordCallback.java?rev=751725&r1=751724&r2=751725&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wssc/src/main/java/interop/client/UTPasswordCallback.java (original)
+++ cxf/sandbox/interopfest/wssc/src/main/java/interop/client/UTPasswordCallback.java Mon Mar  9 16:24:10 2009
@@ -1,8 +1,21 @@
 /**
- *        Copyright (c) 1993-2007 IONA Technologies PLC.
- *                       All Rights Reserved.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package interop.client;
 
 import java.io.IOException;

Modified: cxf/sandbox/interopfest/wssc/src/main/java/interop/server/PingServiceImpl.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssc/src/main/java/interop/server/PingServiceImpl.java?rev=751725&r1=751724&r2=751725&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wssc/src/main/java/interop/server/PingServiceImpl.java (original)
+++ cxf/sandbox/interopfest/wssc/src/main/java/interop/server/PingServiceImpl.java Mon Mar  9 16:24:10 2009
@@ -16,18 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package interop.server;
 
 
 import org.xmlsoap.ping.PingResponseBody;
 
-import interopbaseaddress.interop.IPingService;
-import interopbaseaddress.interop.PingRequest;
-import interopbaseaddress.interop.PingResponse;
 import interopbaseaddress.interop.EchoDataSet.Request;
 import interopbaseaddress.interop.EchoDataSetResponse.EchoDataSetResult;
 import interopbaseaddress.interop.EchoXmlResponse.EchoXmlResult;
+import interopbaseaddress.interop.IPingService;
+import interopbaseaddress.interop.PingRequest;
+import interopbaseaddress.interop.PingResponse;
 
 
 /**

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=751725&r1=751724&r2=751725&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 Mon Mar  9 16:24:10 2009
@@ -19,63 +19,62 @@
 
 package interop.server;
 
-import interop.client.KeystorePasswordCallback;
-
 import javax.xml.ws.Endpoint;
 
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.ws.security.SecurityConstants;
 
+import interop.client.KeystorePasswordCallback;
+
 public class Server {
-protected Server(String baseUrl) throws Exception {
+    protected Server(String baseUrl) throws Exception {
         
         new SpringBusFactory().createBus("etc/server.xml");
         
         //"SecureConversation_UserNameOverTransport_IPingService",
         doPublish(baseUrl + "SecureConversation_MutualCertificate10SignEncrypt_IPingService",
-                  new SCMCSE_IPingService());
+                  new SCMCSEIPingService());
         
-        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());
-        
-        
-        /*
-        //"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
-        //"KDC10_IPingService",     //Kerberos token - not sure where the token comes from or how this works
-        //"_K10_IPingService",     //Kerberos token - not sure where the token comes from or how this works
-        //"_KD10_IPingService",     //Kerberos token - not sure where the token comes from or how this works
-        //"_K_IPingService",     //Kerberos token - not sure where the token comes from or how this works
-        //"_KD_IPingService",     //Kerberos token - not sure where the token comes from or how this works
-        //"_KD-SEES_IPingService",     //Kerberos token - not sure where the token comes from or how this works
-        */
+        doPublish(baseUrl + "AC_IPingService", new ACIPingService());
+        doPublish(baseUrl + "ADC_IPingService", new ADCIPingService());
+        doPublish(baseUrl + "ADC-ES_IPingService", new ADCESIPingService()); 
+        doPublish(baseUrl + "_A_IPingService", new AIPingService());
+        doPublish(baseUrl + "_AD_IPingService", new ADIPingService());
+        doPublish(baseUrl + "_AD-ES_IPingService", new ADESIPingService());
+
+        doPublish(baseUrl + "UXC_IPingService", new UXCIPingService());
+        doPublish(baseUrl + "UXDC_IPingService", new UXDCIPingService());
+        doPublish(baseUrl + "UXDC-SEES_IPingService", new UXDCSEESIPingService());
+        doPublish(baseUrl + "_UX_IPingService", new UXIPingService());
+        doPublish(baseUrl + "_UXD_IPingService", new UXDIPingService());
+        doPublish(baseUrl + "_UXD-SEES_IPingService", new UXDSEESIPingService());
+
+        doPublish(baseUrl + "XC_IPingService", new XCIPingService());
+        doPublish(baseUrl + "XDC_IPingService", new XDCIPingService());
+        doPublish(baseUrl + "XDC_IPingService1", new XDC1IPingService());
+        doPublish(baseUrl + "XDC-ES_IPingService", new XDCESIPingService());
+        doPublish(baseUrl + "XDC-SEES_IPingService", new XDCSEESIPingService());
+        doPublish(baseUrl + "_X_IPingService", new XIPingService());
+        doPublish(baseUrl + "_X10_IPingService", new X10IPingService());
+        doPublish(baseUrl + "_XD_IPingService", new XDIPingService());
+        doPublish(baseUrl + "_XD-SEES_IPingService", new XDSEESIPingService());
+        doPublish(baseUrl + "_XD-ES_IPingService",  new XDESIPingService());
+        
+        
+        //Kerberos token - not sure where the token comes from or how these work
+        //"KC_IPingService",       
+        //"KDC_IPingService",
+        //"KC10_IPingService",
+        //"KDC10_IPingService",
+        //"_K10_IPingService",
+        //"_KD10_IPingService",
+        //"_K_IPingService",
+        //"_KD_IPingService", 
+        //"_KD-SEES_IPingService",
         
     }
 
-    private final void doPublish(String url, Object obj) {
+    private void doPublish(String url, Object obj) {
         Endpoint ep = Endpoint.create(obj);
         ep.getProperties().put(SecurityConstants.CALLBACK_HANDLER + ".sct", new KeystorePasswordCallback());
         ep.getProperties().put(SecurityConstants.ENCRYPT_PROPERTIES + ".sct", "etc/bob.properties");
@@ -102,7 +101,7 @@
                           portName = "SecureConversation_MutualCertificate10SignEncrypt_IPingService", 
                           endpointInterface = "interopbaseaddress.interop.IPingService",
                           wsdlLocation = "target/wsdl2/WSSecureConversation.wsdl")        
-    public static class SCMCSE_IPingService extends PingServiceImpl {
+    public static class SCMCSEIPingService extends PingServiceImpl {
     }
 
     @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
@@ -110,42 +109,42 @@
                           portName = "AC_IPingService", 
                           endpointInterface = "interopbaseaddress.interop.IPingService",
                           wsdlLocation = "target/wsdl2/WSSecureConversation.wsdl")        
-    public static class AC_IPingService extends PingServiceImpl {
+    public static class ACIPingService 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 {
+    public static class ADCIPingService 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 {
+    public static class ADCESIPingService 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 {
+    public static class AIPingService 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 {
+    public static class ADIPingService 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 {
+    public static class ADESIPingService extends PingServiceImpl {
     }
 
     
@@ -154,42 +153,42 @@
                           portName = "UXC_IPingService", 
                           endpointInterface = "interopbaseaddress.interop.IPingService",
                           wsdlLocation = "target/wsdl2/WSSecureConversation.wsdl")        
-    public static class UXC_IPingService extends PingServiceImpl {
+    public static class UXCIPingService 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 {
+    public static class UXDCIPingService 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 {
+    public static class UXDCSEESIPingService 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 {
+    public static class UXIPingService 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 {
+    public static class UXDIPingService 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 {
+    public static class UXDSEESIPingService extends PingServiceImpl {
     }
 
     @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
@@ -197,35 +196,35 @@
                           portName = "XC_IPingService", 
                           endpointInterface = "interopbaseaddress.interop.IPingService",
                           wsdlLocation = "target/wsdl2/WSSecureConversation.wsdl")        
-    public static class XC_IPingService extends PingServiceImpl {
+    public static class XCIPingService 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 {
+    public static class XDCIPingService 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 {
+    public static class XDC1IPingService 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 {
+    public static class XDCESIPingService 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 {
+    public static class XDCSEESIPingService extends PingServiceImpl {
     }
     
     @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
@@ -233,34 +232,34 @@
                           portName = "_X_IPingService", 
                           endpointInterface = "interopbaseaddress.interop.IPingService",
                           wsdlLocation = "target/wsdl2/WSSecureConversation.wsdl")        
-    public static class X_IPingService extends PingServiceImpl {
+    public static class XIPingService 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 {
+    public static class X10IPingService 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 {
+    public static class XDIPingService 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 {
+    public static class XDSEESIPingService 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 {
+    public static class XDESIPingService extends PingServiceImpl {
     }
 }