December 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r5236 - stack/metro/trunk/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-12-07 10:05:36 -0500 (Fri, 07 Dec 2007) New Revision: 5236 Modified: stack/metro/trunk/ant-import/build-testsuite.xml Log: sort stuff Modified: stack/metro/trunk/ant-import/build-testsuite.xml =================================================================== --- stack/metro/trunk/ant-import/build-testsuite.xml 2007-12-07 14:54:58 UTC (rev 5235) +++ stack/metro/trunk/ant-import/build-testsuite.xml 2007-12-07 15:05:36 UTC (rev 5236) @@ -46,8 +46,8 @@ </path> <path id="tests.extra.classpath"> + <pathelement location="${int.sunri.dir}/output/lib/jbossws-sunri-client.jar"/> <pathelement location="${int.sunri.dir}/thirdparty/jbossws-framework.jar"/> - <pathelement location="${int.sunri.dir}/output/lib/jbossws-sunri-client.jar"/> <pathelement location="${int.sunri.dir}/thirdparty/jaxws-tools.jar"/> </path>

16 years, 6 months

1
0
0 / 0

JBossWS SVN: r5235 - stack/metro/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-12-07 09:54:58 -0500 (Fri, 07 Dec 2007) New Revision: 5235 Modified: stack/metro/trunk/version.properties Log: jbossws-jboss42=4.2.1.GA Modified: stack/metro/trunk/version.properties =================================================================== --- stack/metro/trunk/version.properties 2007-12-07 14:27:31 UTC (rev 5234) +++ stack/metro/trunk/version.properties 2007-12-07 14:54:58 UTC (rev 5235) @@ -17,7 +17,7 @@ jbossws-framework=snapshot jbossws-common=snapshot jbossws-spi=1.0.0.GA -jbossws-jboss42=2.0.1.GA +jbossws-jboss42=4.2.1.GA junit=3.8.1 jboss-common-core=2.0.2.GA

16 years, 6 months

1
0
0 / 0

JBossWS SVN: r5234 - stack/native/trunk/src/test/resources.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-12-07 09:27:31 -0500 (Fri, 07 Dec 2007) New Revision: 5234 Modified: stack/native/trunk/src/test/resources/test-excludes-jboss500.txt Log: [JBAS-5055] Failed to load users/passwords/role files Modified: stack/native/trunk/src/test/resources/test-excludes-jboss500.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss500.txt 2007-12-07 14:20:44 UTC (rev 5233) +++ stack/native/trunk/src/test/resources/test-excludes-jboss500.txt 2007-12-07 14:27:31 UTC (rev 5234) @@ -3,11 +3,15 @@ # Fix BPEL before AS50 goes final org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* +# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration +org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.* + # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* # [EJBTHREE-1150] WebServiceContext injection requires mapped-name org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.* -# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration -org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.* +# [JBAS-5055] Failed to load users/passwords/role files +org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.* +org/jboss/test/ws/jaxws/jbws1840/JBWS1840TestCase.*

16 years, 6 months

1
0
0 / 0

