JBossWS SVN: r5395 - stack/native/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-01-03 15:48:00 -0500 (Thu, 03 Jan 2008)
New Revision: 5395
Modified:
stack/native/trunk/ant-import/build-bin-dist.xml
Log:
[JBWS-1924] Fixing issue: copy missing jbossws-jboss421.jar to the lib release dir
Modified: stack/native/trunk/ant-import/build-bin-dist.xml
===================================================================
--- stack/native/trunk/ant-import/build-bin-dist.xml 2008-01-03 17:51:00 UTC (rev 5394)
+++ stack/native/trunk/ant-import/build-bin-dist.xml 2008-01-03 20:48:00 UTC (rev 5395)
@@ -93,6 +93,7 @@
<include name="jbossws-framework-scripts.zip"/>
<include name="jbossws-spi.jar"/>
<include name="jbossws-jboss40.jar"/>
+ <include name="jbossws-jboss421.jar"/>
</fileset>
<fileset dir="${core.dir}/output/lib">
<include name="jboss-jaxrpc.jar"/>
16 years, 11 months
- 1
- 0
JBossWS SVN: r5394 - in legacy/branches/jbossws-1.2.1.GA_JBWS-1900: jbossws-tests/src/java/org/jboss/test/ws/tools and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2008-01-03 12:51:00 -0500 (Thu, 03 Jan 2008)
New Revision: 5394
Added:
legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1217/
legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/
legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/MultiplePackageNamespace.wsdl
legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/MySEI.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/MySEIService.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/TestException.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/jaxrpc-mapping.xml
legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/wstools-config.xml
Modified:
legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java
Log:
[JBWS-1900] JBWS-1217 WSDLtoJava Namespace to package mapping does not support multiple namespaces - added testcase and fixed java file generation
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 2008-01-03 13:22:11 UTC (rev 5393)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2008-01-03 17:51:00 UTC (rev 5394)
@@ -634,7 +634,7 @@
className = packageName + "." + className + arraySuffix;
if (holder)
{
- className = holderWriter.getOrCreateHolder(className, getLocationForJavaGeneration());
+ className = holderWriter.getOrCreateHolder(className, getLocationForJavaGeneration(packageName));
}
buf.append(className);
@@ -798,9 +798,9 @@
return paramName;
}
- private File getLocationForJavaGeneration()
+ private File getLocationForJavaGeneration(String packageName)
{
- return new File(this.directoryToGenerate + "/" + seiPkgName.replace('.', '/'));
+ return new File(this.directoryToGenerate + "/" + packageName.replace('.', '/'));
}
private void generateJavaSource(XSComplexTypeDefinition xt, JBossXSModel xsmodel, String containingElement) throws IOException
@@ -815,8 +815,11 @@
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);
+ if(!tgtNS.equals(targetNS))
+ {
+ File dir = utils.createPackage(this.directoryToGenerate, packName);
+ }
+ xtj.createJavaFile((XSComplexTypeDefinition)xt, containingElement, getLocationForJavaGeneration(packName), packName, xsmodel, exception);
}
public void setParameterStyle(String paramStyle)
Added: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java 2008-01-03 17:51:00 UTC (rev 5394)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.tools.jbws1217;
+
+import java.io.File;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+
+/**
+ * JBWS-1217 - Test the support of multiple namespace to multiple
+ * package generation of tools.
+ *
+ * @author mageshbk(a)jboss.com
+ * @since 02 Jan 2008
+ */
+public class JBWS1217TestCase extends JBossWSTest
+{
+ public final void testMultiplePackageNameSpace() throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1217";
+ String toolsDir = "tools/jbws1217";
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+ new WSTools().generate(args);
+
+ compareSource(resourceDir + "/MySEIService.java", toolsDir + "/org/jboss/test/ws/jbws1217/MySEIService.java");
+ compareSource(resourceDir + "/MySEI.java", toolsDir + "/org/jboss/test/ws/jbws1217/MySEI.java");
+ compareSource(resourceDir + "/TestException.java", toolsDir + "/com/other/TestException.java");
+
+ JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+ mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
+ }
+
+ private static void compareSource(final String expectedName, final String generatedName) throws Exception
+ {
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
+
+ JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
+ sc.validate();
+ sc.validateImports();
+ }
+}
Property changes on: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/MultiplePackageNamespace.wsdl
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/MultiplePackageNamespace.wsdl (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/MultiplePackageNamespace.wsdl 2008-01-03 17:51:00 UTC (rev 5394)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='MySEIService' targetNamespace='http://org.jboss.test.ws/jbws1217' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://other.com' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1217' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://other.com' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://other.com' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <complexType name='TestException'>
+ <sequence/>
+ </complexType>
+ <element name='TestException' type='tns:TestException'/>
+ </schema>
+ </types>
+ <message name='MySEI_testException'/>
+ <message name='MySEI_testExceptionResponse'/>
+ <message name='TestException'>
+ <part element='ns1:TestException' name='TestException'/>
+ </message>
+ <portType name='MySEI'>
+ <operation name='testException'>
+ <input message='tns:MySEI_testException'/>
+ <output message='tns:MySEI_testExceptionResponse'/>
+ <fault message='tns:TestException' name='TestException'/>
+ </operation>
+ </portType>
+ <binding name='MySEIBinding' type='tns:MySEI'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='testException'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1217' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1217' use='literal'/>
+ </output>
+ <fault name='TestException'>
+ <soap:fault name='TestException' use='literal'/>
+ </fault>
+ </operation>
+ </binding>
+ <service name='MySEIService'>
+ <port binding='tns:MySEIBinding' name='MySEIPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/MultiplePackageNamespace.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/MySEI.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/MySEI.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/MySEI.java 2008-01-03 17:51:00 UTC (rev 5394)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Thu Jan 03 16:38:10 IST 2008
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+package org.jboss.test.ws.jbws1217;
+public interface MySEI extends java.rmi.Remote
+{
+
+ public void testException() throws com.other.TestException, java.rmi.RemoteException;
+}
Property changes on: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/MySEI.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/MySEIService.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/MySEIService.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/MySEIService.java 2008-01-03 17:51:00 UTC (rev 5394)
@@ -0,0 +1,19 @@
+/*
+* JBoss, the OpenSource EJB server
+* Distributable under LGPL license. See terms of license at gnu.org.
+*/
+
+//Auto Generated by jbossws - Please do not edit!!!
+
+package org.jboss.test.ws.jbws1217;
+
+
+import javax.xml.rpc.*;
+
+
+public interface MySEIService extends javax.xml.rpc.Service
+{
+
+ public org.jboss.test.ws.jbws1217.MySEI getMySEIPort() throws ServiceException;
+
+}
Property changes on: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/MySEIService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/TestException.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/TestException.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/TestException.java 2008-01-03 17:51:00 UTC (rev 5394)
@@ -0,0 +1,18 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Thu Jan 03 16:24:09 IST 2008
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package com.other;
+
+
+public class TestException
+ extends Exception{
+public TestException(){
+}
+}
Property changes on: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/TestException.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/jaxrpc-mapping.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/jaxrpc-mapping.xml (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/jaxrpc-mapping.xml 2008-01-03 17:51:00 UTC (rev 5394)
@@ -0,0 +1,36 @@
+<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
+ <package-mapping>
+ <package-type>com.other</package-type>
+ <namespaceURI>http://other.com</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1217</package-type>
+ <namespaceURI>http://org.jboss.test.ws/jbws1217</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>com.other.TestException</java-type>
+ <root-type-qname xmlns:typeNS='http://other.com'>typeNS:TestException</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ </java-xml-type-mapping>
+ <exception-mapping>
+ <exception-type>com.other.TestException</exception-type>
+ <wsdl-message xmlns:exMsgNS='http://org.jboss.test.ws/jbws1217'>exMsgNS:TestException</wsdl-message>
+ </exception-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1217.MySEIService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1217'>serviceNS:MySEIService</wsdl-service-name>
+ <port-mapping>
+ <port-name>MySEIPort</port-name>
+ <java-port-name>MySEIPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1217.MySEI</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1217'>portTypeNS:MySEI</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1217'>bindingNS:MySEIBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>testException</java-method-name>
+ <wsdl-operation>testException</wsdl-operation>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Property changes on: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/wstools-config.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/wstools-config.xml (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/wstools-config.xml 2008-01-03 17:51:00 UTC (rev 5394)
@@ -0,0 +1,9 @@
+<configuration xmlns="http://www.jboss.org/jbossws-tools">
+ <global>
+ <package-namespace package="com.other" namespace="http://other.com"/>
+ <package-namespace package="org.jboss.test.ws.jbws1217" namespace="http://org.jboss.test.ws/jbws1217"/>
+ </global>
+ <wsdl-java location="resources/tools/jbws1217/MultiplePackageNamespace.wsdl">
+ <mapping file="jaxrpc-mapping.xml" />
+ </wsdl-java>
+</configuration>
\ No newline at end of file
Property changes on: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1217/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 11 months
- 1
- 0
JBossWS SVN: r5393 - in stack/native/trunk/src: test/java/org/jboss/test/ws/tools and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2008-01-03 08:22:11 -0500 (Thu, 03 Jan 2008)
New Revision: 5393
Added:
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1217/
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java
stack/native/trunk/src/test/resources/tools/jbws1217/
stack/native/trunk/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl
stack/native/trunk/src/test/resources/tools/jbws1217/MySEI.java
stack/native/trunk/src/test/resources/tools/jbws1217/MySEIService.java
stack/native/trunk/src/test/resources/tools/jbws1217/TestException.java
stack/native/trunk/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml
stack/native/trunk/src/test/resources/tools/jbws1217/wstools-config.xml
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java
Log:
[JBWS-1217] WSDLtoJava Namespace to package mapping does not support multiple namespaces - added testcase and fixed java file generation
Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2008-01-03 12:51:20 UTC (rev 5392)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2008-01-03 13:22:11 UTC (rev 5393)
@@ -634,7 +634,7 @@
className = packageName + "." + className + arraySuffix;
if (holder)
{
- className = holderWriter.getOrCreateHolder(className, getLocationForJavaGeneration());
+ className = holderWriter.getOrCreateHolder(className, getLocationForJavaGeneration(packageName));
}
buf.append(className);
@@ -798,9 +798,9 @@
return paramName;
}
- private File getLocationForJavaGeneration()
+ private File getLocationForJavaGeneration(String packageName)
{
- return new File(this.directoryToGenerate + "/" + seiPkgName.replace('.', '/'));
+ return new File(this.directoryToGenerate + "/" + packageName.replace('.', '/'));
}
private void generateJavaSource(XSComplexTypeDefinition xt, JBossXSModel xsmodel, String containingElement) throws IOException
@@ -815,7 +815,11 @@
String targetNS = wsdl.getTargetNamespace();
String tgtNS = xt.getNamespace();
String packName = getPackageName(tgtNS);
- xtj.createJavaFile((XSComplexTypeDefinition)xt, containingElement, getLocationForJavaGeneration(), packName, xsmodel, exception);
+ if(!tgtNS.equals(targetNS))
+ {
+ File dir = utils.createPackage(this.directoryToGenerate, packName);
+ }
+ xtj.createJavaFile((XSComplexTypeDefinition)xt, containingElement, getLocationForJavaGeneration(packName), packName, xsmodel, exception);
}
public void setParameterStyle(String paramStyle)
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java 2008-01-03 13:22:11 UTC (rev 5393)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.tools.jbws1217;
+
+import java.io.File;
+
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * JBWS-1217 - Test the support of multiple namespace to multiple
+ * package generation of tools.
+ *
+ * @author mageshbk(a)jboss.com
+ * @since 02 Jan 2008
+ */
+public class JBWS1217TestCase extends JBossWSTest
+{
+ public final void testMultiplePackageNameSpace() throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1217";
+ String toolsDir = "tools/jbws1217";
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+ new WSTools().generate(args);
+
+ compareSource(resourceDir + "/MySEIService.java", toolsDir + "/org/jboss/test/ws/jbws1217/MySEIService.java");
+ compareSource(resourceDir + "/MySEI.java", toolsDir + "/org/jboss/test/ws/jbws1217/MySEI.java");
+ compareSource(resourceDir + "/TestException.java", toolsDir + "/com/other/TestException.java");
+
+ JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+ mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
+ }
+
+ private static void compareSource(final String expectedName, final String generatedName) throws Exception
+ {
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
+
+ JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
+ sc.validate();
+ sc.validateImports();
+ }
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl 2008-01-03 13:22:11 UTC (rev 5393)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='MySEIService' targetNamespace='http://org.jboss.test.ws/jbws1217' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://other.com' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1217' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://other.com' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://other.com' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <complexType name='TestException'>
+ <sequence/>
+ </complexType>
+ <element name='TestException' type='tns:TestException'/>
+ </schema>
+ </types>
+ <message name='MySEI_testException'/>
+ <message name='MySEI_testExceptionResponse'/>
+ <message name='TestException'>
+ <part element='ns1:TestException' name='TestException'/>
+ </message>
+ <portType name='MySEI'>
+ <operation name='testException'>
+ <input message='tns:MySEI_testException'/>
+ <output message='tns:MySEI_testExceptionResponse'/>
+ <fault message='tns:TestException' name='TestException'/>
+ </operation>
+ </portType>
+ <binding name='MySEIBinding' type='tns:MySEI'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='testException'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1217' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1217' use='literal'/>
+ </output>
+ <fault name='TestException'>
+ <soap:fault name='TestException' use='literal'/>
+ </fault>
+ </operation>
+ </binding>
+ <service name='MySEIService'>
+ <port binding='tns:MySEIBinding' name='MySEIPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: stack/native/trunk/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/tools/jbws1217/MySEI.java
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1217/MySEI.java (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1217/MySEI.java 2008-01-03 13:22:11 UTC (rev 5393)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Thu Jan 03 16:38:10 IST 2008
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+package org.jboss.test.ws.jbws1217;
+public interface MySEI extends java.rmi.Remote
+{
+
+ public void testException() throws com.other.TestException, java.rmi.RemoteException;
+}
Property changes on: stack/native/trunk/src/test/resources/tools/jbws1217/MySEI.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/tools/jbws1217/MySEIService.java
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1217/MySEIService.java (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1217/MySEIService.java 2008-01-03 13:22:11 UTC (rev 5393)
@@ -0,0 +1,19 @@
+/*
+* JBoss, the OpenSource EJB server
+* Distributable under LGPL license. See terms of license at gnu.org.
+*/
+
+//Auto Generated by jbossws - Please do not edit!!!
+
+package org.jboss.test.ws.jbws1217;
+
+
+import javax.xml.rpc.*;
+
+
+public interface MySEIService extends javax.xml.rpc.Service
+{
+
+ public org.jboss.test.ws.jbws1217.MySEI getMySEIPort() throws ServiceException;
+
+}
Property changes on: stack/native/trunk/src/test/resources/tools/jbws1217/MySEIService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/tools/jbws1217/TestException.java
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1217/TestException.java (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1217/TestException.java 2008-01-03 13:22:11 UTC (rev 5393)
@@ -0,0 +1,18 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Thu Jan 03 16:24:09 IST 2008
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package com.other;
+
+
+public class TestException
+ extends Exception{
+public TestException(){
+}
+}
Property changes on: stack/native/trunk/src/test/resources/tools/jbws1217/TestException.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml 2008-01-03 13:22:11 UTC (rev 5393)
@@ -0,0 +1,36 @@
+<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
+ <package-mapping>
+ <package-type>com.other</package-type>
+ <namespaceURI>http://other.com</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1217</package-type>
+ <namespaceURI>http://org.jboss.test.ws/jbws1217</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>com.other.TestException</java-type>
+ <root-type-qname xmlns:typeNS='http://other.com'>typeNS:TestException</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ </java-xml-type-mapping>
+ <exception-mapping>
+ <exception-type>com.other.TestException</exception-type>
+ <wsdl-message xmlns:exMsgNS='http://org.jboss.test.ws/jbws1217'>exMsgNS:TestException</wsdl-message>
+ </exception-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1217.MySEIService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1217'>serviceNS:MySEIService</wsdl-service-name>
+ <port-mapping>
+ <port-name>MySEIPort</port-name>
+ <java-port-name>MySEIPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1217.MySEI</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1217'>portTypeNS:MySEI</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1217'>bindingNS:MySEIBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>testException</java-method-name>
+ <wsdl-operation>testException</wsdl-operation>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Property changes on: stack/native/trunk/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/tools/jbws1217/wstools-config.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1217/wstools-config.xml (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1217/wstools-config.xml 2008-01-03 13:22:11 UTC (rev 5393)
@@ -0,0 +1,9 @@
+<configuration xmlns="http://www.jboss.org/jbossws-tools">
+ <global>
+ <package-namespace package="com.other" namespace="http://other.com"/>
+ <package-namespace package="org.jboss.test.ws.jbws1217" namespace="http://org.jboss.test.ws/jbws1217"/>
+ </global>
+ <wsdl-java location="resources/tools/jbws1217/MultiplePackageNamespace.wsdl">
+ <mapping file="jaxrpc-mapping.xml" />
+ </wsdl-java>
+</configuration>
\ No newline at end of file
Property changes on: stack/native/trunk/src/test/resources/tools/jbws1217/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 11 months
- 1
- 0
JBossWS SVN: r5392 - stack/native/trunk/src/main/java/org/jboss/ws/core/server.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-01-03 07:51:20 -0500 (Thu, 03 Jan 2008)
New Revision: 5392
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
Log:
[JBWS-1939] applying suggested fix
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2008-01-03 09:58:02 UTC (rev 5391)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2008-01-03 12:51:20 UTC (rev 5392)
@@ -199,10 +199,10 @@
int newPort = newURL.getPort();
String newLocation = orgProtocol + "://" + newHost;
- if (orgPort != -1)
+ if (newPort != -1)
+ newLocation += ":" + newPort;
+ else if (orgPort != -1)
newLocation += ":" + orgPort;
- else if (newPort != -1)
- newLocation += ":" + newPort;
newLocation += orgPath;
locationAttr.setNodeValue(newLocation);
16 years, 11 months
- 1
- 0
JBossWS SVN: r5391 - common/trunk/src/main/java/org/jboss/wsf/common/transport/jms.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-01-03 04:58:02 -0500 (Thu, 03 Jan 2008)
New Revision: 5391
Modified:
common/trunk/src/main/java/org/jboss/wsf/common/transport/jms/JMSTransportSupport.java
Log:
[JBWS-1324] JMS Endpoint - Message delivery starts before endpoint is ready: adding Darran's workaround to the JMSTransportSupport.
Modified: common/trunk/src/main/java/org/jboss/wsf/common/transport/jms/JMSTransportSupport.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/transport/jms/JMSTransportSupport.java 2008-01-02 14:14:14 UTC (rev 5390)
+++ common/trunk/src/main/java/org/jboss/wsf/common/transport/jms/JMSTransportSupport.java 2008-01-03 09:58:02 UTC (rev 5391)
@@ -55,6 +55,7 @@
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.Endpoint.EndpointState;
import org.jboss.wsf.spi.invocation.InvocationContext;
import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.management.EndpointRegistry;
@@ -150,6 +151,25 @@
throw new IllegalStateException("Cannot find endpoint for: " + fromName);
log.debug("dipatchMessage: " + endpoint.getName());
+
+ // [JBWS-1324]: workaround to prevent message processing before endpoint is started
+ EndpointState state = endpoint.getState();
+ ObjectName name = endpoint.getName();
+ long startTime = System.currentTimeMillis();
+ log.debug(name + " is in state: " + state);
+ while (state != EndpointState.STARTED && (System.currentTimeMillis() - startTime < 60000))
+ {
+ try
+ {
+ Thread.sleep(1000);
+ state = endpoint.getState();
+ log.debug(name + " is now in state: " + state);
+ }
+ catch (InterruptedException e)
+ {
+ throw new EJBException(e);
+ }
+ }
RequestHandler reqHandler = endpoint.getRequestHandler();
16 years, 11 months
- 1
- 0
JBossWS SVN: r5390 - in stack/native/trunk/src/main/java/org/jboss/ws/tools: config and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2008-01-02 09:14:14 -0500 (Wed, 02 Jan 2008)
New Revision: 5390
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java
stack/native/trunk/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java
stack/native/trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
stack/native/trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java
stack/native/trunk/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java
Log:
[JBWS-1217] Fixed WSDLtoJava Namespace to package mapping does not support multiple namespaces
Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2008-01-02 08:09:38 UTC (rev 5389)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2008-01-02 14:14:14 UTC (rev 5390)
@@ -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(",");
@@ -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,10 @@
{
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);
+ xtj.createJavaFile((XSComplexTypeDefinition)xt, containingElement, getLocationForJavaGeneration(), packName, xsmodel, exception);
}
public void setParameterStyle(String paramStyle)
@@ -817,4 +823,20 @@
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);
+ //Default behaviour will always generate all classes in the SEI package only
+ return seiPkgName;
+ }
}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java 2008-01-02 08:09:38 UTC (rev 5389)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java 2008-01-02 14:14:14 UTC (rev 5390)
@@ -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: stack/native/trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-01-02 08:09:38 UTC (rev 5389)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-01-02 14:14:14 UTC (rev 5390)
@@ -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;
@@ -76,6 +77,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;
@@ -97,6 +99,7 @@
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 +110,13 @@
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;
+ String targetNS = wsdl.getTargetNamespace();
+ packageName = NamespacePackageMapping.getJavaPackageName(targetNS);
+ this.namespacePackageMap = map;
this.typeMapping = ltm;
this.wsdlStyle = utils.getWSDLStyle(wsdl);
@@ -149,7 +154,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 +200,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 +319,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 +464,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 +540,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 +733,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 +743,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 +854,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 +899,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 +947,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 +959,19 @@
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;
+ }
+ }
+ //Default behaviour will always generate all classes in the SEI package only
+ return packageName;
+ }
}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2008-01-02 08:09:38 UTC (rev 5389)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2008-01-02 14:14:14 UTC (rev 5390)
@@ -308,7 +308,8 @@
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);
@@ -397,21 +398,16 @@
private String getPackageName(WSDLDefinitions wsdl, 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: stack/native/trunk/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2008-01-02 08:09:38 UTC (rev 5389)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2008-01-02 14:14:14 UTC (rev 5390)
@@ -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
@@ -78,6 +80,11 @@
protected String serviceName;
/**
+ * SEI Package Name to override
+ */
+ protected String packageName;
+
+ /**
* Service Endpoint Interface (if available).
* <br/> Will be available for server side generation (Java -> WSDL)
*/
@@ -93,6 +100,8 @@
public MappingFileGenerator(WSDLDefinitions wsdl, TypeMapping typeM)
{
this.wsdlDefinitions = wsdl;
+ String targetNS = wsdl.getTargetNamespace();
+ packageName = NamespacePackageMapping.getJavaPackageName(targetNS);
this.typeMapping = (LiteralTypeMapping)typeM;
}
@@ -122,6 +131,17 @@
this.packageName = packageName;
}
+ public Map<String, String> getNamespacePackageMap()
+ {
+ return namespacePackageMap;
+ }
+
+
+ public void setNamespacePackageMap(Map<String, String> map)
+ {
+ namespacePackageMap = map;
+ }
+
/**
* @return @see #serviceName
*/
@@ -156,7 +176,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 +202,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 +214,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 +232,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 +241,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 +250,19 @@
{
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;
+ }
+ }
+ //Default behaviour will always generate all classes in the SEI package only
+ return packageName;
+ }
}
16 years, 11 months
- 1
- 0
JBossWS SVN: r5389 - in legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools: helpers and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2008-01-02 03:09:38 -0500 (Wed, 02 Jan 2008)
New Revision: 5389
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/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] JBWS-1217 - Modified for default behavior to remain as it was before the changes
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 2008-01-02 07:47:51 UTC (rev 5388)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2008-01-02 08:09:38 UTC (rev 5389)
@@ -836,6 +836,8 @@
}
}
- return NamespacePackageMapping.getJavaPackageName(targetNamespace);
+ //return NamespacePackageMapping.getJavaPackageName(targetNamespace);
+ //Default behaviour will always generate all classes in the SEI package only
+ return seiPkgName;
}
}
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 2008-01-02 07:47:51 UTC (rev 5388)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-01-02 08:09:38 UTC (rev 5389)
@@ -98,6 +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>();
@@ -113,6 +114,8 @@
{
this.wsdlDefinitions = wsdl;
this.serviceName = sname;
+ String targetNS = wsdl.getTargetNamespace();
+ packageName = NamespacePackageMapping.getJavaPackageName(targetNS);
this.namespacePackageMap = map;
this.typeMapping = ltm;
@@ -968,6 +971,7 @@
return pkg;
}
}
- return NamespacePackageMapping.getJavaPackageName(targetNamespace);
+ //Default behaviour will always generate all classes in the SEI package only
+ return packageName;
}
}
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 2008-01-02 07:47:51 UTC (rev 5388)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2008-01-02 08:09:38 UTC (rev 5389)
@@ -303,7 +303,7 @@
wsdlToJava.generateSEI(wsdl, new File(outDir));
//Generate the Service File
- this.generateServiceFile(getPackageName(wsdl.getTargetNamespace(), glc), wsdl, outDir);
+ this.generateServiceFile(getPackageName(wsdl, glc), wsdl, outDir);
//Generate the Mapping File
if (w2jc.mappingFileNeeded)
@@ -332,7 +332,7 @@
if (wsdl.getInterfaces().length == 1)
{
- String seiPackage = getPackageName(wsdl.getTargetNamespace(), glc);
+ String seiPackage = getPackageName(wsdl, glc);
seiName = seiPackage + "." + wsdlToJava.getServiceEndpointInterfaceName(wsdl.getInterfaces()[0]);
}
@@ -396,8 +396,9 @@
sc.createServiceDescriptor();
}
- private String getPackageName(String targetNamespace, GlobalConfig glc)
+ private String getPackageName(WSDLDefinitions wsdl, GlobalConfig glc)
{
+ String targetNamespace = wsdl.getTargetNamespace();
//Get it from global config if it is overriden
if (glc != null && glc.packageNamespaceMap != null)
{
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 2008-01-02 07:47:51 UTC (rev 5388)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2008-01-02 08:09:38 UTC (rev 5389)
@@ -80,6 +80,11 @@
protected String serviceName;
/**
+ * SEI Package Name to override
+ */
+ protected String packageName;
+
+ /**
* Service Endpoint Interface (if available).
* <br/> Will be available for server side generation (Java -> WSDL)
*/
@@ -95,6 +100,8 @@
public MappingFileGenerator(WSDLDefinitions wsdl, TypeMapping typeM)
{
this.wsdlDefinitions = wsdl;
+ String targetNS = wsdl.getTargetNamespace();
+ packageName = NamespacePackageMapping.getJavaPackageName(targetNS);
this.typeMapping = (LiteralTypeMapping)typeM;
}
@@ -111,6 +118,19 @@
this.wsdlDefinitions = wsdlDefinitions;
}
+ /**
+ * @return @see #packageName
+ */
+ public String getPackageName()
+ {
+ return packageName;
+ }
+
+ public void setPackageName(String packageName)
+ {
+ this.packageName = packageName;
+ }
+
public Map<String, String> getNamespacePackageMap()
{
return namespacePackageMap;
@@ -242,6 +262,7 @@
return pkg;
}
}
- return NamespacePackageMapping.getJavaPackageName(targetNamespace);
+ //Default behaviour will always generate all classes in the SEI package only
+ return packageName;
}
}
16 years, 11 months
- 1
- 0
JBossWS SVN: r5388 - 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: 2008-01-02 02:47:51 -0500 (Wed, 02 Jan 2008)
New Revision: 5388
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] Reverted changes done for fixing test case 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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2008-01-02 07:47:51 UTC (rev 5388)
@@ -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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws-206/jbosswsConfig/UserException/UserExceptionwsdl2java.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -3,8 +3,7 @@
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.webservice.userexception" namespace="http://org.jboss.ws"/>
- <package-namespace package="org.jboss.test.webservice.userexception" namespace="http://org.jboss.ws/types"/>
+ <package-namespace package="org.jboss.test.webservice.userexception" namespace="http://org.jboss.ws"/>
</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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws-206/jbosswsConfig/UserExceptionInheritance/UserExceptionInheritancewsdl2java.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -3,8 +3,7 @@
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.webservice.userexceptioninheritance" namespace="http://org.jboss.ws"/>
- <package-namespace package="org.jboss.test.webservice.userexceptioninheritance" namespace="http://org.jboss.ws/types"/>
+ <package-namespace package="org.jboss.test.webservice.userexceptioninheritance" namespace="http://org.jboss.ws"/>
</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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1079/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1184/scenario_A/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1184/scenario_B/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1253/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1259/scenario_A/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1259/scenario_B/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1259/scenario_C/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1259/scenario_D/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_A/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_AA/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_AD/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_AE/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_AF/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_B/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_C/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_D/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_E/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_F/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_G/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_H/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_I/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_J/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_K/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_L/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_O/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_R/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_U/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_X/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_Y/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1260/scenario_Z/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1441/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1450/scenario_A/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1450/scenario_B/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1450/scenario_C/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1450/scenario_D/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1453/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1455/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1534/bare/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1534/wrapped/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/doclit_out/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1698/error/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1698/fault/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1723/doclit_in/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1725/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -2,9 +2,6 @@
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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1801/doclit/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1873/doclit/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws1881/doclit/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws429/doclit_inout/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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-21 16:35:00 UTC (rev 5387)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/tools/jbws429/rpclit_out/wstools-config.xml 2008-01-02 07:47:51 UTC (rev 5388)
@@ -1,7 +1,4 @@
<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, 11 months
- 1
- 0