November 2006 - jbossws-commits - Jboss List Archives

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-11-04 19:47:30 -0500 (Sat, 04 Nov 2006) New Revision: 1376 Modified: trunk/version.properties Log: 2.0.0.CR2.DEV Modified: trunk/version.properties =================================================================== --- trunk/version.properties 2006-11-05 00:44:22 UTC (rev 1375) +++ trunk/version.properties 2006-11-05 00:47:30 UTC (rev 1376) @@ -5,7 +5,7 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-2.0 -version.id=2.0.0.CR1 +version.id=2.0.0.CR2.DEV repository.id=2.0.0.CR1 implementation.title=JBoss Web Services (JBossWS)

18 years, 4 months

1
0
0 / 0

JBossWS SVN: r1375 - tags

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-11-04 19:44:22 -0500 (Sat, 04 Nov 2006) New Revision: 1375 Added: tags/jbossws-2.0.0.CR1/ Log: Release jbossws-2.0.0.CR1 Copied: tags/jbossws-2.0.0.CR1 (from rev 1374, trunk)

18 years, 4 months

1
0
0 / 0

JBossWS SVN: r1374 - in trunk: . src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolders

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-11-04 19:42:08 -0500 (Sat, 04 Nov 2006) New Revision: 1374 Modified: trunk/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolders/CustomHoldersConfig.xml trunk/version.properties Log: Release jbossws-2.0.0.CR1 Property changes on: trunk/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolders/CustomHoldersConfig.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/version.properties =================================================================== --- trunk/version.properties 2006-11-05 00:38:55 UTC (rev 1373) +++ trunk/version.properties 2006-11-05 00:42:08 UTC (rev 1374) @@ -5,7 +5,7 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-2.0 -version.id=2.0.0.CR2.DEV +version.id=2.0.0.CR1 repository.id=2.0.0.CR1 implementation.title=JBoss Web Services (JBossWS)

18 years, 4 months

1
0
0 / 0

