Author: thomas.diesler(a)jboss.com Date: 2007-01-12 07:20:33 -0500 (Fri, 12 Jan 2007) New Revision: 1941 Added: branches/tdiesler/trunk/jbossws-tests/src/main/resources/tools/jbws-206/wscompileArtifacts/InOutParameters/service/InOutParameters_Service.java branches/tdiesler/trunk/jbossws-tests/src/main/resources/tools/jbws-206/wscompileArtifacts/OutParameters/service/OutParameters_Service.java Removed: branches/tdiesler/trunk/jbossws-tests/src/main/resources/tools/jbws-206/wscompileArtifacts/InOutParameters/service/InOutParametersService_Service.java branches/tdiesler/trunk/jbossws-tests/src/main/resources/tools/jbws-206/wscompileArtifacts/OutParameters/service/OutParametersService_Service.java Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/client/ServiceCreator.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws_206/tests/InOutParameters/InOutParametersWSDL2JavaTestCase.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws_206/tests/OutParameters/OutParametersWSDL2JavaTestCase.java Log: Fix tools regression Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/client/ServiceCreator.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/client/ServiceCreator.java 2007-01-12 12:03:59 UTC (rev 1940) +++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/client/ServiceCreator.java 2007-01-12 12:20:33 UTC (rev 1941) @@ -210,7 +210,7 @@ private void generateServiceFile(WSDLService wsdlService) throws IOException { String serviceName = wsdlService.getName().toString(); - if (serviceName.endsWith("Service") == false); + if (serviceName.endsWith("Service") == false) serviceName = serviceName + "Service"; //Check if the serviceName conflicts with a portType or interface name Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2007-01-12 12:03:59 UTC (rev 1940) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2007-01-12 12:20:33 UTC (rev 1941) @@ -877,7 +877,7 @@ { String currentFile = generatedFiles[i]; - boolean matched = "PhoneBook_Service.java".equals(currentFile); + boolean matched = "PhoneBookService.java".equals(currentFile); for (int j = 0; j < expectedFiles.length && (matched == false); j++) matched = currentFile.equals(expectedFiles[j]); Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws_206/tests/InOutParameters/InOutParametersWSDL2JavaTestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws_206/tests/InOutParameters/InOutParametersWSDL2JavaTestCase.java 2007-01-12 12:03:59 UTC (rev 1940) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws_206/tests/InOutParameters/InOutParametersWSDL2JavaTestCase.java 2007-01-12 12:20:33 UTC (rev 1941) @@ -48,7 +48,7 @@ public String getServiceName() { - return "InOutParametersService_Service"; + return "InOutParameters_Service"; } public void checkGeneratedUserTypes() Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws_206/tests/OutParameters/OutParametersWSDL2JavaTestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws_206/tests/OutParameters/OutParametersWSDL2JavaTestCase.java 2007-01-12 12:03:59 UTC (rev 1940) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws_206/tests/OutParameters/OutParametersWSDL2JavaTestCase.java 2007-01-12 12:20:33 UTC (rev 1941) @@ -47,7 +47,7 @@ public String getServiceName() { - return "OutParametersService_Service"; + return "OutParameters_Service"; } public void checkGeneratedUserTypes() throws Exception Deleted: branches/tdiesler/trunk/jbossws-tests/src/main/resources/tools/jbws-206/wscompileArtifacts/InOutParameters/service/InOutParametersService_Service.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/tools/jbws-206/wscompileArtifacts/InOutParameters/service/InOutParametersService_Service.java 2007-01-12 12:03:59 UTC (rev 1940) +++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/tools/jbws-206/wscompileArtifacts/InOutParameters/service/InOutParametersService_Service.java 2007-01-12 12:20:33 UTC (rev 1941) @@ -1,12 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.webservice.inoutparameters; - -import javax.xml.rpc.*; - -public interface InOutParametersService_Service extends javax.xml.rpc.Service { - public org.jboss.test.webservice.inoutparameters.InOutParametersService_PortType getInOutParametersServicePort() throws ServiceException; -} Copied: branches/tdiesler/trunk/jbossws-tests/src/main/resources/tools/jbws-206/wscompileArtifacts/InOutParameters/service/InOutParameters_Service.java (from rev 1938, branches/tdiesler/trunk/jbossws-tests/src/main/resources/tools/jbws-206/wscompileArtifacts/InOutParameters/service/InOutParametersService_Service.java) =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/tools/jbws-206/wscompileArtifacts/InOutParameters/service/InOutParametersService_Service.java 2007-01-12 11:17:14 UTC (rev 1938) +++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/tools/jbws-206/wscompileArtifacts/InOutParameters/service/InOutParameters_Service.java 2007-01-12 12:20:33 UTC (rev 1941) @@ -0,0 +1,12 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.webservice.inoutparameters; + +import javax.xml.rpc.*; + +public interface InOutParameters_Service extends javax.xml.rpc.Service { + public org.jboss.test.webservice.inoutparameters.InOutParametersService_PortType getInOutParametersServicePort() throws ServiceException; +} Deleted: branches/tdiesler/trunk/jbossws-tests/src/main/resources/tools/jbws-206/wscompileArtifacts/OutParameters/service/OutParametersService_Service.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/tools/jbws-206/wscompileArtifacts/OutParameters/service/OutParametersService_Service.java 2007-01-12 12:03:59 UTC (rev 1940) +++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/tools/jbws-206/wscompileArtifacts/OutParameters/service/OutParametersService_Service.java 2007-01-12 12:20:33 UTC (rev 1941) @@ -1,12 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.webservice.outparameters; - -import javax.xml.rpc.*; - -public interface OutParametersService_Service extends javax.xml.rpc.Service { - public org.jboss.test.webservice.outparameters.OutParametersService_PortType getOutParametersServicePort() throws ServiceException; -} Copied: branches/tdiesler/trunk/jbossws-tests/src/main/resources/tools/jbws-206/wscompileArtifacts/OutParameters/service/OutParameters_Service.java (from rev 1938, branches/tdiesler/trunk/jbossws-tests/src/main/resources/tools/jbws-206/wscompileArtifacts/OutParameters/service/OutParametersService_Service.java) =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/tools/jbws-206/wscompileArtifacts/OutParameters/service/OutParametersService_Service.java 2007-01-12 11:17:14 UTC (rev 1938) +++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/tools/jbws-206/wscompileArtifacts/OutParameters/service/OutParameters_Service.java 2007-01-12 12:20:33 UTC (rev 1941) @@ -0,0 +1,12 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.webservice.outparameters; + +import javax.xml.rpc.*; + +public interface OutParameters_Service extends javax.xml.rpc.Service { + public org.jboss.test.webservice.outparameters.OutParametersService_PortType getOutParametersServicePort() throws ServiceException; +}