[jbossws-commits] JBossWS SVN: r11001 - in stack/native/branches/jbossws-native-3.2.1.GA/modules: testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190 and 3 other directories.

Author: richard.opalka(a)jboss.com Date: 2009-10-23 08:05:09 -0400 (Fri, 23 Oct 2009) New Revision: 11001 Modified: stack/native/branches/jbossws-native-3.2.1.GA/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml Log: [JBWS-2718] rollback because of broken TCK5 Modified: stack/native/branches/jbossws-native-3.2.1.GA/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java =================================================================== --- stack/native/branches/jbossws-native-3.2.1.GA/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2009-10-23 12:00:53 UTC (rev 11000) +++ stack/native/branches/jbossws-native-3.2.1.GA/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2009-10-23 12:05:09 UTC (rev 11001) @@ -241,7 +241,7 @@ //check for sub-directories resourcePath = resourcePath.substring(0, resourcePath.lastIndexOf("/") + 1); - resourcePath = resourcePath + schemaLocation; + resourcePath = expLocation + resourcePath + schemaLocation; while (resourcePath.indexOf("//") != -1) { resourcePath = resourcePath.replace("//", "/"); @@ -355,21 +355,19 @@ File wsdlFile; if (wsdlLocation.indexOf(expLocation) >= 0) { - wsdlLocation = wsdlLocation.substring(wsdlLocation.indexOf(expLocation)); + wsdlLocation = wsdlLocation.substring(wsdlLocation.indexOf(expLocation) + expLocation.length()); wsdlFile = new File(locationFile + "/" + wsdlLocation); } - else if (wsdlLocation.startsWith("vfsfile:") || wsdlLocation.startsWith("file:") - || wsdlLocation.startsWith("jar:") || wsdlLocation.startsWith("vfszip:")) + else if (wsdlLocation.startsWith("vfsfile:") || wsdlLocation.startsWith("file:") || wsdlLocation.startsWith("jar:")) { - wsdlLocation = wsdlLocation.substring(wsdlLocation.indexOf(archiveName) + archiveName.length()); + wsdlLocation = wsdlLocation.substring(wsdlLocation.lastIndexOf("/") + 1); wsdlFile = new File(locationFile + "/" + wsdlLocation); } else { - throw new WSException("Invalid wsdlFile '" + wsdlLocation + "' location, expected in: " + expLocation); + throw new WSException("Invalid wsdlFile '" + wsdlLocation + "', expected in: " + expLocation); } return wsdlFile; } - } Modified: stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java =================================================================== --- stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2009-10-23 12:00:53 UTC (rev 11000) +++ stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2009-10-23 12:05:09 UTC (rev 11001) @@ -48,8 +48,7 @@ ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig(); File dataDir = serverConfig.getServerDataDir(); - String s = File.separator; - File wsdlDir = new File(dataDir.getAbsolutePath() + s + "wsdl" + s + archive + s + "WEB-INF" + s + "wsdl" + s ); + File wsdlDir = new File(dataDir.getAbsolutePath() + File.separator + "wsdl" + File.separator + archive); if (wsdlDir.exists() == false) { Modified: stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java =================================================================== --- stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java 2009-10-23 12:00:53 UTC (rev 11000) +++ stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java 2009-10-23 12:05:09 UTC (rev 11001) @@ -52,11 +52,11 @@ URL mappingURL = getResourceURL("jaxrpc/wsdlpublish/WEB-INF/jaxrpc-mapping.xml"); QName serviceName = new QName("http://org.jboss.test.ws/wsdlpublish", "TestService"); Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL); - + TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); - + String dir = System.getProperty("wsdl.publish.location"); - String resStr = port.echoSimple(new File(dir + "/some-wsdl-location/WEB-INF/wsdl/foo/bar/TestService.wsdl").getAbsolutePath()); + String resStr = port.echoSimple(new File(dir + "/some-wsdl-location/foo/bar/TestService.wsdl").getAbsolutePath()); assertEquals("{http://org.jboss.test.ws/wsdlpublish}TestEndpoint", resStr); } } Modified: stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml 2009-10-23 12:00:53 UTC (rev 11000) +++ stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml 2009-10-23 12:05:09 UTC (rev 11001) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/TestServiceEJB</service-ref-name> - <wsdl-override>file:@wsdl.publish.location@/jsr109ejb/META-INF/wsdl/TestService.wsdl</wsdl-override> + <wsdl-override>file:@wsdl.publish.location@/jsr109ejb/TestService.wsdl</wsdl-override> </service-ref> </jboss-client> Modified: stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml 2009-10-23 12:00:53 UTC (rev 11000) +++ stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml 2009-10-23 12:05:09 UTC (rev 11001) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/TestServiceJSE</service-ref-name> - <wsdl-override>file:@wsdl.publish.location@/jsr109pojo/WEB-INF/wsdl/TestService.wsdl</wsdl-override> + <wsdl-override>file:@wsdl.publish.location@/jsr109pojo/TestService.wsdl</wsdl-override> </service-ref> </jboss-client>