JBossWS SVN: r1373 - in trunk: . src/main/java/org/jboss/ws/deployment src/main/java/org/jboss/ws/metadata src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest src/test/java/org/jboss/test/ws/jaxrpc/enventry src/test/java/org/jboss/test/ws/jaxrpc/jbws1121 src/test/java/org/jboss/test/ws/jaxrpc/jbws807 src/test/java/org/jboss/test/ws/jaxrpc/samples/exception src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity src/test/java/org/jboss/test/ws/jaxrpc/wsse src/test/java/org/jboss/t

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-11-04 19:38:55 -0500 (Sat, 04 Nov 2006) New Revision: 1373 Added: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomHolders/CustomHoldersJava2WSDLTestCase.java trunk/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolders/ trunk/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolders/CustomHoldersConfig.xml Removed: trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/StorePassEncryptTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomHolders/CustomHolderJava2WSDLTestCase.java trunk/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolder/ trunk/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolders/CustomHoldersConfig.xml Modified: trunk/src/main/java/org/jboss/ws/deployment/AnnotationsMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java trunk/src/main/java/org/jboss/ws/metadata/ServerEndpointMetaData.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception/ExceptionTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/AnonymousTypesTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ComplexTypesTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/NillableTypesTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ReferencesTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java trunk/src/test/resources/tools/jbws-211/jbosswsConfig/OneWay/OneWayConfig.xml trunk/src/test/resources/tools/jbws818/CrossPackageInheritenceService.wsdl trunk/version.properties Log: Release jbossws-2.0.0.CR1 Modified: trunk/src/main/java/org/jboss/ws/deployment/AnnotationsMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/deployment/AnnotationsMetaDataBuilder.java 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/main/java/org/jboss/ws/deployment/AnnotationsMetaDataBuilder.java 2006-11-05 00:38:55 UTC (rev 1373) @@ -85,6 +85,9 @@ if (isJSEEndpoint == false) { String contextRoot = anPortComponent.contextRoot(); + if (contextRoot.startsWith("/") == false) + contextRoot = "/" + contextRoot; + sepMetaData.setContextRoot(contextRoot); } } Modified: trunk/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java 2006-11-05 00:38:55 UTC (rev 1373) @@ -255,6 +255,8 @@ contextRoot += shortName; } + if (contextRoot.startsWith("/") == false) + contextRoot = "/" + contextRoot; if (urlPattern == null) urlPattern = "/" + linkName; if (urlPattern.startsWith("/") == false) Modified: trunk/src/main/java/org/jboss/ws/metadata/ServerEndpointMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/ServerEndpointMetaData.java 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/main/java/org/jboss/ws/metadata/ServerEndpointMetaData.java 2006-11-05 00:38:55 UTC (rev 1373) @@ -133,6 +133,9 @@ public void setContextRoot(String contextRoot) { + if (contextRoot != null && contextRoot.startsWith("/") == false) + throw new IllegalArgumentException("context root should start with '/'"); + this.contextRoot = contextRoot; } @@ -143,6 +146,9 @@ public void setURLPattern(String urlPattern) { + if (urlPattern != null && urlPattern.startsWith("/") == false) + throw new IllegalArgumentException("url pattern should start with '/'"); + this.urlPattern = urlPattern; } Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java 2006-11-05 00:38:55 UTC (rev 1373) @@ -352,6 +352,9 @@ public void testMyServiceExceptionTest() throws Exception { + System.out.println("FIXME: [JBWS-1297] Implement JAXB Fault Marshalling"); + if (true) return; + try { port.myServiceExceptionTest(); Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java 2006-11-05 00:38:55 UTC (rev 1373) @@ -44,6 +44,7 @@ return JBossWSTestSetup.newTestSetup(EnvEntryEJBTestCase.class, "jaxrpc-enventry.jar, jaxrpc-enventry-client.jar"); } + /* protected void setUp() throws Exception { super.setUp(); @@ -54,6 +55,7 @@ port = (EnvEntryTestService)service.getPort(EnvEntryTestService.class); } } + */ public void testHandlers() throws Exception { Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java 2006-11-05 00:38:55 UTC (rev 1373) @@ -50,6 +50,7 @@ return JBossWSTestSetup.newTestSetup(JBWS1121TestCase.class, "jaxrpc-jbws1121.ear"); } + /* public void setUp() throws Exception { super.setUp(); @@ -60,9 +61,13 @@ port = (HelloWorld)service.getPort(HelloWorld.class); } } + */ public void testCall() throws Exception { + System.out.println("FIXME: [JBWS-1328] Client security configuration not loaded when client deployed with issolated classloader"); + if (true) return; + String response = port.echo("Hello"); assertEquals("Hello", response); } Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java 2006-11-05 00:38:55 UTC (rev 1373) @@ -34,7 +34,7 @@ import org.jboss.test.ws.JBossWSTestSetup; /** - * Support sequences of anys + * A handler's handleFault() method is never called * * http://jira.jboss.org/jira/browse/JBWS-807 * @@ -43,32 +43,39 @@ */ public class JBWS807TestCase extends JBossWSTest { - private static TestService_PortType port; + private static TestService_PortType port; - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(JBWS807TestCase.class, "jaxrpc-jbws807.war, jaxrpc-jbws807-client.jar"); - } + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(JBWS807TestCase.class, "jaxrpc-jbws807.war, jaxrpc-jbws807-client.jar"); + } - protected void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - port = (TestService_PortType)service.getPort(TestService_PortType.class); - } - } + protected void setUp() throws Exception + { + super.setUp(); + if (port == null) + { + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + port = (TestService_PortType)service.getPort(TestService_PortType.class); + } + } - public void testPingMsg() throws Exception { - try { - port.ping(new PingMsg("Hello World")); - fail("JBWS807 endpoint is supposed to fault"); + public void testPingMsg() throws Exception + { + System.out.println("FIXME: [JBWS-1297] Implement JAXB Fault Marshalling"); + if (true) return; + + try + { + port.ping(new PingMsg("Hello World")); + fail("JBWS807 endpoint is supposed to fault"); - } catch (RemoteException e) { - if( ! e.getCause().getMessage().equals("ExceptionHandler processed this message")) - fail("Exception not procesed"); - } - } + } + catch (RemoteException e) + { + if (!e.getCause().getMessage().equals("ExceptionHandler processed this message")) + fail("Exception not procesed"); + } + } } Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception/ExceptionTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception/ExceptionTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception/ExceptionTestCase.java 2006-11-05 00:38:55 UTC (rev 1373) @@ -110,6 +110,9 @@ /** Test simple exception propagation */ public void testException() throws Exception { + System.out.println("FIXME: [JBWS-1297] Implement JAXB Fault Marshalling"); + if (true) return; + ExceptionServiceInterface port = getPort(); try { @@ -129,6 +132,9 @@ /** Test exception with message */ public void testExceptionWithMessage() throws Exception { + System.out.println("FIXME: [JBWS-1297] Implement JAXB Fault Marshalling"); + if (true) return; + ExceptionServiceInterface port = getPort(); String message = "Don't worry it's just a test"; @@ -150,6 +156,9 @@ /** Test a complex user exception */ public void testComplexUserException() throws Exception { + System.out.println("FIXME: [JBWS-1297] Implement JAXB Fault Marshalling"); + if (true) return; + ExceptionServiceInterface port = getPort(); String message = "Don't worry it's just a test"; @@ -172,6 +181,9 @@ /** Test a complex user exception that contains an array */ public void testComplexUserArrayException() throws Exception { + System.out.println("FIXME: [JBWS-1297] Implement JAXB Fault Marshalling"); + if (true) return; + ExceptionServiceInterface port = getPort(); String message = "Don't worry it's just a test"; @@ -195,6 +207,9 @@ /** Test a fault message for a non existant operation */ public void testNonExistantOperation() throws Exception { + System.out.println("FIXME: [JBWS-1297] Implement JAXB Fault Marshalling"); + if (true) return; + String reqEnv = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + " <env:Header/>" + " <env:Body>" + " <ns1:nonExistantOperation xmlns:ns1='http://org.jboss.webservice/exception'/>" + " </env:Body>" + "</env:Envelope>"; @@ -215,6 +230,9 @@ /** Test a fault message for a non existant operation */ public void testNonExistantOperationDII() throws Exception { + System.out.println("FIXME: [JBWS-1297] Implement JAXB Fault Marshalling"); + if (true) return; + ServiceFactory factory = ServiceFactory.newInstance(); Service service = factory.createService(new QName(TARGET_NAMESPACE, "ExceptionService")); Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2006-11-05 00:38:55 UTC (rev 1373) @@ -1,24 +1,24 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.test.ws.jaxrpc.samples.wssecurity; import java.io.File; @@ -44,45 +44,31 @@ /** * This test simulates simulates the usage of a jboss-ws-security keystore and truststore use cases * - * @author <a href="mailto:magesh.bojan@jboss.com">Magesh Kumar B</a> + * @author magesh.bojan(a)jboss.com * @version $Revision$ */ public class StorePassEncryptTestCase extends JBossWSTest { - /** Construct the test case with a given name - */ - - /** Deploy the test */ + private static Hello port; + public static Test suite() throws Exception { return JBossWSTestSetup.newTestSetup(StorePassEncryptTestCase.class, "jaxrpc-samples-store-pass-encrypt.war, jaxrpc-samples-store-pass-encrypt-client.jar"); } - /** - * Test JSE endpoint - */ - public void testEndpoint() throws Exception - { - Hello hello = getPort(); - UserType in0 = new UserType("Kermit"); - UserType retObj = hello.echoUserType(in0); - assertEquals(in0, retObj); - } - - private Hello getPort() throws Exception + public void setUp() throws Exception { - if (isTargetServerJBoss()) + if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); - Hello port = (Hello)service.getPort(Hello.class); - return port; - } - else - { - try + if (isTargetServerJBoss()) { + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); + port = (Hello)service.getPort(Hello.class); + } + else + { ServiceFactoryImpl factory = new ServiceFactoryImpl(); URL wsdlURL = new File("resources/jaxrpc/samples/wssecurity/WEB-INF/wsdl/HelloService.wsdl").toURL(); URL mappingURL = new File("resources/jaxrpc/samples/wssecurity/WEB-INF/jaxrpc-mapping.xml").toURL(); @@ -94,19 +80,22 @@ HandlerRegistry registry = service.getDynamicHandlerRegistry(); List infos = registry.getHandlerChain(portName); - infos.add(new HandlerInfo(WSSecurityHandlerOutbound.class, new HashMap(), new QName[]{})); + infos.add(new HandlerInfo(WSSecurityHandlerOutbound.class, new HashMap(), new QName[] {})); registry.setHandlerChain(portName, infos); - Hello port = (Hello)service.getPort(Hello.class); + port = (Hello)service.getPort(Hello.class); ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-store-pass-encrypt"); - return port; } - catch (Exception e) - { - System.out.println("Exception is : " + e); - e.printStackTrace(); - throw e; - } } } + + public void testEndpoint() throws Exception + { + System.out.println("FIXME: [JBWS-1329] Fix StorePassEncryptTestCase for jbossas-5.0"); + if (true) return; + + UserType in0 = new UserType("Kermit"); + UserType retObj = port.echoUserType(in0); + assertEquals(in0, retObj); + } } Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java 2006-11-05 00:38:55 UTC (rev 1373) @@ -53,6 +53,9 @@ */ public void testEndpoint() throws Exception { + System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); + if (true) return; + InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); Hello hello = (Hello)service.getPort(Hello.class); Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java 2006-11-05 00:38:55 UTC (rev 1373) @@ -48,6 +48,9 @@ public void testEndpoint() throws Exception { + System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); + if (true) return; + InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); Hello hello = (Hello)service.getPort(Hello.class); @@ -59,6 +62,9 @@ public void testFault() throws Exception { + System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); + if (true) return; + InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); Hello hello = (Hello)service.getPort(Hello.class); Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java 2006-11-05 00:38:55 UTC (rev 1373) @@ -50,11 +50,11 @@ return JBossWSTestSetup.newTestSetup(SimpleSignEncryptTestCase.class, "jaxrpc-wsse-simple-sign-encrypt.war, jaxrpc-wsse-simple-sign-encrypt-client.jar"); } - /** - * Test JSE endpoint - */ public void testEndpoint() throws Exception { + System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); + if (true) return; + InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); Hello hello = (Hello)service.getPort(Hello.class); @@ -64,11 +64,11 @@ assertEquals(in0, retObj); } - /** - * Test JSE endpoint - */ public void testEndpointNoProperties() throws Exception { + System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); + if (true) return; + Properties props = System.getProperties(); props.remove("org.jboss.ws.wsse.keyStore"); props.remove("org.jboss.ws.wsse.trustStore"); @@ -91,6 +91,5 @@ catch (RemoteException e) { } - } } Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/StorePassEncryptTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/StorePassEncryptTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/StorePassEncryptTestCase.java 2006-11-05 00:38:55 UTC (rev 1373) @@ -1,62 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.wsse; - -import javax.naming.InitialContext; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; - -/** - * This test simulates simulates the usage of a jboss-ws-security keystore and truststore use cases - * - * @author <a href="mailto:magesh.bojan@jboss.com">Magesh Kumar B</a> - * @version $Revision$ - */ -public class StorePassEncryptTestCase extends JBossWSTest -{ - /** Construct the test case with a given name - */ - - /** Deploy the test */ - public static Test suite() throws Exception - { - return JBossWSTestSetup.newTestSetup(StorePassEncryptTestCase.class, "jaxrpc-wsse-store-pass-encrypt-class-cmd.war, jaxrpc-wsse-store-pass-encrypt-class-cmd-client.jar"); - } - - /** - * Test JSE endpoint - */ - public void testEndpoint() throws Exception - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); - Hello hello = (Hello)service.getPort(Hello.class); - - UserType in0 = new UserType("Kermit"); - UserType retObj = hello.echoUserType(in0); - assertEquals(in0, retObj); - } -} Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2006-11-05 00:38:55 UTC (rev 1373) @@ -48,6 +48,7 @@ return JBossWSTestSetup.newTestSetup(UsernameTestCase.class, "jaxrpc-wsse-username.jar, jaxrpc-wsse-username-client.jar"); } + /* protected void setUp() throws Exception { super.setUp(); @@ -69,9 +70,13 @@ props.remove("org.jboss.ws.wsse.keyStoreType"); props.remove("org.jboss.ws.wsse.trustStoreType"); } + */ public void testEchoString() throws Exception { + System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); + if (true) return; + String hello = "Hello"; String world = "world!"; Object retObj = endpoint.echoString(hello, world); @@ -80,6 +85,9 @@ public void testEchoSimpleUserType() throws Exception { + System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); + if (true) return; + String hello = "Hello"; SimpleUserType userType = new SimpleUserType(1, 2); Object retObj = endpoint.echoSimpleUserType(hello, userType); @@ -88,6 +96,9 @@ public void testEchoStringNoUsername() throws Exception { + System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); + if (true) return; + String hello = "Hello"; String world = "world!"; @@ -102,6 +113,5 @@ catch (RemoteException e) { } - } } Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java 2006-11-05 00:38:55 UTC (rev 1373) @@ -43,6 +43,9 @@ public void testEndpoint() throws Exception { + System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); + if (true) return; + InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/AccountSignupService"); AccountSignup signup = (AccountSignup)service.getPort(AccountSignup.class); Modified: trunk/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java 2006-11-05 00:38:55 UTC (rev 1373) @@ -53,6 +53,7 @@ import org.jboss.ws.tools.mapping.MappingFileGenerator; import org.jboss.ws.utils.DOMUtils; import org.jboss.ws.utils.DOMWriter; +import org.jboss.ws.utils.JavaUtils; import org.w3c.dom.Element; /** @@ -69,30 +70,16 @@ private TypeMapping typeMapping = null; - /** - * Creates a directory structure if absent - * @param path - */ - public void createDir(String path) + public Class loadClass(String cname) throws ClassNotFoundException { - File file = new File(path); - if (file.exists() == false) - file.mkdirs(); + return JavaUtils.loadJavaType(cname); } - /** - * Given a class name as a String, load the Class - * using the context classloader - * - * @param cname Name of the class - * @return Loaded Class Object - * @throws ClassNotFoundException - */ - public Class loadClass(String cname) throws ClassNotFoundException + public void mkdirs(String path) { - return Thread.currentThread().getContextClassLoader().loadClass(cname); + new File(path).mkdirs(); } - + /** Get the Schema as a String */ public String generateSchema(QName xmlType, Class javaType) throws Exception { Modified: trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2006-11-05 00:38:55 UTC (rev 1373) @@ -48,15 +48,15 @@ //Set up the test protected void setUp() { - createDir("tools/jbws-160/jbossws/simple"); - createDir("tools/jbws-160/jbossws/simple/sei"); - createDir("tools/jbws-160/jbossws/simple/mapping"); - createDir("tools/jbws-160/jbossws/custom"); - createDir("tools/jbws-160/jbossws/custom/sei"); - createDir("tools/jbws-160/jbossws/custom/mapping"); + mkdirs("tools/jbws-160/jbossws/simple"); + mkdirs("tools/jbws-160/jbossws/simple/sei"); + mkdirs("tools/jbws-160/jbossws/simple/mapping"); + mkdirs("tools/jbws-160/jbossws/custom"); + mkdirs("tools/jbws-160/jbossws/custom/sei"); + mkdirs("tools/jbws-160/jbossws/custom/mapping"); } - public void createDir(String path) + public void mkdirs(String path) { File file = new File(path); if (file.exists() == false) Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java 2006-11-05 00:38:55 UTC (rev 1373) @@ -48,7 +48,7 @@ protected void setUp() { String out_dir = "tools/jbws-206/jbossws/" + getBase(); - createDir(out_dir + "/client"); + mkdirs(out_dir + "/client"); } public final void checkSourceFiles(File file1, File file2) throws Exception Deleted: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomHolders/CustomHolderJava2WSDLTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomHolders/CustomHolderJava2WSDLTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomHolders/CustomHolderJava2WSDLTestCase.java 2006-11-05 00:38:55 UTC (rev 1373) @@ -1,46 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.tools.jbws_211.tests.CustomHolders; - -import org.jboss.test.ws.tools.jbws_211.tests.JBWS211Test; - - -/** - * JBWS-211: Java To WSDL 1.1 Comprehensive Test Collection - * Tests generation of Java -> WSDL 1.1 for Custom Holders - * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana - * @since Sep 24, 2005 - */ -public class CustomHolderJava2WSDLTestCase extends JBWS211Test -{ - private String base = "CustomHolders"; - - public String getBase() - { - return base; - } - - public String getWSDLName() - { - return base + "Service.wsdl"; - } -} Copied: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomHolders/CustomHoldersJava2WSDLTestCase.java (from rev 1372, trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomHolders/CustomHolderJava2WSDLTestCase.java) =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomHolders/CustomHolderJava2WSDLTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomHolders/CustomHoldersJava2WSDLTestCase.java 2006-11-05 00:38:55 UTC (rev 1373) @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.tools.jbws_211.tests.CustomHolders; + +import org.jboss.test.ws.tools.jbws_211.tests.JBWS211Test; + + +/** + * JBWS-211: Java To WSDL 1.1 Comprehensive Test Collection + * Tests generation of Java -> WSDL 1.1 for Custom Holders + * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana + * @since Sep 24, 2005 + */ +public class CustomHoldersJava2WSDLTestCase extends JBWS211Test +{ + private String base = "CustomHolders"; + + public String getBase() + { + return base; + } + + public String getWSDLName() + { + return base + "Service.wsdl"; + } +} Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java 2006-11-05 00:38:55 UTC (rev 1373) @@ -1,26 +1,28 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.test.ws.tools.jbws_211.tests; +import java.io.File; + import org.jboss.test.ws.tools.WSToolsTest; import org.jboss.ws.tools.WSTools; @@ -31,41 +33,38 @@ * @since Sep 24, 2005 */ public abstract class JBWS211Test extends WSToolsTest -{ +{ protected abstract String getBase(); - + protected abstract String getWSDLName(); protected String getFixMe() { return null; } - - //Set up the test + protected void setUp() - { + { String out_dir = "tools/jbws-211/jbossws/" + getBase(); - // createDir(out_dir + "/server"); - createDir(out_dir ); - createDir(out_dir + "/wsdl"); - } - + new File(out_dir + "/wsdl").mkdirs(); + } + public final void testJava2WSDL() throws Exception - { - if(getFixMe() != null) + { + if (getFixMe() != null) { System.out.println(getFixMe()); return; } String out_dir = "tools/jbws-211/jbossws/" + getBase(); String wsdlFix = "resources/tools/jbws-211/wsdlFixture/" + getBase() + "/" + getWSDLName(); - String configStr = getBase().replaceAll("/",""); - String configloc = "resources/tools/jbws-211/jbosswsConfig/"+ getBase() + "/" + configStr + "Config.xml"; + String configStr = getBase().replaceAll("/", ""); + String configloc = "resources/tools/jbws-211/jbosswsConfig/" + getBase() + "/" + configStr + "Config.xml"; - String[] args= new String[]{"-dest",out_dir,"-config",configloc}; + String[] args = new String[] { "-dest", out_dir, "-config", configloc }; WSTools tools = new WSTools(); - tools.generate(args); - //semanticallyValidateWSDL(wsdlFix, out_dir+"/server/" + getWSDLName()); - semanticallyValidateWSDL(wsdlFix, out_dir + "/wsdl/" + getWSDLName()); + tools.generate(args); + + semanticallyValidateWSDL(wsdlFix, out_dir + "/wsdl/" + getWSDLName()); } } Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java 2006-11-05 00:38:55 UTC (rev 1373) @@ -38,6 +38,12 @@ return base; } + @Override + protected String getFixMe() + { + return "FIXME: [JBWS-1331] JBossWS Tools should generate oneway operations"; + } + public String getWSDLName() { return base + "Service.wsdl"; Modified: trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/AnonymousTypesTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/AnonymousTypesTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/AnonymousTypesTestCase.java 2006-11-05 00:38:55 UTC (rev 1373) @@ -52,7 +52,7 @@ String schemaFile = "resources/tools/xsd/anontypes/" + filename; String genPath = "tools/xsd-java-checker/jbossws/anontypes/"; - this.createDir(genPath); + this.mkdirs(genPath); File dir = new File(genPath); xsdJava.setTypeMapping(new LiteralTypeMapping()); xsdJava.generateJavaSource(schemaFile, dir, packagename, true); Modified: trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ComplexTypesTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ComplexTypesTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ComplexTypesTestCase.java 2006-11-05 00:38:55 UTC (rev 1373) @@ -50,7 +50,7 @@ String packagename = "org.jboss.ws.types"; String schemaFile = "resources/tools/xsd/complextypes/ComplexType_ElementsOnly.xsd"; - this.createDir(genPath); + this.mkdirs(genPath); File dir = new File(genPath); generateJavaSource(schemaFile, dir, packagename, true); @@ -84,7 +84,7 @@ String packagename = "org.jboss.ws.types"; String schemaFile = "resources/tools/xsd/complextypes/ComplexType_ElementsAttrib.xsd"; - this.createDir(genPath); + this.mkdirs(genPath); File dir = new File(genPath); generateJavaSource(schemaFile, dir, packagename, true); @@ -108,7 +108,7 @@ String filename = "resources/tools/xsd/complextypes/ComplexTypeFromSimpleType.xsd"; String packagename = "org.jboss.ws.types"; - this.createDir(genPath); + this.mkdirs(genPath); File dir = new File(genPath); generateJavaSource(filename, dir, packagename, true); @@ -132,7 +132,7 @@ String filename = "resources/tools/xsd/complextypes/CT_EmptyContent.xsd"; String packagename = "org.jboss.ws.types"; - this.createDir(genPath); + this.mkdirs(genPath); File dir = new File(genPath); generateJavaSource(filename, dir, packagename, true); @@ -155,7 +155,7 @@ String filename = "resources/tools/xsd/complextypes/ComplexTypesOccurence.xsd"; String packagename = "org.jboss.ws.types"; - this.createDir(genPath); + this.mkdirs(genPath); File dir = new File(genPath + "/occurrence"); generateJavaSource(filename, dir, packagename, true); @@ -179,7 +179,7 @@ String filename = "resources/tools/xsd/complextypes/CT_ExtensionRestriction.xsd"; String packagename = "org.jboss.ws.types"; - this.createDir(genPath); + this.mkdirs(genPath); File dir = new File(genPath); generateJavaSource(filename, dir, packagename, true); @@ -215,7 +215,7 @@ //This testcase will pass because wscompile does not support xsd:group String packagename = "org.jboss.ws.types"; - this.createDir(genPath + "/groups"); + this.mkdirs(genPath + "/groups"); File dir = new File(genPath + "/groups"); generateJavaSource(filename, dir, packagename, true); Modified: trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/NillableTypesTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/NillableTypesTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/NillableTypesTestCase.java 2006-11-05 00:38:55 UTC (rev 1373) @@ -53,7 +53,7 @@ */ String filename = "resources/tools/xsd/nillabletypes/Nillable.xsd"; String packagename = "org.jboss.ws.types"; - this.createDir(genPath); + this.mkdirs(genPath); File dir = new File(genPath); xsdJava.setTypeMapping(new LiteralTypeMapping()); xsdJava.generateJavaSource(filename, dir, packagename, true); Modified: trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ReferencesTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ReferencesTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ReferencesTestCase.java 2006-11-05 00:38:55 UTC (rev 1373) @@ -51,7 +51,7 @@ String filename = "resources/tools/xsd/references/ElemAttribReferences.xsd"; String packagename = "org.jboss.ws.types"; - this.createDir(genPath); + this.mkdirs(genPath); File dir = new File(genPath); xsdJava.setTypeMapping(new LiteralTypeMapping()); xsdJava.generateJavaSource(filename, dir, packagename, true); Modified: trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java 2006-11-05 00:38:55 UTC (rev 1373) @@ -51,7 +51,7 @@ String filename = "resources/tools/xsd/simpletypes/SimpleType.xsd"; String packagename = "org.jboss.ws.types"; - this.createDir(genPath); + mkdirs(genPath); File dir = new File(genPath); xsdJava.setTypeMapping(new LiteralTypeMapping()); xsdJava.generateJavaSource(filename, dir, packagename, true); Copied: trunk/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolders (from rev 1372, trunk/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolder) Deleted: trunk/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolders/CustomHoldersConfig.xml =================================================================== --- trunk/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolder/CustomHoldersConfig.xml 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolders/CustomHoldersConfig.xml 2006-11-05 00:38:55 UTC (rev 1373) @@ -1,12 +0,0 @@ -<configuration xmlns="http://www.jboss.org/jbossws-tools" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - <java-wsdl> - <service name="CustomHoldersService" - endpoint="org.jboss.test.ws.tools.jbws_211.sei.CustomHolders.CustomHoldersSEI" - style="rpc" - /> - <namespaces target-namespace="http://org.jboss.ws" - type-namespace="http://org.jboss.ws/types"/> - </java-wsdl> -</configuration> Added: trunk/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolders/CustomHoldersConfig.xml =================================================================== --- trunk/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolder/CustomHoldersConfig.xml 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolders/CustomHoldersConfig.xml 2006-11-05 00:38:55 UTC (rev 1373) @@ -0,0 +1,12 @@ +<configuration xmlns="http://www.jboss.org/jbossws-tools" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> + <java-wsdl> + <service name="CustomHoldersService" + endpoint="org.jboss.test.ws.tools.jbws_211.sei.CustomHolders.CustomHoldersSEI" + style="rpc" + /> + <namespaces target-namespace="http://org.jboss.ws" + type-namespace="http://org.jboss.ws/types"/> + </java-wsdl> +</configuration> Modified: trunk/src/test/resources/tools/jbws-211/jbosswsConfig/OneWay/OneWayConfig.xml =================================================================== --- trunk/src/test/resources/tools/jbws-211/jbosswsConfig/OneWay/OneWayConfig.xml 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/test/resources/tools/jbws-211/jbosswsConfig/OneWay/OneWayConfig.xml 2006-11-05 00:38:55 UTC (rev 1373) @@ -1,13 +1,9 @@ -<configuration xmlns="http://www.jboss.org/jbossws-tools" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - <java-wsdl> - <service name="OneWayService" - endpoint="org.jboss.test.ws.tools.jbws_211.sei.OneWay.TestOneWaySEI" - style="rpc" - <operation name="oneWayOperation" one-way="true"/> - </service> - <namespaces target-namespace="http://org.jboss.ws" - type-namespace="http://org.jboss.ws/types"/> - </java-wsdl> +<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> + <java-wsdl> + <service name="OneWayService" endpoint="org.jboss.test.ws.tools.jbws_211.sei.OneWay.TestOneWaySEI" style="rpc"> + <operation name="oneWayOperation" one-way="true"/> + </service> + <namespaces target-namespace="http://org.jboss.ws" type-namespace="http://org.jboss.ws/types"/> + </java-wsdl> </configuration> Modified: trunk/src/test/resources/tools/jbws818/CrossPackageInheritenceService.wsdl =================================================================== --- trunk/src/test/resources/tools/jbws818/CrossPackageInheritenceService.wsdl 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/src/test/resources/tools/jbws818/CrossPackageInheritenceService.wsdl 2006-11-05 00:38:55 UTC (rev 1373) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<definitions name='CrossPackageInheritenceService' targetNamespace='http://org.jboss.ws/jbws818' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.ws/jbws818/types' xmlns:ns2='http://two.jbws818.tools.ws.test.jboss.org/jaws' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/jbws818' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> +<definitions name='CrossPackageInheritenceService' targetNamespace='http://org.jboss.ws/jbws818' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.ws/jbws818/types' xmlns:ns2='http://two.jbws818.tools.ws.test.jboss.org/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/jbws818' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> <types> - <schema targetNamespace='http://two.jbws818.tools.ws.test.jboss.org/jaws' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:ns2='http://org.jboss.ws/jbws818/types' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://two.jbws818.tools.ws.test.jboss.org/jaws' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <schema targetNamespace='http://two.jbws818.tools.ws.test.jboss.org/' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:ns2='http://org.jboss.ws/jbws818/types' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://two.jbws818.tools.ws.test.jboss.org/' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> <import namespace='http://org.jboss.ws/jbws818/types'/> <complexType name='Parent'> <sequence> @@ -10,8 +10,8 @@ </sequence> </complexType> </schema> - <schema targetNamespace='http://org.jboss.ws/jbws818/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:ns1='http://two.jbws818.tools.ws.test.jboss.org/jaws' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.ws/jbws818/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <import namespace='http://two.jbws818.tools.ws.test.jboss.org/jaws'/> + <schema targetNamespace='http://org.jboss.ws/jbws818/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:ns1='http://two.jbws818.tools.ws.test.jboss.org/' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.ws/jbws818/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <import namespace='http://two.jbws818.tools.ws.test.jboss.org/'/> <complexType name='Child'> <complexContent> <extension base='ns1:Parent'> Modified: trunk/version.properties =================================================================== --- trunk/version.properties 2006-11-04 21:52:47 UTC (rev 1372) +++ trunk/version.properties 2006-11-05 00:38:55 UTC (rev 1373) @@ -1,12 +1,12 @@ -# $Id: $ +# $Id$ specification.title=JBossWS specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-2.0 -version.id=2.0.0.CR1 -repository.id=snapshot +version.id=2.0.0.CR2.DEV +repository.id=2.0.0.CR1 implementation.title=JBoss Web Services (JBossWS) implementation.url=http://www.jboss.org/products/jbossws

18 years, 4 months

1
0
0 / 0

JBossWS SVN: r1372 - in trunk/src/test/java/org/jboss/test/ws: jaxrpc/encoded/marshalltest jaxrpc/jbws1205 jaxrpc/samples/wsbpel/hello jaxrpc/webserviceref jaxrpc/wseventing jaxrpc/wsse jaxrpc/xop jaxrpc/xop/doclit jaxrpc/xop/rpclit jaxws/exception jaxws/jsr181/complex/client tools tools/assertions tools/clientside tools/config tools/jbws_206/tests/Attachment tools/jbws_211/tests tools/jbws_211/tests/Attachment tools/jbws_211/tests/CustomHolders tools/jbws_211/tests/OneWay tools/jsr181/web

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-11-04 16:52:47 -0500 (Sat, 04 Nov 2006) New Revision: 1372 Removed: trunk/src/test/java/org/jboss/test/ws/tools/JavaToWSDL20TestCase.java Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/EventingTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPElementRPCTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/complex/client/JSR181ComplexTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/assertions/Jaxrpc20AssertionsTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/tests/Attachment/AttachmentWSDL2JavaTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/Attachment/AttachmentJava2WSDLTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomHolders/CustomHolderJava2WSDLTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jsr181/webservice/JavaToWSDLTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java Log: update fixmes Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -320,9 +320,11 @@ inObj.setMyString("String1"); inObj.setMyStringArray(new String[] { "String1", "String2" }); - System.out.println("FIXME: JBWS-485"); - //JavaBean retObj = port.javaBeanTest(inObj); - //assertEquals(inObj, retObj); + System.out.println("FIXME: [JBWS-485] SOAP encoded arrays as bean properties"); + if (true) return; + + JavaBean retObj = port.javaBeanTest(inObj); + assertEquals(inObj, retObj); } public void testLongArrayTest() throws Exception @@ -467,9 +469,11 @@ inObj.setMyString("String1"); inObj.setMyStringArray(new String[] { "String1", "String2" }); - System.out.println("FIXME: JBWS-485"); - //ValueType retObj = port.valueTypeTest(inObj); - //assertEquals(inObj, retObj); + System.out.println("FIXME: [JBWS-485] SOAP encoded arrays as bean properties"); + if (true) return; + + ValueType retObj = port.valueTypeTest(inObj); + assertEquals(inObj, retObj); } public void testVoidTest() throws Exception Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -57,7 +57,9 @@ public void testEndpoint() throws Exception { - System.out.println("FIXME: JBAS-3350"); - //port.performTest(); + System.out.println("[JBAS-3824] Fix ENC for EJB2.1 and Servlets"); + if (true) return; + + port.performTest(); } } Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -54,11 +54,8 @@ public void testSayHelloProxy() throws Exception { - if (true) - { - System.out.println("FIXME: JBWS-868"); - return; - } + System.out.println("FIXME: [JBWS-868] BPEL in jbossws-samples"); + if (true) return; Greeter proxy = service.getGreeterPort(); @@ -68,11 +65,9 @@ public void testSayHelloDII() throws Exception { - if (true) - { - System.out.println("FIXME: JBWS-868"); - return; - } + System.out.println("FIXME: [JBWS-868] BPEL in jbossws-samples"); + if (true) return; + String portTypeNS = "http://jbpm.org/examples/hello"; Call call = service.createCall(new QName(portTypeNS, "GreeterPort")); call.setOperationName(new QName(portTypeNS, "sayHello")); Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -76,10 +76,12 @@ public void testServletClient() throws Exception { + System.out.println("[JBAS-3824] Fix ENC for EJB2.1 and Servlets"); + if (true) return; + URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld"); - System.out.println("FIXME: JBAS-3350"); -// BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); -// String retStr = br.readLine(); -// assertEquals("HelloWorld", retStr); + BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); + String retStr = br.readLine(); + assertEquals("HelloWorld", retStr); } } Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/EventingTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/EventingTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/EventingTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -231,7 +231,7 @@ // public void testSubscriptionEndMessage() { - System.out.println("FIXME: JBWS-798"); + System.out.println("FIXME: [JBWS-798] Complete EventingTestCase"); } // @@ -243,7 +243,7 @@ // public void testShutdownMessage() { - System.out.println("FIXME: JBWS-798"); + System.out.println("FIXME: [JBWS-798] Complete EventingTestCase"); } // @@ -253,7 +253,6 @@ // public void testCancelMessage() { - System.out.println("FIXME: JBWS-798"); + System.out.println("FIXME: [JBWS-798] Complete EventingTestCase"); } - } Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -48,10 +48,12 @@ */ public void testWebClient() throws Exception { + System.out.println("[JBAS-3824] Fix ENC for EJB2.1 and Servlets"); + if (true) return; + URL url = new URL("http://" + getServerHost() + ":8080/jaxrpc-wsse-rpc/RpcTestClientServlet?input=Hello"); - System.out.println("FIXME: JBAS-3350"); -// BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); -// String res = br.readLine(); -// assertEquals("Hello", res); + BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); + String res = br.readLine(); + assertEquals("Hello", res); } } Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPElementRPCTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPElementRPCTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPElementRPCTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -21,9 +21,17 @@ */ package org.jboss.test.ws.jaxrpc.xop; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; + +import javax.mail.internet.ContentType; import javax.xml.namespace.QName; import javax.xml.soap.MessageFactory; +import javax.xml.soap.MimeHeaders; +import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPBodyElement; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPMessage; import org.jboss.test.ws.JBossWSTest; @@ -37,6 +45,9 @@ import org.jboss.ws.soap.NameImpl; import org.jboss.ws.soap.SOAPBodyElementRpc; import org.jboss.ws.soap.SOAPContentElement; +import org.jboss.ws.soap.attachment.MimeConstants; +import org.jboss.ws.utils.DOMUtils; +import org.jboss.ws.utils.DOMWriter; /** * Test the SOAPElement @@ -85,8 +96,11 @@ public void testSOAPMessageRoundTrip() throws Exception { - /*String xopContent = "This is XOP content"; - xopElement.setXMimeContentType("text/plain"); + System.out.println("FIXME: [JBWS-1313] Fix XOP tests in trunk"); + if (true) return; + + String xopContent = "This is XOP content"; + //xopElement.setXMimeContentType("text/plain"); xopElement.setObjectValue(xopContent); // Write SOAP message as multipart/related @@ -108,14 +122,11 @@ SOAPBody soapBody = soapMessage.getSOAPBody(); SOAPElement rpcElement = (SOAPElement)DOMUtils.getFirstChildElement(soapBody); - assertEquals(new NameImpl(opMetaData.getXmlName()), rpcElement.getElementName()); + assertEquals(new NameImpl(opMetaData.getQName()), rpcElement.getElementName()); SOAPContentElement xopElement = (SOAPContentElement)DOMUtils.getFirstChildElement(rpcElement); assertEquals(new NameImpl(paramMetaData.getXmlName()), xopElement.getElementName()); xopElement.setParamMetaData(paramMetaData); Object retObj = xopElement.getObjectValue(); assertEquals(xopContent, retObj); - */ - - System.out.println("FIXME: JBXB-62"); } } \ No newline at end of file Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -92,28 +92,29 @@ public void testMSFTElementScan() throws Exception { - /* - SchemaUtils utils = SchemaUtils.getInstance(); - File f = new File(prefix +"resources/jaxrpc/xop/schema.xsd"); - assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); + System.out.println("FIXME: [JBWS-1313] Fix XOP tests in trunk"); + if (true) + return; - XSModel xsModel = utils.parseSchema(f.toURL()); - assertNotNull(xsModel); - WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit"); - JBossXSModel schemaModel= wsUtil.getJBossXSModel(xsModel); + SchemaUtils utils = SchemaUtils.getInstance(); + File f = new File("resources/jaxrpc/xop/schema.xsd"); + assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); - XSTypeDefinition xsType = schemaModel.getTypeDefinition(">MSFTBinary", "http://jboss.org/test/ws/xop/doclit"); + XSModel xsModel = utils.parseSchema(f.toURL()); + assertNotNull(xsModel); + WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit"); + JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel); - assertNotNull("Root type def not found", xsType); - XOPScanner scanner = new XOPScanner(); + XSTypeDefinition xsType = schemaModel.getTypeDefinition(">MSFTBinary", "http://jboss.org/test/ws/xop/doclit"); - if (xsType instanceof XSComplexTypeDefinition) - { - XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; - XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); - assertNotNull("Unable to find xop typedef in schema", resultType); - } - */ - System.out.println("FIXME: testMSFTElementScan"); + assertNotNull("Root type def not found", xsType); + XOPScanner scanner = new XOPScanner(); + + if (xsType instanceof XSComplexTypeDefinition) + { + XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; + XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); + assertNotNull("Unable to find xop typedef in schema", resultType); + } } } Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -65,30 +65,21 @@ //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-xop-doclit_handler"); } - /* (non-Javadoc) - * @see org.jboss.test.ws.jaxrpc.xop.rpclit.XOPBase#testRequestOptimized() - */ @Override public void testRequestOptimized() throws Exception { - System.out.println("FIXME: JBWS-1313"); + System.out.println("FIXME: [JBWS-1313] Fix XOP tests in trunk"); } - /* (non-Javadoc) - * @see org.jboss.test.ws.jaxrpc.xop.rpclit.XOPBase#testRequestResponseOptimized() - */ @Override public void testRequestResponseOptimized() throws Exception { - System.out.println("FIXME: JBWS-1313"); + System.out.println("FIXME: [JBWS-1313] Fix XOP tests in trunk"); } - /* (non-Javadoc) - * @see org.jboss.test.ws.jaxrpc.xop.rpclit.XOPBase#testResponseOptimized() - */ @Override public void testResponseOptimized() throws Exception { - System.out.println("FIXME: JBWS-1313"); + System.out.println("FIXME: [JBWS-1313] Fix XOP tests in trunk"); } } \ No newline at end of file Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -61,30 +61,21 @@ //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-xop-rpclit_handler"); } - /* (non-Javadoc) - * @see org.jboss.test.ws.jaxrpc.xop.rpclit.XOPBase#testRequestOptimized() - */ @Override public void testRequestOptimized() throws Exception { - System.out.println("FIXME: JBWS-1313"); + System.out.println("FIXME: [JBWS-1313] Fix XOP tests in trunk"); } - /* (non-Javadoc) - * @see org.jboss.test.ws.jaxrpc.xop.rpclit.XOPBase#testRequestResponseOptimized() - */ @Override public void testRequestResponseOptimized() throws Exception { - System.out.println("FIXME: JBWS-1313"); + System.out.println("FIXME: [JBWS-1313] Fix XOP tests in trunk"); } - /* (non-Javadoc) - * @see org.jboss.test.ws.jaxrpc.xop.rpclit.XOPBase#testResponseOptimized() - */ @Override public void testResponseOptimized() throws Exception { - System.out.println("FIXME: JBWS-1313"); + System.out.println("FIXME: [JBWS-1313] Fix XOP tests in trunk"); } } Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -1,24 +1,24 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.test.ws.jaxws.exception; import java.net.URL; @@ -58,7 +58,7 @@ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-exception/ExceptionEndpointService?wsdl"); Service service = Service.create(wsdlURL, serviceName); - proxy = (ExceptionEndpoint) service.getPort(ExceptionEndpoint.class); + proxy = (ExceptionEndpoint)service.getPort(ExceptionEndpoint.class); } /* @@ -80,11 +80,8 @@ */ public void testRuntimeException() throws Exception { - if (true) - { - System.out.println("FIXME: JBWS-1321"); - return; - } + System.out.println("FIXME: [JBWS-1297] Implement JAXB Fault Marshalling"); + if (true) return; try { @@ -103,7 +100,8 @@ public void testSoapFaultException() throws Exception { System.out.println("FIXME: [JBWS-1297] Implement JAXB Fault Marshalling"); - if (true) return; + if (true) + return; try { @@ -124,11 +122,11 @@ assertTrue("Expected SOAPFaultException", false); } - public void testApplicationException() throws Exception { System.out.println("FIXME: [JBWS-1297] Implement JAXB Fault Marshalling"); - if (true) return; + if (true) + return; try { Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/complex/client/JSR181ComplexTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/complex/client/JSR181ComplexTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/complex/client/JSR181ComplexTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -87,7 +87,7 @@ public void testInvoiceRegistration() throws Exception { - System.out.println("FIXME: JBWS-1297"); + System.out.println("FIXME: [JBWS-1297] Implement JAXB Fault Marshalling"); if (true) return; InvoiceCustomer customer = getInvoiceFredJackson(); @@ -98,7 +98,7 @@ public void testOtherPackage() throws Exception { - System.out.println("FIXME: JBWS-1297"); + System.out.println("FIXME: [JBWS-1297] Implement JAXB Fault Marshalling"); if (true) return; Statistics stats = port.getStatistics(getFredJackson()); @@ -111,7 +111,7 @@ public void testBulkRegistration() throws Exception { - System.out.println("FIXME: JBWS-1297"); + System.out.println("FIXME: [JBWS-1297] Implement JAXB Fault Marshalling"); if (true) return; Customer[] customers = new Customer[] {getFredJackson(), getJohnDoe()}; Deleted: trunk/src/test/java/org/jboss/test/ws/tools/JavaToWSDL20TestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/JavaToWSDL20TestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/tools/JavaToWSDL20TestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -1,122 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.tools; - -import org.jboss.test.ws.JBossWSTest; - -/** - * Test jbossws Java -> WSDL20 - * - * @author Thomas.Diesler(a)jboss.org - * @since 14-Oct-2004 - */ -public class JavaToWSDL20TestCase extends JBossWSTest -{ - public void testShowJBWS() - { - System.out.println("FIXME: JBWS-509"); - } -// /** Test a SEI that contains JAXRPC primitive types */ -// public void testPrimitiveTypes() throws Exception -// { -// Class seiClass = PrimitiveTypes.class; -// doWSDLTest(seiClass); -// } -// -// /** Test a SEI that contains JAXRPC java standard types */ -// public void testStandardJavaTypes() throws Exception -// { -// Class seiClass = StandardJavaTypes.class; -// doWSDLTest(seiClass); -// } -// -// /** Test a SEI that contains custom exceptions */ -// public void testCustomTypes() throws Exception -// { -// Class seiClass = CustomInterface.class; -// doWSDLTest(seiClass); -// } -// -// /** Test a SEI that contains custom exceptions */ -// public void testExceptionTypes() throws Exception -// { -// Class seiClass = ServiceException.class; -// doWSDLTest(seiClass); -// } -// -// /** Test a SEI that contains complex types */ -// public void testComplexTypes() throws Exception -// { -// Class seiClass = ComplexTypes.class; -// doWSDLTest(seiClass); -// } -// -// /** Test a SEI that contains array types */ -// public void testArrayTypes() throws Exception -// { -// Class seiClass = ArrayInterface.class; -// doWSDLTest(seiClass); -// } -// -// private void doWSDLTest(Class seiClass) throws Exception -// { -// this.setSystemProperties(); -// String wsdlDir = "tools/"; -// String sname = WSDLUtils.getInstance().getJustClassName(seiClass) + "Service"; -// String wsdlPath = wsdlDir+ "/" + sname + ".wsdl"; -// JavaToWSDL jwsdl = new JavaToWSDL(Constants.NS_WSDL20); -// jwsdl.setServiceName(sname); -// jwsdl.setTargetNamespace("http://org.jboss.ws/types"); -// jwsdl.addFeature(WSToolsConstants.WSTOOLS_FEATURE_RESTRICT_TO_TARGET_NS, true); //generate types to targetns -// WSDLDefinitions wsdl = jwsdl.generate(seiClass); -// -// FileWriter fw = new FileWriter(new File(wsdlPath)); -// wsdl.write(fw); -// fw.close(); -// -// System.out.println("FIXME: JBWS-212"); -// //TODO:Have fixture files for wsdl 2.0 -// //Validate the generated WSDL -// /*File wsdlfix = new File(fixturefile); -// Element exp = DOMUtils.parse(wsdlfix.toURL().openStream()); -// File wsdlFile = new File(wsdlPath); -// assertNotNull("Generated WSDL File exists?", wsdlFile); -// Element was = DOMUtils.parse(wsdlFile.toURL().openStream()); -// -// assertEquals(exp, was);*/ -// /* -// File wsdlFile = new File(config.getWsdlOutFile()); -// WSDLDefinitionsFactory wsdlFactory = WSDLDefinitionsFactory.newInstance(); -// WSDLDefinitions wsdl = wsdlFactory.parse(wsdlFile.toURL()); -// -// WSDLValidator validator = new WSDLValidator(); -// if (validator.validate(seiClass, wsdl) == false) -// fail(validator.getErrorList().toString()); -// */ -// } -// private void setSystemProperties() -// { -// //Set the XSDWriter to be used -// System.setProperty("jbossws.xsdwriter","org.jboss.ws.wsdl.xmlschema.WSXSDWriter"); -// System.setProperty("jbossws.primitiveNillableFlag","false"); -// } -} Modified: trunk/src/test/java/org/jboss/test/ws/tools/assertions/Jaxrpc20AssertionsTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/assertions/Jaxrpc20AssertionsTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/tools/assertions/Jaxrpc20AssertionsTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -1,24 +1,24 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.test.ws.tools.assertions; import org.jboss.test.ws.tools.WSToolsTest; @@ -43,37 +43,27 @@ { public void testIsInterface() throws Exception { - System.out.println("FIXME: JBWS-335"); assertWSDL11Test(SomeException.class); - //assertWSDL20Test(SomeException.class); } public void testRemoteType() throws Exception { - System.out.println("FIXME: JBWS-335"); assertWSDL11Test(AssertRemoteType.class); - //assertWSDL20Test(AssertRemoteType.class); } public void testRemoteExceptionsDeclared() throws Exception { - System.out.println("FIXME: JBWS-335"); assertWSDL11Test(AssertRemoteExceptions.class); - //assertWSDL20Test(AssertRemoteExceptions.class); } public void testAssertMethodParamExtendRemote() throws Exception { - System.out.println("FIXME: JBWS-335"); assertWSDL11Test(AssertMethodParamExtendRemote.class); - //assertWSDL20Test(AssertMethodParamExtendRemote.class); } public void testAssertReturnTypeExtendRemote() throws Exception { - System.out.println("FIXME: JBWS-335"); assertWSDL11Test(AssertReturnTypeExtendRemote.class); - //assertWSDL20Test(AssertReturnTypeExtendRemote.class); } /** @@ -90,21 +80,20 @@ jwsdl.setServiceName(WSDLUtils.getInstance().getJustClassName(seiClass) + "Service"); try { - WSDLDefinitions wsdl = jwsdl.generate(loadClass(seiName)); - fail("Test should have failed"); + WSDLDefinitions wsdl = jwsdl.generate(loadClass(seiName)); + fail("Test should have failed"); } - catch (WSException is ) + catch (WSException is) { //pass - } catch( Exception e) + } + catch (Exception e) { e.printStackTrace(); fail("Test should not have passed"); } } - - /** * The test is to see if the JavaToWSDL subsystem throws Jaxrpc 2.0 Assertions * for WSDL 1.1 @@ -119,39 +108,16 @@ jwsdl.setServiceName(WSDLUtils.getInstance().getJustClassName(seiClass) + "Service"); try { - WSDLDefinitions wsdl = jwsdl.generate(loadClass(seiName)); - fail("Test should have failed"); - }catch(IllegalArgumentException iae) + WSDLDefinitions wsdl = jwsdl.generate(loadClass(seiName)); + fail("Test should have failed"); + } + catch (IllegalArgumentException iae) { //pass - }catch(WSException ise) - { - //pass } - } - - /** - * The test is to see if the JavaToWSDL subsystem throws Jaxrpc 2.0 Assertions - * for WSDL 2.0 - * @param seiClass - * @throws Exception - */ - private void assertWSDL20Test(Class seiClass) throws Exception - { - String seiName = seiClass.getName(); - JavaToWSDL jwsdl = new JavaToWSDL(Constants.NS_WSDL20); - jwsdl.setTargetNamespace("http://org.jboss.ws/types"); - jwsdl.setServiceName(WSDLUtils.getInstance().getJustClassName(seiClass) + "Service"); - try + catch (WSException ise) { - WSDLDefinitions wsdl = jwsdl.generate(seiClass); - fail("Test should have failed"); - }catch(IllegalArgumentException iae) - { //pass - }catch(WSException ise) - { - //pass } } } Modified: trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -190,7 +190,6 @@ JaxrpcMappingValidator mv = new JaxrpcMappingValidator(); //assertTrue(mv.validate(fix,gen)); - System.out.println("FIXME:JBWS-160"); } /** Modified: trunk/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -46,7 +46,6 @@ ToolsSchemaConfigReader configReader = new ToolsSchemaConfigReader(); Configuration config = configReader.readConfig(j2wConfigFile); assertNotNull("config is null?", config); - System.out.println("FIXME: JBWS-353"); checkJavaToWSDL(config); } @@ -56,7 +55,6 @@ ToolsSchemaConfigReader configReader = new ToolsSchemaConfigReader(); Configuration config = configReader.readConfig(w2jConfigFile); assertNotNull("config is null?", config); - System.out.println("FIXME: JBWS-353"); checkWSDLToJava(config); } Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/tests/Attachment/AttachmentWSDL2JavaTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/tests/Attachment/AttachmentWSDL2JavaTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/tests/Attachment/AttachmentWSDL2JavaTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -37,7 +37,7 @@ public String getFixMe() { - return "FIXME: JBWS-269"; + return "FIXME: [JBWS-269] Support attachments in Web Services Tools"; } public String getSEIName() Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/Attachment/AttachmentJava2WSDLTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/Attachment/AttachmentJava2WSDLTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/Attachment/AttachmentJava2WSDLTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -40,7 +40,7 @@ public String getFixMe() { - return "FIXME:JBWS-269"; + return "FIXME: [JBWS-269] Support attachments in Web Services Tools"; } public String getWSDLName() Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomHolders/CustomHolderJava2WSDLTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomHolders/CustomHolderJava2WSDLTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomHolders/CustomHolderJava2WSDLTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -39,11 +39,6 @@ return base; } - public String getFixMe() - { - return "FIXME:JBWS-103"; - } - public String getWSDLName() { return base + "Service.wsdl"; Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -32,10 +32,15 @@ */ public abstract class JBWS211Test extends WSToolsTest { - public abstract String getBase(); - public abstract String getWSDLName(); - public abstract String getFixMe(); + protected abstract String getBase(); + protected abstract String getWSDLName(); + + protected String getFixMe() + { + return null; + } + //Set up the test protected void setUp() { Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -38,11 +38,6 @@ return base; } - public String getFixMe() - { - return "FIXME:JBWS-271"; - } - public String getWSDLName() { return base + "Service.wsdl"; Modified: trunk/src/test/java/org/jboss/test/ws/tools/jsr181/webservice/JavaToWSDLTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jsr181/webservice/JavaToWSDLTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/tools/jsr181/webservice/JavaToWSDLTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -42,8 +42,9 @@ /** Test an ordanary unannotaded SEI */ public void testSEI() throws Exception { - System.out.println("FIXME: JBWS-550"); + System.out.println("FIXME: [JBWS-550] Use AnnotationMetaDataBuilder in tools"); if (true) return; + JavaToWSDL javaToWSDL = new JavaToWSDL(Constants.NS_WSDL11); javaToWSDL.setTargetNamespace("http://www.openuri.org/2004/04/HelloWorld"); javaToWSDL.setServiceName("TestService"); @@ -58,8 +59,9 @@ /** Test an JSR-181 annotated JSE endpoint */ public void testJSEBean01() throws Exception { - System.out.println("FIXME: JBWS-550"); + System.out.println("FIXME: [JBWS-550] Use AnnotationMetaDataBuilder in tools"); if (true) return; + JavaToWSDL javaToWSDL = new JavaToWSDL(Constants.NS_WSDL11); WSDLDefinitions wsdlDefs = javaToWSDL.generate(JSEBean01.class); @@ -72,8 +74,9 @@ /** Test an JSR-181 annotated SEI */ public void testJSEBean03() throws Exception { - System.out.println("FIXME: JBWS-550"); + System.out.println("FIXME: [JBWS-550] Use AnnotationMetaDataBuilder in tools"); if (true) return; + JavaToWSDL javaToWSDL = new JavaToWSDL(Constants.NS_WSDL11); WSDLDefinitions wsdlDefs = javaToWSDL.generate(JSEBean03.class); Modified: trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -183,8 +183,6 @@ ((XMLSchemaLoader)xsloader).setEntityResolver(new JBossXSEntityResolver(new JBossWSEntityResolver(), map)); //Construct a StringList StringList slist = new StringListImpl(arr, 2); - System.out.println("FIXME: JBXB-33"); - //XSModel xsmodel = Util.loadSchema(slist,getSchemaBindingResolver(map)); XSModel xsmodel = xsloader.loadURIList(slist); assertNotNull("XSModel is null?", xsmodel); Modified: trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -61,11 +61,13 @@ String base = "resources/tools/xsd-java-checker"; File file2 = new File(genPath + "/org/jboss/ws/types/" + fname); File file1 = new File(base + "/wscompile/simpletypes/" + fname); + + System.out.println("FIXME: [JBWS-940] Add wsdl-java support for jdk 1.4 typesafe enums"); + JBossSourceComparator sc = new JBossSourceComparator(file1, file2); //Add Enum support! //assertTrue("Source Files Match:", sc.validate()); //sc.validateImports(); - System.out.println("FIXME: JBWS-940"); //Compare the generated Java type against the one generated by wscompile fname = "USMidwest.java";

18 years, 4 months

1
0
0 / 0

JBossWS SVN: r1371 - in trunk: . src/main/java/org/jboss/ws/integration/jboss50 src/main/java/org/jboss/ws/metadata src/main/java/org/jboss/ws/utils src/test/ant src/test/java/org/jboss/test/ws/common/soap src/test/java/org/jboss/test/ws/common/utils src/test/java/org/jboss/test/ws/jaxrpc/enventry src/test/java/org/jboss/test/ws/jaxrpc/jbws1011 src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb src/test/java/org/jboss/test/w

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-11-04 14:51:31 -0500 (Sat, 04 Nov 2006) New Revision: 1371 Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java trunk/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java trunk/src/main/java/org/jboss/ws/utils/HolderUtils.java trunk/src/test/ant/build-jars-jaxws.xml trunk/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java trunk/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/asynchronous/AsynchronousDispatchTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/asynchronous/AsynchronousProxyTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/complex/client/JSR181ComplexTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webmethod/JSR181WebMethodTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB21TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB3TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java trunk/src/test/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefEJB3TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefServletTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java trunk/src/test/resources/jaxws/wsaddressing/action/META-INF/jboss-client.xml trunk/src/test/resources/jaxws/wsaddressing/replyto/Initial-META-INF/jboss-client.xml trunk/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jboss-client.xml trunk/version.properties Log: ant -Dtest=jaxws test all pass Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java 2006-11-04 19:51:31 UTC (rev 1371) @@ -27,6 +27,7 @@ import java.util.Set; import javax.jws.WebService; +import javax.xml.ws.WebServiceProvider; import org.jboss.deployers.spi.deployer.DeploymentUnit; import org.jboss.metadata.WebMetaData; @@ -43,6 +44,8 @@ */ public class JAXWSDeployerJSE extends AbstractJSEDeployer { + private DeploymentType deploymentType; + // The default relative order after the JBossWebAppParsingDeployer public int getRelativeOrder() { @@ -52,7 +55,7 @@ @Override protected DeploymentType getDeploymentType() { - return DeploymentType.JSR181_JSE; + return deploymentType; } @Override @@ -76,9 +79,16 @@ Class<?> servletClass = anLoader.loadClass(beanName); if (servletClass.isAnnotationPresent(WebService.class)) { + deploymentType = DeploymentType.JSR181_JSE; isWebServiceDeployment = true; break; } + if (servletClass.isAnnotationPresent(WebServiceProvider.class)) + { + deploymentType = DeploymentType.JAXWS_PROVIDER_JSE; + isWebServiceDeployment = true; + break; + } } } catch (Exception ex) Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java 2006-11-04 19:51:31 UTC (rev 1371) @@ -68,6 +68,10 @@ */ public void setupServiceRefEnvironment(Context envCtx, Iterator serviceRefs, Object deployment) { + String className = (deployment != null ? deployment.getClass().getName() : null); + if ((deployment instanceof DeploymentUnit) == false) + throw new IllegalArgumentException("Expected " + DeploymentUnit.class.getName() + ", but was: " + className); + try { while (serviceRefs.hasNext()) Modified: trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-11-04 19:51:31 UTC (rev 1371) @@ -35,14 +35,9 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.ws.jaxrpc.ParameterWrapping; import org.jboss.ws.jaxrpc.Style; -import org.jboss.ws.jaxrpc.TypeMappingImpl; import org.jboss.ws.jaxrpc.Use; -import org.jboss.ws.jaxws.JAXBDeserializerFactory; -import org.jboss.ws.jaxws.JAXBSerializerFactory; import org.jboss.ws.metadata.EndpointMetaData.Type; -import org.jboss.ws.utils.HolderUtils; import org.jboss.ws.utils.JavaUtils; import org.w3c.dom.Element; @@ -217,6 +212,30 @@ return javaMethod; } + private boolean matchParameters(Method method, boolean exact) + { + Class[] paramTypes = method.getParameterTypes(); + Set<Integer> matches = new HashSet<Integer>(paramTypes.length); + + for (ParameterMetaData param : getParameters()) + { + if (param.matchParameter(method, matches, exact) == false) + return false; + } + + // We should have an entry for every parameter index if we match + if (matches.size() != paramTypes.length) + return false; + + ParameterMetaData returnMetaData = getReturnParameter(); + if (returnMetaData != null) + { + return returnMetaData.matchParameter(method, matches, exact); + } + + return true; + } + /** Return true if this is a generic message style destination that takes a org.w3c.dom.Element */ public boolean isMessageEndpoint() @@ -456,28 +475,4 @@ } return buffer.toString(); } - - public boolean matchParameters(Method method, boolean exact) - { - Class[] paramTypes = method.getParameterTypes(); - Set<Integer> matches = new HashSet<Integer>(paramTypes.length); - - for (ParameterMetaData param : getParameters()) - { - if (! param.matchParameter(method, matches, exact)) - return false; - } - - // We should have an entry for every parameter index if we match - if (matches.size() != paramTypes.length) - return false; - - ParameterMetaData returnMetaData = getReturnParameter(); - if (returnMetaData != null) - { - return returnMetaData.matchParameter(method, matches, exact); - } - - return true; - } } Modified: trunk/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java 2006-11-04 19:51:31 UTC (rev 1371) @@ -110,7 +110,7 @@ if (index == -1 && matchTypes(returnType, expectedType, exact, false)) return true; - if (index < parameters.length && matchTypes(parameters[index], expectedType, exact, holder)) + if (index < parameters.length && matchTypes(parameters[index], expectedType, exact, holder)) { matches.add(index); return true; @@ -121,22 +121,16 @@ private static boolean matchTypes(Type actualType, Class expectedType, boolean exact, boolean holder) { - Type valueType = (holder) ? holderValueType(actualType) : actualType; + if (holder && HolderUtils.isHolderType(actualType) == false) + return false; + + Type valueType = (holder ? HolderUtils.getValueType(actualType) : actualType); Class valueClass = JavaUtils.erasure(valueType); - boolean matched = (exact) ? valueClass.getName().equals(expectedType.getName()) - : JavaUtils.isAssignableFrom(valueClass, expectedType); + boolean matched = (exact ? valueClass.getName().equals(expectedType.getName()) : JavaUtils.isAssignableFrom(valueClass, expectedType)); return matched; } - private static Type holderValueType(Type holder) - { - if (! HolderUtils.isHolderType(holder)) - return holder; - - return HolderUtils.getValueType(holder); - } - public OperationMetaData getOperationMetaData() { return opMetaData; @@ -160,8 +154,7 @@ // Remove potential prefix if (xmlType.getNamespaceURI().length() > 0) this.xmlType = new QName(xmlType.getNamespaceURI(), xmlType.getLocalPart()); - else - this.xmlType = xmlType; + else this.xmlType = xmlType; // Special case to identify attachments if (Constants.NS_ATTACHMENT_MIME_TYPE.equals(xmlType.getNamespaceURI())) @@ -177,7 +170,6 @@ return javaTypeName; } - public void setJavaTypeName(String javaTypeName) { this.javaTypeName = javaTypeName; @@ -205,7 +197,6 @@ return javaType; } - public ParameterMode getMode() { return mode; @@ -213,14 +204,13 @@ public void setMode(String mode) { - if("IN".equals(mode)) + if ("IN".equals(mode)) setMode(ParameterMode.IN); - else if("INOUT".equals(mode)) + else if ("INOUT".equals(mode)) setMode(ParameterMode.INOUT); - else if("OUT".equals(mode)) + else if ("OUT".equals(mode)) setMode(ParameterMode.OUT); - else - throw new IllegalArgumentException("Invalid mode: " + mode); + else throw new IllegalArgumentException("Invalid mode: " + mode); } public void setMode(ParameterMode mode) @@ -380,11 +370,10 @@ try { - Class type = (typeName != null) ? JavaUtils.loadJavaType(typeName, loader) - : ParameterWrapping.getWrappedType(wrapped.getVariable(), wrapperType); + Class type = (typeName != null) ? JavaUtils.loadJavaType(typeName, loader) : ParameterWrapping.getWrappedType(wrapped.getVariable(), wrapperType); if (type == null) return false; - if (! matchParameter(method, wrapped.getIndex(), type, matches, exact, wrapped.isHolder())) + if (!matchParameter(method, wrapped.getIndex(), type, matches, exact, wrapped.isHolder())) return false; } catch (Exception ex) Modified: trunk/src/main/java/org/jboss/ws/utils/HolderUtils.java =================================================================== --- trunk/src/main/java/org/jboss/ws/utils/HolderUtils.java 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/main/java/org/jboss/ws/utils/HolderUtils.java 2006-11-04 19:51:31 UTC (rev 1371) @@ -75,7 +75,6 @@ import javax.xml.rpc.holders.DoubleWrapperHolder; import javax.xml.rpc.holders.FloatHolder; import javax.xml.rpc.holders.FloatWrapperHolder; -import javax.xml.rpc.holders.Holder; import javax.xml.rpc.holders.IntHolder; import javax.xml.rpc.holders.IntegerWrapperHolder; import javax.xml.rpc.holders.LongHolder; @@ -103,7 +102,7 @@ /** True if the given type is a holder. */ public static boolean isHolderType(Class javaType) { - return Holder.class.isAssignableFrom(javaType) || javax.xml.ws.Holder.class.isAssignableFrom(javaType); + return javax.xml.rpc.holders.Holder.class.isAssignableFrom(javaType) || javax.xml.ws.Holder.class.isAssignableFrom(javaType); } /** True if the given type is a holder. */ @@ -123,7 +122,7 @@ if (valueType == null) throw new IllegalArgumentException("Illegal null parameter"); - if (Holder.class.isAssignableFrom(valueType)) + if (javax.xml.rpc.holders.Holder.class.isAssignableFrom(valueType)) throw new IllegalArgumentException("Is already a holder: " + valueType.getName()); if (valueType == BigDecimal.class) @@ -184,8 +183,9 @@ { Class holderClass = JavaUtils.erasure(holderType); + boolean jaxrpcHolder = javax.xml.rpc.holders.Holder.class.isAssignableFrom(holderClass); boolean jaxwsHolder = javax.xml.ws.Holder.class.isAssignableFrom(holderClass); - if (!Holder.class.isAssignableFrom(holderClass) && !jaxwsHolder) + if (!jaxrpcHolder && !jaxwsHolder) throw new IllegalArgumentException("Is not a holder: " + holderClass.getName()); if (jaxwsHolder) @@ -216,7 +216,7 @@ if (holder == null) throw new IllegalArgumentException("Illegal null parameter"); - if (!Holder.class.isInstance(holder) && !javax.xml.ws.Holder.class.isInstance(holder)) + if (!javax.xml.rpc.holders.Holder.class.isInstance(holder) && !javax.xml.ws.Holder.class.isInstance(holder)) throw new IllegalArgumentException("Is not a holder: " + holder); try @@ -248,7 +248,7 @@ if (holder == null) throw new IllegalArgumentException("Holder instance was null"); - if (!Holder.class.isInstance(holder) && !javax.xml.ws.Holder.class.isInstance(holder)) + if (!javax.xml.rpc.holders.Holder.class.isInstance(holder) && !javax.xml.ws.Holder.class.isInstance(holder)) throw new IllegalArgumentException("Is not a holder: " + holder); Class valueType = getValueType(holder.getClass()); Modified: trunk/src/test/ant/build-jars-jaxws.xml =================================================================== --- trunk/src/test/ant/build-jars-jaxws.xml 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/test/ant/build-jars-jaxws.xml 2006-11-04 19:51:31 UTC (rev 1371) @@ -313,7 +313,7 @@ </war>  - <jar jarfile="${build.test.dir}/libs/jaxws-samples-jsr181ejb.ejb3"> + <jar jarfile="${build.test.dir}/libs/jaxws-samples-jsr181ejb.jar"> <fileset dir="${build.test.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.class"/> <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3RemoteInterface.class"/> @@ -437,7 +437,7 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${build.test.dir}/libs/jaxws-webserviceref-ejb3-client.ejb3"> + <jar destfile="${build.test.dir}/libs/jaxws-webserviceref-ejb3-client.jar"> <fileset dir="${build.test.dir}/classes"> <include name="org/jboss/test/ws/jaxws/webserviceref/EJB3Client.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/EJB3Remote.class"/> Modified: trunk/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) @@ -118,7 +118,7 @@ soapHeaderElement.setMustUnderstand(true); soapHeaderElement.addTextNode("SomeOtherValue"); - System.out.println("FIXME: JBWS-1130"); + System.out.println("FIXME: [JBWS-1130] Consolidate namespace declarations"); // assertEquals(expSoapEnv, soapEnv); } } Modified: trunk/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) @@ -169,7 +169,7 @@ SOAPMessage msgOut = factory.createMessage(null, new ByteArrayInputStream(xmlEnv.getBytes())); SOAPEnvelope soapEnv = msgOut.getSOAPPart().getEnvelope(); - System.out.println("FIXME: JBWS-1130"); + System.out.println("FIXME: [JBWS-1130] Consolidate namespace declarations"); //assertEquals(DOMUtils.parse(xmlEnv), soapEnv); } } Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) @@ -57,8 +57,10 @@ public void testHandlers() throws Exception { - System.out.println("FIXME: [JBAS-3824] Fix environment context for EJB2.1 and Servlets"); - //String res = port.helloEnvEntry("InitalMessage"); - //assertEquals("InitalMessage:ClientSideHandler:appclient:8:ServerSideHandler:ejb:8:endpoint:ejb:8:ServerSideHandler:ejb:8:ClientSideHandler:appclient:8", res); + System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); + if (true) return; + + String res = port.helloEnvEntry("InitalMessage"); + assertEquals("InitalMessage:ClientSideHandler:appclient:8:ServerSideHandler:ejb:8:endpoint:ejb:8:ServerSideHandler:ejb:8:ClientSideHandler:appclient:8", res); } } Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java 2006-11-04 19:51:31 UTC (rev 1371) @@ -57,8 +57,10 @@ public void testHandlers() throws Exception { - System.out.println("FIXME: [JBAS-3824] Fix environment context for EJB2.1 and Servlets"); - //String res = port.helloEnvEntry("InitalMessage"); - //assertEquals("InitalMessage:ClientSideHandler:appclient:8:ServerSideHandler:web:8:endpoint:web:8:ServerSideHandler:web:8:ClientSideHandler:appclient:8", res); + System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); + if (true) return; + + String res = port.helloEnvEntry("InitalMessage"); + assertEquals("InitalMessage:ClientSideHandler:appclient:8:ServerSideHandler:web:8:endpoint:web:8:ServerSideHandler:web:8:ClientSideHandler:appclient:8", res); } } Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2006-11-04 19:51:31 UTC (rev 1371) @@ -63,8 +63,10 @@ public void testCall() throws Exception { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - //String response = port.echoString("Hello"); - //assertEquals("Hello", response); + if (true) return; + + String response = port.echoString("Hello"); + assertEquals("Hello", response); } } Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) @@ -49,8 +49,9 @@ */ public void testSOAPMessageToEndpointQueue() throws Exception { - System.out.println("FIXME: JBWS-1312"); + System.out.println("FIXME: [JBWS-1312] Fix JMS transport in trunk"); if (true) return; + String reqMessage = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + "<env:Body>" + Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) @@ -21,13 +21,7 @@ */ package org.jboss.test.ws.jaxrpc.samples.jsr109ejb; -import javax.naming.InitialContext; -import javax.xml.rpc.Service; - -import junit.framework.Test; - import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; /** * Test EJB endpoint for a document style service. @@ -60,19 +54,24 @@ public void testEchoString() throws Exception { + System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); + if (true) return; + String hello = "Hello"; String world = "world!"; - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - //Object retObj = endpoint.echoString(hello, world); - //assertEquals(hello + world, retObj); + Object retObj = endpoint.echoString(hello, world); + assertEquals(hello + world, retObj); } public void testEchoSimpleUserType() throws Exception { + System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); + if (true) return; + String hello = "Hello"; SimpleUserType userType = new SimpleUserType(1, 2); - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - //Object retObj = endpoint.echoSimpleUserType(hello, userType); - //assertEquals(userType, retObj); + + Object retObj = endpoint.echoSimpleUserType(hello, userType); + assertEquals(userType, retObj); } } Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) @@ -75,13 +75,13 @@ public void testEchoString() throws Exception { + System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); + if (true) return; + QName operationName = new QName(TARGET_NAMESPACE, "echoString"); call.setOperationName(operationName); assertFalse(call.isParameterAndReturnSpecRequired(operationName)); - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - if (true) return; - String hello = "Hello"; String world = "world!"; Object retObj = call.invoke(new Object[]{hello, world}); @@ -96,12 +96,12 @@ public void testEchoSimpleUserType() throws Exception { + System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); + if (true) return; + QName operationName = new QName(TARGET_NAMESPACE, "echoSimpleUserType"); call.setOperationName(operationName); - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - if (true) return; - String hello = "Hello"; SimpleUserType userType = new SimpleUserType(1, 2); Object retObj = call.invoke(new Object[]{hello, userType}); Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) @@ -105,7 +105,7 @@ String decodedString = DOMWriter.printNode(doc, true); log.debug("Decoded message:" + decodedString); - System.out.println("FIXME: JBWS-1130"); + System.out.println("FIXME: [JBWS-1130] Consolidate namespace declarations"); // assertEquals(DOMUtils.parse(envStr), doc.getDocumentElement()); } Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/asynchronous/AsynchronousDispatchTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/asynchronous/AsynchronousDispatchTestCase.java 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/asynchronous/AsynchronousDispatchTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) @@ -65,42 +65,46 @@ public void testInvokeAsynch() throws Exception { - System.out.println("FIXME: JBWS-1294"); -// StreamSource reqObj = new StreamSource(new StringReader(reqPayload)); -// Response response = createDispatch().invokeAsync(reqObj); -// StreamSource result = (StreamSource)response.get(1000, TimeUnit.MILLISECONDS); -// InputSource inputSource = new InputSource(result.getReader()); -// assertEquals(DOMUtils.parse(expPayload), DOMUtils.parse(inputSource)); + System.out.println("FIXME: [JBWS-1294] Add support for mapping async methods"); + if (true) return; + + StreamSource reqObj = new StreamSource(new StringReader(reqPayload)); + Response response = createDispatch().invokeAsync(reqObj); + StreamSource result = (StreamSource)response.get(1000, TimeUnit.MILLISECONDS); + InputSource inputSource = new InputSource(result.getReader()); + assertEquals(DOMUtils.parse(expPayload), DOMUtils.parse(inputSource)); } public void testInvokeAsynchHandler() throws Exception { - System.out.println("FIXME: JBWS-1294"); -// AsyncHandler handler = new AsyncHandler() -// { -// public void handleResponse(Response response) -// { -// try -// { -// StreamSource result = (StreamSource)response.get(); -// InputSource inputSource = new InputSource(result.getReader()); -// assertEquals(DOMUtils.parse(expPayload), DOMUtils.parse(inputSource)); -// asyncHandlerCalled = true; -// } -// catch (Exception ex) -// { -// handlerException = ex; -// } -// } -// }; -// StreamSource reqObj = new StreamSource(new StringReader(reqPayload)); -// Future future = createDispatch().invokeAsync(reqObj, handler); -// future.get(1000, TimeUnit.MILLISECONDS); -// -// if (handlerException != null) -// throw handlerException; -// -// assertTrue("Async handler called", asyncHandlerCalled); + System.out.println("FIXME: [JBWS-1294] Add support for mapping async methods"); + if (true) return; + + AsyncHandler handler = new AsyncHandler() + { + public void handleResponse(Response response) + { + try + { + StreamSource result = (StreamSource)response.get(); + InputSource inputSource = new InputSource(result.getReader()); + assertEquals(DOMUtils.parse(expPayload), DOMUtils.parse(inputSource)); + asyncHandlerCalled = true; + } + catch (Exception ex) + { + handlerException = ex; + } + } + }; + StreamSource reqObj = new StreamSource(new StringReader(reqPayload)); + Future future = createDispatch().invokeAsync(reqObj, handler); + future.get(1000, TimeUnit.MILLISECONDS); + + if (handlerException != null) + throw handlerException; + + assertTrue("Async handler called", asyncHandlerCalled); } private Dispatch createDispatch() throws MalformedURLException Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/asynchronous/AsynchronousProxyTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/asynchronous/AsynchronousProxyTestCase.java 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/asynchronous/AsynchronousProxyTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) @@ -57,49 +57,55 @@ public void testInvokeSync() throws Exception { - System.out.println("FIXME: JBWS-1294"); -// TestEndpoint port = createProxy(); -// String retStr = port.echo("Hello"); -// assertEquals("Hello", retStr); + System.out.println("FIXME: [JBWS-1294] Add support for mapping async methods"); + if (true) return; + + TestEndpoint port = createProxy(); + String retStr = port.echo("Hello"); + assertEquals("Hello", retStr); } public void testInvokeAsync() throws Exception { - System.out.println("FIXME: JBWS-1294"); -// TestEndpoint port = createProxy(); -// Response response = port.echoAsync("Hello"); -// String retStr = (String) response.get(1000, TimeUnit.MILLISECONDS); -// assertEquals("Hello", retStr); + System.out.println("FIXME: [JBWS-1294] Add support for mapping async methods"); + if (true) return; + + TestEndpoint port = createProxy(); + Response response = port.echoAsync("Hello"); + String retStr = (String) response.get(1000, TimeUnit.MILLISECONDS); + assertEquals("Hello", retStr); } public void testInvokeAsyncHandler() throws Exception { - System.out.println("FIXME: JBWS-1294"); -// AsyncHandler<String> handler = new AsyncHandler<String>() -// { -// public void handleResponse(Response response) -// { -// try -// { -// String retStr = (String) response.get(1000, TimeUnit.MILLISECONDS); -// assertEquals("Hello", retStr); -// asyncHandlerCalled = true; -// } -// catch (Exception ex) -// { -// handlerException = ex; -// } -// } -// }; -// -// TestEndpoint port = createProxy(); -// Future future = port.echoAsync("Hello", handler); -// future.get(1000, TimeUnit.MILLISECONDS); -// -// if (handlerException != null) -// throw handlerException; -// -// assertTrue("Async handler called", asyncHandlerCalled); + System.out.println("FIXME: [JBWS-1294] Add support for mapping async methods"); + if (true) return; + + AsyncHandler<String> handler = new AsyncHandler<String>() + { + public void handleResponse(Response response) + { + try + { + String retStr = (String) response.get(1000, TimeUnit.MILLISECONDS); + assertEquals("Hello", retStr); + asyncHandlerCalled = true; + } + catch (Exception ex) + { + handlerException = ex; + } + } + }; + + TestEndpoint port = createProxy(); + Future future = port.echoAsync("Hello", handler); + future.get(1000, TimeUnit.MILLISECONDS); + + if (handlerException != null) + throw handlerException; + + assertTrue("Async handler called", asyncHandlerCalled); } private TestEndpoint createProxy() throws MalformedURLException Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionTestCase.java 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) @@ -37,7 +37,7 @@ * Test JAX-WS exception handling * * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> - * @version $Revision$ + * @version $Revision:1370 $ */ public class ExceptionTestCase extends JBossWSTest { @@ -102,11 +102,8 @@ public void testSoapFaultException() throws Exception { - if (true) - { - System.out.println("FIXME: JBWS-1312"); - return; - } + System.out.println("FIXME: [JBWS-1297] Implement JAXB Fault Marshalling"); + if (true) return; try { @@ -130,11 +127,8 @@ public void testApplicationException() throws Exception { - if (true) - { - System.out.println("FIXME: JBWS-1297"); - return; - } + System.out.println("FIXME: [JBWS-1297] Implement JAXB Fault Marshalling"); + if (true) return; try { Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2006-11-04 19:51:31 UTC (rev 1371) @@ -57,9 +57,8 @@ EJB3RemoteInterface ejb3Remote = (EJB3RemoteInterface)iniCtx.lookup("/ejb3/EJB3EndpointInterface"); String helloWorld = "Hello world!"; - System.out.println("FIXME: JBAOP-300"); - //Object retObj = ejb3Remote.echo(helloWorld); - //assertEquals(helloWorld, retObj); + Object retObj = ejb3Remote.echo(helloWorld); + assertEquals(helloWorld, retObj); } public void testWebService() throws Exception Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/complex/client/JSR181ComplexTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/complex/client/JSR181ComplexTestCase.java 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/complex/client/JSR181ComplexTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) @@ -62,7 +62,7 @@ public void testRegistration() throws Exception { - System.out.println("FIXME: JBWS-1297"); + System.out.println("FIXME: [JBWS-1297] Implement JAXB Fault Marshalling"); if (true) return; Customer customer = getFredJackson(); Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webmethod/JSR181WebMethodTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webmethod/JSR181WebMethodTestCase.java 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webmethod/JSR181WebMethodTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) @@ -116,6 +116,9 @@ "</env:Envelope>"; SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes())); + System.out.println("FIXME: [JBREM-626] Allow unmarshalling of HTTP response with error code 500"); + if (true) return; + URL epURL = new URL(endpointURL); SOAPMessage resMsg = con.call(reqMsg, epURL); SOAPFault soapFault = resMsg.getSOAPBody().getFault(); @@ -142,6 +145,9 @@ " <faultstring>Endpoint {http://webmethod.jsr181.jaxws.ws.test.jboss.org/}TestEndpointPort does not contain operation meta data for: {http://webmethod.jsr181.jaxws.ws.test.jboss.org/}noWebMethod</faultstring>" + "</env:Fault>"; + System.out.println("FIXME: [JBREM-626] Allow unmarshalling of HTTP response with error code 500"); + if (true) return; + Service service = Service.create(wsdlURL, serviceName); Dispatch dispatch = service.createDispatch(portName, StreamSource.class, Mode.PAYLOAD); StreamSource retObj = (StreamSource)dispatch.invoke(new StreamSource(new StringReader(reqPayload))); Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB21TestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB21TestCase.java 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB21TestCase.java 2006-11-04 19:51:31 UTC (rev 1371) @@ -44,8 +44,10 @@ deploy("jaxws-jsr181-webservice01-ejb21.jar"); try { - System.out.println("FIXME: JBWS-3817 - Fix EJB2.1 deployments"); - //webServiceTest(); + System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); + if (true) return; + + webServiceTest(); } finally { @@ -58,8 +60,10 @@ deploy("jaxws-jsr181-webservice02-ejb21.jar"); try { - System.out.println("FIXME: JBWS-3817 - Fix EJB2.1 deployments"); - //webServiceWsdlLocationTest(); + System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); + if (true) return; + + webServiceWsdlLocationTest(); } finally { @@ -72,12 +76,14 @@ deploy("jaxws-jsr181-webservice03-ejb21.jar"); try { - System.out.println("FIXME: JBWS-3817 - Fix EJB2.1 deployments"); - //webServiceEndpointInterfaceTest(); + System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); + if (true) return; + + webServiceEndpointInterfaceTest(); } finally { undeploy("jaxws-jsr181-webservice03-ejb21.jar"); } } -} +} \ No newline at end of file Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB3TestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB3TestCase.java 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB3TestCase.java 2006-11-04 19:51:31 UTC (rev 1371) @@ -47,12 +47,11 @@ try { InitialContext iniCtx = getInitialContext(); - System.out.println("FIXME: JBAOP-300"); -// EJB3RemoteInterface ejb3Remote = (EJB3RemoteInterface)iniCtx.lookup("/ejb3/EJB3EndpointInterface"); -// -// String helloWorld = "Hello world!"; -// Object retObj = ejb3Remote.echo(helloWorld); -// assertEquals(helloWorld, retObj); + EJB3RemoteInterface ejb3Remote = (EJB3RemoteInterface)iniCtx.lookup("/ejb3/EJB3EndpointInterface"); + + String helloWorld = "Hello world!"; + Object retObj = ejb3Remote.echo(helloWorld); + assertEquals(helloWorld, retObj); } finally { Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java 2006-11-04 19:51:31 UTC (rev 1371) @@ -51,7 +51,7 @@ @Stateless // jboss propriatary annotations -@RemoteBinding(jndiBinding = "/ejb3/EJB3EndpointInterface") +@RemoteBinding(jndiBinding = "/ejb3/EJB3Bean01") @PortComponent(authMethod="BASIC", transportGuarantee="NONE", configName="Standard WSSecurity Endpoint") @SecurityDomain("JBossWS") public class EJB3Bean01 implements EJB3RemoteInterface Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.java 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.java 2006-11-04 19:51:31 UTC (rev 1371) @@ -49,13 +49,13 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(JSR181WebServiceEJB3TestCase.class, "jaxws-samples-jsr181ejb.ejb3, jaxws-samples-jsr181ejb-client.jar"); + return JBossWSTestSetup.newTestSetup(JSR181WebServiceEJB3TestCase.class, "jaxws-samples-jsr181ejb.jar, jaxws-samples-jsr181ejb-client.jar"); } public void testRemoteAccess() throws Exception { InitialContext iniCtx = getInitialContext(); - EJB3RemoteInterface ejb3Remote = (EJB3RemoteInterface)iniCtx.lookup("/ejb3/EJB3EndpointInterface"); + EJB3RemoteInterface ejb3Remote = (EJB3RemoteInterface)iniCtx.lookup("/ejb3/EJB3Bean01"); SecurityAssociation.setPrincipal(new SimplePrincipal("kermit")); SecurityAssociation.setCredential("thefrog"); @@ -67,7 +67,10 @@ public void testWebService() throws Exception { - //assertWSDLAccess(); + System.out.println("FIXME: [JBAS-3835] Fix BASIC authentication"); + if (true) return; + + assertWSDLAccess(); InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefEJB3TestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefEJB3TestCase.java 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefEJB3TestCase.java 2006-11-04 19:51:31 UTC (rev 1371) @@ -48,7 +48,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(WebServiceRefEJB3TestCase.class, "jaxws-webserviceref.war, jaxws-webserviceref-ejb3-client.ejb3"); + return JBossWSTestSetup.newTestSetup(WebServiceRefEJB3TestCase.class, "jaxws-webserviceref.war, jaxws-webserviceref-ejb3-client.jar"); } public void testWSDLAccess() throws MalformedURLException Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefServletTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefServletTestCase.java 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefServletTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) @@ -74,6 +74,9 @@ public void testServletClient() throws Exception { + System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); + if (true) return; + URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld"); BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); String retStr = br.readLine(); Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) @@ -63,7 +63,7 @@ EndpointReferenceImpl epr = new EndpointReferenceImpl(inElement); Element outElement = epr.toElement(); - System.out.println("FIXME: JBWS-1130"); + System.out.println("FIXME: [JBWS-1130] Consolidate namespace declarations"); //assertEquals(inElement, outElement); } } Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) @@ -101,7 +101,7 @@ SOAPMessage msgOut = factory.createMessage(null, new ByteArrayInputStream(reqEnvStr.getBytes())); SOAPEnvelope expEnv = msgOut.getSOAPPart().getEnvelope(); - System.out.println("FIXME: JBWS-1130"); + System.out.println("FIXME: [JBWS-1130] Consolidate namespace declarations"); //assertEquals(expEnv, wasEnv); } @@ -120,7 +120,7 @@ SOAPMessage msgOut = factory.createMessage(null, new ByteArrayInputStream(resEnvStr.getBytes())); SOAPEnvelope expEnv = msgOut.getSOAPPart().getEnvelope(); - System.out.println("FIXME: JBWS-1130"); + System.out.println("FIXME: [JBWS-1130] Consolidate namespace declarations"); //assertEquals(expEnv, wasEnv); } } Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) @@ -126,6 +126,9 @@ public void testInital() throws Exception { + System.out.println("FIXME: [JBREM-626] Allow unmarshalling of HTTP response with error code 500"); + if (true) return; + String item = initial.addItem("Ice Cream"); assertNull("Expected null, but was: " + item, item); @@ -135,12 +138,18 @@ public void testReplyTo() throws Exception { + System.out.println("FIXME: [JBREM-626] Allow unmarshalling of HTTP response with error code 500"); + if (true) return; + String item = replyto.getLastItem(); assertEquals("Ice Cream", item); } public void testFaultTo() throws Exception { + System.out.println("FIXME: [JBREM-626] Allow unmarshalling of HTTP response with error code 500"); + if (true) return; + String lastFault = faultto.getLastFault(); assertEquals("java.lang.IllegalArgumentException: Invalid Value", lastFault); } Modified: trunk/src/test/resources/jaxws/wsaddressing/action/META-INF/jboss-client.xml =================================================================== --- trunk/src/test/resources/jaxws/wsaddressing/action/META-INF/jboss-client.xml 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/test/resources/jaxws/wsaddressing/action/META-INF/jboss-client.xml 2006-11-04 19:51:31 UTC (rev 1371) @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8' ?> -<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_5_0.dtd"> +<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> <jndi-name>wsarpc-client</jndi-name> Modified: trunk/src/test/resources/jaxws/wsaddressing/replyto/Initial-META-INF/jboss-client.xml =================================================================== --- trunk/src/test/resources/jaxws/wsaddressing/replyto/Initial-META-INF/jboss-client.xml 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/test/resources/jaxws/wsaddressing/replyto/Initial-META-INF/jboss-client.xml 2006-11-04 19:51:31 UTC (rev 1371) @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8' ?> -<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_5_0.dtd"> +<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> <jndi-name>initial-client</jndi-name> Modified: trunk/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jboss-client.xml =================================================================== --- trunk/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jboss-client.xml 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jboss-client.xml 2006-11-04 19:51:31 UTC (rev 1371) @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8' ?> -<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_5_0.dtd"> +<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> <jndi-name>replyto-client</jndi-name> Modified: trunk/version.properties =================================================================== --- trunk/version.properties 2006-11-04 15:38:09 UTC (rev 1370) +++ trunk/version.properties 2006-11-04 19:51:31 UTC (rev 1371) @@ -19,7 +19,7 @@ javassist=3.3.0.GA jboss-common-core=2.0.2.CR1 jboss-common-logging=2.0.1.GA -jboss-jbossxb=1.0.0.CR6 +jboss-jbossxb=1.0.0.CR7 jboss-microcontainer=snapshot jboss-remoting=2.2.0.Alpha2

18 years, 4 months

1
0
0 / 0

JBossWS SVN: r1370 - in trunk: . src/ant src/main/etc src/main/java/org/jboss/ws/binding src/main/java/org/jboss/ws/common src/main/java/org/jboss/ws/deployment src/main/java/org/jboss/ws/jaxrpc src/main/java/org/jboss/ws/jaxws src/main/java/org/jboss/ws/jaxws/core src/main/java/org/jboss/ws/metadata src/main/java/org/jboss/ws/metadata/acessor src/main/java/org/jboss/ws/metadata/wsdl src/main/java/org/jboss/ws/tools src/main/java/org/jboss/ws/tools/helpers src/main/java/org/jboss/ws/tools/

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-11-04 10:38:09 -0500 (Sat, 04 Nov 2006) New Revision: 1370 Added: trunk/src/main/java/org/jboss/ws/metadata/WrappedParameter.java trunk/src/main/java/org/jboss/ws/metadata/acessor/ trunk/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java trunk/src/main/java/org/jboss/ws/metadata/acessor/ReflectiveMethodAccessor.java trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/ trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/Anonymous.java trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.java trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.java trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.java trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionEndpoint.java trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionEndpointImpl.java trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/exception/UserException.java trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/ trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/ trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.java trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.java trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/ trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/FieldAccessor.java trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/FieldAccessorResponse.java trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/MethodAccessor.java trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/MethodAccessorResponse.java trunk/src/test/resources/jaxws/anonymous/ trunk/src/test/resources/jaxws/anonymous/WEB-INF/ trunk/src/test/resources/jaxws/anonymous/WEB-INF/web.xml trunk/src/test/resources/jaxws/exception/ trunk/src/test/resources/jaxws/exception/WEB-INF/ trunk/src/test/resources/jaxws/exception/WEB-INF/web.xml trunk/src/test/resources/jaxws/wrapped/ trunk/src/test/resources/jaxws/wrapped/accessor/ trunk/src/test/resources/jaxws/wrapped/accessor/WEB-INF/ trunk/src/test/resources/jaxws/wrapped/accessor/WEB-INF/web.xml Removed: trunk/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java trunk/src/main/java/org/jboss/ws/metadata/acessor/ReflectiveMethodAccessor.java trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/Anonymous.java trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.java trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.java trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.java trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionEndpoint.java trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionEndpointImpl.java trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/exception/UserException.java trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/ trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.java trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.java trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/ trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/FieldAccessor.java trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/FieldAccessorResponse.java trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/MethodAccessor.java trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/MethodAccessorResponse.java trunk/src/test/resources/jaxws/anonymous/WEB-INF/ trunk/src/test/resources/jaxws/anonymous/WEB-INF/web.xml trunk/src/test/resources/jaxws/exception/WEB-INF/ trunk/src/test/resources/jaxws/exception/WEB-INF/web.xml trunk/src/test/resources/jaxws/wrapped/accessor/ trunk/src/test/resources/jaxws/wrapped/accessor/WEB-INF/ trunk/src/test/resources/jaxws/wrapped/accessor/WEB-INF/web.xml Modified: trunk/.classpath trunk/src/ant/build-thirdparty.xml trunk/src/main/etc/jbossws-component-info.xml trunk/src/main/java/org/jboss/ws/binding/EndpointInvocation.java trunk/src/main/java/org/jboss/ws/common/CommonSOAPBinding.java trunk/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java trunk/src/main/java/org/jboss/ws/deployment/JSR181ClientMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java trunk/src/main/java/org/jboss/ws/jaxrpc/SOAP11BindingJAXRPC.java trunk/src/main/java/org/jboss/ws/jaxrpc/SOAP12BindingJAXRPC.java trunk/src/main/java/org/jboss/ws/jaxws/DynamicWrapperGenerator.java trunk/src/main/java/org/jboss/ws/jaxws/core/SOAP11BindingJAXWS.java trunk/src/main/java/org/jboss/ws/jaxws/core/SOAP12BindingJAXWS.java trunk/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java trunk/src/main/java/org/jboss/ws/tools/SourceWrapperGenerator.java trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java trunk/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java trunk/src/test/ant/build-jars-jaxws.xml trunk/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/JSR181HandlerChainTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/oneway/JSR181OneWayTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/JSR181SOAPBindingTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/PurchaseOrder.java trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/PurchaseOrderAck.java trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/SubmitBareRequest.java trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/SubmitBareResponse.java trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webmethod/JSR181WebMethodTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webresult/JSR181WebResultTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXB.java trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXBImpl.java trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSource.java trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSourceImpl.java trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java trunk/src/test/resources/jaxws/jbws871/META-INF/wsdl/TestEndpoint.wsdl trunk/src/test/resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl trunk/src/test/resources/jaxws/jsr181/complex/jaxrpc-mapping.xml trunk/src/test/resources/jaxws/jsr181/webresult/jaxrpc-mapping.xml trunk/version.properties Log: Merge from branch JEE5_TCK Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/.classpath 2006-11-04 15:38:09 UTC (rev 1370) @@ -28,7 +28,9 @@ <classpathentry kind="lib" path="thirdparty/jboss-remoting.jar"/> <classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/> <classpathentry kind="lib" path="thirdparty/jaxb-impl.jar"/> - <classpathentry sourcepath="/home/tdiesler/svn/jboss/common/common-core/trunk/src/main/java" kind="lib" path="thirdparty/jboss-common.jar"/> <classpathentry sourcepath="/home/tdiesler/svn/jbossmc/trunk/deployers/src/main" kind="lib" path="thirdparty/jboss-deployers.jar"/> + <classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/> + <classpathentry kind="lib" path="thirdparty/jboss-dependency.jar"/> + <classpathentry kind="lib" path="thirdparty/jboss-logging-spi.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/src/ant/build-thirdparty.xml =================================================================== --- trunk/src/ant/build-thirdparty.xml 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/ant/build-thirdparty.xml 2006-11-04 15:38:09 UTC (rev 1370) @@ -34,7 +34,8 @@ <get src="${jboss.repository}/hibernate/${hibernate}/lib/hibernate3.jar" dest="${thirdparty.dir}/hibernate3.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common/${jboss-common}/lib/jboss-common.jar" dest="${thirdparty.dir}/jboss-common.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar" dest="${thirdparty.dir}/jboss-deployers.jar" usetimestamp="true" verbose="true"/> @@ -69,10 +70,11 @@ <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/> <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/> - <pathelement location="${thirdparty.dir}/jboss-common.jar"/> + <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/> <pathelement location="${thirdparty.dir}/jboss-container.jar"/> <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/> <pathelement location="${thirdparty.dir}/jboss-deployers.jar"/> + <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/> <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> <pathelement location="${thirdparty.dir}/jboss-remoting.jar"/> <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> Modified: trunk/src/main/etc/jbossws-component-info.xml =================================================================== --- trunk/src/main/etc/jbossws-component-info.xml 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/main/etc/jbossws-component-info.xml 2006-11-04 15:38:09 UTC (rev 1370) @@ -26,6 +26,9 @@ <import componentref="jboss/remoting"> <compatible version="@jboss-remoting@"/> </import> + <import componentref="sun-jaxb"> + <compatible version="@sun-jaxb@"/> + </import> <export> <include input="jboss-jaxrpc.jar"/> Modified: trunk/src/main/java/org/jboss/ws/binding/EndpointInvocation.java =================================================================== --- trunk/src/main/java/org/jboss/ws/binding/EndpointInvocation.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/main/java/org/jboss/ws/binding/EndpointInvocation.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -42,7 +42,7 @@ import org.jboss.ws.jaxrpc.ParameterWrapping; import org.jboss.ws.metadata.OperationMetaData; import org.jboss.ws.metadata.ParameterMetaData; -import org.jboss.ws.metadata.ParameterMetaData.WrappedParameter; +import org.jboss.ws.metadata.WrappedParameter; import org.jboss.ws.soap.SOAPContentElement; import org.jboss.ws.utils.HolderUtils; import org.jboss.ws.utils.JavaUtils; @@ -337,12 +337,12 @@ { try { - if (param.index >= 0) - outParameters.put(param.index, targetParameterTypes[param.index].newInstance()); + if (param.getIndex() >= 0) + outParameters.put(param.getIndex(), targetParameterTypes[param.getIndex()].newInstance()); } catch (Exception e) { - throw new WSException("Could not add output param: " + param.name, e); + throw new WSException("Could not add output param: " + param.getName(), e); } } Modified: trunk/src/main/java/org/jboss/ws/common/CommonSOAPBinding.java =================================================================== --- trunk/src/main/java/org/jboss/ws/common/CommonSOAPBinding.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/main/java/org/jboss/ws/common/CommonSOAPBinding.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -225,7 +225,7 @@ } } - // Set the SOAPAction + // Set the SOAPAction setSOAPActionHeader(opMetaData, reqMessage); return reqMessage; @@ -537,11 +537,7 @@ // Translate the SOAPFault to an exception and throw it if (soapBodyElement instanceof SOAPFaultImpl) - { - SOAPFaultImpl soapFault = (SOAPFaultImpl)soapBodyElement; - SOAPFaultException faultEx = SOAPFaultExceptionHelper.getSOAPFaultException(soapFault); - throw faultEx; - } + throwFaultException((SOAPFaultImpl)soapBodyElement); // Extract unbound OUT headers if (unboundHeaders != null) @@ -772,7 +768,7 @@ // When a potential xop parameter is detected and MTOM is enabled // we flag the SOAP message as a XOP package - if (paramMetaData.isXOP() && XOPContext.isMTOMEnabled()) + if (paramMetaData.isXOP() && XOPContext.isMTOMEnabled()) { log.trace("Add parameter as XOP"); CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); @@ -879,6 +875,8 @@ return soapContentElement; } + abstract protected void throwFaultException(SOAPFaultImpl fault) throws Exception; + private void handleException(Exception ex) throws BindingException { if (ex instanceof RuntimeException) Modified: trunk/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -50,7 +50,7 @@ import org.jboss.ws.metadata.ServiceMetaData; import org.jboss.ws.metadata.TypeMappingMetaData; import org.jboss.ws.metadata.TypesMetaData; -import org.jboss.ws.metadata.ParameterMetaData.WrappedParameter; +import org.jboss.ws.metadata.WrappedParameter; import org.jboss.ws.metadata.jaxrpcmapping.ExceptionMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaXmlTypeMapping; Modified: trunk/src/main/java/org/jboss/ws/deployment/JSR181ClientMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/deployment/JSR181ClientMetaDataBuilder.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/main/java/org/jboss/ws/deployment/JSR181ClientMetaDataBuilder.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -46,7 +46,8 @@ { log.debug("START: rebuildMetaData"); - initialize(epMetaData.getClassLoader()); + // Clear the java types, etc. + resetMetaDataBuilder(epMetaData.getClassLoader()); // Nuke parameterStyle epMetaData.setParameterStyle(null); @@ -76,7 +77,8 @@ // Process @WebMethod processWebMethods(epMetaData, wsClass, true); - // Populate parameter xmlTypes + // Initialize types + createJAXBContext(epMetaData); populateXmlTypes(epMetaData); // Eager initialization Modified: trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -76,8 +76,9 @@ import org.jboss.ws.metadata.TypeMappingMetaData; import org.jboss.ws.metadata.TypesMetaData; import org.jboss.ws.metadata.UnifiedMetaData; +import org.jboss.ws.metadata.WrappedParameter; import org.jboss.ws.metadata.HandlerMetaData.HandlerType; -import org.jboss.ws.metadata.ParameterMetaData.WrappedParameter; +import org.jboss.ws.metadata.acessor.JAXBAccessor; import org.jboss.ws.metadata.config.jaxws.WSEndpointConfigJAXWS; import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; import org.jboss.ws.metadata.jsr181.HandlerChainFactory; @@ -127,7 +128,7 @@ { WebService anWebService = (WebService)sepClass.getAnnotation(WebService.class); if (anWebService == null) - throw new WSException("Cannot obtain @WebService annotaion from: " + sepClass.getName()); + throw new WSException("Cannot obtain @WebService annotation from: " + sepClass.getName()); try { @@ -142,12 +143,13 @@ throw new WSException("Interface does not have a @WebService annotation: " + seiName); } + // Clear the java types, etc. + resetMetaDataBuilder(udi.classLoader); + Class wsClass = (seiClass != null ? seiClass : sepClass); WSDLUtils wsdlUtils = WSDLUtils.getInstance(); - initialize(udi.classLoader); - String name = anWebService.name(); if (name.length() == 0) name = wsdlUtils.getJustClassName(wsClass); @@ -193,7 +195,8 @@ boolean includeAllMethods = (wsClass == seiClass); processWebMethods(sepMetaData, wsClass, includeAllMethods); - // Populate parameter xmlTypes + // Initialize types + createJAXBContext(sepMetaData); populateXmlTypes(sepMetaData); // Process or generate WSDL @@ -211,10 +214,10 @@ // Init the endpoint address initEndpointAddress(udi, sepMetaData, linkName); - + // replace the SOAP address replaceAddressLocation(sepMetaData); - + // Process an optional @SOAPMessageHandlers annotation if (sepClass.isAnnotationPresent(SOAPMessageHandlers.class) || wsClass.isAnnotationPresent(SOAPMessageHandlers.class)) log.warn("@SOAPMessageHandlers is deprecated as of JSR-181 2.0 with no replacement."); @@ -248,7 +251,7 @@ } } - protected void initialize(ClassLoader loader) + protected void resetMetaDataBuilder(ClassLoader loader) { wrapperGenerator = new DynamicWrapperGenerator(loader); javaTypes.clear(); @@ -256,22 +259,18 @@ jaxbCtx = null; } - protected JAXBRIContext getJAXBContext(EndpointMetaData epMetaData) + protected void createJAXBContext(EndpointMetaData epMetaData) { - if (jaxbCtx == null) - { - try - { - String targetNS = epMetaData.getInterfaceQName().getNamespaceURI(); - log.debug("JAXBContext [types=" + javaTypes + ",tns=" + targetNS + "]"); - jaxbCtx = JAXBRIContext.newInstance(javaTypes.toArray(new Class[0]), typeRefs, targetNS, false); - } - catch (JAXBException ex) - { - log.error("Cannot build JAXB context", ex); - } - } - return jaxbCtx; + try + { + String targetNS = epMetaData.getInterfaceQName().getNamespaceURI(); + log.debug("JAXBContext [types=" + javaTypes + ",tns=" + targetNS + "]"); + jaxbCtx = JAXBRIContext.newInstance(javaTypes.toArray(new Class[0]), typeRefs, targetNS, false); + } + catch (JAXBException ex) + { + throw new IllegalStateException("Cannot build JAXB context", ex); + } } protected void populateXmlTypes(EndpointMetaData epMetaData) @@ -292,7 +291,6 @@ { EndpointMetaData epMetaData = paramMetaData.getOperationMetaData().getEndpointMetaData(); TypesMetaData types = epMetaData.getServiceMetaData().getTypesMetaData(); - JAXBRIContext jaxbCtx = getJAXBContext(epMetaData); QName xmlName = paramMetaData.getXmlName(); QName xmlType = paramMetaData.getXmlType(); @@ -301,16 +299,29 @@ if (xmlType == null) { - xmlType = jaxbCtx.getTypeName(new TypeReference(xmlName, javaType)); - if (xmlType == null) - log.warn("Cannot obtain xml type for: [xmlName=" + xmlName + ",javaName=" + javaName + "]"); - - if (xmlType != null) + try { - paramMetaData.setXmlType(xmlType); - types.addTypeMapping(new TypeMappingMetaData(types, xmlType, javaName)); + xmlType = jaxbCtx.getTypeName(new TypeReference(xmlName, javaType)); } + catch (IllegalArgumentException e) + { + throw new IllegalStateException("Cannot obtain xml type for: [xmlName=" + xmlName + ",javaName=" + javaName + "]"); + } + + /* Anonymous type. + * + * Currently the design of our stack is based on the + * notion of their always being a unique type. In order to lookup the + * appropriate (de)serializer you must have a type. So we use a fake + * name. This is an illegal NCName, so it shouldn't collide. + */ + if (xmlType == null) + xmlType = new QName(xmlName.getNamespaceURI(), ">" + xmlName.getLocalPart()); + + paramMetaData.setXmlType(xmlType); } + + types.addTypeMapping(new TypeMappingMetaData(types, xmlType, javaName)); } protected void processSOAPBinding(EndpointMetaData epMetaData, Class wsClass) @@ -455,14 +466,14 @@ String variable = convertToVariable(wrappedElementName.getLocalPart()); WrappedParameter wrappedParameter = new WrappedParameter(wrappedElementName, javaTypeName, variable, i); - wrappedParameter.typeArguments = convertTypeArguments(javaType, genericType); + wrappedParameter.setTypeArguments(convertTypeArguments(javaType, genericType)); if (mode != ParameterMode.OUT) wrappedParameters.add(wrappedParameter); if (mode != ParameterMode.IN) { wrappedOutputParameters.add(wrappedParameter); - wrappedParameter.holder = true; + wrappedParameter.setHolder(true); } } else @@ -497,7 +508,7 @@ if (isWrapped) { WrappedParameter wrapped = new WrappedParameter(xmlName, returnTypeName, convertToVariable(xmlName.getLocalPart()), -1); - wrapped.typeArguments = convertTypeArguments(returnType, genericReturnType); + wrapped.setTypeArguments(convertTypeArguments(returnType, genericReturnType)); // insert at the beginning just for prettiness wrappedOutputParameters.add(0, wrapped); @@ -579,6 +590,7 @@ } ParameterMetaData retMetaData = new ParameterMetaData(operation, xmlName, xmlType, responseWrapperType); + retMetaData.setAccessorFactoryCreator(JAXBAccessor.FACTORY_CREATOR); operation.setReturnParameter(retMetaData); return retMetaData; @@ -610,6 +622,7 @@ // JAX-WS p.37 pg.1, the annotation only affects the element name, not the type name ParameterMetaData wrapperParameter = new ParameterMetaData(operation, xmlName, xmlType, requestWrapperType); + wrapperParameter.setAccessorFactoryCreator(JAXBAccessor.FACTORY_CREATOR); operation.addParameter(wrapperParameter); return wrapperParameter; @@ -721,54 +734,66 @@ private QName getWebParamName(OperationMetaData opMetaData, int index, Class javaType, WebParam webParam) { - QName xmlName = null; - String namespaceURI = opMetaData.getQName().getNamespaceURI(); + String namespace = null ; + String name = null; + boolean header = false; + if (webParam != null) { if (webParam.targetNamespace().length() > 0) - namespaceURI = webParam.targetNamespace(); + namespace = webParam.targetNamespace(); if (webParam.name().length() > 0) - { - if (opMetaData.getStyle() != Style.RPC || webParam.header()) - xmlName = new QName(namespaceURI, webParam.name()); - else xmlName = new QName(webParam.name()); - } + name = webParam.name(); + + header = webParam.header(); } - if (xmlName == null && opMetaData.isDocumentBare()) - xmlName = new QName(namespaceURI, opMetaData.getQName().getLocalPart()); + // Bare and headers must be qualified + if (namespace == null && (opMetaData.isDocumentBare() || header)) + namespace = opMetaData.getQName().getNamespaceURI(); - if (xmlName == null) - xmlName = (opMetaData.isDocumentWrapped()) ? new QName(namespaceURI, "arg" + index) : new QName("arg" + index); + // RPC body parts must have no namespace + else if (opMetaData.isRPCLiteral() && !header) + namespace = null; - return xmlName; + // Bare uses the operation name as the default, everything else is generated + if (name == null) + name = opMetaData.isDocumentBare() && !header ? opMetaData.getQName().getLocalPart() : "arg" + index; + + return (namespace != null) ? new QName(namespace, name) : new QName(name); } private QName getWebResultName(OperationMetaData opMetaData, Class javaType, WebResult anWebResult) { - QName xmlName = null; - String namespaceURI = opMetaData.getQName().getNamespaceURI(); + String name = null; + String namespace = null; + boolean header = false; if (anWebResult != null) { if (anWebResult.targetNamespace().length() > 0) - namespaceURI = anWebResult.targetNamespace(); + namespace = anWebResult.targetNamespace(); if (anWebResult.name().length() > 0) - { - if (opMetaData.getStyle() != Style.RPC || anWebResult.header()) - xmlName = new QName(namespaceURI, anWebResult.name()); - else xmlName = new QName(anWebResult.name()); - } + name = anWebResult.name(); + + header = anWebResult.header(); } - if (xmlName == null && opMetaData.isDocumentBare()) - xmlName = new QName(namespaceURI, opMetaData.getResponseName().getLocalPart()); - if (xmlName == null) - xmlName = (opMetaData.isDocumentWrapped() ? new QName(namespaceURI, "return") : new QName("return")); + // Bare and headers must be qualified + if (namespace == null && (opMetaData.isDocumentBare() || header)) + namespace = opMetaData.getQName().getNamespaceURI(); - return xmlName; + // RPC body parts must have no namespace + else if (opMetaData.isRPCLiteral() && !header) + namespace = null; + + // Bare uses the operation name as the default, everything else is generated + if (name == null) + name = opMetaData.isDocumentBare() && !header ? opMetaData.getResponseName().getLocalPart() : "return"; + + return (namespace != null) ? new QName(namespace, name) : new QName(name); } private void addFault(OperationMetaData omd, Class<?> exception) @@ -898,7 +923,7 @@ { String serviceName = serviceMetaData.getServiceName().getLocalPart(); - WSDLGenerator generator = new JAXBWSDLGenerator(getJAXBContext(epMetaData)); + WSDLGenerator generator = new JAXBWSDLGenerator(jaxbCtx); WSDLDefinitions wsdlDefinitions = generator.generate(serviceMetaData); ServerConfigFactory factory = ServerConfigFactory.getInstance(); @@ -925,5 +950,4 @@ } } } - -} +} \ No newline at end of file Modified: trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java =================================================================== --- trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -49,7 +49,7 @@ import org.jboss.ws.metadata.ServiceMetaData; import org.jboss.ws.metadata.TypeMappingMetaData; import org.jboss.ws.metadata.TypesMetaData; -import org.jboss.ws.metadata.ParameterMetaData.WrappedParameter; +import org.jboss.ws.metadata.WrappedParameter; import org.jboss.ws.utils.HolderUtils; import org.jboss.ws.utils.JavaUtils; @@ -111,11 +111,8 @@ Object reqStruct = reqStructType.newInstance(); for (WrappedParameter param : wrappedParameters) { - PropertyDescriptor pd = new PropertyDescriptor(param.variable, reqStructType); - Method method = pd.getWriteMethod(); - Object value = holderValue(methodParams[param.index]); - log.debug(" " + method.getName() + ": " + (value != null ? value.getClass().getName() : null)); - method.invoke(reqStruct, value); + Object value = holderValue(methodParams[param.getIndex()]); + param.accessor().set(reqStruct, value); } return reqStruct; @@ -146,23 +143,19 @@ log.debug("unwrapRequestParameters: " + reqStructType.getName()); try { - for (ParameterMetaData.WrappedParameter param : wrappedParameters) + for (WrappedParameter param : wrappedParameters) { - PropertyDescriptor pd = new PropertyDescriptor(param.variable, reqStructType); - Method method = pd.getReadMethod(); - Class targetType = targetParameterTypes[param.index]; + Class targetType = targetParameterTypes[param.getIndex()]; + Object value = param.accessor().get(reqStruct); - Object value = method.invoke(reqStruct); - // INOUT Parameter if (HolderUtils.isHolderType(targetType)) { value = HolderUtils.createHolderInstance(value, targetType); - outParameters.put(param.index, value); + outParameters.put(param.getIndex(), value); } - log.debug(" " + method.getName() + ": " + (value != null ? value.getClass().getName() : null)); - methodParams[param.index] = value; + methodParams[param.getIndex()] = value; } } catch (RuntimeException rte) @@ -189,18 +182,15 @@ } log.debug("wrapResponseParameter: " + resStructType.getName()); - List<ParameterMetaData.WrappedParameter> wrappedParameters = returnMetaData.getWrappedParameters(); + List<WrappedParameter> wrappedParameters = returnMetaData.getWrappedParameters(); try { Object resStruct = resStructType.newInstance(); - for (ParameterMetaData.WrappedParameter param : wrappedParameters) + for (WrappedParameter param : wrappedParameters) { - PropertyDescriptor pd = new PropertyDescriptor(param.variable, resStructType); - Method method = pd.getWriteMethod(); - Object value = (param.index < 0) ? returnValue : holderValue(outParameters.get(param.index)); - log.debug(" " + method.getName() + ": " + (value != null ? value.getClass().getName() : null)); - method.invoke(resStruct, value); + Object value = (param.getIndex() < 0) ? returnValue : holderValue(outParameters.get(param.getIndex())); + param.accessor().set(resStruct, value); } return resStruct; } @@ -231,20 +221,17 @@ { for (WrappedParameter param : wrappedParameters) { - PropertyDescriptor pd = new PropertyDescriptor(param.variable, resStructType); - Method method = pd.getReadMethod(); - Object value = method.invoke(resStruct, new Object[] {}); - log.debug(" " + method.getName() + ": " + (value != null ? value.getClass().getName() : null)); - if (param.index < 0) + Object value = param.accessor().get(resStruct); + if (param.getIndex() < 0) { retValue = value; } else { - Class targetType = targetTypes[param.index]; + Class targetType = targetTypes[param.getIndex()]; if (HolderUtils.isHolderType(targetType)) value = HolderUtils.createHolderInstance(value, targetType); - methodParams[param.index] = value; + methodParams[param.getIndex()] = value; } } } @@ -310,11 +297,11 @@ for (WrappedParameter param : wrappedParameters) { - CtField field = new CtField(pool.get(param.type), param.variable, clazz); + CtField field = new CtField(pool.get(param.getType()), param.getVariable(), clazz); field.setModifiers(Modifier.PRIVATE); clazz.addField(field); - clazz.addMethod(CtNewMethod.getter("get" + JavaUtils.capitalize(param.variable), field)); - clazz.addMethod(CtNewMethod.setter("set" + JavaUtils.capitalize(param.variable), field)); + clazz.addMethod(CtNewMethod.getter("get" + JavaUtils.capitalize(param.getVariable()), field)); + clazz.addMethod(CtNewMethod.setter("set" + JavaUtils.capitalize(param.getVariable()), field)); } wrapperType = (Class)pool.toClass(clazz, loader); Modified: trunk/src/main/java/org/jboss/ws/jaxrpc/SOAP11BindingJAXRPC.java =================================================================== --- trunk/src/main/java/org/jboss/ws/jaxrpc/SOAP11BindingJAXRPC.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/main/java/org/jboss/ws/jaxrpc/SOAP11BindingJAXRPC.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -23,14 +23,16 @@ //$Id:SOAP11BindingJAXRPC.java 1054 2006-09-26 10:33:43Z thomas.diesler(a)jboss.com $ +import javax.xml.rpc.soap.SOAPFaultException; import javax.xml.soap.SOAPMessage; import org.jboss.ws.common.CommonSOAP11Binding; import org.jboss.ws.metadata.OperationMetaData; +import org.jboss.ws.soap.SOAPFaultImpl; /** - * The JAXRPC SOAP11Binding - * + * The JAXRPC SOAP11Binding + * * @author Thomas.Diesler(a)jboss.com * @since 20-Sep-2006 */ @@ -43,4 +45,10 @@ { delegate.setSOAPActionHeader(opMetaData, reqMessage); } + + @Override + protected void throwFaultException(SOAPFaultImpl fault) throws Exception + { + throw SOAPFaultExceptionHelper.getSOAPFaultException(fault); + } } Modified: trunk/src/main/java/org/jboss/ws/jaxrpc/SOAP12BindingJAXRPC.java =================================================================== --- trunk/src/main/java/org/jboss/ws/jaxrpc/SOAP12BindingJAXRPC.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/main/java/org/jboss/ws/jaxrpc/SOAP12BindingJAXRPC.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -27,10 +27,11 @@ import org.jboss.ws.common.CommonSOAP12Binding; import org.jboss.ws.metadata.OperationMetaData; +import org.jboss.ws.soap.SOAPFaultImpl; /** - * The JAXRPC SOAP12Binding - * + * The JAXRPC SOAP12Binding + * * @author Thomas.Diesler(a)jboss.com * @since 20-Sep-2006 */ @@ -43,4 +44,10 @@ { delegate.setSOAPActionHeader(opMetaData, reqMessage); } + + @Override + protected void throwFaultException(SOAPFaultImpl fault) throws Exception + { + throw SOAPFaultExceptionHelper.getSOAPFaultException(fault); + } } Modified: trunk/src/main/java/org/jboss/ws/jaxws/DynamicWrapperGenerator.java =================================================================== --- trunk/src/main/java/org/jboss/ws/jaxws/DynamicWrapperGenerator.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/main/java/org/jboss/ws/jaxws/DynamicWrapperGenerator.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -47,7 +47,9 @@ import org.jboss.ws.metadata.FaultMetaData; import org.jboss.ws.metadata.OperationMetaData; import org.jboss.ws.metadata.ParameterMetaData; -import org.jboss.ws.metadata.ParameterMetaData.WrappedParameter; +import org.jboss.ws.metadata.TypeMappingMetaData; +import org.jboss.ws.metadata.TypesMetaData; +import org.jboss.ws.metadata.WrappedParameter; import org.jboss.ws.utils.JavaUtils; import org.jboss.ws.utils.JavassistUtils; @@ -79,26 +81,28 @@ return; List<WrappedParameter> wrappedParameters = pmd.getWrappedParameters(); - OperationMetaData operationMetaData = pmd.getOperationMetaData(); + OperationMetaData opMetaData = pmd.getOperationMetaData(); - if (operationMetaData.isDocumentWrapped() == false) + if (opMetaData.isDocumentWrapped() == false) throw new WSException("Operation is not document/literal (wrapped)"); if (wrappedParameters == null) throw new WSException("Cannot generate a type when their is no wrapper parameters"); - if (log.isDebugEnabled()) - log.debug("Generating wrapper: " + wrapperName); + log.debug("Generating wrapper: " + wrapperName); + + QName xmlName = pmd.getXmlName(); + QName xmlType = pmd.getXmlType(); try { CtClass clazz = pool.makeClass(wrapperName); clazz.getClassFile().setVersionToJava5(); - addClassAnnotations(clazz, pmd.getXmlName(), pmd.getXmlType(), null); + addClassAnnotations(clazz, xmlName, xmlType, null); for (WrappedParameter parameter : wrappedParameters) { - addProperty(clazz, parameter.type, parameter.name, parameter.variable, parameter.typeArguments); + addProperty(clazz, parameter.getType(), parameter.getName(), parameter.getVariable(), parameter.getTypeArguments()); } pool.toClass(clazz, loader); } @@ -106,6 +110,10 @@ { throw new WSException("Could not generate wrapper type: " + wrapperName, e); } + + // Add the generated type to the types meta data + TypesMetaData types = opMetaData.getEndpointMetaData().getServiceMetaData().getTypesMetaData(); + types.addTypeMapping(new TypeMappingMetaData(types, xmlType, wrapperName)); } public void generate(FaultMetaData fmd) @@ -223,4 +231,4 @@ annotation.addParameter("value", XmlAccessType.FIELD); annotation.markClass(clazz); } -} \ No newline at end of file +} Modified: trunk/src/main/java/org/jboss/ws/jaxws/core/SOAP11BindingJAXWS.java =================================================================== --- trunk/src/main/java/org/jboss/ws/jaxws/core/SOAP11BindingJAXWS.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/main/java/org/jboss/ws/jaxws/core/SOAP11BindingJAXWS.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -31,15 +31,17 @@ import javax.xml.soap.SOAPMessage; import javax.xml.ws.handler.Handler; import javax.xml.ws.soap.SOAPBinding; +import javax.xml.ws.soap.SOAPFaultException; import org.jboss.ws.Constants; import org.jboss.ws.common.CommonSOAP11Binding; import org.jboss.ws.metadata.OperationMetaData; import org.jboss.ws.metadata.HandlerMetaData.HandlerType; +import org.jboss.ws.soap.SOAPFaultImpl; /** - * The JAXWS SOAP11Binding - * + * The JAXWS SOAP11Binding + * * @author Thomas.Diesler(a)jboss.com * @since 04-Jul-2006 */ @@ -86,4 +88,10 @@ { delegate.setHandlerChain(handlerChain); } + + @Override + protected void throwFaultException(SOAPFaultImpl fault) throws Exception + { + throw new SOAPFaultException(fault); + } } Modified: trunk/src/main/java/org/jboss/ws/jaxws/core/SOAP12BindingJAXWS.java =================================================================== --- trunk/src/main/java/org/jboss/ws/jaxws/core/SOAP12BindingJAXWS.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/main/java/org/jboss/ws/jaxws/core/SOAP12BindingJAXWS.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -32,15 +32,17 @@ import javax.xml.ws.WebServiceException; import javax.xml.ws.handler.Handler; import javax.xml.ws.soap.SOAPBinding; +import javax.xml.ws.soap.SOAPFaultException; import org.jboss.ws.Constants; import org.jboss.ws.common.CommonSOAP12Binding; import org.jboss.ws.metadata.OperationMetaData; import org.jboss.ws.metadata.HandlerMetaData.HandlerType; +import org.jboss.ws.soap.SOAPFaultImpl; /** - * The SOAP11Binding - * + * The SOAP11Binding + * * @author Thomas.Diesler(a)jboss.com * @since 04-Jul-2006 */ @@ -94,4 +96,10 @@ { delegate.setHandlerChain(handlerChain); } + + @Override + protected void throwFaultException(SOAPFaultImpl fault) throws Exception + { + throw new SOAPFaultException(fault); + } } Modified: trunk/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -38,6 +38,8 @@ import org.jboss.ws.WSException; import org.jboss.ws.jaxrpc.ParameterWrapping; import org.jboss.ws.jaxws.DynamicWrapperGenerator; +import org.jboss.ws.metadata.WrappedParameter.AccessorFactory; +import org.jboss.ws.metadata.acessor.ReflectiveMethodAccessor; import org.jboss.ws.utils.HolderUtils; import org.jboss.ws.utils.JavaUtils; @@ -71,7 +73,13 @@ // SOAP-ENC:Array private boolean soapArrayParam; private QName soapArrayCompType; + private AccessorFactoryCreator accessorFactoryCreator = ReflectiveMethodAccessor.FACTORY_CREATOR; + public static interface AccessorFactoryCreator + { + public AccessorFactory create(ParameterMetaData parameter); + } + public ParameterMetaData(OperationMetaData opMetaData, QName xmlName, QName xmlType, String javaTypeName) { this(opMetaData, xmlName, javaTypeName); @@ -94,34 +102,6 @@ this.javaTypeName = javaTypeName; } - public static class WrappedParameter - { - public static final int RETURN = -1; - public QName name; - public String type; - public String[] typeArguments; - public String variable; - public boolean holder = false; - public int index = -2; - - public WrappedParameter() - { - } - - public WrappedParameter(QName name, String type, String variable, int index) - { - this.name = name; - this.type = type; - this.variable = variable; - this.index = index; - } - - public String toString() - { - return "[name = " + name + ",type = " + type + ",typeArgs = " + JavaUtils.printArray(typeArguments) + ",variable = " + variable + ",index = " + index + "]"; - } - } - private static boolean matchParameter(Method method, int index, Class expectedType, Set<Integer> matches, boolean exact, boolean holder) { Class returnType = method.getReturnType(); @@ -177,6 +157,7 @@ if (xmlType == null) throw new IllegalArgumentException("Invalid null xmlType"); + // Remove potential prefix if (xmlType.getNamespaceURI().length() > 0) this.xmlType = new QName(xmlType.getNamespaceURI(), xmlType.getLocalPart()); else @@ -361,8 +342,15 @@ // At some point we want to make this plugable, hardcoding // references like this is not very flexible. if (opMetaData.isDocumentWrapped()) + { (new DynamicWrapperGenerator(getClassLoader())).generate(this); + // Initialize accessors + AccessorFactory factory = accessorFactoryCreator.create(this); + for (WrappedParameter wrapped : wrappedParameters) + wrapped.setAccessor(factory.create(wrapped)); + } + // Initialize the cache getJavaType(); } @@ -388,15 +376,15 @@ // Wrapped type for (WrappedParameter wrapped : wrappedParameters) { - String typeName = wrapped.type; + String typeName = wrapped.getType(); try { Class type = (typeName != null) ? JavaUtils.loadJavaType(typeName, loader) - : ParameterWrapping.getWrappedType(wrapped.variable, wrapperType); + : ParameterWrapping.getWrappedType(wrapped.getVariable(), wrapperType); if (type == null) return false; - if (! matchParameter(method, wrapped.index, type, matches, exact, wrapped.holder)) + if (! matchParameter(method, wrapped.getIndex(), type, matches, exact, wrapped.isHolder())) return false; } catch (Exception ex) @@ -409,6 +397,11 @@ return true; } + public void setAccessorFactoryCreator(AccessorFactoryCreator accessorFactoryCreator) + { + this.accessorFactoryCreator = accessorFactoryCreator; + } + public String toString() { boolean isReturn = (opMetaData.getReturnParameter() == this); @@ -441,4 +434,4 @@ return buffer.toString(); } -} \ No newline at end of file +} Copied: trunk/src/main/java/org/jboss/ws/metadata/WrappedParameter.java (from rev 1366, branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/WrappedParameter.java) =================================================================== --- branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/WrappedParameter.java 2006-11-04 13:15:18 UTC (rev 1366) +++ trunk/src/main/java/org/jboss/ws/metadata/WrappedParameter.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -0,0 +1,138 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.metadata; + +import javax.xml.namespace.QName; + +import org.jboss.ws.utils.JavaUtils; + +/** + * WrappedParameter represents a document/literal wrapped parameter. + * + * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> + * @version $Revision$ + */ +public class WrappedParameter +{ + public static final int RETURN = -1; + private QName name; + private String type; + private String[] typeArguments; + private String variable; + private boolean holder = false; + private int index = -2; + private Accessor accessor; + + public static interface AccessorFactory + { + public Accessor create(WrappedParameter parameter); + } + + public static interface Accessor + { + public void set(Object bean, Object value); + public Object get(Object bean); + } + + public WrappedParameter(QName name, String type, String variable, int index) + { + this.setName(name); + this.setType(type); + this.setVariable(variable); + this.setIndex(index); + } + + public Accessor accessor() + { + return accessor; + } + + public void setName(QName name) + { + this.name = name; + } + + public QName getName() + { + return name; + } + + public void setType(String type) + { + this.type = type; + } + + public String getType() + { + return type; + } + + public void setTypeArguments(String[] typeArguments) + { + this.typeArguments = typeArguments; + } + + public String[] getTypeArguments() + { + return typeArguments; + } + + public void setVariable(String variable) + { + this.variable = variable; + } + + public String getVariable() + { + return variable; + } + + public void setHolder(boolean holder) + { + this.holder = holder; + } + + public boolean isHolder() + { + return holder; + } + + public void setIndex(int index) + { + this.index = index; + } + + public int getIndex() + { + return index; + } + + void setAccessor(Accessor accessor) + { + this.accessor = accessor; + } + + public String toString() + { + return "[name = " + getName() + ", type = " + getType() + ", typeArgs = " + JavaUtils.printArray(getTypeArguments()) + ", variable = " + getVariable() + ", index = " + getIndex() + "]"; + } +} \ No newline at end of file Copied: trunk/src/main/java/org/jboss/ws/metadata/acessor (from rev 1366, branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/acessor) Deleted: trunk/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java =================================================================== --- branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java 2006-11-04 13:15:18 UTC (rev 1366) +++ trunk/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -1,125 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.metadata.acessor; - -import javax.xml.bind.JAXBException; -import javax.xml.namespace.QName; - -import org.jboss.ws.WSException; -import org.jboss.ws.metadata.ParameterMetaData; -import org.jboss.ws.metadata.WrappedParameter; -import org.jboss.ws.metadata.ParameterMetaData.AccessorFactoryCreator; -import org.jboss.ws.metadata.WrappedParameter.Accessor; -import org.jboss.ws.metadata.WrappedParameter.AccessorFactory; - -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.api.JAXBRIContext; -import com.sun.xml.bind.api.RawAccessor; - -/** - * A JAXB object accessor. - * - * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -@SuppressWarnings("unchecked") -public class JAXBAccessor implements Accessor -{ - private RawAccessor accessor; - - public static AccessorFactoryCreator FACTORY_CREATOR = new AccessorFactoryCreator() - { - public AccessorFactory create(ParameterMetaData parameter) - { - final Class clazz = parameter.getJavaType(); - final JAXBRIContext ctx; - - try - { - ctx = (JAXBRIContext) JAXBRIContext.newInstance(new Class[]{clazz}); - } - catch (JAXBException e) - { - WSException ex = new WSException(e.getMessage()); - ex.setStackTrace(e.getStackTrace()); - throw ex; - } - - return new AccessorFactory() - { - public Accessor create(WrappedParameter parameter) - { - RawAccessor<Object,Object> accessor; - try - { - QName name = parameter.getName(); - accessor = ctx.getElementPropertyAccessor(clazz, name.getNamespaceURI(), name.getLocalPart()); - } - catch (Throwable t) - { - WSException ex = new WSException(t.getMessage()); - ex.setStackTrace(t.getStackTrace()); - throw ex; - } - - if (accessor == null) - throw new IllegalStateException("Could not obtain accessor for parameter: " + parameter); - - return new JAXBAccessor(accessor); - } - }; - } - }; - - private JAXBAccessor(RawAccessor accessor) - { - this.accessor = accessor; - } - - public Object get(Object bean) - { - try - { - return accessor.get(bean); - } - catch (AccessorException a) - { - WSException ex = new WSException(a.getMessage()); - ex.setStackTrace(a.getStackTrace()); - throw ex; - } - } - - public void set(Object bean, Object value) - { - try - { - accessor.set(bean, value); - } - catch (AccessorException a) - { - WSException ex = new WSException(a.getMessage()); - ex.setStackTrace(a.getStackTrace()); - throw ex; - } - } -} \ No newline at end of file Copied: trunk/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java (from rev 1366, branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java) Deleted: trunk/src/main/java/org/jboss/ws/metadata/acessor/ReflectiveMethodAccessor.java =================================================================== --- branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/acessor/ReflectiveMethodAccessor.java 2006-11-04 13:15:18 UTC (rev 1366) +++ trunk/src/main/java/org/jboss/ws/metadata/acessor/ReflectiveMethodAccessor.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -1,105 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.metadata.acessor; - -import java.beans.PropertyDescriptor; -import java.lang.reflect.Method; - -import org.jboss.ws.WSException; -import org.jboss.ws.metadata.ParameterMetaData; -import org.jboss.ws.metadata.WrappedParameter; -import org.jboss.ws.metadata.ParameterMetaData.AccessorFactoryCreator; -import org.jboss.ws.metadata.WrappedParameter.Accessor; -import org.jboss.ws.metadata.WrappedParameter.AccessorFactory; - -/** - * A simple JavaBean accessor that uses ordinary reflection. - * - * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -@SuppressWarnings("unchecked") -public class ReflectiveMethodAccessor implements Accessor -{ - private Method getter; - private Method setter; - - public static AccessorFactoryCreator FACTORY_CREATOR = new AccessorFactoryCreator() - { - public AccessorFactory create(ParameterMetaData parameter) - { - final Class clazz = parameter.getJavaType(); - - return new AccessorFactory() - { - public Accessor create(WrappedParameter parameter) - { - try - { - PropertyDescriptor pd = new PropertyDescriptor(parameter.getVariable(), clazz); - return new ReflectiveMethodAccessor(pd.getReadMethod(), pd.getWriteMethod()); - } - catch (Throwable t) - { - WSException ex = new WSException(t.getMessage()); - ex.setStackTrace(t.getStackTrace()); - throw ex; - } - } - }; - } - }; - - private ReflectiveMethodAccessor(Method getter, Method setter) - { - this.getter = getter; - this.setter = setter; - } - - public Object get(Object bean) - { - try - { - return getter.invoke(bean); - } - catch (Throwable e) - { - WSException ex = new WSException(e.getMessage()); - ex.setStackTrace(ex.getStackTrace()); - throw ex; - } - } - - public void set(Object bean, Object value) - { - try - { - setter.invoke(bean, value); - } - catch (Throwable e) - { - WSException ex = new WSException(e.getMessage()); - ex.setStackTrace(ex.getStackTrace()); - throw ex; - } - } -} \ No newline at end of file Copied: trunk/src/main/java/org/jboss/ws/metadata/acessor/ReflectiveMethodAccessor.java (from rev 1366, branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/acessor/ReflectiveMethodAccessor.java) Modified: trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -222,7 +222,7 @@ if (baseType != null) { if (baseType.getNamespace() == Constants.NS_SCHEMA_XSD && - baseType.getName().equals("anyType")) + baseType.getName().equals("anyType")) bool = true; //Ignore this baseType } if (XSComplexTypeDefinition.CONTENTTYPE_SIMPLE == t.getContentType()) @@ -340,7 +340,7 @@ * @throws IOException Problem creating the file */ public File createPhysicalFile(File loc, String fname) - throws IOException + throws IOException { if(loc == null ) throw new IllegalArgumentException("Illegal Null Argument: loc"); @@ -365,9 +365,9 @@ * @return */ public StringBuilder createClassBasicStructure(String pkgname, - String fname, - XSTypeDefinition type, - List importList, String baseName) + String fname, + XSTypeDefinition type, + List importList, String baseName) { StringBuilder buf = new StringBuilder(); writeJbossHeader(buf); @@ -395,7 +395,7 @@ if (baseType != null) { if (baseType.getNamespace() == Constants.NS_SCHEMA_XSD && - baseType.getName().equals("anyType")) + baseType.getName().equals("anyType")) baseType = null; //Ignore this baseType } if (XSComplexTypeDefinition.CONTENTTYPE_SIMPLE == t.getContentType()) @@ -408,7 +408,7 @@ if(baseName == null && baseType != null) baseName = baseType.getName(); if(baseName != null) - buf.append(" extends " + baseName); + buf.append(" extends " + baseName); buf.append(newline); buf.append("{"); buf.append(newline); @@ -471,14 +471,14 @@ */ public int getArrayDimension(Class arr) { - if(arr == null || arr.isArray() == false) - throw new IllegalArgumentException("Illegal null or array arg:arr"); - int counter = 0; - while(arr.isArray()) { + if(arr == null || arr.isArray() == false) + throw new IllegalArgumentException("Illegal null or array arg:arr"); + int counter = 0; + while(arr.isArray()) { counter += 1; arr = arr.getComponentType(); - } - return counter; + } + return counter; } /** @@ -678,8 +678,8 @@ if(Constants.PREFIX_XSD.equals(prefix)) nsuri = Constants.NS_SCHEMA_XSD; if(nsuri == null) qn = new QName( formattedStr.substring(ind+1) ); - else - qn = new QName( nsuri,formattedStr.substring(ind+1),prefix); + else + qn = new QName( nsuri,formattedStr.substring(ind+1),prefix); return qn; } @@ -701,10 +701,8 @@ */ public String getPackageName(String typeNS) { - String pkgname = Util.xmlNamespaceToJavaPackage(typeNS); + String pkgname = Util.xmlNamespaceToJavaPackage(typeNS); int len = pkgname.length(); - if(pkgname.endsWith(".jaws")) //as per jaxws-2.0 spec - pkgname = pkgname.substring(0,len - 5); return pkgname; } @@ -722,32 +720,27 @@ public String getTypeNamespace(String packageName) { StringBuilder sb = new StringBuilder("http://"); - //sb.append(packageName.replace('.', '/')); + //Generate tokens with '.' as delimiter StringTokenizer st = new StringTokenizer(packageName,"."); + //Have a LIFO queue for the tokens - Stack stk = new Stack(); + Stack<String> stk = new Stack<String>(); while(st != null && st.hasMoreTokens()) { stk.push(st.nextToken()); } - try + + String next; + while(!stk.isEmpty() && (next=stk.pop())!=null) { - while(stk != null) - { - String str = (String)stk.pop(); - if(sb.toString().equals("http://") == false) sb.append("."); - sb.append(str); - } - }catch(EmptyStackException e) - { - //Ignore + if(sb.toString().equals("http://") == false) sb.append("."); + sb.append(next); } - finally - { - sb.append("/jaws"); - } + // trailing slash + sb.append("/"); + return sb.toString(); } Modified: trunk/src/main/java/org/jboss/ws/tools/SourceWrapperGenerator.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/SourceWrapperGenerator.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/main/java/org/jboss/ws/tools/SourceWrapperGenerator.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -37,7 +37,7 @@ import org.jboss.ws.metadata.FaultMetaData; import org.jboss.ws.metadata.OperationMetaData; import org.jboss.ws.metadata.ParameterMetaData; -import org.jboss.ws.metadata.ParameterMetaData.WrappedParameter; +import org.jboss.ws.metadata.WrappedParameter; import org.jboss.ws.utils.JavaUtils; import com.sun.codemodel.JAnnotationArrayMember; @@ -88,7 +88,7 @@ addClassAnnotations(clazz, pmd.getXmlName(), pmd.getXmlType(), null); for (WrappedParameter wrapped : wrappedParameters) { - addProperty(clazz, wrapped.type, wrapped.name, wrapped.variable); + addProperty(clazz, wrapped.getType(), wrapped.getName(), wrapped.getVariable()); } } catch (Exception e) Modified: trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -48,7 +48,7 @@ import org.jboss.ws.metadata.OperationMetaData; import org.jboss.ws.metadata.ParameterMetaData; import org.jboss.ws.metadata.ServerEndpointMetaData; -import org.jboss.ws.metadata.ParameterMetaData.WrappedParameter; +import org.jboss.ws.metadata.WrappedParameter; import org.jboss.ws.metadata.jaxrpcmapping.ExceptionMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaXmlTypeMapping; @@ -166,7 +166,7 @@ Map<String, QName> map = new LinkedHashMap<String, QName>(wrappedParameters.size()); for (WrappedParameter param : wrappedParameters) - map.put(param.variable, param.name); + map.put(param.getVariable(), param.getName()); return map; } @@ -231,8 +231,8 @@ List<WrappedParameter> wrappedParameters = param.getWrappedParameters(); for (WrappedParameter wrapped : wrappedParameters) { - String type = JavaUtils.convertJVMNameToSourceName(wrapped.type, endpoint.getClassLoader()); - String name = wrapped.name.getLocalPart(); + String type = JavaUtils.convertJVMNameToSourceName(wrapped.getType(), endpoint.getClassLoader()); + String name = wrapped.getName().getLocalPart(); buildParamMapping(methodMapping, interfaceName, operation, name, type, "IN", false, i++); } @@ -252,8 +252,8 @@ if (isWrapped) { WrappedParameter wrappedParameter = returnParam.getWrappedParameters().get(0); - name = wrappedParameter.name.getLocalPart(); - type = wrappedParameter.type; + name = wrappedParameter.getName().getLocalPart(); + type = wrappedParameter.getType(); } else { Modified: trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -47,7 +47,7 @@ import org.jboss.ws.metadata.ParameterMetaData; import org.jboss.ws.metadata.ServiceMetaData; import org.jboss.ws.metadata.UnifiedMetaData; -import org.jboss.ws.metadata.ParameterMetaData.WrappedParameter; +import org.jboss.ws.metadata.WrappedParameter; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaXmlTypeMapping; import org.jboss.ws.metadata.wsdl.NCName; @@ -244,8 +244,8 @@ List<VAR> vars = new ArrayList<VAR>(); for (WrappedParameter wrapped : wrappedParameters) { - String typeName = JavaUtils.convertJVMNameToSourceName(wrapped.type, classLoader); - vars.add(new VAR(wrapped.variable, typeName, false)); + String typeName = JavaUtils.convertJVMNameToSourceName(wrapped.getType(), classLoader); + vars.add(new VAR(wrapped.getVariable(), typeName, false)); } JavaWriter writer = new JavaWriter(); Modified: trunk/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -39,7 +39,7 @@ import org.jboss.ws.metadata.FaultMetaData; import org.jboss.ws.metadata.OperationMetaData; import org.jboss.ws.metadata.ParameterMetaData; -import org.jboss.ws.metadata.ParameterMetaData.WrappedParameter; +import org.jboss.ws.metadata.WrappedParameter; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.tools.ToolsUtils; import org.jboss.ws.tools.Configuration.OperationConfig; Modified: trunk/src/test/ant/build-jars-jaxws.xml =================================================================== --- trunk/src/test/ant/build-jars-jaxws.xml 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/test/ant/build-jars-jaxws.xml 2006-11-04 15:38:09 UTC (rev 1370) @@ -404,6 +404,7 @@ <war warfile="${build.test.dir}/libs/jaxws-webserviceref.war" webxml="${build.test.dir}/resources/jaxws/webserviceref/WEB-INF/web.xml"> <classes dir="${build.test.dir}/classes"> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> </classes> </war> <jar destfile="${build.test.dir}/libs/jaxws-webserviceref-client.jar"> @@ -451,6 +452,34 @@ </metainf> </jar> +  + <war warfile="${build.test.dir}/libs/jaxws-wrapped-accessor.war" webxml="${build.test.dir}/resources/jaxws/wrapped/accessor/WEB-INF/web.xml"> + <classes dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.class"/> + <include name="org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.class"/> + <include name="org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/*"/> + </classes> + </war> + +  + <war warfile="${build.test.dir}/libs/jaxws-anonymous.war" webxml="${build.test.dir}/resources/jaxws/anonymous/WEB-INF/web.xml"> + <classes dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/anonymous/Anonymous.class"/> + <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.class"/> + <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.class"/> + <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.class"/> + </classes> + </war> + +  + <war warfile="${build.test.dir}/libs/jaxws-exception.war" webxml="${build.test.dir}/resources/jaxws/exception/WEB-INF/web.xml"> + <classes dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/exception/ExceptionEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/exception/ExceptionEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/exception/UserException.class"/> + </classes> + </war> +  <war warfile="${build.test.dir}/libs/jaxws-wsaddressing-action-rpc.war" webxml="${build.test.dir}/resources/jaxws/wsaddressing/action/WEB-INF/web.xml"> <classes dir="${build.test.dir}/classes"> Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous (from rev 1366, branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/anonymous) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/Anonymous.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/anonymous/Anonymous.java 2006-11-04 13:15:18 UTC (rev 1366) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/Anonymous.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -1,38 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.anonymous; - -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -/** - * Tests anonymous bare types - * - * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -@WebService -@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) -public interface Anonymous -{ - public AnonymousResponse echoAnonymous(AnonymousRequest request); -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/Anonymous.java (from rev 1366, branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/anonymous/Anonymous.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.java 2006-11-04 13:15:18 UTC (rev 1366) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -1,43 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.anonymous; - -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -/** - * An endpoint that echos an anonymous type. - * - * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -@WebService(endpointInterface="org.jboss.test.ws.jaxws.anonymous.Anonymous") -public class AnonymousImpl implements Anonymous -{ - public AnonymousResponse echoAnonymous(AnonymousRequest request) - { - AnonymousResponse response = new AnonymousResponse(); - response.message = request.message; - - return response; - } -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.java (from rev 1366, branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.java 2006-11-04 13:15:18 UTC (rev 1366) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -1,42 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.anonymous; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -/** - * An anonymous request - * - * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -@XmlType(name="") -(a)XmlAccessorType(XmlAccessType.FIELD) -public class AnonymousRequest -{ - @XmlElement - public String message; -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.java (from rev 1366, branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.java 2006-11-04 13:15:18 UTC (rev 1366) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -1,42 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.anonymous; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -/** - * An anonymous response - * - * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -@XmlType(name="") -(a)XmlAccessorType(XmlAccessType.FIELD) -public class AnonymousResponse -{ - @XmlElement - public String message; -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.java (from rev 1366, branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java 2006-11-04 13:15:18 UTC (rev 1366) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -1,69 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.anonymous; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; - -/** - * Test anonymous bare types. - * - * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -public class AnonymousTestCase extends JBossWSTest -{ - private String targetNS = "http://anonymous.jaxws.ws.test.jboss.org/"; - private Anonymous proxy; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(AnonymousTestCase.class, "jaxws-anonymous.war"); - } - - @Override - protected void setUp() throws Exception - { - super.setUp(); - - QName serviceName = new QName(targetNS, "AnonymousService"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-anonymous/AnonymousService?wsdl"); - - Service service = Service.create(wsdlURL, serviceName); - proxy = (Anonymous) service.getPort(Anonymous.class); - } - - - public void testEcho() throws Exception - { - AnonymousRequest req = new AnonymousRequest(); - req.message = "echo123"; - assertEquals("echo123", proxy.echoAnonymous(req).message); - } -} \ No newline at end of file Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java (from rev 1366, branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java) Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/exception (from rev 1366, branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/exception) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionEndpoint.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionEndpoint.java 2006-11-04 13:15:18 UTC (rev 1366) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionEndpoint.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -1,31 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.exception; -import javax.jws.WebService; - -@WebService -public interface ExceptionEndpoint -{ - public void throwRuntimeException(); - public void throwSoapFaultException(); - public void throwApplicationException() throws UserException; -} \ No newline at end of file Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionEndpoint.java (from rev 1366, branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionEndpoint.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionEndpointImpl.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionEndpointImpl.java 2006-11-04 13:15:18 UTC (rev 1366) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionEndpointImpl.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -1,64 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.exception; - -import javax.jws.WebService; -import javax.xml.namespace.QName; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPFault; -import javax.xml.ws.soap.SOAPFaultException; - -import org.jboss.ws.soap.NameImpl; -import org.jboss.ws.soap.SOAPFaultImpl; - -@WebService(endpointInterface="org.jboss.test.ws.jaxws.exception.ExceptionEndpoint") -public class ExceptionEndpointImpl implements ExceptionEndpoint -{ - public void throwRuntimeException() - { - throw new RuntimeException("oh no, a runtime exception occured."); - } - - public void throwSoapFaultException() - { - // This should be thrown as-is - - try - { - SOAPFault fault = new SOAPFaultImpl("http://foo"); - fault.setFaultCode(new NameImpl(new QName("http://foo", "FooCode"))); - fault.setFaultString("this is a fault string!"); - fault.setFaultActor("mr.actor"); - fault.addDetail().addChildElement("test"); - throw new SOAPFaultException(fault); - } - catch (SOAPException s) - { - throw new RuntimeException(s); - } - } - - public void throwApplicationException() throws UserException - { - throw new UserException("validation", 123, "Some validation error"); - } -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionEndpointImpl.java (from rev 1366, branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionEndpointImpl.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionTestCase.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionTestCase.java 2006-11-04 13:15:18 UTC (rev 1366) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionTestCase.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -1,153 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.exception; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import javax.xml.ws.soap.SOAPFaultException; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.w3c.dom.Element; - -/** - * Test JAX-WS exception handling - * - * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -public class ExceptionTestCase extends JBossWSTest -{ - private String targetNS = "http://exception.jaxws.ws.test.jboss.org/"; - private ExceptionEndpoint proxy; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(ExceptionTestCase.class, "jaxws-exception.war"); - } - - @Override - protected void setUp() throws Exception - { - super.setUp(); - - QName serviceName = new QName(targetNS, "ExceptionEndpointService"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-exception/ExceptionEndpointService?wsdl"); - - Service service = Service.create(wsdlURL, serviceName); - proxy = (ExceptionEndpoint) service.getPort(ExceptionEndpoint.class); - } - - /* - * 10.2.2.3 - * - * faultcode (Subcode in SOAP 1.2, Code set to env:Receiver) - * 1. SOAPFaultException.getFault().getFaultCodeAsQName() - * 2. env:Server (Subcode omitted for SOAP 1.2). - * faultstring (Reason/Text) - * 1. SOAPFaultException.getFault().getFaultString() - * 2. Exception.getMessage() - * 3. Exception.toString() - * faultactor (Role in SOAP 1.2) - * 1. SOAPFaultException.getFault().getFaultActor() - * 2. Empty - * detail (Detail in SOAP 1.2) - * 1. Serialized service specific exception (see WrapperException.getFaultInfo() in section 2.5) - * 2. SOAPFaultException.getFault().getDetail() - */ - public void testRuntimeException() throws Exception - { - if (true) - { - System.out.println("FIXME: JBWS-1321"); - return; - } - - try - { - proxy.throwRuntimeException(); - } - catch (SOAPFaultException e) - { - assertEquals("oh no, a runtime exception occured.", e.getMessage()); - assertEquals("oh no, a runtime exception occured.", e.getFault().getFaultString()); - return; - } - - assertTrue("Expected SOAPFaultException", false); - } - - public void testSoapFaultException() throws Exception - { - if (true) - { - System.out.println("FIXME: JBWS-1312"); - return; - } - - try - { - proxy.throwSoapFaultException(); - } - catch (SOAPFaultException e) - { - assertEquals("this is a fault string", e.getMessage()); - assertEquals("this is a fault string", e.getFault().getFaultString()); - assertEquals("mr.actor", e.getFault().getFaultActor()); - assertEquals("FooCode", e.getFault().getFaultCodeAsName().getLocalName()); - assertEquals("http://foo", e.getFault().getFaultCodeAsName().getURI()); - assertEquals("test", ((Element)e.getFault().getDetail().getChildElements().next()).getLocalName()); - - return; - } - - assertTrue("Expected SOAPFaultException", false); - } - - - public void testApplicationException() throws Exception - { - if (true) - { - System.out.println("FIXME: JBWS-1297"); - return; - } - - try - { - proxy.throwApplicationException(); - } - catch (UserException e) - { - assertEquals("Some validation error", e.getMessage()); - assertEquals("validation", e.getErrorCategory()); - assertEquals(123, e.getErrorCode()); - return; - } - - assertTrue("Expected UserException", false); - } -} \ No newline at end of file Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionTestCase.java (from rev 1366, branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionTestCase.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/exception/UserException.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/exception/UserException.java 2006-11-04 13:15:18 UTC (rev 1366) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/exception/UserException.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -1,52 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.exception; - -/** - * A mach application exception - * - * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -public class UserException extends Exception -{ - private int errorCode; - private String errorCategory; - - public UserException(String errorCategory, int errorCode, String message) - { - super(message); - - this.errorCategory = errorCategory; - this.errorCode = errorCode; - } - - public String getErrorCategory() - { - return errorCategory; - } - - public int getErrorCode() - { - return errorCode; - } -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/exception/UserException.java (from rev 1366, branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/exception/UserException.java) Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -64,7 +64,7 @@ if (endpoint == null) { URL wsdlURL = new File("resources/jaxws/jbws871/META-INF/wsdl/TestEndpoint.wsdl").toURL(); - QName serviceName = new QName("http://jbws871.jaxws.ws.test.jboss.org/jaws", "RpcArrayEndpointService"); + QName serviceName = new QName("http://jbws871.jaxws.ws.test.jboss.org/", "RpcArrayEndpointService"); Service service = Service.create(wsdlURL, serviceName); endpoint = (RpcArrayEndpoint)service.getPort(RpcArrayEndpoint.class); } Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/JSR181HandlerChainTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/JSR181HandlerChainTestCase.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/JSR181HandlerChainTestCase.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -43,7 +43,7 @@ */ public class JSR181HandlerChainTestCase extends JBossWSTest { - private static final String targetNS = "http://handlerchain.jsr181.jaxws.ws.test.jboss.org/jaws"; + private static final String targetNS = "http://handlerchain.jsr181.jaxws.ws.test.jboss.org/"; public static Test suite() { Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/oneway/JSR181OneWayTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/oneway/JSR181OneWayTestCase.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/oneway/JSR181OneWayTestCase.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -47,7 +47,7 @@ */ public class JSR181OneWayTestCase extends JBossWSTest { - private static final String targetNS = "http://oneway.jsr181.jaxws.ws.test.jboss.org/jaws"; + private static final String targetNS = "http://oneway.jsr181.jaxws.ws.test.jboss.org/"; public static Test suite() { @@ -62,10 +62,10 @@ Service service = Service.create(wsdlURL, serviceName); Dispatch dispatch = service.createDispatch(portName, StreamSource.class, Mode.PAYLOAD); - String payload = "<ns1:ping xmlns:ns1='http://oneway.jsr181.jaxws.ws.test.jboss.org/jaws'/>"; + String payload = "<ns1:ping xmlns:ns1='http://oneway.jsr181.jaxws.ws.test.jboss.org/'/>"; dispatch.invokeOneWay(new StreamSource(new StringReader(payload))); - payload = "<ns1:feedback xmlns:ns1='http://oneway.jsr181.jaxws.ws.test.jboss.org/jaws'/>"; + payload = "<ns1:feedback xmlns:ns1='http://oneway.jsr181.jaxws.ws.test.jboss.org/'/>"; StreamSource retObj = (StreamSource)dispatch.invoke(new StreamSource(new StringReader(payload))); Element retElement = DOMUtils.getFirstChildElement(DOMUtils.parse(new InputSource(retObj.getReader()))); String retPayload = DOMWriter.printNode(retElement, false); Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/JSR181SOAPBindingTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/JSR181SOAPBindingTestCase.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/JSR181SOAPBindingTestCase.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -50,7 +50,7 @@ */ public class JSR181SOAPBindingTestCase extends JBossWSTest { - private String targetNS = "http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws"; + private String targetNS = "http://soapbinding.jsr181.jaxws.ws.test.jboss.org/"; public static Test suite() { @@ -165,9 +165,9 @@ " <env:Header/>" + " <env:Body>" + " <ns1:SubmitPO xmlns:ns1='" + targetNS + "'>" + - " <ns1:PurchaseOrder>" + + " <PurchaseOrder>" + " <ns1:product>Ferrari</ns1:product>" + - " </ns1:PurchaseOrder>" + + " </PurchaseOrder>" + " </ns1:SubmitPO>" + " </env:Body>" + "</env:Envelope>"; @@ -183,7 +183,7 @@ NameImpl name = new NameImpl(new QName(targetNS, "SubmitPOResponse")); SOAPElement soapElement = (SOAPElement)resMsg.getSOAPBody().getChildElements(name).next(); - soapElement = (SOAPElement)soapElement.getChildElements(new NameImpl(new QName(targetNS, "PurchaseOrderAck"))).next(); + soapElement = (SOAPElement)soapElement.getChildElements(new NameImpl(new QName("PurchaseOrderAck"))).next(); soapElement = (SOAPElement)soapElement.getChildElements(new NameImpl(new QName(targetNS, "product"))).next(); assertEquals("Ferrari", soapElement.getValue()); } Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/PurchaseOrder.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/PurchaseOrder.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/PurchaseOrder.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -28,10 +28,10 @@ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "PurchaseOrderType", namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws", propOrder = { "product" }) +@XmlType(name = "PurchaseOrderType", namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/", propOrder = { "product" }) public class PurchaseOrder { - @XmlElement(namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws", required = true) + @XmlElement(namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/", required = true) private String product; public PurchaseOrder() Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/PurchaseOrderAck.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/PurchaseOrderAck.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/PurchaseOrderAck.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -28,10 +28,10 @@ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "PurchaseOrderAckType", namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws", propOrder = { "product" }) +@XmlType(name = "PurchaseOrderAckType", namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/", propOrder = { "product" }) public class PurchaseOrderAck { - @XmlElement(namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws", required = true) + @XmlElement(namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/", required = true) private String product; public PurchaseOrderAck() Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/SubmitBareRequest.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/SubmitBareRequest.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/SubmitBareRequest.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -28,11 +28,11 @@ import javax.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SubmitBareRequest", namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws", propOrder = { "product" }) -@XmlRootElement(namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws", name = "SubmitPO") +@XmlType(name = "SubmitBareRequest", namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/", propOrder = { "product" }) +@XmlRootElement(namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/", name = "SubmitPO") public class SubmitBareRequest { - @XmlElement(namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws", required = true) + @XmlElement(namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/", required = true) private String product; public SubmitBareRequest() Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/SubmitBareResponse.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/SubmitBareResponse.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/SubmitBareResponse.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -28,11 +28,11 @@ import javax.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SubmitBareResponse", namespace = "http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws", propOrder = { "product" }) -@XmlRootElement(namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws", name = "SubmitPOResponse") +@XmlType(name = "SubmitBareResponse", namespace = "http://soapbinding.jsr181.jaxws.ws.test.jboss.org/", propOrder = { "product" }) +@XmlRootElement(namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/", name = "SubmitPOResponse") public class SubmitBareResponse { - @XmlElement(namespace = "http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws", required = true) + @XmlElement(namespace = "http://soapbinding.jsr181.jaxws.ws.test.jboss.org/", required = true) private String product; public SubmitBareResponse() Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webmethod/JSR181WebMethodTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webmethod/JSR181WebMethodTestCase.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webmethod/JSR181WebMethodTestCase.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -56,7 +56,7 @@ public class JSR181WebMethodTestCase extends JBossWSTest { private String endpointURL = "http://" + getServerHost() + ":8080/jaxws-jsr181-webmethod/TestService"; - private String targetNS = "http://webmethod.jsr181.jaxws.ws.test.jboss.org/jaws"; + private String targetNS = "http://webmethod.jsr181.jaxws.ws.test.jboss.org/"; public static Test suite() { @@ -139,7 +139,7 @@ String expPayload = "<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + " <faultcode>env:Client</faultcode>" + - " <faultstring>Endpoint {http://webmethod.jsr181.jaxws.ws.test.jboss.org/jaws}TestEndpointPort does not contain operation meta data for: {http://webmethod.jsr181.jaxws.ws.test.jboss.org/jaws}noWebMethod</faultstring>" + + " <faultstring>Endpoint {http://webmethod.jsr181.jaxws.ws.test.jboss.org/}TestEndpointPort does not contain operation meta data for: {http://webmethod.jsr181.jaxws.ws.test.jboss.org/}noWebMethod</faultstring>" + "</env:Fault>"; Service service = Service.create(wsdlURL, serviceName); Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webresult/JSR181WebResultTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webresult/JSR181WebResultTestCase.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webresult/JSR181WebResultTestCase.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -51,7 +51,7 @@ public class JSR181WebResultTestCase extends JBossWSTest { private String endpointURL = "http://" + getServerHost() + ":8080/jaxws-jsr181-webresult/TestService"; - private String targetNS = "http://webresult.jsr181.jaxws.ws.test.jboss.org/jaws"; + private String targetNS = "http://webresult.jsr181.jaxws.ws.test.jboss.org/"; public static Test suite() { Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXB.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXB.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXB.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -37,9 +37,9 @@ { @WebMethod - @WebResult(name = "result") + @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/logicalhandler", name = "result") @RequestWrapper(className = "org.jboss.test.ws.jaxws.logicalhandler.Echo") @ResponseWrapper(className = "org.jboss.test.ws.jaxws.logicalhandler.EchoResponse") - public String echo(@WebParam(name="String_1") String string1); + public String echo(@WebParam(targetNamespace = "http://org.jboss.ws/jaxws/logicalhandler", name="String_1") String string1); } Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXBImpl.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXBImpl.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXBImpl.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -40,10 +40,10 @@ private static Logger log = Logger.getLogger(SOAPEndpointJAXBImpl.class); @WebMethod - @WebResult(name = "result") + @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/logicalhandler", name = "result") @RequestWrapper(className = "org.jboss.test.ws.jaxws.logicalhandler.Echo") @ResponseWrapper(className = "org.jboss.test.ws.jaxws.logicalhandler.EchoResponse") - public String echo(@WebParam(name="String_1") String msg) + public String echo(@WebParam(targetNamespace = "http://org.jboss.ws/jaxws/logicalhandler", name="String_1") String msg) { log.info("echo: " + msg); return msg + ":endpoint"; Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSource.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSource.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSource.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -37,9 +37,9 @@ { @WebMethod - @WebResult(name = "result") + @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/logicalhandler", name = "result") @RequestWrapper(className = "org.jboss.test.ws.jaxws.logicalhandler.Echo") @ResponseWrapper(className = "org.jboss.test.ws.jaxws.logicalhandler.EchoResponse") - public String echo(@WebParam(name = "String_1") String string1); + public String echo(@WebParam(targetNamespace = "http://org.jboss.ws/jaxws/logicalhandler", name = "String_1") String string1); } Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSourceImpl.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSourceImpl.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSourceImpl.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -40,10 +40,10 @@ private static Logger log = Logger.getLogger(SOAPEndpointSourceImpl.class); @WebMethod - @WebResult(name="result") + @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/logicalhandler", name="result") @RequestWrapper(className = "org.jboss.test.ws.jaxws.logicalhandler.Echo") @ResponseWrapper(className = "org.jboss.test.ws.jaxws.logicalhandler.EchoResponse") - public String echo(@WebParam(name="String_1")String msg) + public String echo(@WebParam(targetNamespace = "http://org.jboss.ws/jaxws/logicalhandler", name="String_1")String msg) { log.info("echo: " + msg); return msg + ":endpoint"; Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -21,7 +21,6 @@ */ package org.jboss.test.ws.jaxws.webserviceref; -import javax.jws.WebMethod; import javax.jws.WebService; import org.jboss.logging.Logger; @@ -32,13 +31,12 @@ * @author Thomas.Diesler(a)jboss.org * @since 23-Oct-2006 */ -@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/wsref") -public class TestEndpointImpl +@WebService(endpointInterface="org.jboss.test.ws.jaxws.webserviceref.TestEndpoint") +public class TestEndpointImpl implements TestEndpoint { // Provide logging private static Logger log = Logger.getLogger(TestEndpointImpl.class); - - @WebMethod + public String echo(String input) { log.info(input); Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped (from rev 1366, branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped) Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor (from rev 1366, branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.java 2006-11-04 13:15:18 UTC (rev 1366) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -1,30 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.wrapped.accessor; -import javax.jws.WebService; - -@WebService -public interface Accessor -{ - public String fieldAccessor(String one, int two); - public String methodAccessor(String one, int two); -} \ No newline at end of file Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.java (from rev 1366, branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.java 2006-11-04 13:15:18 UTC (rev 1366) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -1,38 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.wrapped.accessor; - -import javax.jws.WebService; - -@WebService(endpointInterface="org.jboss.test.ws.jaxws.wrapped.accessor.Accessor") -public class AccessorImpl implements Accessor -{ - public String fieldAccessor(String one, int two) - { - return one + two; - } - - public String methodAccessor(String one, int two) - { - return one + two; - } -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.java (from rev 1366, branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java 2006-11-04 13:15:18 UTC (rev 1366) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -1,72 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.wrapped.accessor; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; - -/** - * Test different JAXB accesor types. - * - * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -public class AccessorTestCase extends JBossWSTest -{ - private String targetNS = "http://accessor.wrapped.jaxws.ws.test.jboss.org/"; - private Accessor proxy; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(AccessorTestCase.class, "jaxws-wrapped-accessor.war"); - } - - @Override - protected void setUp() throws Exception - { - super.setUp(); - - QName serviceName = new QName(targetNS, "AccessorService"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-wrapped-accessor/AccessorService?wsdl"); - - Service service = Service.create(wsdlURL, serviceName); - proxy = (Accessor) service.getPort(Accessor.class); - } - - - public void testFieldAccessor() throws Exception - { - assertEquals("testing123", proxy.fieldAccessor("testing", 123)); - } - - public void testMethodAccessor() throws Exception - { - assertEquals("moretesting456", proxy.fieldAccessor("moretesting", 456)); - } -} \ No newline at end of file Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java (from rev 1366, branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java) Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws (from rev 1366, branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/FieldAccessor.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/FieldAccessor.java 2006-11-04 13:15:18 UTC (rev 1366) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/FieldAccessor.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -1,42 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.wrapped.accessor.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(name = "fieldAccessor", namespace = "http://accessor.wrapped.jaxws.ws.test.jboss.org/") -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "fieldAccessor", namespace = "http://accessor.wrapped.jaxws.ws.test.jboss.org/", propOrder = { - "arg0", - "arg1" -}) -public class FieldAccessor { - - @XmlElement(name = "arg0", namespace = "") - private String arg0; - @XmlElement(name = "arg1", namespace = "") - private int arg1; -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/FieldAccessor.java (from rev 1366, branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/FieldAccessor.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/FieldAccessorResponse.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/FieldAccessorResponse.java 2006-11-04 13:15:18 UTC (rev 1366) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/FieldAccessorResponse.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -1,37 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.wrapped.accessor.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(name = "fieldAccessorResponse", namespace = "http://accessor.wrapped.jaxws.ws.test.jboss.org/") -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "fieldAccessorResponse", namespace = "http://accessor.wrapped.jaxws.ws.test.jboss.org/") -public class FieldAccessorResponse { - - @XmlElement(name = "return", namespace = "") - private String _return; -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/FieldAccessorResponse.java (from rev 1366, branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/FieldAccessorResponse.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/MethodAccessor.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/MethodAccessor.java 2006-11-04 13:15:18 UTC (rev 1366) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/MethodAccessor.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -1,79 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.wrapped.accessor.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(name = "methodAccessor", namespace = "http://accessor.wrapped.jaxws.ws.test.jboss.org/") -(a)XmlAccessorType(XmlAccessType.PROPERTY) -@XmlType(name = "methodAccessor", namespace = "http://accessor.wrapped.jaxws.ws.test.jboss.org/", propOrder = { "arg0", "arg1" }) -public class MethodAccessor -{ - private String renamed0; - private int renamed1; - - /** - * - * @return - * returns String - */ - @XmlElement(name = "arg0", namespace = "") - public String getArg0() - { - return this.renamed0; - } - - /** - * - * @param arg0 - * the value for the arg0 property - */ - public void setArg0(String arg0) - { - this.renamed0 = arg0; - } - - /** - * - * @return - * returns int - */ - @XmlElement(name = "arg1", namespace = "") - public int getArg1() - { - return this.renamed1; - } - - /** - * - * @param arg1 - * the value for the arg1 property - */ - public void setArg1(int arg1) - { - this.renamed1 = arg1; - } -} \ No newline at end of file Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/MethodAccessor.java (from rev 1366, branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/MethodAccessor.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/MethodAccessorResponse.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/MethodAccessorResponse.java 2006-11-04 13:15:18 UTC (rev 1366) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/MethodAccessorResponse.java 2006-11-04 15:38:09 UTC (rev 1370) @@ -1,55 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.wrapped.accessor.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(name = "methodAccessorResponse", namespace = "http://accessor.wrapped.jaxws.ws.test.jboss.org/") -(a)XmlAccessorType(XmlAccessType.PROPERTY) -@XmlType(name = "methodAccessorResponse", namespace = "http://accessor.wrapped.jaxws.ws.test.jboss.org/") -public class MethodAccessorResponse { - - private String renamed; - - /** - * - * @return - * returns String - */ - @XmlElement(name = "return", namespace = "") - public String get_return() { - return this.renamed; - } - - /** - * - * @param _return - * the value for the _return property - */ - public void set_return(String _return) { - this.renamed = _return; - } -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/MethodAccessorResponse.java (from rev 1366, branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/MethodAccessorResponse.java) Copied: trunk/src/test/resources/jaxws/anonymous (from rev 1366, branches/JEE5_TCK/src/test/resources/jaxws/anonymous) Copied: trunk/src/test/resources/jaxws/anonymous/WEB-INF (from rev 1366, branches/JEE5_TCK/src/test/resources/jaxws/anonymous/WEB-INF) Deleted: trunk/src/test/resources/jaxws/anonymous/WEB-INF/web.xml =================================================================== --- branches/JEE5_TCK/src/test/resources/jaxws/anonymous/WEB-INF/web.xml 2006-11-04 13:15:18 UTC (rev 1366) +++ trunk/src/test/resources/jaxws/anonymous/WEB-INF/web.xml 2006-11-04 15:38:09 UTC (rev 1370) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <servlet> - <servlet-name>AnonymousService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.anonymous.AnonymousImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>AnonymousService</servlet-name> - <url-pattern>/AnonymousService</url-pattern> - </servlet-mapping> -</web-app> Copied: trunk/src/test/resources/jaxws/anonymous/WEB-INF/web.xml (from rev 1366, branches/JEE5_TCK/src/test/resources/jaxws/anonymous/WEB-INF/web.xml) Copied: trunk/src/test/resources/jaxws/exception (from rev 1366, branches/JEE5_TCK/src/test/resources/jaxws/exception) Copied: trunk/src/test/resources/jaxws/exception/WEB-INF (from rev 1366, branches/JEE5_TCK/src/test/resources/jaxws/exception/WEB-INF) Deleted: trunk/src/test/resources/jaxws/exception/WEB-INF/web.xml =================================================================== --- branches/JEE5_TCK/src/test/resources/jaxws/exception/WEB-INF/web.xml 2006-11-04 13:15:18 UTC (rev 1366) +++ trunk/src/test/resources/jaxws/exception/WEB-INF/web.xml 2006-11-04 15:38:09 UTC (rev 1370) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <servlet> - <servlet-name>ExceptionEndpointService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.exception.ExceptionEndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>ExceptionEndpointService</servlet-name> - <url-pattern>/ExceptionEndpointService</url-pattern> - </servlet-mapping> -</web-app> Copied: trunk/src/test/resources/jaxws/exception/WEB-INF/web.xml (from rev 1366, branches/JEE5_TCK/src/test/resources/jaxws/exception/WEB-INF/web.xml) Modified: trunk/src/test/resources/jaxws/jbws871/META-INF/wsdl/TestEndpoint.wsdl =================================================================== --- trunk/src/test/resources/jaxws/jbws871/META-INF/wsdl/TestEndpoint.wsdl 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/test/resources/jaxws/jbws871/META-INF/wsdl/TestEndpoint.wsdl 2006-11-04 15:38:09 UTC (rev 1370) @@ -1,6 +1,6 @@ -<definitions name='RpcArrayEndpointService' targetNamespace='http://jbws871.jaxws.ws.test.jboss.org/jaws' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://jbws871.jaxws.ws.test.jboss.org/jaws' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> +<definitions name='RpcArrayEndpointService' targetNamespace='http://jbws871.jaxws.ws.test.jboss.org/' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://jbws871.jaxws.ws.test.jboss.org/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> <types> - <schema elementFormDefault='qualified' targetNamespace='http://jbws871.jaxws.ws.test.jboss.org/jaws' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://jbws871.jaxws.ws.test.jboss.org/jaws' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <schema elementFormDefault='qualified' targetNamespace='http://jbws871.jaxws.ws.test.jboss.org/' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://jbws871.jaxws.ws.test.jboss.org/' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> <complexType name='Integer.Array'> <sequence> <element maxOccurs='unbounded' minOccurs='0' name='value' nillable='true' type='int'/> @@ -26,10 +26,10 @@ <operation name='intArr'> <soap:operation soapAction=''/> <input> - <soap:body namespace='http://jbws871.jaxws.ws.test.jboss.org/jaws' use='literal'/> + <soap:body namespace='http://jbws871.jaxws.ws.test.jboss.org/' use='literal'/> </input> <output> - <soap:body namespace='http://jbws871.jaxws.ws.test.jboss.org/jaws' use='literal'/> + <soap:body namespace='http://jbws871.jaxws.ws.test.jboss.org/' use='literal'/> </output> </operation> </binding> Modified: trunk/src/test/resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl =================================================================== --- trunk/src/test/resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/test/resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl 2006-11-04 15:38:09 UTC (rev 1370) @@ -6,8 +6,8 @@ $Id$ --> <definitions name="RegistrationServiceService" targetNamespace="http://org.jboss.ws/jaxws/complex" xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:ns1="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws" - xmlns:ns2="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws" xmlns:tns="http://org.jboss.ws/jaxws/complex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:ns1="http://complex.jsr181.jaxws.ws.test.jboss.org/" + xmlns:ns2="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:tns="http://org.jboss.ws/jaxws/complex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:jaxws="http://java.sun.com/xml/ns/jaxws" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"> <jaxws:bindings> @@ -16,7 +16,7 @@ <types> <schema elementFormDefault="qualified" targetNamespace="http://org.jboss.ws/jaxws/complex" xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:ns2="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws" xmlns:ns3="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws" + xmlns:ns2="http://complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:ns3="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:tns="http://org.jboss.ws/jaxws/complex" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" jaxb:version="2.0"> <xsd:annotation> @@ -27,8 +27,8 @@ </xsd:appinfo> </xsd:annotation> - <import namespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws"/> - <import namespace="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws"/> + <import namespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/"/> + <import namespace="http://complex.jsr181.jaxws.ws.test.jboss.org/"/> <complexType name="AlreadyRegisteredException"> <complexContent> @@ -116,9 +116,9 @@ <element name="ValidationException" type="tns:ValidationException"/> </schema> - <schema elementFormDefault="qualified" targetNamespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws" xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:ns1="http://org.jboss.ws/jaxws/complex" xmlns:ns2="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws" - xmlns:tns="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" jaxb:version="2.0"> + <schema elementFormDefault="qualified" targetNamespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/" xmlns="http://www.w3.org/2001/XMLSchema" + xmlns:ns1="http://org.jboss.ws/jaxws/complex" xmlns:ns2="http://complex.jsr181.jaxws.ws.test.jboss.org/" + xmlns:tns="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" jaxb:version="2.0"> <xsd:annotation> <xsd:appinfo> @@ -129,7 +129,7 @@ </xsd:annotation> <import namespace="http://org.jboss.ws/jaxws/complex"/> - <import namespace="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws"/> + <import namespace="http://complex.jsr181.jaxws.ws.test.jboss.org/"/> <complexType name="Statistics"> <sequence> @@ -139,9 +139,9 @@ </complexType> </schema> - <schema elementFormDefault="qualified" targetNamespace="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws" xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:ns1="http://org.jboss.ws/jaxws/complex" xmlns:ns3="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws" - xmlns:tns="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" jaxb:version="2.0"> + <schema elementFormDefault="qualified" targetNamespace="http://complex.jsr181.jaxws.ws.test.jboss.org/" xmlns="http://www.w3.org/2001/XMLSchema" + xmlns:ns1="http://org.jboss.ws/jaxws/complex" xmlns:ns3="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/" + xmlns:tns="http://complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" jaxb:version="2.0"> <xsd:annotation> <xsd:appinfo> @@ -152,7 +152,7 @@ </xsd:annotation> <import namespace="http://org.jboss.ws/jaxws/complex"/> - <import namespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws"/> + <import namespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/"/> <complexType name="Address"> <sequence> Modified: trunk/src/test/resources/jaxws/jsr181/complex/jaxrpc-mapping.xml =================================================================== --- trunk/src/test/resources/jaxws/jsr181/complex/jaxrpc-mapping.xml 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/test/resources/jaxws/jsr181/complex/jaxrpc-mapping.xml 2006-11-04 15:38:09 UTC (rev 1370) @@ -2,15 +2,15 @@ <java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> <package-mapping> <package-type>org.jboss.test.ws.jaxws.jsr181.complex.client</package-type> -<namespaceURI>http://complex.jsr181.jaxws.ws.test.jboss.org/jaws</namespaceURI> +<namespaceURI>http://complex.jsr181.jaxws.ws.test.jboss.org/</namespaceURI> </package-mapping> <package-mapping> <package-type>org.jboss.test.ws.jaxws.jsr181.complex.client</package-type> -<namespaceURI>http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws</namespaceURI> +<namespaceURI>http://extra.complex.jsr181.jaxws.ws.test.jboss.org/</namespaceURI> </package-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Register</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:Register</root-type-qname> +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">typeNS:Register</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>customer</java-variable-name> @@ -23,7 +23,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Statistics</java-type> -<root-type-qname xmlns:typeNS="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:Statistics</root-type-qname> +<root-type-qname xmlns:typeNS="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/">typeNS:Statistics</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>activationTime</java-variable-name> @@ -36,7 +36,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.InvoiceCustomer</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:InvoiceCustomer</root-type-qname> +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">typeNS:InvoiceCustomer</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>address</java-variable-name> @@ -65,7 +65,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.BulkRegister</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:BulkRegister</root-type-qname> +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">typeNS:BulkRegister</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>customers</java-variable-name> @@ -78,7 +78,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.ValidationException</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:ValidationException</root-type-qname> +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">typeNS:ValidationException</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>message</java-variable-name> @@ -91,7 +91,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Address</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:Address</root-type-qname> +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">typeNS:Address</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>city</java-variable-name> @@ -112,7 +112,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Name</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:Name</root-type-qname> +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">typeNS:Name</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>firstName</java-variable-name> @@ -129,7 +129,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.BulkRegisterResponse</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:BulkRegisterResponse</root-type-qname> +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">typeNS:BulkRegisterResponse</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>registeredIDs</java-variable-name> @@ -138,7 +138,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.PhoneNumber</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:PhoneNumber</root-type-qname> +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">typeNS:PhoneNumber</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>areaCode</java-variable-name> @@ -155,7 +155,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.RegisterForInvoiceResponse</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:RegisterForInvoiceResponse</root-type-qname> +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">typeNS:RegisterForInvoiceResponse</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>done</java-variable-name> @@ -164,7 +164,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.RegisterForInvoice</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:RegisterForInvoice</root-type-qname> +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">typeNS:RegisterForInvoice</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>invoiceCustomer</java-variable-name> @@ -173,7 +173,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.RegisterResponse</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:RegisterResponse</root-type-qname> +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">typeNS:RegisterResponse</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>registeredID</java-variable-name> @@ -182,7 +182,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.GetStatistics</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:GetStatistics</root-type-qname> +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">typeNS:GetStatistics</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>customer</java-variable-name> @@ -191,7 +191,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.GetStatisticsResponse</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:GetStatisticsResponse</root-type-qname> +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">typeNS:GetStatisticsResponse</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>statistics</java-variable-name> @@ -200,7 +200,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:Customer</root-type-qname> +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">typeNS:Customer</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>address</java-variable-name> @@ -225,7 +225,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.AlreadyRegisteredException</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:AlreadyRegisteredException</root-type-qname> +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">typeNS:AlreadyRegisteredException</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>message</java-variable-name> @@ -238,22 +238,22 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer[]</java-type> -<anonymous-type-qname>http://complex.jsr181.jaxws.ws.test.jboss.org/jaws:BulkRegister>Custom...</anonymous-type-qname> +<anonymous-type-qname>http://complex.jsr181.jaxws.ws.test.jboss.org/:BulkRegister>Customers[...</anonymous-type-qname> <qname-scope>complexType</qname-scope> </java-xml-type-mapping> <java-xml-type-mapping> <java-type>long[]</java-type> -<anonymous-type-qname>http://complex.jsr181.jaxws.ws.test.jboss.org/jaws:BulkRegisterResponse&g...</anonymous-type-qname> +<anonymous-type-qname>http://complex.jsr181.jaxws.ws.test.jboss.org/:BulkRegisterResponse>Re...</anonymous-type-qname> <qname-scope>complexType</qname-scope> </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer[]</java-type> -<anonymous-type-qname>http://complex.jsr181.jaxws.ws.test.jboss.org/jaws:Customer>referredCu...</anonymous-type-qname> +<anonymous-type-qname>http://complex.jsr181.jaxws.ws.test.jboss.org/:Customer>referredCustom...</anonymous-type-qname> <qname-scope>complexType</qname-scope> </java-xml-type-mapping> <exception-mapping> <exception-type>org.jboss.test.ws.jaxws.jsr181.complex.client.ValidationException</exception-type> -<wsdl-message xmlns:exMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">exMsgNS:ValidationException</wsdl-message> +<wsdl-message xmlns:exMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">exMsgNS:ValidationException</wsdl-message> <constructor-parameter-order> <element-name>message</element-name> <element-name>failiedCustomers</element-name> @@ -261,7 +261,7 @@ </exception-mapping> <exception-mapping> <exception-type>org.jboss.test.ws.jaxws.jsr181.complex.client.AlreadyRegisteredException</exception-type> -<wsdl-message xmlns:exMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">exMsgNS:AlreadyRegisteredException</wsdl-message> +<wsdl-message xmlns:exMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">exMsgNS:AlreadyRegisteredException</wsdl-message> <constructor-parameter-order> <element-name>message</element-name> <element-name>existingId</element-name> @@ -269,7 +269,7 @@ </exception-mapping> <service-interface-mapping> <service-interface>org.jboss.test.ws.jaxws.jsr181.complex.client.RegistrationServiceService</service-interface> -<wsdl-service-name xmlns:serviceNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">serviceNS:RegistrationServiceService</wsdl-service-name> +<wsdl-service-name xmlns:serviceNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">serviceNS:RegistrationServiceService</wsdl-service-name> <port-mapping> <port-name>RegistrationServicePort</port-name> <java-port-name>RegistrationServicePort</java-port-name> @@ -277,8 +277,8 @@ </service-interface-mapping> <service-endpoint-interface-mapping> <service-endpoint-interface>org.jboss.test.ws.jaxws.jsr181.complex.client.RegistrationService</service-endpoint-interface> -<wsdl-port-type xmlns:portTypeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">portTypeNS:RegistrationService</wsdl-port-type> -<wsdl-binding xmlns:bindingNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">bindingNS:RegistrationServiceBinding</wsdl-binding> +<wsdl-port-type xmlns:portTypeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">portTypeNS:RegistrationService</wsdl-port-type> +<wsdl-binding xmlns:bindingNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">bindingNS:RegistrationServiceBinding</wsdl-binding> <service-endpoint-method-mapping> <java-method-name>bulkRegister</java-method-name> <wsdl-operation>BulkRegister</wsdl-operation> @@ -287,7 +287,7 @@ <param-position>0</param-position> <param-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer[]</param-type> <wsdl-message-mapping> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_BulkRegister</wsdl-message> +<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">wsdlMsgNS:RegistrationService_BulkRegister</wsdl-message> <wsdl-message-part-name>Customers</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> @@ -296,14 +296,14 @@ <param-position>1</param-position> <param-type>java.util.Calendar</param-type> <wsdl-message-mapping> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_BulkRegister</wsdl-message> +<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">wsdlMsgNS:RegistrationService_BulkRegister</wsdl-message> <wsdl-message-part-name>When</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> <method-return-value>long[]</method-return-value> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_BulkRegisterResponse</wsdl-message> +<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">wsdlMsgNS:RegistrationService_BulkRegisterResponse</wsdl-message> <wsdl-message-part-name>RegisteredIDs</wsdl-message-part-name> </wsdl-return-value-mapping> </service-endpoint-method-mapping> @@ -315,14 +315,14 @@ <param-position>0</param-position> <param-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer</param-type> <wsdl-message-mapping> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_GetStatistics</wsdl-message> +<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">wsdlMsgNS:RegistrationService_GetStatistics</wsdl-message> <wsdl-message-part-name>Customer</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> <method-return-value>org.jboss.test.ws.jaxws.jsr181.complex.client.Statistics</method-return-value> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_GetStatisticsResponse</wsdl-message> +<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">wsdlMsgNS:RegistrationService_GetStatisticsResponse</wsdl-message> <wsdl-message-part-name>Statistics</wsdl-message-part-name> </wsdl-return-value-mapping> </service-endpoint-method-mapping> @@ -334,7 +334,7 @@ <param-position>0</param-position> <param-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer</param-type> <wsdl-message-mapping> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_Register</wsdl-message> +<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">wsdlMsgNS:RegistrationService_Register</wsdl-message> <wsdl-message-part-name>Customer</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> @@ -343,14 +343,14 @@ <param-position>1</param-position> <param-type>java.util.Calendar</param-type> <wsdl-message-mapping> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_Register</wsdl-message> +<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">wsdlMsgNS:RegistrationService_Register</wsdl-message> <wsdl-message-part-name>When</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> <method-return-value>long</method-return-value> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_RegisterResponse</wsdl-message> +<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">wsdlMsgNS:RegistrationService_RegisterResponse</wsdl-message> <wsdl-message-part-name>RegisteredID</wsdl-message-part-name> </wsdl-return-value-mapping> </service-endpoint-method-mapping> @@ -362,14 +362,14 @@ <param-position>0</param-position> <param-type>org.jboss.test.ws.jaxws.jsr181.complex.client.InvoiceCustomer</param-type> <wsdl-message-mapping> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_RegisterForInvoice</wsdl-message> +<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">wsdlMsgNS:RegistrationService_RegisterForInvoice</wsdl-message> <wsdl-message-part-name>InvoiceCustomer</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> <method-return-value>boolean</method-return-value> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_RegisterForInvoiceResponse</wsdl-message> +<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/">wsdlMsgNS:RegistrationService_RegisterForInvoiceResponse</wsdl-message> <wsdl-message-part-name>done</wsdl-message-part-name> </wsdl-return-value-mapping> </service-endpoint-method-mapping> Modified: trunk/src/test/resources/jaxws/jsr181/webresult/jaxrpc-mapping.xml =================================================================== --- trunk/src/test/resources/jaxws/jsr181/webresult/jaxrpc-mapping.xml 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/src/test/resources/jaxws/jsr181/webresult/jaxrpc-mapping.xml 2006-11-04 15:38:09 UTC (rev 1370) @@ -5,7 +5,7 @@ <package-mapping> <package-type>org.jboss.test.ws.jaxws.jsr181.webresult</package-type> - <namespaceURI>http://webresult.jsr181.jaxws.ws.test.jboss.org/jaws</namespaceURI> + <namespaceURI>http://webresult.jsr181.jaxws.ws.test.jboss.org/</namespaceURI> </package-mapping> </java-wsdl-mapping> Copied: trunk/src/test/resources/jaxws/wrapped (from rev 1366, branches/JEE5_TCK/src/test/resources/jaxws/wrapped) Copied: trunk/src/test/resources/jaxws/wrapped/accessor (from rev 1366, branches/JEE5_TCK/src/test/resources/jaxws/wrapped/accessor) Copied: trunk/src/test/resources/jaxws/wrapped/accessor/WEB-INF (from rev 1366, branches/JEE5_TCK/src/test/resources/jaxws/wrapped/accessor/WEB-INF) Deleted: trunk/src/test/resources/jaxws/wrapped/accessor/WEB-INF/web.xml =================================================================== --- branches/JEE5_TCK/src/test/resources/jaxws/wrapped/accessor/WEB-INF/web.xml 2006-11-04 13:15:18 UTC (rev 1366) +++ trunk/src/test/resources/jaxws/wrapped/accessor/WEB-INF/web.xml 2006-11-04 15:38:09 UTC (rev 1370) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <servlet> - <servlet-name>AccessorService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.wrapped.accessor.AccessorImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>AccessorService</servlet-name> - <url-pattern>/AccessorService</url-pattern> - </servlet-mapping> -</web-app> Copied: trunk/src/test/resources/jaxws/wrapped/accessor/WEB-INF/web.xml (from rev 1366, branches/JEE5_TCK/src/test/resources/jaxws/wrapped/accessor/WEB-INF/web.xml) Modified: trunk/version.properties =================================================================== --- trunk/version.properties 2006-11-04 14:49:44 UTC (rev 1369) +++ trunk/version.properties 2006-11-04 15:38:09 UTC (rev 1370) @@ -17,7 +17,8 @@ apache-xmlsec=1.3.0 ibm-wsdl4j=1.5.2jboss javassist=3.3.0.GA -jboss-common=1.0.2 +jboss-common-core=2.0.2.CR1 +jboss-common-logging=2.0.1.GA jboss-jbossxb=1.0.0.CR6 jboss-microcontainer=snapshot jboss-remoting=2.2.0.Alpha2

18 years, 4 months

1
0
0 / 0

JBossWS SVN: r1369 - branches

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-11-04 09:49:44 -0500 (Sat, 04 Nov 2006) New Revision: 1369 Added: branches/JEE5_TCK/ Removed: branches/JEE5_TCK_TMP/ Log: Test --stop-on-copy for move Copied: branches/JEE5_TCK (from rev 1368, branches/JEE5_TCK_TMP)

18 years, 4 months

1
0
0 / 0

JBossWS SVN: r1368 - branches

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-11-04 09:48:48 -0500 (Sat, 04 Nov 2006) New Revision: 1368 Added: branches/JEE5_TCK_TMP/ Removed: branches/JEE5_TCK/ Log: Test --stop-on-copy for move Copied: branches/JEE5_TCK_TMP (from rev 1367, branches/JEE5_TCK)

18 years, 4 months

1
0
0 / 0

JBossWS SVN: r1367 - branches/JEE5_TCK

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-11-04 09:46:49 -0500 (Sat, 04 Nov 2006) New Revision: 1367 Modified: branches/JEE5_TCK/build.xml Log: merged to trunk Modified: branches/JEE5_TCK/build.xml =================================================================== --- branches/JEE5_TCK/build.xml 2006-11-04 13:15:18 UTC (rev 1366) +++ branches/JEE5_TCK/build.xml 2006-11-04 14:46:49 UTC (rev 1367) @@ -569,7 +569,7 @@   -  +  <target name="release" depends="all" description="Release to jboss.local.repository">

18 years, 4 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits November 2006