[jbossws-commits] JBossWS SVN: r8001 - in stack/native/branches/dlofthouse/JBPAPP-904/src/test: resources/tools/jbws1217 and 1 other directory.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Mon Aug 4 08:30:46 EDT 2008
Author: darran.lofthouse at jboss.com
Date: 2008-08-04 08:30:45 -0400 (Mon, 04 Aug 2008)
New Revision: 8001
Added:
stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/BaseException.java
Modified:
stack/native/branches/dlofthouse/JBPAPP-904/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java
stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl
stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/MySEI.java
stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/TestException.java
stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml
stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/wstools-config.xml
Log:
Backport -r 5788
Modified: stack/native/branches/dlofthouse/JBPAPP-904/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java
===================================================================
--- stack/native/branches/dlofthouse/JBPAPP-904/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java 2008-08-04 12:28:55 UTC (rev 8000)
+++ stack/native/branches/dlofthouse/JBPAPP-904/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java 2008-08-04 12:30:45 UTC (rev 8001)
@@ -46,7 +46,8 @@
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");
+ compareSource(resourceDir + "/TestException.java", toolsDir + "/com/other/exception/TestException.java");
+ compareSource(resourceDir + "/BaseException.java", toolsDir + "/com/other/base/BaseException.java");
JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
Copied: stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/BaseException.java (from rev 5788, stack/native/trunk/src/test/resources/tools/jbws1217/BaseException.java)
===================================================================
--- stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/BaseException.java (rev 0)
+++ stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/BaseException.java 2008-08-04 12:30:45 UTC (rev 8001)
@@ -0,0 +1,18 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Sun Feb 24 03:13:31 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.base;
+
+
+public class BaseException
+ extends Exception{
+public BaseException(){
+}
+}
Modified: stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl
===================================================================
--- stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl 2008-08-04 12:28:55 UTC (rev 8000)
+++ stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl 2008-08-04 12:30:45 UTC (rev 8001)
@@ -1,11 +1,22 @@
<?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/>
+ <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:ns1='http://other.com.base' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <import namespace='http://other.com.base'/>
+ <complexType name='TestException'>
+ <complexContent>
+ <extension base="ns1:BaseException">
+ <sequence/>
+ </extension>
+ </complexContent>
</complexType>
<element name='TestException' type='tns:TestException'/>
+ </schema>
+ <schema targetNamespace='http://other.com.base' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://other.com.base' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <complexType name='BaseException'>
+ <sequence/>
+ </complexType>
+ <element name="BaseException" type="tns:BaseException"/>
</schema>
</types>
<message name='MySEI_testException'/>
Modified: stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/MySEI.java
===================================================================
--- stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/MySEI.java 2008-08-04 12:28:55 UTC (rev 8000)
+++ stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/MySEI.java 2008-08-04 12:30:45 UTC (rev 8001)
@@ -1,7 +1,7 @@
/*
* JBossWS WS-Tools Generated Source
*
- * Generation Date: Thu Jan 03 16:38:10 IST 2008
+ * Generation Date: Sun Feb 24 03:13:31 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
@@ -11,5 +11,5 @@
public interface MySEI extends java.rmi.Remote
{
- public void testException() throws com.other.TestException, java.rmi.RemoteException;
+ public void testException() throws com.other.exception.TestException, java.rmi.RemoteException;
}
Modified: stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/TestException.java
===================================================================
--- stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/TestException.java 2008-08-04 12:28:55 UTC (rev 8000)
+++ stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/TestException.java 2008-08-04 12:30:45 UTC (rev 8001)
@@ -1,18 +1,18 @@
/*
* JBossWS WS-Tools Generated Source
*
- * Generation Date: Thu Jan 03 16:24:09 IST 2008
+ * Generation Date: Sun Feb 24 03:13:31 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;
+package com.other.exception;
public class TestException
- extends Exception{
+ extends com.other.base.BaseException{
public TestException(){
}
}
Modified: stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml
===================================================================
--- stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml 2008-08-04 12:28:55 UTC (rev 8000)
+++ stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml 2008-08-04 12:30:45 UTC (rev 8001)
@@ -1,6 +1,6 @@
<?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>
+ <package-type>com.other.exception</package-type>
<namespaceURI>http://other.com</namespaceURI>
</package-mapping>
<package-mapping>
@@ -8,12 +8,12 @@
<namespaceURI>http://org.jboss.test.ws/jbws1217</namespaceURI>
</package-mapping>
<java-xml-type-mapping>
- <java-type>com.other.TestException</java-type>
+ <java-type>com.other.exception.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>
+ <exception-type>com.other.exception.TestException</exception-type>
<wsdl-message xmlns:exMsgNS='http://org.jboss.test.ws/jbws1217'>exMsgNS:TestException</wsdl-message>
</exception-mapping>
<service-interface-mapping>
Modified: stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/wstools-config.xml
===================================================================
--- stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/wstools-config.xml 2008-08-04 12:28:55 UTC (rev 8000)
+++ stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/wstools-config.xml 2008-08-04 12:30:45 UTC (rev 8001)
@@ -1,6 +1,7 @@
<configuration xmlns="http://www.jboss.org/jbossws-tools">
<global>
- <package-namespace package="com.other" namespace="http://other.com"/>
+ <package-namespace package="com.other.exception" namespace="http://other.com"/>
+ <package-namespace package="com.other.base" namespace="http://other.com.base"/>
<package-namespace package="org.jboss.test.ws.jbws1217" namespace="http://org.jboss.test.ws/jbws1217"/>
</global>
<wsdl-java location="resources/tools/jbws1217/MultiplePackageNamespace.wsdl">
More information about the jbossws-commits
mailing list