JBossWS SVN: r5233 - in stack/native/trunk/src/test/java/org/jboss/test/ws: jaxrpc/jbws723 and 13 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-12-07 09:20:44 -0500 (Fri, 07 Dec 2007) New Revision: 5233 Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/WSDL11ToJavaTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java Log: Fix FIXME typos Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java 2007-12-07 14:19:21 UTC (rev 5232) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java 2007-12-07 14:20:44 UTC (rev 5233) @@ -158,7 +158,7 @@ { if (false) { - System.out.println("FIXME: [JBWS-1771] Post-handler-chain not invoked for \"Standard Client\" configuration with DII client"); + System.out.println("FIXME [JBWS-1771] Post-handler-chain not invoked for \"Standard Client\" configuration with DII client"); return; } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2007-12-07 14:19:21 UTC (rev 5232) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2007-12-07 14:20:44 UTC (rev 5233) @@ -167,7 +167,7 @@ port.getContactInfo("mafia"); if (isTargetJBoss50()) - System.out.println("FIXME: [JBAS-3595] - Tomcat allows http access with transport guarantie CONFIDENTIAL"); + System.out.println("FIXME [JBAS-3595] - Tomcat allows http access with transport guarantie CONFIDENTIAL"); else fail("Security exception expected"); } catch (RemoteException ignore) Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java 2007-12-07 14:19:21 UTC (rev 5232) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java 2007-12-07 14:20:44 UTC (rev 5233) @@ -45,7 +45,7 @@ { if (true) { - System.out.println("FIXME: [JBWS-751] Multiple schema imports with the same namespace"); + System.out.println("FIXME [JBWS-751] Multiple schema imports with the same namespace"); return; } @@ -61,7 +61,7 @@ { if (true) { - System.out.println("FIXME: [JBWS-751] Multiple schema imports with the same namespace"); + System.out.println("FIXME [JBWS-751] Multiple schema imports with the same namespace"); return; } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2007-12-07 14:19:21 UTC (rev 5232) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2007-12-07 14:20:44 UTC (rev 5233) @@ -49,7 +49,7 @@ { if (isTargetJBoss50()) { - System.out.println("FIXME: [JBWS-1312] Fix JMS transport in trunk"); + System.out.println("FIXME [JBWS-1312] Fix JMS transport in trunk"); return; } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2007-12-07 14:19:21 UTC (rev 5232) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2007-12-07 14:20:44 UTC (rev 5233) @@ -64,7 +64,7 @@ } else { - System.out.println("FIXME: [JBWS-1397] Fix <wsdl-publish-location> for jboss-5.0.x"); + System.out.println("FIXME [JBWS-1397] Fix <wsdl-publish-location> for jboss-5.0.x"); ServiceFactoryImpl factory = new ServiceFactoryImpl(); URL wsdlURL = new File("resources/jaxrpc/samples/jsr109pojo/rpclit//WEB-INF/wsdl/TestService.wsdl").toURL(); URL mappingURL = new File("resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jaxrpc-mapping.xml").toURL(); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2007-12-07 14:19:21 UTC (rev 5232) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2007-12-07 14:20:44 UTC (rev 5233) @@ -148,7 +148,7 @@ port.getContactInfo("mafia"); if (isTargetJBoss50()) - System.out.println("FIXME: [JBAS-3595] - Tomcat allows http access with transport guarantie CONFIDENTIAL"); + System.out.println("FIXME [JBAS-3595] - Tomcat allows http access with transport guarantie CONFIDENTIAL"); else fail("Security exception expected"); } catch (RemoteException ignore) Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java 2007-12-07 14:19:21 UTC (rev 5232) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java 2007-12-07 14:20:44 UTC (rev 5233) @@ -49,7 +49,7 @@ public void testWebService() throws Exception { - System.out.println("FIXME: [JBWS-1665] incorrect wsdl generation"); + System.out.println("FIXME [JBWS-1665] incorrect wsdl generation"); //assertWSDLAccess(); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java 2007-12-07 14:19:21 UTC (rev 5232) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java 2007-12-07 14:20:44 UTC (rev 5233) @@ -52,7 +52,7 @@ { if (isTargetJBoss42() || isTargetJBoss40()) { - System.out.println("FIXME: [JBWS-1813] context-root in jboss.xml is ignored"); + System.out.println("FIXME [JBWS-1813] context-root in jboss.xml is ignored"); return; } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java 2007-12-07 14:19:21 UTC (rev 5232) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java 2007-12-07 14:20:44 UTC (rev 5233) @@ -137,7 +137,7 @@ public void testWSConsume() throws Exception { - System.out.println("[JBWS-1724] wsconsume cannot use part names that are friendly to .NET"); + System.out.println("FIXME [JBWS-1724] wsconsume cannot use part names that are friendly to .NET"); //WSConsume.main(new String[]{"--output=tests/wsconsume", wsdlURL.toExternalForm()}); } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2007-12-07 14:19:21 UTC (rev 5232) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2007-12-07 14:20:44 UTC (rev 5233) @@ -70,7 +70,7 @@ { if (true) { - System.out.println("FIXME: [JBCTS-540] EJB3 proxy does not implement the Home interface"); + System.out.println("FIXME [JBCTS-540] EJB3 proxy does not implement the Home interface"); return; } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2007-12-07 14:19:21 UTC (rev 5232) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2007-12-07 14:20:44 UTC (rev 5233) @@ -63,7 +63,7 @@ public void testCall() throws Exception { - System.out.println("FIXME: [JBWS-981] Virtual host configuration for EJB endpoints"); + System.out.println("FIXME [JBWS-981] Virtual host configuration for EJB endpoints"); if (true) return; String message = "hello"; Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingTestCase.java 2007-12-07 14:19:21 UTC (rev 5232) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingTestCase.java 2007-12-07 14:20:44 UTC (rev 5233) @@ -229,7 +229,7 @@ // public void testSubscriptionEndMessage() { - System.out.println("FIXME: [JBWS-798] Complete EventingTestCase"); + System.out.println("FIXME [JBWS-798] Complete EventingTestCase"); } // @@ -241,7 +241,7 @@ // public void testShutdownMessage() { - System.out.println("FIXME: [JBWS-798] Complete EventingTestCase"); + System.out.println("FIXME [JBWS-798] Complete EventingTestCase"); } // @@ -251,6 +251,6 @@ // public void testCancelMessage() { - System.out.println("FIXME: [JBWS-798] Complete EventingTestCase"); + System.out.println("FIXME [JBWS-798] Complete EventingTestCase"); } } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java 2007-12-07 14:19:21 UTC (rev 5232) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java 2007-12-07 14:20:44 UTC (rev 5233) @@ -73,7 +73,7 @@ if(true) { - System.out.println("FIXME: [JBWS-1460] @XmlMimeType on SEI parameter declarations"); + System.out.println("FIXME [JBWS-1460] @XmlMimeType on SEI parameter declarations"); return; } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/WSDL11ToJavaTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/WSDL11ToJavaTestCase.java 2007-12-07 14:19:21 UTC (rev 5232) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/WSDL11ToJavaTestCase.java 2007-12-07 14:20:44 UTC (rev 5233) @@ -107,7 +107,7 @@ WSDLValidator validator = new WSDL11Validator(); if (validator.validate(seiClass, wsdlDefinitions) == false) - System.err.println("FIXME: " + validator.getErrorList().toString()); + System.err.println("FIXME " + validator.getErrorList().toString()); return wsdlDefinitions; } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java 2007-12-07 14:19:21 UTC (rev 5232) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java 2007-12-07 14:20:44 UTC (rev 5233) @@ -203,7 +203,7 @@ XSElementDecl valueElement = (XSElementDecl) ((XSParticleDecl) sequence.getParticles().item(0)).getTerm(); String name = valueElement.getTypeDefinition().getName(); - //System.out.println("FIXME: JBWS-357"); + //System.out.println("FIXME JBWS-357"); assertEquals("HelloObj", name); }

16 years, 6 months

1
0
0 / 0

JBossWS SVN: r5232 - framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-12-07 09:19:21 -0500 (Fri, 07 Dec 2007) New Revision: 5232 Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java Log: Fix FIXME typos Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2007-12-07 14:11:25 UTC (rev 5231) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2007-12-07 14:19:21 UTC (rev 5232) @@ -219,7 +219,7 @@ System.out.println(messageOut); System.out.println("--- End captured output --"); - System.out.println("[JBWS-1772]: WSConsume output is not correctly redirected"); + System.out.println("FIXME [JBWS-1772] WSConsume output is not correctly redirected"); /*assertTrue("Tools output not correctly redirected", messageOut.indexOf("org/jboss/test/ws/tools/testMessageStream/EndpointInterface.java")!=-1 @@ -237,7 +237,7 @@ */ public void testAdditionalCompilerClassPath() { - System.out.println("FIXME [JBWS-1773]: Verify isolated classloading with WSConsume"); + System.out.println("FIXME [JBWS-1773] Verify isolated classloading with WSConsume"); } /** Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java 2007-12-07 14:11:25 UTC (rev 5231) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java 2007-12-07 14:19:21 UTC (rev 5232) @@ -169,7 +169,7 @@ */ public void testClassLoader() { - System.out.println("FIXME [JBWS-1776]: Verify isolated classloading with WSProvide"); + System.out.println("FIXME [JBWS-1776] Verify isolated classloading with WSProvide"); } /** @@ -182,7 +182,7 @@ if(isIntegrationSunRI()) { - System.out.println("FIXME [JBWS-1777]: WSProvide output is not correctly redirected"); + System.out.println("FIXME [JBWS-1777] WSProvide output is not correctly redirected"); return; }

16 years, 6 months

1
0
0 / 0

JBossWS SVN: r5231 - framework/trunk/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-12-07 09:11:25 -0500 (Fri, 07 Dec 2007) New Revision: 5231 Modified: framework/trunk/ant-import/build-hudson.xml Log: CATALINA_OPTS=-Xmx512m Modified: framework/trunk/ant-import/build-hudson.xml =================================================================== --- framework/trunk/ant-import/build-hudson.xml 2007-12-07 14:05:18 UTC (rev 5230) +++ framework/trunk/ant-import/build-hudson.xml 2007-12-07 14:11:25 UTC (rev 5231) @@ -132,6 +132,7 @@ <mkdir dir="${framework.dir}/output"/> <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true" output="${framework.dir}/output/hudson.log"> + <env key="CATALINA_OPTS" value="-Xmx512m"/> <arg line="start"/> </exec>

16 years, 6 months

1
0
0 / 0

JBossWS SVN: r5230 - in legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src: resources/tools/jbws-206/jbosswsConfig/UserException and 60 other directories.

by jbossws-commits＠lists.jboss.org

Author: mageshbk(a)jboss.com Date: 2007-12-07 09:05:18 -0500 (Fri, 07 Dec 2007) New Revision: 5230 Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws-206/jbosswsConfig/UserException/UserExceptionwsdl2java.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws-206/jbosswsConfig/UserExceptionInheritance/UserExceptionInheritancewsdl2java.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1079/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1184/scenario_A/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1184/scenario_B/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1253/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1259/scenario_A/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1259/scenario_B/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1259/scenario_C/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1259/scenario_D/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_A/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_AA/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_AD/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_AE/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_AF/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_B/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_C/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_D/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_E/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_F/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_G/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_H/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_I/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_J/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_K/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_L/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_O/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_R/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_U/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_X/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_Y/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_Z/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1441/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1450/scenario_A/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1450/scenario_B/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1450/scenario_C/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1450/scenario_D/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1453/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1455/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1534/bare/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1534/wrapped/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/doclit_out/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1698/error/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1698/fault/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1723/doclit_in/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1725/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1801/doclit/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1873/doclit/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1881/doclit/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws429/doclit_inout/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws429/rpclit_out/wstools-config.xml Log: [JBWS-1900] Fixed test cases failures due to JBWS-1217 Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2007-12-07 14:05:18 UTC (rev 5230) @@ -84,7 +84,7 @@ //Generate the Mapping file MappingFileGenerator mgf = new MappingFileGenerator(wsdl, new LiteralTypeMapping()); - mgf.setPackageName("org.jboss.types"); + //mgf.setPackageName("org.jboss.types"); mgf.setServiceName("HelloWsService"); JavaWsdlMapping jwm = mgf.generate(); FileWriter fw = new FileWriter("tools/jbws-160/jbossws/simple/mapping" + "/" + "jaxrpc-mapping.xml"); @@ -148,7 +148,7 @@ //Generate the Mapping file MappingFileGenerator mgf = new MappingFileGenerator(wsdl, new LiteralTypeMapping()); - mgf.setPackageName("org.jboss.types"); + //mgf.setPackageName("org.jboss.types"); mgf.setServiceName("HelloCustomService"); // mgf.generate(); JavaWsdlMapping jwm = mgf.generate(); Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws-206/jbosswsConfig/UserException/UserExceptionwsdl2java.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws-206/jbosswsConfig/UserException/UserExceptionwsdl2java.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws-206/jbosswsConfig/UserException/UserExceptionwsdl2java.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -4,6 +4,7 @@ xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> <global> <package-namespace package="org.jboss.test.webservice.userexception" namespace="http://org.jboss.ws"/> + <package-namespace package="org.jboss.test.webservice.userexception" namespace="http://org.jboss.ws/types"/> </global> <wsdl-java location="resources/tools/jbws-206/wsdlFixture/UserException/UserExceptionService_RPC_11.wsdl"/> </configuration> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws-206/jbosswsConfig/UserExceptionInheritance/UserExceptionInheritancewsdl2java.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws-206/jbosswsConfig/UserExceptionInheritance/UserExceptionInheritancewsdl2java.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws-206/jbosswsConfig/UserExceptionInheritance/UserExceptionInheritancewsdl2java.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -4,6 +4,7 @@ xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> <global> <package-namespace package="org.jboss.test.webservice.userexceptioninheritance" namespace="http://org.jboss.ws"/> + <package-namespace package="org.jboss.test.webservice.userexceptioninheritance" namespace="http://org.jboss.ws/types"/> </global> <wsdl-java location="resources/tools/jbws-206/wsdlFixture/UserExceptionInheritance/UserExceptionInheritanceService_RPC_11.wsdl"/> </configuration> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1079/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1079/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1079/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1079" namespace="http://test.jboss.org/ws/jbws1079/types"/> + </global> <wsdl-java location="resources/tools/jbws1079/Anonymous.wsdl" parameter-style="bare"> <mapping file="anonymous-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1184/scenario_A/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1184/scenario_A/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1184/scenario_A/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1184" namespace="http://test.jboss.org/ws/jbws1184/types"/> + </global> <wsdl-java location="resources/tools/jbws1184/scenario_A/TestEndpoint.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1184/scenario_B/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1184/scenario_B/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1184/scenario_B/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1184" namespace="http://test.jboss.org/ws/jbws1184/types"/> + </global> <wsdl-java location="resources/tools/jbws1184/scenario_B/TestEndpoint.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1253/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1253/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1253/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1253" namespace="http://test.jboss.org/ws/jbws1253/types"/> + </global> <wsdl-java location="resources/tools/jbws1253/MyPortTypeService.wsdl" parameter-style="bare"> <mapping file="myporttype-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1259/scenario_A/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1259/scenario_A/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1259/scenario_A/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1259" namespace="http://test.jboss.org/ws/jbws1259/types"/> + </global> <wsdl-java location="resources/tools/jbws1259/scenario_A/PhoneBook.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1259/scenario_B/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1259/scenario_B/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1259/scenario_B/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1259" namespace="http://test.jboss.org/ws/jbws1259/types"/> + </global> <wsdl-java location="resources/tools/jbws1259/scenario_B/PhoneBook.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1259/scenario_C/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1259/scenario_C/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1259/scenario_C/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1259" namespace="http://test.jboss.org/ws/jbws1259/types"/> + </global> <wsdl-java location="resources/tools/jbws1259/scenario_C/PhoneBook.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1259/scenario_D/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1259/scenario_D/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1259/scenario_D/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1259" namespace="http://test.jboss.org/ws/jbws1259/types"/> + </global> <wsdl-java location="resources/tools/jbws1259/scenario_D/PhoneBook.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_A/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_A/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_A/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1260" namespace="http://test.jboss.org/ws/jbws1260/types"/> + </global> <wsdl-java location="resources/tools/jbws1260/scenario_A/Wrapped.wsdl" parameter-style="wrapped"> <mapping file="wrapped-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_AA/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_AA/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_AA/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1260" namespace="http://test.jboss.org/ws/jbws1260/types"/> + </global> <wsdl-java location="resources/tools/jbws1260/scenario_AA/Wrapped.wsdl" parameter-style="wrapped"> <mapping file="wrapped-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_AD/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_AD/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_AD/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1260" namespace="http://test.jboss.org/ws/jbws1260/types"/> + </global> <wsdl-java location="resources/tools/jbws1260/scenario_AD/Wrapped.wsdl" parameter-style="wrapped"> <mapping file="wrapped-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_AE/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_AE/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_AE/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1260" namespace="http://test.jboss.org/ws/jbws1260/types"/> + </global> <wsdl-java location="resources/tools/jbws1260/scenario_AE/Wrapped.wsdl" parameter-style="wrapped"> <mapping file="wrapped-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_AF/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_AF/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_AF/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1260" namespace="http://test.jboss.org/ws/jbws1260/types"/> + </global> <wsdl-java location="resources/tools/jbws1260/scenario_AF/Wrapped.wsdl" parameter-style="wrapped"> <mapping file="wrapped-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_B/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_B/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_B/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1260" namespace="http://test.jboss.org/ws/jbws1260/types"/> + </global> <wsdl-java location="resources/tools/jbws1260/scenario_B/Wrapped.wsdl" parameter-style="wrapped"> <mapping file="wrapped-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_C/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_C/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_C/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1260" namespace="http://test.jboss.org/ws/jbws1260/types"/> + </global> <wsdl-java location="resources/tools/jbws1260/scenario_C/Wrapped.wsdl" parameter-style="wrapped"> <mapping file="wrapped-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_D/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_D/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_D/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1260" namespace="http://test.jboss.org/ws/jbws1260/types"/> + </global> <wsdl-java location="resources/tools/jbws1260/scenario_D/Wrapped.wsdl" parameter-style="wrapped"> <mapping file="wrapped-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_E/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_E/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_E/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1260" namespace="http://test.jboss.org/ws/jbws1260/types"/> + </global> <wsdl-java location="resources/tools/jbws1260/scenario_E/Wrapped.wsdl" parameter-style="wrapped"> <mapping file="wrapped-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_F/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_F/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_F/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1260" namespace="http://test.jboss.org/ws/jbws1260/types"/> + </global> <wsdl-java location="resources/tools/jbws1260/scenario_F/Wrapped.wsdl" parameter-style="wrapped"> <mapping file="wrapped-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_G/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_G/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_G/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1260" namespace="http://test.jboss.org/ws/jbws1260/types"/> + </global> <wsdl-java location="resources/tools/jbws1260/scenario_G/Wrapped.wsdl" parameter-style="wrapped"> <mapping file="wrapped-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_H/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_H/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_H/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1260" namespace="http://test.jboss.org/ws/jbws1260/types"/> + </global> <wsdl-java location="resources/tools/jbws1260/scenario_H/Wrapped.wsdl" parameter-style="wrapped"> <mapping file="wrapped-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_I/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_I/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_I/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1260" namespace="http://test.jboss.org/ws/jbws1260/types"/> + </global> <wsdl-java location="resources/tools/jbws1260/scenario_I/Wrapped.wsdl" parameter-style="wrapped"> <mapping file="wrapped-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_J/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_J/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_J/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1260" namespace="http://test.jboss.org/ws/jbws1260/types"/> + </global> <wsdl-java location="resources/tools/jbws1260/scenario_J/Wrapped.wsdl" parameter-style="wrapped"> <mapping file="wrapped-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_K/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_K/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_K/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1260" namespace="http://test.jboss.org/ws/jbws1260/types"/> + </global> <wsdl-java location="resources/tools/jbws1260/scenario_K/Wrapped.wsdl" parameter-style="wrapped"> <mapping file="wrapped-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_L/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_L/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_L/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1260" namespace="http://test.jboss.org/ws/jbws1260/types"/> + </global> <wsdl-java location="resources/tools/jbws1260/scenario_L/Wrapped.wsdl" parameter-style="wrapped"> <mapping file="wrapped-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_O/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_O/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_O/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1260" namespace="http://test.jboss.org/ws/jbws1260/types"/> + </global> <wsdl-java location="resources/tools/jbws1260/scenario_O/Wrapped.wsdl" parameter-style="wrapped"> <mapping file="wrapped-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_R/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_R/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_R/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1260" namespace="http://test.jboss.org/ws/jbws1260/types"/> + </global> <wsdl-java location="resources/tools/jbws1260/scenario_R/Wrapped.wsdl" parameter-style="wrapped"> <mapping file="wrapped-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_U/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_U/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_U/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1260" namespace="http://test.jboss.org/ws/jbws1260/types"/> + </global> <wsdl-java location="resources/tools/jbws1260/scenario_U/Wrapped.wsdl" parameter-style="wrapped"> <mapping file="wrapped-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_X/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_X/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_X/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1260" namespace="http://test.jboss.org/ws/jbws1260/types"/> + </global> <wsdl-java location="resources/tools/jbws1260/scenario_X/Wrapped.wsdl" parameter-style="wrapped"> <mapping file="wrapped-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_Y/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_Y/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_Y/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1260" namespace="http://test.jboss.org/ws/jbws1260/types"/> + </global> <wsdl-java location="resources/tools/jbws1260/scenario_Y/Wrapped.wsdl" parameter-style="wrapped"> <mapping file="wrapped-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_Z/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_Z/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_Z/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1260" namespace="http://test.jboss.org/ws/jbws1260/types"/> + </global> <wsdl-java location="resources/tools/jbws1260/scenario_Z/Wrapped.wsdl" parameter-style="wrapped"> <mapping file="wrapped-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1441/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1441/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1441/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1441" namespace="http://test.jboss.org/ws/jbws1441/types"/> + </global> <wsdl-java location="resources/tools/jbws1441/PhoneBook.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1450/scenario_A/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1450/scenario_A/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1450/scenario_A/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1450" namespace="http://test.jboss.org/ws/jbws1450/types"/> + </global> <wsdl-java location="resources/tools/jbws1450/scenario_A/TestEndpoint.wsdl" parameter-style="wrapped"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1450/scenario_B/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1450/scenario_B/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1450/scenario_B/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1450" namespace="http://test.jboss.org/ws/jbws1450/types"/> + </global> <wsdl-java location="resources/tools/jbws1450/scenario_B/TestEndpoint.wsdl" parameter-style="wrapped"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1450/scenario_C/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1450/scenario_C/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1450/scenario_C/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1450" namespace="http://test.jboss.org/ws/jbws1450/types"/> + </global> <wsdl-java location="resources/tools/jbws1450/scenario_C/TestEndpoint.wsdl" parameter-style="wrapped"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1450/scenario_D/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1450/scenario_D/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1450/scenario_D/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1450" namespace="http://test.jboss.org/ws/jbws1450/types"/> + </global> <wsdl-java location="resources/tools/jbws1450/scenario_D/TestEndpoint.wsdl" parameter-style="wrapped"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1453/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1453/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1453/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1453" namespace="http://test.jboss.org/ws/jbws1453/types"/> + </global> <wsdl-java location="resources/tools/jbws1453/PhoneBook.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1455/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1455/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1455/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1455" namespace="http://test.jboss.org/ws/jbws1455/types"/> + </global> <wsdl-java location="resources/tools/jbws1455/TestEndpoint.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1534/bare/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1534/bare/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1534/bare/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1534" namespace="http://test.jboss.org/ws/jbws1534/types"/> + </global> <wsdl-java location="resources/tools/jbws1534/bare/TestEndpoint.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1534/wrapped/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1534/wrapped/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1534/wrapped/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1534" namespace="http://test.jboss.org/ws/jbws1534/types"/> + </global> <wsdl-java location="resources/tools/jbws1534/wrapped/TestEndpoint.wsdl" parameter-style="wrapped"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1597" namespace="http://test.jboss.org/ws/jbws1597/types"/> + </global> <wsdl-java location="resources/tools/jbws1597/doclit_in/PhoneBook.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml"/> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1597" namespace="http://test.jboss.org/ws/jbws1597/types"/> + </global> <wsdl-java location="resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml"/> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1597" namespace="http://test.jboss.org/ws/jbws1597/types"/> + </global> <wsdl-java location="resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml"/> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/doclit_out/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/doclit_out/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/doclit_out/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1597" namespace="http://test.jboss.org/ws/jbws1597/types"/> + </global> <wsdl-java location="resources/tools/jbws1597/doclit_out/PhoneBook.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml"/> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1597" namespace="http://test.jboss.org/ws/jbws1597/types"/> + </global> <wsdl-java location="resources/tools/jbws1597/rpclit_in/PhoneBook.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml"/> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1597" namespace="http://test.jboss.org/ws/jbws1597/types"/> + </global> <wsdl-java location="resources/tools/jbws1597/rpclit_in_and_out/PhoneBook.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml"/> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1597" namespace="http://test.jboss.org/ws/jbws1597/types"/> + </global> <wsdl-java location="resources/tools/jbws1597/rpclit_inout/PhoneBook.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml"/> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1597" namespace="http://test.jboss.org/ws/jbws1597/types"/> + </global> <wsdl-java location="resources/tools/jbws1597/rpclit_out/PhoneBook.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml"/> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1627" namespace="http://test.jboss.org/ws/jbws1627/types"/> + </global> <wsdl-java location="resources/tools/jbws1627/PhoneBook.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1698/error/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1698/error/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1698/error/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1698" namespace="http://test.jboss.org/ws/jbws1698/types"/> + </global> <wsdl-java location="resources/tools/jbws1698/error/PhoneBook.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1698/fault/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1698/fault/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1698/fault/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1698" namespace="http://test.jboss.org/ws/jbws1698/types"/> + </global> <wsdl-java location="resources/tools/jbws1698/fault/PhoneBook.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1723/doclit_in/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1723/doclit_in/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1723/doclit_in/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1723" namespace="http://test.jboss.org/ws/jbws1723/types"/> + </global> <wsdl-java location="resources/tools/jbws1723/doclit_in/PhoneBook.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml"/> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1723" namespace="http://test.jboss.org/ws/jbws1723/types"/> + </global> <wsdl-java location="resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml"/> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1725/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1725/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1725/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -2,6 +2,9 @@ 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"> + <global> + <package-namespace package="org.jboss.test.ws.jbws1725" namespace="http://test.jboss.org/ws/jbws1725/types"/> + </global> <wsdl-java location="resources/tools/jbws1725/Extension.wsdl" parameter-style="bare"> <mapping file="extended-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1801/doclit/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1801/doclit/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1801/doclit/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1801" namespace="http://test.jboss.org/ws/jbws1801/types"/> + </global> <wsdl-java location="resources/tools/jbws1801/doclit/PhoneBook.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml"/> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1873/doclit/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1873/doclit/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1873/doclit/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1873" namespace="http://test.jboss.org/ws/jbws1873/types"/> + </global> <wsdl-java location="resources/tools/jbws1873/doclit/PhoneBook.wsdl" parameter-style="wrapped"> <mapping file="jaxrpc-mapping.xml"/> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1881/doclit/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1881/doclit/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1881/doclit/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws1881" namespace="http://test.jboss.org/ws/jbws1881/types"/> + </global> <wsdl-java location="resources/tools/jbws1881/doclit/PhoneBook.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml"/> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws429/doclit_inout/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws429/doclit_inout/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws429/doclit_inout/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws429" namespace="http://test.jboss.org/ws/jbws429/types"/> + </global> <wsdl-java location="resources/tools/jbws429/doclit_inout/PhoneBook.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws429" namespace="http://test.jboss.org/ws/jbws429/types"/> + </global> <wsdl-java location="resources/tools/jbws429/rpclit_inout/PhoneBook.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws429/rpclit_out/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws429/rpclit_out/wstools-config.xml 2007-12-07 14:02:19 UTC (rev 5229) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws429/rpclit_out/wstools-config.xml 2007-12-07 14:05:18 UTC (rev 5230) @@ -1,4 +1,7 @@ <configuration> + <global> + <package-namespace package="org.jboss.test.ws.jbws429" namespace="http://test.jboss.org/ws/jbws429/types"/> + </global> <wsdl-java location="resources/tools/jbws429/rpclit_out/PhoneBook.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java>

16 years, 6 months

1
0
0 / 0

JBossWS SVN: r5229 - in legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools: config and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: mageshbk(a)jboss.com Date: 2007-12-07 09:02:19 -0500 (Fri, 07 Dec 2007) New Revision: 5229 Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/helpers/ToolsHelper.java legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java Log: [JBWS-1900] Ported JBWS-1217 WSDLtoJava Namespace to package mapping does not support multiple namespaces Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-12-07 10:57:19 UTC (rev 5228) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-12-07 14:02:19 UTC (rev 5229) @@ -204,7 +204,7 @@ if (namespacePackageMap == null) namespacePackageMap = new HashMap<String, String>(); String pkg = iter.next(); - namespacePackageMap.put(map.get(pkg), pkg); + namespacePackageMap.put(pkg, map.get(pkg)); } } @@ -327,7 +327,8 @@ if (cl == null) { String faultTypeName = (!xt.getAnonymous()) ? faultXMLType.getLocalPart() : faultXMLName.getLocalPart(); - buf.append(seiPkgName + "." + JavaUtils.capitalize(faultTypeName)); + String packageName = getPackageName(xt.getNamespace()); + buf.append(packageName + "." + JavaUtils.capitalize(faultTypeName)); } else buf.append(cl.getName()); buf.append(","); @@ -338,8 +339,8 @@ } } - private String appendRpcParameters(StringBuilder paramBuffer, WSDLInterfaceOperation op, WSDLInterfaceOperationOutput output, WSDLBindingOperation bindingOperation) - throws IOException + private String appendRpcParameters(StringBuilder paramBuffer, WSDLInterfaceOperation op, WSDLInterfaceOperationOutput output, + WSDLBindingOperation bindingOperation) throws IOException { String returnType = null; boolean first = true; @@ -628,8 +629,9 @@ className = className.substring(1); className = ToolsUtils.convertInvalidCharacters(className); className = utils.firstLetterUpperCase(className); - className = seiPkgName + "." + className + arraySuffix; + String packageName = getPackageName(xt.getNamespace()); + className = packageName + "." + className + arraySuffix; if (holder) { className = holderWriter.getOrCreateHolder(className, getLocationForJavaGeneration()); @@ -751,7 +753,8 @@ className = className.substring(1); className = ToolsUtils.convertInvalidCharacters(className); className = utils.firstLetterUpperCase(className); - return seiPkgName + "." + className + arraySuffix; + String packageName = getPackageName(xt.getNamespace()); + return packageName + "." + className + arraySuffix; } if (cls.isArray()) @@ -809,7 +812,11 @@ { XSDTypeToJava xtj = new XSDTypeToJava(); xtj.setTypeMapping(this.typeMapping); - xtj.createJavaFile((XSComplexTypeDefinition)xt, containingElement, getLocationForJavaGeneration(), seiPkgName, xsmodel, exception); + String targetNS = wsdl.getTargetNamespace(); + String tgtNS = xt.getNamespace(); + String packName = getPackageName(tgtNS); + //if(tgtNS.equals(targetNS)) + xtj.createJavaFile((XSComplexTypeDefinition)xt, containingElement, getLocationForJavaGeneration(), packName, xsmodel, exception); } public void setParameterStyle(String paramStyle) @@ -817,4 +824,18 @@ this.parameterStyle = paramStyle; } + private String getPackageName(String targetNamespace) + { + //Get it from global config + if (namespacePackageMap != null) + { + String pkg = namespacePackageMap.get(targetNamespace); + if (pkg != null) + { + return pkg; + } + } + + return NamespacePackageMapping.getJavaPackageName(targetNamespace); + } } Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java 2007-12-07 10:57:19 UTC (rev 5228) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java 2007-12-07 14:02:19 UTC (rev 5229) @@ -251,7 +251,7 @@ { String pkgname = attrs.getValue(PACKAGE_ATTRIBUTE); String ns = attrs.getValue(NAMESPACE_ATTRIBUTE); - globalc.packageNamespaceMap.put(pkgname, ns); + globalc.packageNamespaceMap.put(ns, pkgname); } return globalc; } Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-12-07 10:57:19 UTC (rev 5228) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-12-07 14:02:19 UTC (rev 5229) @@ -25,6 +25,7 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; import javax.xml.namespace.QName; @@ -77,6 +78,7 @@ import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; import org.jboss.ws.tools.HeaderUtil; +import org.jboss.ws.tools.NamespacePackageMapping; import org.jboss.ws.tools.RPCSignature; import org.jboss.ws.tools.ToolsUtils; import org.jboss.ws.tools.WSToolsConstants; @@ -96,7 +98,7 @@ private WSDLDefinitions wsdlDefinitions = null; private String typeNamespace; private String serviceName = null; - private String packageName = null; + private Map<String, String> namespacePackageMap = null; private Set<String> registeredTypes = new HashSet<String>(); private Set<String> registeredExceptions = new HashSet<String>(); @@ -107,11 +109,11 @@ private String parameterStyle; - public MappingFileGeneratorHelper(WSDLDefinitions wsdl, String sname, String pname, Class seiClass, LiteralTypeMapping ltm, String paramStyle) + public MappingFileGeneratorHelper(WSDLDefinitions wsdl, String sname, Map<String, String> map, Class seiClass, LiteralTypeMapping ltm, String paramStyle) { this.wsdlDefinitions = wsdl; this.serviceName = sname; - this.packageName = pname; + this.namespacePackageMap = map; this.typeMapping = ltm; this.wsdlStyle = utils.getWSDLStyle(wsdl); @@ -149,7 +151,7 @@ String targetNS = wsdlDefinitions.getTargetNamespace(); String prefix = WSToolsConstants.WSTOOLS_CONSTANT_MAPPING_SERVICE_PREFIX; ServiceInterfaceMapping sim = new ServiceInterfaceMapping(jwm); - sim.setServiceInterface(packageName + "." + javaServiceName); + sim.setServiceInterface(getPackageName(targetNS) + "." + javaServiceName); sim.setWsdlServiceName(new QName(targetNS, serviceName, prefix)); WSDLEndpoint[] endpoints = ser.getEndpoints(); @@ -195,7 +197,7 @@ javaPortName += "_PortType"; ServiceEndpointInterfaceMapping seim = new ServiceEndpointInterfaceMapping(jwm); - seim.setServiceEndpointInterface(packageName + "." + javaPortName); + seim.setServiceEndpointInterface(getPackageName(targetNS) + "." + javaPortName); seim.setWsdlPortType(new QName(targetNS, portName, "portTypeNS")); seim.setWsdlBinding(new QName(targetNS, bindName, "bindingNS")); constructServiceEndpointMethodMapping(seim, wsdlintf); @@ -314,11 +316,15 @@ //Check it is a holder. if (wiop.getInputByPartName(xmlName.getLocalPart()) == null) { - + String nameSpace = null; + if (xt != null) + { + nameSpace = xt.getNamespace(); + } if (xt instanceof XSSimpleTypeDefinition) xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt); - String javaType = getJavaTypeAsString(xmlName, xmlType, array, primitive); + String javaType = getJavaTypeAsString(xmlName, xmlType, nameSpace, array, primitive); if ((isDocStyle() == false && "void".equals(javaType)) == false) { @@ -455,11 +461,18 @@ QName xmlType = returnParameter.getType(); XSTypeDefinition xt = schemaModel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); + String nameSpace = null; + if (xt != null) + { + nameSpace = xt.getNamespace(); + } if (xt instanceof XSSimpleTypeDefinition) + { xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt); + } WsdlReturnValueMapping wrvm = new WsdlReturnValueMapping(semm); - wrvm.setMethodReturnValue(getJavaTypeAsString(xmlName, xmlType, false, true)); + wrvm.setMethodReturnValue(getJavaTypeAsString(xmlName, xmlType, nameSpace, false, true)); QName messageName = WSDLUtils.getWsdl11Output(wiop).getMessageName(); wrvm.setWsdlMessage(new QName(messageName.getNamespaceURI(), messageName.getLocalPart(), WSToolsConstants.WSTOOLS_CONSTANT_MAPPING_WSDL_MESSAGE_NS)); wrvm.setWsdlMessagePartName(partName); @@ -524,7 +537,7 @@ XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); addJavaXMLTypeMap(xt, xmlName.getLocalPart(), "", "", jwm, true); - String exceptionType = getJavaTypeAsString(null, xmlType, false, true); + String exceptionType = getJavaTypeAsString(null, xmlType, xt.getNamespace(), false, true); if (registeredExceptions.contains(exceptionType) == false) { @@ -717,7 +730,7 @@ if (localName == null) { String tempName = containingElement + ToolsUtils.firstLetterUpperCase(name); - javaType = getJavaTypeAsString(null, new QName(tempName), false, true); + javaType = getJavaTypeAsString(null, new QName(tempName), xt.getNamespace(), false, true); StringBuilder temp = new StringBuilder(); if (containingType != null && containingType.length() > 0) temp.append(">").append(containingType); @@ -727,7 +740,7 @@ } else { - javaType = getJavaTypeAsString(null, new QName(localName), false, true); + javaType = getJavaTypeAsString(null, new QName(localName), xt.getNamespace(), false, true); jxtm.setRootTypeQName(new QName(xt.getNamespace(), xt.getName(), "typeNS")); } @@ -838,7 +851,7 @@ } } - private String getJavaTypeAsString(QName xmlName, QName xmlType, boolean array, boolean primitive) + private String getJavaTypeAsString(QName xmlName, QName xmlType, String targetNS, boolean array, boolean primitive) { String jtype = null; @@ -883,7 +896,7 @@ if (className.charAt(0) == '>') className = className.substring(1); className = ToolsUtils.convertInvalidCharacters(className); - jtype = packageName + "." + utils.firstLetterUpperCase(className); + jtype = getPackageName(targetNS) + "." + utils.firstLetterUpperCase(className); } else { @@ -931,7 +944,7 @@ String targetNS = wsdlDefinitions.getTargetNamespace(); MethodParamPartsMapping mppm = new MethodParamPartsMapping(semm); mppm.setParamPosition(paramPosition); - String javaType = getJavaTypeAsString(xmlName, xmlType, array, primitive); + String javaType = getJavaTypeAsString(xmlName, xmlType, targetNS, array, primitive); mppm.setParamType(javaType); //WSDL Message Mapping @@ -943,4 +956,18 @@ mppm.setWsdlMessageMapping(wmm); return mppm; } + + private String getPackageName(String targetNamespace) + { + //Get it from global config + if (namespacePackageMap != null) + { + String pkg = namespacePackageMap.get(targetNamespace); + if (pkg != null) + { + return pkg; + } + } + return NamespacePackageMapping.getJavaPackageName(targetNamespace); + } } Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/helpers/ToolsHelper.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2007-12-07 10:57:19 UTC (rev 5228) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2007-12-07 14:02:19 UTC (rev 5229) @@ -303,13 +303,14 @@ wsdlToJava.generateSEI(wsdl, new File(outDir)); //Generate the Service File - this.generateServiceFile(getPackageName(wsdl, glc), wsdl, outDir); + this.generateServiceFile(getPackageName(wsdl.getTargetNamespace(), glc), wsdl, outDir); //Generate the Mapping File if (w2jc.mappingFileNeeded) { MappingFileGenerator mgf = new MappingFileGenerator(wsdl, new LiteralTypeMapping()); - mgf.setPackageName(getPackageName(wsdl, glc)); + if (glc != null && glc.packageNamespaceMap != null) + mgf.setNamespacePackageMap(glc.packageNamespaceMap); mgf.setServiceName(wsdl.getServices()[0].getName().getLocalPart()); mgf.setParameterStyle(w2jc.parameterStyle); @@ -331,7 +332,7 @@ if (wsdl.getInterfaces().length == 1) { - String seiPackage = getPackageName(wsdl, glc); + String seiPackage = getPackageName(wsdl.getTargetNamespace(), glc); seiName = seiPackage + "." + wsdlToJava.getServiceEndpointInterfaceName(wsdl.getInterfaces()[0]); } @@ -395,24 +396,18 @@ sc.createServiceDescriptor(); } - private String getPackageName(WSDLDefinitions wsdl, GlobalConfig glc) + private String getPackageName(String targetNamespace, GlobalConfig glc) { - String targetNamespace = wsdl.getTargetNamespace(); - //Get it from global config + //Get it from global config if it is overriden if (glc != null && glc.packageNamespaceMap != null) { - Map<String, String> map = glc.packageNamespaceMap; - Iterator iter = map.keySet().iterator(); - while (iter.hasNext()) + String pkg = glc.packageNamespaceMap.get(targetNamespace); + if (pkg != null) { - String pkg = (String)iter.next(); - String ns = map.get(pkg); - if (ns.equals(targetNamespace)) - return pkg; + return pkg; } } - - return NamespacePackageMapping.getJavaPackageName(wsdl.getTargetNamespace()); + return NamespacePackageMapping.getJavaPackageName(targetNamespace); } private void createDir(String path) Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2007-12-07 10:57:19 UTC (rev 5228) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2007-12-07 14:02:19 UTC (rev 5229) @@ -25,6 +25,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import java.util.Map; import javax.xml.rpc.encoding.TypeMapping; @@ -42,6 +43,7 @@ import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.tools.JavaWriter; +import org.jboss.ws.tools.NamespacePackageMapping; import org.jboss.ws.tools.XSDTypeToJava; import org.jboss.ws.tools.XSDTypeToJava.VAR; import org.jboss.ws.tools.helpers.MappingFileGeneratorHelper; @@ -68,9 +70,9 @@ protected WSDLDefinitions wsdlDefinitions; /** - * Package Name to override + * Package Names to override */ - protected String packageName; + protected Map<String, String> namespacePackageMap; /** * Service Name @@ -109,17 +111,15 @@ this.wsdlDefinitions = wsdlDefinitions; } - /** - * @return @see #packageName - */ - public String getPackageName() + public Map<String, String> getNamespacePackageMap() { - return packageName; + return namespacePackageMap; } - public void setPackageName(String packageName) + + public void setNamespacePackageMap(Map<String, String> map) { - this.packageName = packageName; + namespacePackageMap = map; } /** @@ -156,7 +156,7 @@ */ public JavaWsdlMapping generate() throws IOException { - MappingFileGeneratorHelper helper = new MappingFileGeneratorHelper(this.wsdlDefinitions, this.serviceName, this.packageName, this.serviceEndpointInterface, + MappingFileGeneratorHelper helper = new MappingFileGeneratorHelper(this.wsdlDefinitions, this.serviceName, this.namespacePackageMap, this.serviceEndpointInterface, this.typeMapping, this.parameterStyle); JavaWsdlMapping jwm = new JavaWsdlMapping(); @@ -182,8 +182,8 @@ //Construct package mapping //Check if the user has provided a typeNamespace if (typeNamespace != null && typeNamespace.equals(targetNS) == false || isServerSideGeneration()) - jwm.addPackageMapping(helper.constructPackageMapping(jwm, packageName, typeNamespace)); - jwm.addPackageMapping(helper.constructPackageMapping(jwm, packageName, targetNS)); + jwm.addPackageMapping(helper.constructPackageMapping(jwm, getPackageName(typeNamespace), typeNamespace)); + jwm.addPackageMapping(helper.constructPackageMapping(jwm, getPackageName(targetNS), targetNS)); return jwm; } @@ -194,7 +194,7 @@ WSDLUtils utils = WSDLUtils.getInstance(); XSDTypeToJava xst = new XSDTypeToJava(); xst.setTypeMapping(this.typeMapping); - xst.setPackageName(this.packageName); + xst.setPackageName(getPackageName(typeNamespace)); ServiceEndpointMethodMapping[] mapArr = seim.getServiceEndpointMethodMappings(); int len = mapArr != null ? mapArr.length : 0; for (int i = 0; i < len; i++) @@ -212,7 +212,7 @@ listInputs.addAll(xst.getVARList((XSComplexTypeDefinition)xsmodel.getTypeDefinition(opname, typeNamespace), xsmodel, false)); } JavaWriter jw = new JavaWriter(); - jw.createJavaFile(location, classname, packageName, listInputs, null, null, false, null); + jw.createJavaFile(location, classname, getPackageName(typeNamespace), listInputs, null, null, false, null); classname = plainClassName + "_" + opname + "_ResponseStruct"; XSTypeDefinition xt = xsmodel.getTypeDefinition(opname + "Response", typeNamespace); List<VAR> listOutputs = new ArrayList<VAR>(); @@ -221,7 +221,7 @@ listOutputs.add(new VAR(Constants.DEFAULT_RPC_RETURN_NAME, xt.getName(), false)); } else listOutputs.addAll(xst.getVARList((XSComplexTypeDefinition)xt, xsmodel, false)); - jw.createJavaFile(location, classname, packageName, listOutputs, null, null, false, null); + jw.createJavaFile(location, classname, getPackageName(typeNamespace), listOutputs, null, null, false, null); } } @@ -230,4 +230,18 @@ { return this.serviceEndpointInterface != null; } + + private String getPackageName(String targetNamespace) + { + //Get it from global config + if (namespacePackageMap != null) + { + String pkg = namespacePackageMap.get(targetNamespace); + if (pkg != null) + { + return pkg; + } + } + return NamespacePackageMapping.getJavaPackageName(targetNamespace); + } }

16 years, 6 months

1
0
0 / 0

JBossWS SVN: r5228 - in stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws: jbws944 and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-12-07 05:57:19 -0500 (Fri, 07 Dec 2007) New Revision: 5228 Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java Log: Use default jndi binding for AS5 Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2007-12-07 10:55:36 UTC (rev 5227) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2007-12-07 10:57:19 UTC (rev 5228) @@ -54,7 +54,7 @@ public void testEJBVehicle() throws Exception { - EJB3Remote remote = (EJB3Remote)getInitialContext().lookup("/ejb3/EJB3Bean"); + EJB3Remote remote = (EJB3Remote)getInitialContext().lookup("/EJB3Bean/remote"); String retStr = remote.runTest("Hello World!"); assertEquals("Hello World!", retStr); } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2007-12-07 10:55:36 UTC (rev 5227) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2007-12-07 10:57:19 UTC (rev 5228) @@ -54,7 +54,7 @@ public void testEJBVehicle() throws Exception { - EJB3Remote remote = (EJB3Remote)getInitialContext().lookup("/ejb3/EJB3Bean"); + EJB3Remote remote = (EJB3Remote)getInitialContext().lookup("/EJB3Bean/remote"); String retStr = remote.runTest("Hello World!"); assertEquals("Hello World!", retStr); } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2007-12-07 10:55:36 UTC (rev 5227) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2007-12-07 10:57:19 UTC (rev 5228) @@ -57,7 +57,7 @@ public void testRemoteAccess() throws Exception { InitialContext iniCtx = getInitialContext(); - EJB3RemoteBusinessInterface ejb3Remote = (EJB3RemoteBusinessInterface)iniCtx.lookup("/ejb3/EJB3EndpointInterface"); + EJB3RemoteBusinessInterface ejb3Remote = (EJB3RemoteBusinessInterface)iniCtx.lookup("/FooBean01/remote"); String helloWorld = "Hello world!"; Object retObj = ejb3Remote.echo(helloWorld); @@ -75,7 +75,7 @@ } InitialContext iniCtx = getInitialContext(); - Object obj = iniCtx.lookup("/ejb3/EJB3EndpointInterface"); + Object obj = iniCtx.lookup("/FooBean01/remote"); EJB3RemoteHome ejb3Home = (EJB3RemoteHome)PortableRemoteObject.narrow(obj, EJB3RemoteHome.class); EJB3RemoteInterface ejb3Remote = ejb3Home.create();

16 years, 6 months

1
0
0 / 0

JBossWS SVN: r5227 - stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2007-12-07 05:55:36 -0500 (Fri, 07 Dec 2007) New Revision: 5227 Added: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMessageAssembler.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMSender.java Removed: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelManager.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelManagerImpl.java Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannel.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelResponse.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelTask.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMarshaller.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMessage.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMessageFactory.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMessageImpl.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMetadata.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMTransportHelper.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMUnMarshaller.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMUnassignedMessageListener.java Log: beautification refactoring - so architecture documentation will be consistent with class names Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannel.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannel.java 2007-12-07 10:54:55 UTC (rev 5226) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannel.java 2007-12-07 10:55:36 UTC (rev 5227) @@ -21,26 +21,18 @@ */ package org.jboss.ws.extensions.wsrm.transport; -import static org.jboss.ws.extensions.wsrm.RMConstant.*; - -import org.jboss.remoting.marshal.Marshaller; -import org.jboss.remoting.marshal.UnMarshaller; import org.jboss.ws.core.MessageAbstraction; -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.io.ByteArrayOutputStream; - -import java.util.Map; - /** - * RM Channel + * RM Channel implements reliable transport + * * @author richard.opalka(a)jboss.com */ public class RMChannel { - private static final RMChannel INSTANCE = new RMChannel(); + private static final RMChannel instance = new RMChannel(); + private RMChannel() { // forbidden inheritance @@ -48,55 +40,14 @@ public static RMChannel getInstance() { - return INSTANCE; + return instance; } - // Holds the list of tasks that will be send to the remoting transport channel - private static final RMChannelManager rmChannelManager = RMChannelManagerImpl.getInstance(); - - - private RMMessage createRMMessage(MessageAbstraction request, RMMetadata rmMetadata) throws Throwable - { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - Marshaller marshaller = (Marshaller)rmMetadata.getContext(SERIALIZATION_CONTEXT).get(MARSHALLER); - // we have to serialize message before putting it to the rm pool - // * contextClassloader not serializable issue - // * DOMUtil threadlocal issue (if message is de/serialized in separate thread) - marshaller.write(request, baos); - RMMessage rmMessage = RMMessageFactory.newMessage(baos.toByteArray(), rmMetadata); - return rmMessage; - } - - private MessageAbstraction createResponse(RMMessage rmRequest, RMMessage rmResponse, RMMetadata rmMetadata) throws Throwable - { - Map<String, Object> invocationContext = rmMetadata.getContext(INVOCATION_CONTEXT); - boolean oneWay = RMTransportHelper.isOneWayOperation(rmRequest); - MessageAbstraction response = null; - if (!oneWay) - { - byte[] payload = rmResponse.getPayload(); - InputStream is = payload == null ? null : new ByteArrayInputStream(rmResponse.getPayload()); - // we have to deserialize message after pick up from the rm pool - // * contextClassloader not serializable issue - // * DOMUtil threadlocal issue (if message is de/serialized in separate thread) - UnMarshaller unmarshaller = (UnMarshaller)rmMetadata.getContext(SERIALIZATION_CONTEXT).get(UNMARSHALLER); - response = (MessageAbstraction)unmarshaller.read(is, rmResponse.getMetadata().getContext(REMOTING_INVOCATION_CONTEXT)); - } - invocationContext.clear(); - invocationContext.putAll(rmMetadata.getContext(REMOTING_INVOCATION_CONTEXT)); - return response; - } - public MessageAbstraction send(MessageAbstraction request, RMMetadata rmMetadata) throws Throwable { - RMMessage rmRequest = createRMMessage(request, rmMetadata); - RMMessage rmResponse = sendToChannel(rmRequest); - return createResponse(rmRequest, rmResponse, rmMetadata); + RMMessage rmRequest = RMMessageAssembler.convertMessageToRMSource(request, rmMetadata); + RMMessage rmResponse = RMSender.getInstance().send(rmRequest); + return RMMessageAssembler.convertRMSourceToMessage(rmRequest, rmResponse, rmMetadata); } - private RMMessage sendToChannel(RMMessage request) throws Throwable - { - return rmChannelManager.send(request); - } - } Deleted: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelManager.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelManager.java 2007-12-07 10:54:55 UTC (rev 5226) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelManager.java 2007-12-07 10:55:36 UTC (rev 5227) @@ -1,41 +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.extensions.wsrm.transport; - -/** - * WS-RM channel manager interface - * - * @author richard.opalka(a)jboss.com - * - * @since Dec 5, 2007 - */ -public interface RMChannelManager -{ - - /** - * Send request to server reliably - * @param request RM request wrapper - * @return RM response wrapper - */ - RMMessage send(RMMessage request) throws Throwable; - -} Deleted: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelManagerImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelManagerImpl.java 2007-12-07 10:54:55 UTC (rev 5226) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelManagerImpl.java 2007-12-07 10:55:36 UTC (rev 5227) @@ -1,175 +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.extensions.wsrm.transport; - -import static org.jboss.ws.extensions.wsrm.RMConstant.REMOTING_INVOCATION_CONTEXT; - -import java.util.Map; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; -import java.util.concurrent.atomic.AtomicInteger; - -import javax.servlet.http.HttpServletResponse; - -import org.jboss.logging.Logger; -import org.jboss.remoting.transport.http.HTTPMetadataConstants; -import org.jboss.ws.extensions.wsrm.api.RMException; -import org.jboss.ws.extensions.wsrm.config.RMMessageRetransmissionConfig; - -/** - * WS-RM channel manager ensures message reliable delivery according to sequence retransmission configuration - * - * @author richard.opalka(a)jboss.com - * - * @since Dec 5, 2007 - */ -public final class RMChannelManagerImpl implements RMChannelManager -{ - - private static final Logger logger = Logger.getLogger(RMChannelManagerImpl.class); - private static RMChannelManager instance = new RMChannelManagerImpl(); - private static final ExecutorService rmChannelPool = Executors.newFixedThreadPool(5, new RMThreadFactory()); - - private static final class RMThreadFactory implements ThreadFactory - { - final ThreadGroup group; - final AtomicInteger threadNumber = new AtomicInteger(1); - final String namePrefix = "rm-pool-thread-"; - - private RMThreadFactory() - { - SecurityManager sm = System.getSecurityManager(); - group = (sm != null) ? sm.getThreadGroup() : Thread.currentThread().getThreadGroup(); - } - - public Thread newThread(Runnable r) - { - Thread t = new Thread(group, r, namePrefix + threadNumber.getAndIncrement(), 0); - if (t.isDaemon()) - t.setDaemon(false); - if (t.getPriority() != Thread.NORM_PRIORITY) - t.setPriority(Thread.NORM_PRIORITY); - return t; - } - } - - private RMChannelManagerImpl() - { - // forbidden inheritance - } - - public static final RMChannelManager getInstance() - { - return instance; - } - - public final RMMessage send(RMMessage request) throws Throwable - { - RMMessageRetransmissionConfig qos = RMTransportHelper.getSequence(request).getRMConfig().getMessageRetransmission(); - if (qos == null) - throw new RMException("User must specify message retransmission configuration in JAX-WS WS-RM config"); - - int countOfAttempts = qos.getCountOfAttempts(); - int inactivityTimeout = qos.getMessageTimeout(); - int retransmissionInterval = qos.getRetransmissionInterval(); - RMChannelResponse result = null; - long startTime = 0L; - long endTime = 0L; - int attemptNumber = 1; - - for (int i = 0; i < countOfAttempts; i++) - { - logger.debug("Sending RM request - attempt no. " + attemptNumber++); - Future<RMChannelResponse> futureResult = rmChannelPool.submit(new RMChannelTask(request)); - try - { - startTime = System.currentTimeMillis(); - result = futureResult.get(inactivityTimeout, TimeUnit.SECONDS); - if (result != null) - { - Throwable t = result.getFault(); - if (t != null) - { - logger.warn(result.getFault().getClass().getName(), result.getFault()); - } - else - { - endTime = System.currentTimeMillis(); - if (result.getResponse() != null) - { - Map<String, Object> remotingCtx = result.getResponse().getMetadata().getContext(REMOTING_INVOCATION_CONTEXT); - if (remotingCtx != null) - { - if (Integer.valueOf(HttpServletResponse.SC_INTERNAL_SERVER_ERROR).equals(remotingCtx.get(HTTPMetadataConstants.RESPONSE_CODE))) - { - logger.debug("Response message received in " + (endTime - startTime) + " miliseconds, but contains internal server code, going to resend the request message"); - continue; - } - } - } - logger.debug("Response message received in " + (endTime - startTime) + " miliseconds"); - break; - } - try - { - Thread.sleep(retransmissionInterval * 1000); - } - catch (InterruptedException ie) - { - logger.warn(ie.getMessage(), ie); - } - } - } - catch (TimeoutException te) - { - endTime = System.currentTimeMillis(); - logger.warn("Timeout - response message not received in " + (endTime - startTime) + " miliseconds"); - try - { - Thread.sleep(retransmissionInterval * 1000); - } - catch (InterruptedException ie) - { - logger.warn(ie.getMessage(), ie); - } - } - } - - if (result == null) - throw new RMException("Unable to deliver message with addressing id: " + RMTransportHelper.getMessageId(request) + ". Count of attempts to deliver the message was: " + countOfAttempts); - - Throwable fault = result.getFault(); - if (fault != null) - { - throw new RMException("Unable to deliver message with addressing id: " + RMTransportHelper.getMessageId(request) + ". Count of attempts to deliver the message was: " + countOfAttempts, fault); - } - else - { - return result.getResponse(); - } - } - -} Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelResponse.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelResponse.java 2007-12-07 10:54:55 UTC (rev 5226) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelResponse.java 2007-12-07 10:55:36 UTC (rev 5227) @@ -24,8 +24,8 @@ import org.jboss.ws.extensions.wsrm.transport.backchannel.RMCallbackHandler; /** - * Represents response that goes from the RM channel - * @see org.jboss.ws.extensions.wsrm.transport.RMChannel + * RM channel response represents response that goes from the RM channel + * * @author richard.opalka(a)jboss.com */ final class RMChannelResponse Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelTask.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelTask.java 2007-12-07 10:54:55 UTC (rev 5226) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelTask.java 2007-12-07 10:55:36 UTC (rev 5227) @@ -38,11 +38,11 @@ import org.jboss.ws.extensions.wsrm.transport.backchannel.RMCallbackHandlerFactory; /** - * Represents request that goes to the RM channel - * @see org.jboss.ws.extensions.wsrm.transport.RMChannel + * RM channel task to be executed + * * @author richard.opalka(a)jboss.com */ -public final class RMChannelTask implements Callable<RMChannelResponse> +final class RMChannelTask implements Callable<RMChannelResponse> { private static final Logger logger = Logger.getLogger(RMChannelTask.class); private static final String JBOSSWS_SUBSYSTEM = "jbossws"; @@ -69,7 +69,7 @@ try { URI backPort = RMTransportHelper.getBackPortURI(rmRequest); - String messageId = RMTransportHelper.getMessageId(rmRequest); + String messageId = RMTransportHelper.getAddressingMessageId(rmRequest); logger.debug("[WS-RM] backport URI is: " + backPort); RMCallbackHandler callbackHandler = null; @@ -95,8 +95,6 @@ client.setUnMarshaller(RMUnMarshaller.getInstance()); Map<String, Object> remotingInvocationContext = rmRequest.getMetadata().getContext(REMOTING_INVOCATION_CONTEXT); - if (logger.isDebugEnabled()) - logger.debug("Remoting metadata: " + remotingInvocationContext); // debug the outgoing request message MessageTrace.traceMessage("Outgoing RM Request Message", rmRequest.getPayload()); Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMarshaller.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMarshaller.java 2007-12-07 10:54:55 UTC (rev 5226) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMarshaller.java 2007-12-07 10:55:36 UTC (rev 5227) @@ -30,11 +30,12 @@ /** * Marshalls byte array to the output stream + * * @author richard.opalka(a)jboss.com */ final class RMMarshaller implements Marshaller { - private static final Marshaller INSTANCE = new RMMarshaller(); + private static final Marshaller instance = new RMMarshaller(); public Marshaller cloneMarshaller() throws CloneNotSupportedException { @@ -43,7 +44,7 @@ public static Marshaller getInstance() { - return INSTANCE; + return instance; } public void write(Object dataObject, OutputStream output) throws IOException Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMessage.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMessage.java 2007-12-07 10:54:55 UTC (rev 5226) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMessage.java 2007-12-07 10:55:36 UTC (rev 5227) @@ -1,5 +1,10 @@ package org.jboss.ws.extensions.wsrm.transport; +/** + * Represents RM source + * + * @author richard.opalka(a)jboss.com + */ public interface RMMessage { byte[] getPayload(); Added: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMessageAssembler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMessageAssembler.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMessageAssembler.java 2007-12-07 10:55:36 UTC (rev 5227) @@ -0,0 +1,91 @@ +/* + * 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.extensions.wsrm.transport; + +import static org.jboss.ws.extensions.wsrm.RMConstant.INVOCATION_CONTEXT; +import static org.jboss.ws.extensions.wsrm.RMConstant.MARSHALLER; +import static org.jboss.ws.extensions.wsrm.RMConstant.REMOTING_INVOCATION_CONTEXT; +import static org.jboss.ws.extensions.wsrm.RMConstant.SERIALIZATION_CONTEXT; +import static org.jboss.ws.extensions.wsrm.RMConstant.UNMARSHALLER; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.util.Map; + +import org.jboss.remoting.marshal.Marshaller; +import org.jboss.remoting.marshal.UnMarshaller; +import org.jboss.ws.core.MessageAbstraction; + +/** + * Translates JBoss messages to RM sources and vice-versa. + * It's necessary to translate JBoss messages to/from RM + * sources before submiting them to the RMSender. + * + * <p> + * This is because of the following reasons: + * <ul> + * <li>contextClassloader not serializable issue</li> + * <li>DOMUtil threadlocal issue (if message is de/serialized in separate thread)</li> + * </ul> + * </p> + * + * @author richard.opalka(a)jboss.com + */ +public final class RMMessageAssembler +{ + + /** + * Transforms JBoss request message to the RM request message + * This transformation is done before submiting request to the RMSender. + */ + public static RMMessage convertMessageToRMSource(MessageAbstraction request, RMMetadata rmMetadata) throws Throwable + { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + Marshaller marshaller = (Marshaller)rmMetadata.getContext(SERIALIZATION_CONTEXT).get(MARSHALLER); + marshaller.write(request, baos); + RMMessage rmMessage = RMMessageFactory.newMessage(baos.toByteArray(), rmMetadata); + return rmMessage; + } + + /** + * Transforms RM response message to the JBoss response message. + * This transformation is done after RMSender have finished his job. + */ + public static MessageAbstraction convertRMSourceToMessage(RMMessage rmRequest, RMMessage rmResponse, RMMetadata rmMetadata) throws Throwable + { + boolean oneWay = RMTransportHelper.isOneWayOperation(rmRequest); + MessageAbstraction response = null; + if (false == oneWay) + { + byte[] payload = rmResponse.getPayload(); + InputStream in = (payload == null) ? null : new ByteArrayInputStream(rmResponse.getPayload()); + UnMarshaller unmarshaller = (UnMarshaller)rmMetadata.getContext(SERIALIZATION_CONTEXT).get(UNMARSHALLER); + response = (MessageAbstraction)unmarshaller.read(in, rmResponse.getMetadata().getContext(REMOTING_INVOCATION_CONTEXT)); + } + Map<String, Object> invocationContext = rmMetadata.getContext(INVOCATION_CONTEXT); + invocationContext.clear(); + invocationContext.putAll(rmMetadata.getContext(REMOTING_INVOCATION_CONTEXT)); + return response; + } + +} Property changes on: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMessageAssembler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMessageFactory.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMessageFactory.java 2007-12-07 10:54:55 UTC (rev 5226) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMessageFactory.java 2007-12-07 10:55:36 UTC (rev 5227) @@ -1,7 +1,13 @@ package org.jboss.ws.extensions.wsrm.transport; +/** + * Constructs RM message instances + * + * @author richard.opalka(a)jboss.com + */ public class RMMessageFactory { + private RMMessageFactory() { // forbidden inheritance @@ -11,4 +17,5 @@ { return new RMMessageImpl(payload, rmMetadata); } + } Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMessageImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMessageImpl.java 2007-12-07 10:54:55 UTC (rev 5226) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMessageImpl.java 2007-12-07 10:55:36 UTC (rev 5227) @@ -1,11 +1,13 @@ package org.jboss.ws.extensions.wsrm.transport; /** - * RM message object + * RM source instance + * * @author richard.opalka(a)jboss.com */ public class RMMessageImpl implements RMMessage { + private final byte[] payload; private final RMMetadata rmMetadata; @@ -25,4 +27,5 @@ { return this.rmMetadata; } + } Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMetadata.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMetadata.java 2007-12-07 10:54:55 UTC (rev 5226) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMetadata.java 2007-12-07 10:55:36 UTC (rev 5227) @@ -6,6 +6,11 @@ import org.jboss.remoting.marshal.UnMarshaller; import org.jboss.ws.extensions.wsrm.RMConstant; +/** + * RM metadata heavily used by this RM transport + * + * @author richard.opalka(a)jboss.com + */ public final class RMMetadata { private Map<String, Map<String, Object>> contexts = new HashMap<String, Map<String, Object>>(); @@ -60,4 +65,5 @@ { return this.contexts.get(key); } + } Added: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMSender.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMSender.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMSender.java 2007-12-07 10:55:36 UTC (rev 5227) @@ -0,0 +1,178 @@ +/* + * 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.extensions.wsrm.transport; + +import static org.jboss.ws.extensions.wsrm.RMConstant.REMOTING_INVOCATION_CONTEXT; + +import java.util.Map; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.concurrent.atomic.AtomicInteger; + +import javax.servlet.http.HttpServletResponse; + +import org.jboss.logging.Logger; +import org.jboss.remoting.transport.http.HTTPMetadataConstants; +import org.jboss.ws.extensions.wsrm.api.RMException; +import org.jboss.ws.extensions.wsrm.config.RMMessageRetransmissionConfig; + +/** + * RM sender ensures reliable message delivery. The QoS is specified in the JAX-WS client Sconfiguration file. + * + * @author richard.opalka(a)jboss.com + */ +public final class RMSender +{ + + private static final Logger logger = Logger.getLogger(RMSender.class); + private static RMSender instance = new RMSender(); + private static final ThreadFactory rmThreadPool = new RMThreadPoolFactory(); + private static final int maxCountOfThreads = 5; + private static final ExecutorService rmTasksQueue = Executors.newFixedThreadPool(maxCountOfThreads, rmThreadPool); + + /** + * Generates worker threads (daemons) + */ + private static final class RMThreadPoolFactory implements ThreadFactory + { + final ThreadGroup group; + final AtomicInteger threadNumber = new AtomicInteger(1); + final String namePrefix = "rm-pool-worker-thread-"; + + private RMThreadPoolFactory() + { + SecurityManager sm = System.getSecurityManager(); + group = (sm != null) ? sm.getThreadGroup() : Thread.currentThread().getThreadGroup(); + } + + public Thread newThread(Runnable r) + { + Thread t = new Thread(group, r, namePrefix + threadNumber.getAndIncrement(), 0); + if (false == t.isDaemon()) + t.setDaemon(true); + if (Thread.NORM_PRIORITY != t.getPriority()) + t.setPriority(Thread.NORM_PRIORITY); + return t; + } + } + + private RMSender() + { + // forbidden inheritance + } + + public static final RMSender getInstance() + { + return instance; + } + + public final RMMessage send(RMMessage request) throws Throwable + { + RMMessageRetransmissionConfig qos = RMTransportHelper.getSequence(request).getRMConfig().getMessageRetransmission(); + if (qos == null) + throw new RMException("User must specify message retransmission configuration in JAX-WS WS-RM config"); + + int countOfAttempts = qos.getCountOfAttempts(); + int inactivityTimeout = qos.getMessageTimeout(); + int retransmissionInterval = qos.getRetransmissionInterval(); + RMChannelResponse result = null; + long startTime = 0L; + long endTime = 0L; + int attemptNumber = 1; + + for (int i = 0; i < countOfAttempts; i++) + { + logger.debug("Sending RM request - attempt no. " + attemptNumber++); + Future<RMChannelResponse> futureResult = rmTasksQueue.submit(new RMChannelTask(request)); + try + { + startTime = System.currentTimeMillis(); + result = futureResult.get(inactivityTimeout, TimeUnit.SECONDS); + if (result != null) + { + Throwable t = result.getFault(); + if (t != null) + { + logger.warn(result.getFault().getClass().getName(), result.getFault()); + } + else + { + endTime = System.currentTimeMillis(); + if (result.getResponse() != null) + { + Map<String, Object> remotingCtx = result.getResponse().getMetadata().getContext(REMOTING_INVOCATION_CONTEXT); + if (remotingCtx != null) + { + if (Integer.valueOf(HttpServletResponse.SC_INTERNAL_SERVER_ERROR).equals(remotingCtx.get(HTTPMetadataConstants.RESPONSE_CODE))) + { + logger.debug("Response message received in " + (endTime - startTime) + " miliseconds, but contains internal server code, going to resend the request message"); + continue; + } + } + } + logger.debug("Response message received in " + (endTime - startTime) + " miliseconds"); + break; + } + try + { + Thread.sleep(retransmissionInterval * 1000); + } + catch (InterruptedException ie) + { + logger.warn(ie.getMessage(), ie); + } + } + } + catch (TimeoutException te) + { + endTime = System.currentTimeMillis(); + logger.warn("Timeout - response message not received in " + (endTime - startTime) + " miliseconds"); + try + { + Thread.sleep(retransmissionInterval * 1000); + } + catch (InterruptedException ie) + { + logger.warn(ie.getMessage(), ie); + } + } + } + + if (result == null) + throw new RMException("Unable to deliver message with addressing id: " + RMTransportHelper.getAddressingMessageId(request) + ". Count of attempts to deliver the message was: " + countOfAttempts); + + Throwable fault = result.getFault(); + if (fault != null) + { + throw new RMException("Unable to deliver message with addressing id: " + RMTransportHelper.getAddressingMessageId(request) + ". Count of attempts to deliver the message was: " + countOfAttempts, fault); + } + else + { + return result.getResponse(); + } + } + +} Property changes on: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMSender.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMTransportHelper.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMTransportHelper.java 2007-12-07 10:54:55 UTC (rev 5226) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMTransportHelper.java 2007-12-07 10:55:36 UTC (rev 5227) @@ -9,6 +9,11 @@ import org.jboss.ws.extensions.wsrm.RMConstant; import org.jboss.ws.extensions.wsrm.RMSequenceImpl; +/** + * Utility class heavily used in this transport implementation + * + * @author richard.opalka(a)jboss.com + */ public final class RMTransportHelper { @@ -24,7 +29,7 @@ return (ctx != null) && (ctx.containsKey(RMConstant.REQUEST_CONTEXT)); } - public static String getMessageId(RMMessage rmRequest) + public static String getAddressingMessageId(RMMessage rmRequest) { return (String)getWsrmRequestContext(rmRequest).get(WSA_MESSAGE_ID); } Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMUnMarshaller.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMUnMarshaller.java 2007-12-07 10:54:55 UTC (rev 5226) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMUnMarshaller.java 2007-12-07 10:55:36 UTC (rev 5227) @@ -30,11 +30,12 @@ /** * Unmarshalls byte array from the input stream + * * @author richard.opalka(a)jboss.com */ final class RMUnMarshaller implements UnMarshaller { - private static final UnMarshaller INSTANCE = new RMUnMarshaller(); + private static final UnMarshaller instance = new RMUnMarshaller(); public UnMarshaller cloneUnMarshaller() throws CloneNotSupportedException { @@ -43,7 +44,7 @@ public static UnMarshaller getInstance() { - return INSTANCE; + return instance; } public Object read(InputStream is, Map metadata) throws IOException, ClassNotFoundException @@ -67,5 +68,6 @@ { // do nothing } + } Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMUnassignedMessageListener.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMUnassignedMessageListener.java 2007-12-07 10:54:55 UTC (rev 5226) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMUnassignedMessageListener.java 2007-12-07 10:55:36 UTC (rev 5227) @@ -25,17 +25,13 @@ * Implementations of this interface must be registered in callback handler * * @author richard.opalka(a)jboss.com - * - * @since Nov 27, 2007 */ public interface RMUnassignedMessageListener { + /** - * This event is fired when there's new unassigned message available in - * callback handler this sequence is associated with. Each implementation - * of this class should remember the count of this notification method calls - * and must initiate new dummy message request to pick up all unassigned - * messages from the callback handler + * This event is fired when there's new unassigned message available in callback handler. */ void unassignedMessageReceived(); + }

16 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits December 2007