JBossWS SVN: r4552 - legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-core/src/java/org/jboss/ws/tools/helpers.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-09-11 10:38:19 -0400 (Tue, 11 Sep 2007)
New Revision: 4552
Modified:
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
Log:
[JBWS-1788] WSDL To Java - When an array if returned from a method on the SEI it is incorrectly ommitted from the generated JAX-RPC mapping.
Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-09-11 13:38:20 UTC (rev 4551)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-09-11 14:38:19 UTC (rev 4552)
@@ -489,7 +489,8 @@
if (isDocStyle())
{
XSTypeDefinition xt = getXSType(input);
- addJavaXMLTypeMap(xt, input.getElement().getLocalPart(), "", "", jwm, !isWrapped());
+ // Don't unwrap the actual parameter.
+ addJavaXMLTypeMap(xt, input.getElement().getLocalPart(), "", "", jwm, false);
}
else
{
@@ -503,7 +504,8 @@
if (isDocStyle())
{
XSTypeDefinition xt = getXSType(output);
- addJavaXMLTypeMap(xt, output.getElement().getLocalPart(), "", "", jwm, !isWrapped());
+ // Don't unwrap the response type.
+ addJavaXMLTypeMap(xt, output.getElement().getLocalPart(), "", "", jwm, false);
}
else
{
@@ -704,7 +706,7 @@
}
}
- if ((skipWrapperArray && isRepresentsArray(xt)) == false)
+ if ((skipWrapperArray && SchemaUtils.isWrapperArrayType(xt)) == false)
{
jxtm = new JavaXmlTypeMapping(jwm);
String javaType;
@@ -900,40 +902,6 @@
}
/**
- * Checks whether the type represents an array type
- *
- * @param xst
- * @return true: type represents an array
- */
- private boolean isRepresentsArray(XSTypeDefinition xst)
- {
- boolean bool = false;
- if (xst instanceof XSComplexTypeDefinition)
- {
- XSComplexTypeDefinition xc = (XSComplexTypeDefinition)xst;
- if (xc.getContentType() == XSComplexTypeDefinition.CONTENTTYPE_EMPTY)
- return false;
- XSParticle xsp = xc.getParticle();
-
- if (xsp == null)
- return false;
-
- XSTerm xsterm = xsp.getTerm();
- if (xsterm instanceof XSModelGroup)
- {
- XSModelGroup xm = (XSModelGroup)xsterm;
- XSObjectList xo = xm.getParticles();
- if (xo.getLength() == 1)
- {
- XSParticle xp = (XSParticle)xo.item(0);
- bool = xp.getMaxOccursUnbounded() || xp.getMaxOccurs() > 1;
- }
- }
- }
- return bool;
- }
-
- /**
* Any custom decisions that need to be made will be done here
*
* @param javaType
18 years, 3 months
- 1
- 0
JBossWS SVN: r4551 - in legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src: java/org/jboss/test/ws/tools/jbws1801 and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-09-11 09:38:20 -0400 (Tue, 11 Sep 2007)
New Revision: 4551
Added:
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1801/
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/Person.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/PhoneBook.wsdl
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/PhoneBook_PortType.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/TelephoneNumber.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/wstools-config.xml
Removed:
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/Person.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/PhoneBook.wsdl
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/PhoneBook_PortType.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/TelephoneNumber.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/wstools-config.xml
Log:
[JBWS-1788] WSDL To Java - When an array if returned from a method on the SEI it is incorrectly ommitted from the generated JAX-RPC mapping.
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1801 (from rev 4543, stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/tools/jbws1801)
Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java
===================================================================
--- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java 2007-09-11 12:08:30 UTC (rev 4543)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java 2007-09-11 13:38:20 UTC (rev 4551)
@@ -1,108 +0,0 @@
-/*
- * 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.jbws1801;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-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;
-
-/**
- * Test case to test the following fix: -
- *
- * @see http://jira.jboss.com/jira/browse/JBWS-1801
- *
- * WSDL To Java - When an array if returned from a method
- * on the SEI it is incorrectly ommitted from the generated
- * JAX-RPC mapping.
- *
- * @author darran.lofthouse(a)jboss.com
- * @since Sep 11, 2007
- */
-public class JBWS1801TestCase extends JBossWSTest
-{
-
- public void testDocumentLiteral() throws Exception
- {
- generateScenario("doclit");
- }
-
- protected void generateScenario(final String scenario) throws Exception
- {
- String resourceDir = "resources/tools/jbws1801/" + scenario;
- String toolsDir = "tools/jbws1801/" + scenario;
- String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
- new WSTools().generate(args);
- File resourceDirFile = new File(resourceDir);
- String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
- public boolean accept(File dir, String name)
- {
- return name.endsWith(".java");
- }
- });
-
- for (int i = 0; i < expectedFiles.length; i++)
- {
- String currentFile = expectedFiles[i];
-
- try
- {
- compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1801/" + currentFile);
- }
- catch (Exception e)
- {
- throw new Exception("Validation of '" + currentFile + "' failed.", e);
- }
- }
-
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1801");
- String[] generatedFiles = packageDir.list();
- for (int i = 0; i < generatedFiles.length; i++)
- {
- String currentFile = generatedFiles[i];
-
- boolean matched = "PhoneBookService.java".equals(currentFile);
-
- for (int j = 0; j < expectedFiles.length && (matched == false); j++)
- matched = currentFile.equals(expectedFiles[j]);
-
- assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
- }
-
- 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();
- }
-
-}
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java (from rev 4543, stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java 2007-09-11 13:38:20 UTC (rev 4551)
@@ -0,0 +1,108 @@
+/*
+ * 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.jbws1801;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+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;
+
+/**
+ * Test case to test the following fix: -
+ *
+ * @see http://jira.jboss.com/jira/browse/JBWS-1801
+ *
+ * WSDL To Java - When an array if returned from a method
+ * on the SEI it is incorrectly ommitted from the generated
+ * JAX-RPC mapping.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since Sep 11, 2007
+ */
+public class JBWS1801TestCase extends JBossWSTest
+{
+
+ public void testDocumentLiteral() throws Exception
+ {
+ generateScenario("doclit");
+ }
+
+ protected void generateScenario(final String scenario) throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1801/" + scenario;
+ String toolsDir = "tools/jbws1801/" + scenario;
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+ new WSTools().generate(args);
+ File resourceDirFile = new File(resourceDir);
+ String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
+ public boolean accept(File dir, String name)
+ {
+ return name.endsWith(".java");
+ }
+ });
+
+ for (int i = 0; i < expectedFiles.length; i++)
+ {
+ String currentFile = expectedFiles[i];
+
+ try
+ {
+ compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1801/" + currentFile);
+ }
+ catch (Exception e)
+ {
+ throw new Exception("Validation of '" + currentFile + "' failed.", e);
+ }
+ }
+
+ File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1801");
+ String[] generatedFiles = packageDir.list();
+ for (int i = 0; i < generatedFiles.length; i++)
+ {
+ String currentFile = generatedFiles[i];
+
+ boolean matched = "PhoneBookService.java".equals(currentFile);
+
+ for (int j = 0; j < expectedFiles.length && (matched == false); j++)
+ matched = currentFile.equals(expectedFiles[j]);
+
+ assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
+ }
+
+ 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();
+ }
+
+}
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801 (from rev 4543, stack/native/branches/native-2.0/src/test/resources/tools/jbws1801)
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit (from rev 4543, stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit)
Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/Person.java
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/Person.java 2007-09-11 12:08:30 UTC (rev 4543)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/Person.java 2007-09-11 13:38:20 UTC (rev 4551)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue Sep 11 12:13:54 BST 2007
- *
- * 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.jbws1801;
-
-
-public class Person
-{
-
-protected java.lang.String[] surname;
-public Person(){}
-
-public Person(java.lang.String[] surname){
-this.surname=surname;
-}
-public java.lang.String[] getSurname() { return surname ;}
-
-public void setSurname(java.lang.String[] surname){ this.surname=surname; }
-
-}
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/Person.java (from rev 4543, stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/Person.java)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/Person.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/Person.java 2007-09-11 13:38:20 UTC (rev 4551)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue Sep 11 12:13:54 BST 2007
+ *
+ * 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.jbws1801;
+
+
+public class Person
+{
+
+protected java.lang.String[] surname;
+public Person(){}
+
+public Person(java.lang.String[] surname){
+this.surname=surname;
+}
+public java.lang.String[] getSurname() { return surname ;}
+
+public void setSurname(java.lang.String[] surname){ this.surname=surname; }
+
+}
Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/PhoneBook.wsdl
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/PhoneBook.wsdl 2007-09-11 12:08:30 UTC (rev 4543)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/PhoneBook.wsdl 2007-09-11 13:38:20 UTC (rev 4551)
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook'
- targetNamespace='http://test.jboss.org/ws/jbws1801'
- xmlns='http://schemas.xmlsoap.org/wsdl/'
- xmlns:ns1='http://test.jboss.org/ws/jbws1801/types'
- xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
- xmlns:tns='http://test.jboss.org/ws/jbws1801'
- xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1801/types'
- xmlns='http://www.w3.org/2001/XMLSchema'
- xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
- xmlns:tns='http://test.jboss.org/ws/jbws1801/types'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
- <complexType name='Person'>
- <sequence>
- <element maxOccurs="unbounded" minOccurs="0" name="surname" nillable="true" type="string"/>
- </sequence>
- </complexType>
-
- <complexType name='TelephoneNumber'>
- <sequence>
- <element maxOccurs="unbounded" minOccurs="0" name="number" nillable="true" type="string"/>
- </sequence>
- </complexType>
-
- <element name='lookup' type='tns:Person'/>
- <element name='lookupResponse' type='tns:TelephoneNumber'/>
-
- </schema>
- </types>
-
- <message name='PhoneBook_lookup'>
- <part element='ns1:lookup' name='parameters'/>
- </message>
-
- <message name='PhoneBook_lookupResponse'>
- <part element='ns1:lookupResponse' name='result'/>
- </message>
-
- <portType name='PhoneBook'>
- <operation name='lookup'>
- <input message='tns:PhoneBook_lookup'/>
- <output message='tns:PhoneBook_lookupResponse'/>
- </operation>
- </portType>
-
- <binding name='PhoneBookBinding' type='tns:PhoneBook'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='lookup'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal' parts='parameters'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- </binding>
-
- <service name='PhoneBook'>
- <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-
-</definitions>
\ No newline at end of file
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/PhoneBook.wsdl (from rev 4543, stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/PhoneBook.wsdl)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/PhoneBook.wsdl (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/PhoneBook.wsdl 2007-09-11 13:38:20 UTC (rev 4551)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook'
+ targetNamespace='http://test.jboss.org/ws/jbws1801'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws1801/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1801'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1801/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1801/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element maxOccurs="unbounded" minOccurs="0" name="surname" nillable="true" type="string"/>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element maxOccurs="unbounded" minOccurs="0" name="number" nillable="true" type="string"/>
+ </sequence>
+ </complexType>
+
+ <element name='lookup' type='tns:Person'/>
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ </message>
+
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ </message>
+
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal' parts='parameters'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+
+</definitions>
\ No newline at end of file
Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/PhoneBook_PortType.java
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/PhoneBook_PortType.java 2007-09-11 12:08:30 UTC (rev 4543)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/PhoneBook_PortType.java 2007-09-11 13:38:20 UTC (rev 4551)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue Sep 11 12:13:54 BST 2007
- *
- * 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.jbws1801;
-public interface PhoneBook_PortType extends java.rmi.Remote
-{
-
- public org.jboss.test.ws.jbws1801.TelephoneNumber lookup(org.jboss.test.ws.jbws1801.Person lookup) throws java.rmi.RemoteException;
-}
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/PhoneBook_PortType.java (from rev 4543, stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/PhoneBook_PortType.java)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/PhoneBook_PortType.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/PhoneBook_PortType.java 2007-09-11 13:38:20 UTC (rev 4551)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue Sep 11 12:13:54 BST 2007
+ *
+ * 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.jbws1801;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public org.jboss.test.ws.jbws1801.TelephoneNumber lookup(org.jboss.test.ws.jbws1801.Person lookup) throws java.rmi.RemoteException;
+}
Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/TelephoneNumber.java
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/TelephoneNumber.java 2007-09-11 12:08:30 UTC (rev 4543)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/TelephoneNumber.java 2007-09-11 13:38:20 UTC (rev 4551)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue Sep 11 12:13:54 BST 2007
- *
- * 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.jbws1801;
-
-
-public class TelephoneNumber
-{
-
-protected java.lang.String[] number;
-public TelephoneNumber(){}
-
-public TelephoneNumber(java.lang.String[] number){
-this.number=number;
-}
-public java.lang.String[] getNumber() { return number ;}
-
-public void setNumber(java.lang.String[] number){ this.number=number; }
-
-}
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/TelephoneNumber.java (from rev 4543, stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/TelephoneNumber.java)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/TelephoneNumber.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/TelephoneNumber.java 2007-09-11 13:38:20 UTC (rev 4551)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue Sep 11 12:13:54 BST 2007
+ *
+ * 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.jbws1801;
+
+
+public class TelephoneNumber
+{
+
+protected java.lang.String[] number;
+public TelephoneNumber(){}
+
+public TelephoneNumber(java.lang.String[] number){
+this.number=number;
+}
+public java.lang.String[] getNumber() { return number ;}
+
+public void setNumber(java.lang.String[] number){ this.number=number; }
+
+}
Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml 2007-09-11 12:08:30 UTC (rev 4543)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml 2007-09-11 13:38:20 UTC (rev 4551)
@@ -1,59 +0,0 @@
-<?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>org.jboss.test.ws.jbws1801</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1801/types</namespaceURI>
- </package-mapping>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1801</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1801</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1801.Person</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1801/types'>typeNS:Person</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>surname</java-variable-name>
- <xml-element-name>surname</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1801.TelephoneNumber</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1801/types'>typeNS:TelephoneNumber</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>number</java-variable-name>
- <xml-element-name>number</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1801.PhoneBook_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1801'>serviceNS:PhoneBook</wsdl-service-name>
- <port-mapping>
- <port-name>PhoneBookPort</port-name>
- <java-port-name>PhoneBookPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jbws1801.PhoneBook_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1801'>portTypeNS:PhoneBook</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1801'>bindingNS:PhoneBookBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>lookup</java-method-name>
- <wsdl-operation>lookup</wsdl-operation>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>org.jboss.test.ws.jbws1801.Person</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1801'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
- <wsdl-message-part-name>parameters</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jbws1801.TelephoneNumber</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1801'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml (from rev 4543, stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml 2007-09-11 13:38:20 UTC (rev 4551)
@@ -0,0 +1,59 @@
+<?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>org.jboss.test.ws.jbws1801</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1801/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1801</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1801</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1801.Person</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1801/types'>typeNS:Person</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1801.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1801/types'>typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1801.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1801'>serviceNS:PhoneBook</wsdl-service-name>
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1801.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1801'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1801'>bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws1801.Person</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1801'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>parameters</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws1801.TelephoneNumber</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1801'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/wstools-config.xml
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/wstools-config.xml 2007-09-11 12:08:30 UTC (rev 4543)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/wstools-config.xml 2007-09-11 13:38:20 UTC (rev 4551)
@@ -1,6 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws1801/doclit/PhoneBook.wsdl"
- parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/wstools-config.xml (from rev 4543, stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/wstools-config.xml)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/wstools-config.xml (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1801/doclit/wstools-config.xml 2007-09-11 13:38:20 UTC (rev 4551)
@@ -0,0 +1,6 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1801/doclit/PhoneBook.wsdl"
+ parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
18 years, 3 months
- 1
- 0
JBossWS SVN: r4550 - stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/deserialization.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-09-11 09:13:33 -0400 (Tue, 11 Sep 2007)
New Revision: 4550
Modified:
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/deserialization/WSRMDeSerializationTestCase.java
Log:
extending test case to cover new de/serializer
Modified: stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/deserialization/WSRMDeSerializationTestCase.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/deserialization/WSRMDeSerializationTestCase.java 2007-09-11 13:12:34 UTC (rev 4549)
+++ stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/deserialization/WSRMDeSerializationTestCase.java 2007-09-11 13:13:33 UTC (rev 4550)
@@ -22,7 +22,10 @@
package org.jboss.test.ws.jaxws.wsrm.deserialization;
import java.io.ByteArrayInputStream;
+import java.util.List;
+
import javax.xml.soap.SOAPMessage;
+
import org.jboss.ws.extensions.wsrm.spi.Provider;
import org.jboss.ws.extensions.wsrm.spi.MessageFactory;
import org.jboss.ws.extensions.wsrm.spi.protocol.AckRequested;
@@ -32,6 +35,7 @@
import org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequenceResponse;
import org.jboss.ws.extensions.wsrm.spi.protocol.IncompleteSequenceBehavior;
import org.jboss.ws.extensions.wsrm.spi.protocol.Sequence;
+import org.jboss.ws.extensions.wsrm.spi.protocol.SequenceAcknowledgement;
import org.jboss.ws.extensions.wsrm.spi.protocol.Serializable;
import org.jboss.ws.extensions.wsrm.spi.protocol.TerminateSequence;
import org.jboss.ws.extensions.wsrm.spi.protocol.TerminateSequenceResponse;
@@ -124,7 +128,7 @@
+ " <soap:Body><!-- Some Application Data --></soap:Body>"
+ "</soap:Envelope>";
- private static final String SEQUENCE_ACKNOWLEDGEMENT_MESSAGE
+ private static final String SEQUENCE_ACKNOWLEDGEMENT_MESSAGE_1
= "<soap:Envelope"
+ " xmlns:soap=\"http://www.w3.org/2003/05/soap-envelope\""
+ " xmlns:wsrm=\"http://docs.oasis-open.org/ws-rx/wsrm/200702\""
@@ -140,11 +144,52 @@
+ " <wsrm:Identifier>http://Business456.com/RM/ABC</wsrm:Identifier>"
+ " <wsrm:AcknowledgementRange Upper='1' Lower='1'/>"
+ " <wsrm:AcknowledgementRange Upper='3' Lower='3'/>"
+ + " <wsrm:Final/>"
+ " </wsrm:SequenceAcknowledgement>"
+ " </soap:Header>"
+ " <soap:Body/>"
+ "</soap:Envelope>";
+ private static final String SEQUENCE_ACKNOWLEDGEMENT_MESSAGE_2
+ = "<soap:Envelope"
+ + " xmlns:soap=\"http://www.w3.org/2003/05/soap-envelope\""
+ + " xmlns:wsrm=\"http://docs.oasis-open.org/ws-rx/wsrm/200702\""
+ + " xmlns:wsa=\"http://www.w3.org/2005/08/addressing\">"
+ + " <soap:Header>"
+ + " <wsa:MessageID>http://example.com/guid/0baaf88d-483b-4ecf-a6d8</wsa:MessageID>"
+ + " <wsa:To>http://Business456.com/serviceA/789</wsa:To>"
+ + " <wsa:From>"
+ + " <wsa:Address>http://example.com/serviceB/123</wsa:Address>"
+ + " </wsa:From>"
+ + " <wsa:Action>http://docs.oasis-open.org/ws-rx/wsrm/200702/SequenceAcknowledgement</wsa:Action>"
+ + " <wsrm:SequenceAcknowledgement>"
+ + " <wsrm:Identifier>http://Business456.com/RM/ABC</wsrm:Identifier>"
+ + " <wsrm:Nack>2</wsrm:Nack>"
+ + " </wsrm:SequenceAcknowledgement>"
+ + " </soap:Header>"
+ + " <soap:Body/>"
+ + "</soap:Envelope>";
+
+ private static final String SEQUENCE_ACKNOWLEDGEMENT_MESSAGE_3
+ = "<soap:Envelope"
+ + " xmlns:soap=\"http://www.w3.org/2003/05/soap-envelope\""
+ + " xmlns:wsrm=\"http://docs.oasis-open.org/ws-rx/wsrm/200702\""
+ + " xmlns:wsa=\"http://www.w3.org/2005/08/addressing\">"
+ + " <soap:Header>"
+ + " <wsa:MessageID>http://example.com/guid/0baaf88d-483b-4ecf-a6d8</wsa:MessageID>"
+ + " <wsa:To>http://Business456.com/serviceA/789</wsa:To>"
+ + " <wsa:From>"
+ + " <wsa:Address>http://example.com/serviceB/123</wsa:Address>"
+ + " </wsa:From>"
+ + " <wsa:Action>http://docs.oasis-open.org/ws-rx/wsrm/200702/SequenceAcknowledgement</wsa:Action>"
+ + " <wsrm:SequenceAcknowledgement>"
+ + " <wsrm:Identifier>http://Business456.com/RM/ABC</wsrm:Identifier>"
+ + " <wsrm:None/>"
+ + " </wsrm:SequenceAcknowledgement>"
+ + " </soap:Header>"
+ + " <soap:Body/>"
+ + "</soap:Envelope>";
+
private static final String CLOSE_SEQUENCE_MESSAGE
= "<soap:Envelope"
+ " xmlns:soap=\"http://www.w3.org/2003/05/soap-envelope\""
@@ -229,6 +274,89 @@
+ " </soap:Body>"
+ "</soap:Envelope>";
+ public void testSequenceAcknowledgementDeserialization1() throws Exception
+ {
+ SequenceAcknowledgement sequenceAcknowledgement = WSRM_200702_FACTORY.newSequenceAcknowledgement();
+ sequenceAcknowledgement.deserializeFrom(toSOAPMessage(SEQUENCE_ACKNOWLEDGEMENT_MESSAGE_1));
+ // perform assertion
+ assertEquals(sequenceAcknowledgement.getIdentifier(), "http://Business456.com/RM/ABC");
+ assertTrue(sequenceAcknowledgement.isFinal());
+ assertFalse(sequenceAcknowledgement.isNone());
+ assertEquals(sequenceAcknowledgement.getNacks().size(), 0);
+ List<SequenceAcknowledgement.AcknowledgementRange> ranges = sequenceAcknowledgement.getAcknowledgementRanges();
+ assertEquals(ranges.size(), 2);
+ SequenceAcknowledgement.AcknowledgementRange firstRange = ranges.get(0);
+ assertEquals(firstRange.getLower(), 1);
+ assertEquals(firstRange.getLower(), 1);
+ SequenceAcknowledgement.AcknowledgementRange secondRange = ranges.get(1);
+ assertEquals(secondRange.getLower(), 3);
+ assertEquals(secondRange.getLower(), 3);
+ }
+
+ public void testSequenceAcknowledgementSerialization1() throws Exception
+ {
+ SequenceAcknowledgement sequenceAcknowledgementMessage = WSRM_200702_FACTORY.newSequenceAcknowledgement();
+ // construct message
+ sequenceAcknowledgementMessage.setIdentifier("http://Business456.com/RM/ABC");
+ sequenceAcknowledgementMessage.setFinal();
+ SequenceAcknowledgement.AcknowledgementRange firstRange = sequenceAcknowledgementMessage.newAcknowledgementRange();
+ firstRange.setLower(1);
+ firstRange.setUpper(1);
+ sequenceAcknowledgementMessage.addAcknowledgementRange(firstRange);
+ SequenceAcknowledgement.AcknowledgementRange secondRange = sequenceAcknowledgementMessage.newAcknowledgementRange();
+ secondRange.setLower(3);
+ secondRange.setUpper(3);
+ sequenceAcknowledgementMessage.addAcknowledgementRange(secondRange);
+ // perform assertion
+ assertEquals(sequenceAcknowledgementMessage, SEQUENCE_ACKNOWLEDGEMENT_MESSAGE_1, WSRM_200702_FACTORY);
+ }
+
+ public void testSequenceAcknowledgementDeserialization2() throws Exception
+ {
+ SequenceAcknowledgement sequenceAcknowledgement = WSRM_200702_FACTORY.newSequenceAcknowledgement();
+ sequenceAcknowledgement.deserializeFrom(toSOAPMessage(SEQUENCE_ACKNOWLEDGEMENT_MESSAGE_2));
+ // perform assertion
+ assertEquals(sequenceAcknowledgement.getIdentifier(), "http://Business456.com/RM/ABC");
+ assertFalse(sequenceAcknowledgement.isFinal());
+ assertFalse(sequenceAcknowledgement.isNone());
+ assertEquals(sequenceAcknowledgement.getAcknowledgementRanges().size(), 0);
+ List<Long> nacks = sequenceAcknowledgement.getNacks();
+ assertEquals(nacks.size(), 1);
+ assertEquals(nacks.get(0).longValue(), 2);
+ }
+
+ public void testSequenceAcknowledgementSerialization2() throws Exception
+ {
+ SequenceAcknowledgement sequenceAcknowledgementMessage = WSRM_200702_FACTORY.newSequenceAcknowledgement();
+ // construct message
+ sequenceAcknowledgementMessage.setIdentifier("http://Business456.com/RM/ABC");
+ sequenceAcknowledgementMessage.addNack(2);
+ // perform assertion
+ assertEquals(sequenceAcknowledgementMessage, SEQUENCE_ACKNOWLEDGEMENT_MESSAGE_2, WSRM_200702_FACTORY);
+ }
+
+ public void testSequenceAcknowledgementDeserialization3() throws Exception
+ {
+ SequenceAcknowledgement sequenceAcknowledgement = WSRM_200702_FACTORY.newSequenceAcknowledgement();
+ sequenceAcknowledgement.deserializeFrom(toSOAPMessage(SEQUENCE_ACKNOWLEDGEMENT_MESSAGE_3));
+ // perform assertion
+ assertEquals(sequenceAcknowledgement.getIdentifier(), "http://Business456.com/RM/ABC");
+ assertFalse(sequenceAcknowledgement.isFinal());
+ assertTrue(sequenceAcknowledgement.isNone());
+ assertEquals(sequenceAcknowledgement.getAcknowledgementRanges().size(), 0);
+ assertEquals(sequenceAcknowledgement.getNacks().size(), 0);
+ }
+
+ public void testSequenceAcknowledgementSerialization3() throws Exception
+ {
+ SequenceAcknowledgement sequenceAcknowledgementMessage = WSRM_200702_FACTORY.newSequenceAcknowledgement();
+ // construct message
+ sequenceAcknowledgementMessage.setIdentifier("http://Business456.com/RM/ABC");
+ sequenceAcknowledgementMessage.setNone();
+ // perform assertion
+ assertEquals(sequenceAcknowledgementMessage, SEQUENCE_ACKNOWLEDGEMENT_MESSAGE_3, WSRM_200702_FACTORY);
+ }
+
public void testCreateSequenceMessageDeserialization() throws Exception
{
CreateSequence createSequenceMessage = WSRM_200702_FACTORY.newCreateSequence();
@@ -428,6 +556,8 @@
return factory.newSequence();
if (helper instanceof AckRequested)
return factory.newAckRequested();
+ if (helper instanceof SequenceAcknowledgement)
+ return factory.newSequenceAcknowledgement();
throw new IllegalArgumentException();
}
18 years, 3 months
- 1
- 0
JBossWS SVN: r4549 - stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-09-11 09:12:34 -0400 (Tue, 11 Sep 2007)
New Revision: 4549
Modified:
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/ConstantsImpl.java
Log:
refactoring
Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/ConstantsImpl.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/ConstantsImpl.java 2007-09-11 13:11:53 UTC (rev 4548)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/ConstantsImpl.java 2007-09-11 13:12:34 UTC (rev 4549)
@@ -87,7 +87,7 @@
this.lastMessageNumberQName = new QName(namespaceURI, "LastMessageNumber", prefix);
this.lastMessageQName = new QName(namespaceURI, "LastMessage", prefix);
this.lastMsgNumberQName = new QName(namespaceURI, "LastMsgNumber", prefix);
- this.lowerQName = new QName(namespaceURI, "Lower", prefix);
+ this.lowerQName = new QName(null, "Lower", "");
this.messageNumberQName = new QName(namespaceURI, "MessageNumber", prefix);
this.nackQName = new QName(namespaceURI, "Nack", prefix);
this.noneQName = new QName(namespaceURI, "None", prefix);
@@ -97,7 +97,7 @@
this.equenceQName = new QName(namespaceURI, "Sequence", prefix);
this.terminateSequenceQName = new QName(namespaceURI, "TerminateSequence", prefix);
this.terminateSequenceResponseQName = new QName(namespaceURI, "TerminateSequenceResponse", prefix);
- this.upperQName = new QName(namespaceURI, "Upper", prefix);
+ this.upperQName = new QName(null, "Upper", "");
}
/**
18 years, 3 months
- 1
- 0
JBossWS SVN: r4548 - stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-09-11 09:11:53 -0400 (Tue, 11 Sep 2007)
New Revision: 4548
Modified:
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/AckRequestedSerializer.java
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CloseSequenceResponseSerializer.java
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CloseSequenceSerializer.java
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CreateSequenceResponseSerializer.java
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CreateSequenceSerializer.java
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/SequenceAcknowledgementSerializer.java
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/SequenceSerializer.java
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/SerializationHelper.java
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/TerminateSequenceResponseSerializer.java
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/TerminateSequenceSerializer.java
Log:
adding SequenceAcknowledgement de/serializer + refactoring + source code documentation improved
Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/AckRequestedSerializer.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/AckRequestedSerializer.java 2007-09-11 12:45:34 UTC (rev 4547)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/AckRequestedSerializer.java 2007-09-11 13:11:53 UTC (rev 4548)
@@ -21,6 +21,7 @@
*/
package org.jboss.ws.extensions.wsrm.common.serialization;
+import static org.jboss.ws.extensions.wsrm.common.serialization.SerializationHelper.stringToLong;
import static org.jboss.ws.extensions.wsrm.common.serialization.SerializationHelper.getOptionalElement;
import static org.jboss.ws.extensions.wsrm.common.serialization.SerializationHelper.getRequiredElement;
import static org.jboss.ws.extensions.wsrm.common.serialization.SerializationHelper.getRequiredTextContent;
@@ -63,29 +64,24 @@
SOAPHeader soapHeader = soapMessage.getSOAPPart().getEnvelope().getHeader();
Constants wsrmConstants = provider.getConstants();
- // read wsrm:AckRequested
+ // read required wsrm:AckRequested element
QName ackRequestedQName = wsrmConstants.getAckRequestedQName();
SOAPElement ackRequestedElement = getRequiredElement(soapHeader, ackRequestedQName, "soap header");
- // read wsrm:Identifier
+ // read required wsrm:Identifier element
QName identifierQName = wsrmConstants.getIdentifierQName();
SOAPElement identifierElement = getRequiredElement(ackRequestedElement, identifierQName, ackRequestedQName);
String identifier = getRequiredTextContent(identifierElement, identifierQName);
object.setIdentifier(identifier);
- // read wsrm:MessageNumber
+ // read optional wsrm:MessageNumber element
QName messageNumberQName = wsrmConstants.getMessageNumberQName();
SOAPElement messageNumberElement = getOptionalElement(ackRequestedElement, messageNumberQName, ackRequestedQName);
if (messageNumberElement != null)
{
- try
- {
- long messageNumber = Long.valueOf(getRequiredTextContent(messageNumberElement, messageNumberQName));
- object.setMessageNumber(messageNumber);
- } catch (NumberFormatException nfe)
- {
- throw new ReliableMessagingException("Unable to parse MessageNumber element text content", nfe);
- }
+ String messageNumberString = getRequiredTextContent(messageNumberElement, messageNumberQName);
+ long messageNumberValue = stringToLong(messageNumberString, "Unable to parse MessageNumber element text content");
+ object.setMessageNumber(messageNumberValue);
}
}
catch (SOAPException se)
@@ -111,17 +107,17 @@
// Add xmlns:wsrm declaration
soapEnvelope.addNamespaceDeclaration(wsrmConstants.getPrefix(), wsrmConstants.getNamespaceURI());
- // write wsrm:AckRequested
+ // write required wsrm:AckRequested element
QName ackRequestedQName = wsrmConstants.getAckRequestedQName();
SOAPElement ackRequestedElement = soapEnvelope.getHeader().addChildElement(ackRequestedQName);
- // write wsrm:Identifier
+ // write required wsrm:Identifier element
QName identifierQName = wsrmConstants.getIdentifierQName();
ackRequestedElement.addChildElement(identifierQName).setValue(object.getIdentifier());
if (object.getMessageNumber() != 0)
{
- // write wsrm:MessageNumber
+ // write optional wsrm:MessageNumber element
QName messageNumberQName = wsrmConstants.getMessageNumberQName();
SOAPElement messageNumberElement = ackRequestedElement.addChildElement(messageNumberQName);
messageNumberElement.setValue(String.valueOf(object.getMessageNumber()));
Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CloseSequenceResponseSerializer.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CloseSequenceResponseSerializer.java 2007-09-11 12:45:34 UTC (rev 4547)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CloseSequenceResponseSerializer.java 2007-09-11 13:11:53 UTC (rev 4548)
@@ -62,11 +62,11 @@
SOAPBody soapBody = soapMessage.getSOAPPart().getEnvelope().getBody();
Constants wsrmConstants = provider.getConstants();
- // read wsrm:CloseSequenceResponse
+ // read required wsrm:CloseSequenceResponse element
QName closeSequenceResponseQName = wsrmConstants.getCloseSequenceResponseQName();
SOAPElement closeSequenceResponseElement = getRequiredElement(soapBody, closeSequenceResponseQName, "soap body");
- // read wsrm:Identifier
+ // read required wsrm:Identifier element
QName identifierQName = wsrmConstants.getIdentifierQName();
SOAPElement identifierElement = getRequiredElement(closeSequenceResponseElement, identifierQName, closeSequenceResponseQName);
String identifier = getRequiredTextContent(identifierElement, identifierQName);
@@ -95,11 +95,11 @@
// Add xmlns:wsrm declaration
soapEnvelope.addNamespaceDeclaration(wsrmConstants.getPrefix(), wsrmConstants.getNamespaceURI());
- // write wsrm:CloseSequenceResponse
+ // write required wsrm:CloseSequenceResponse element
QName closeSequenceResponseQName = wsrmConstants.getCloseSequenceResponseQName();
SOAPElement closeSequenceResponseElement = soapEnvelope.getBody().addChildElement(closeSequenceResponseQName);
- // write wsrm:Identifier
+ // write required wsrm:Identifier element
QName identifierQName = wsrmConstants.getIdentifierQName();
closeSequenceResponseElement.addChildElement(identifierQName).setValue(object.getIdentifier());
}
Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CloseSequenceSerializer.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CloseSequenceSerializer.java 2007-09-11 12:45:34 UTC (rev 4547)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CloseSequenceSerializer.java 2007-09-11 13:11:53 UTC (rev 4548)
@@ -21,6 +21,7 @@
*/
package org.jboss.ws.extensions.wsrm.common.serialization;
+import static org.jboss.ws.extensions.wsrm.common.serialization.SerializationHelper.stringToLong;
import static org.jboss.ws.extensions.wsrm.common.serialization.SerializationHelper.getOptionalElement;
import static org.jboss.ws.extensions.wsrm.common.serialization.SerializationHelper.getRequiredElement;
import static org.jboss.ws.extensions.wsrm.common.serialization.SerializationHelper.getRequiredTextContent;
@@ -63,29 +64,24 @@
SOAPBody soapBody = soapMessage.getSOAPPart().getEnvelope().getBody();
Constants wsrmConstants = provider.getConstants();
- // read wsrm:CloseSequence
+ // read required wsrm:CloseSequence element
QName closeSequenceQName = wsrmConstants.getCloseSequenceQName();
SOAPElement closeSequenceElement = getRequiredElement(soapBody, closeSequenceQName, "soap body");
- // read wsrm:Identifier
+ // read required wsrm:Identifier element
QName identifierQName = wsrmConstants.getIdentifierQName();
SOAPElement identifierElement = getRequiredElement(closeSequenceElement, identifierQName, closeSequenceQName);
String identifier = getRequiredTextContent(identifierElement, identifierQName);
object.setIdentifier(identifier);
- // read wsrm:LastMsgNumber
+ // read optional wsrm:LastMsgNumber element
QName lastMsgNumberQName = wsrmConstants.getLastMsgNumberQName();
SOAPElement lastMsgNumberElement = getOptionalElement(closeSequenceElement, lastMsgNumberQName, closeSequenceQName);
if (lastMsgNumberElement != null)
{
- try
- {
- long lastMsgNumber = Long.valueOf(getRequiredTextContent(lastMsgNumberElement, lastMsgNumberQName));
- object.setLastMsgNumber(lastMsgNumber);
- } catch (NumberFormatException nfe)
- {
- throw new ReliableMessagingException("Unable to parse LastMsgNumber element text content", nfe);
- }
+ String lastMsgNumberString = getRequiredTextContent(lastMsgNumberElement, lastMsgNumberQName);
+ long lastMsgNumberValue = stringToLong(lastMsgNumberString, "Unable to parse LastMsgNumber element text content");
+ object.setLastMsgNumber(lastMsgNumberValue);
}
}
catch (SOAPException se)
@@ -111,17 +107,17 @@
// Add xmlns:wsrm declaration
soapEnvelope.addNamespaceDeclaration(wsrmConstants.getPrefix(), wsrmConstants.getNamespaceURI());
- // write wsrm:CloseSequence
+ // write required wsrm:CloseSequence element
QName closeSequenceQName = wsrmConstants.getCloseSequenceQName();
SOAPElement closeSequenceElement = soapEnvelope.getBody().addChildElement(closeSequenceQName);
- // write wsrm:Identifier
+ // write required wsrm:Identifier element
QName identifierQName = wsrmConstants.getIdentifierQName();
closeSequenceElement.addChildElement(identifierQName).setValue(object.getIdentifier());
if (object.getLastMsgNumber() != 0)
{
- // write wsrm:LastMsgNumber
+ // write optional wsrm:LastMsgNumber element
QName lastMsgNumberQName = wsrmConstants.getLastMsgNumberQName();
SOAPElement lastMsgNumberElement = closeSequenceElement.addChildElement(lastMsgNumberQName);
lastMsgNumberElement.setValue(String.valueOf(object.getLastMsgNumber()));
Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CreateSequenceResponseSerializer.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CreateSequenceResponseSerializer.java 2007-09-11 12:45:34 UTC (rev 4547)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CreateSequenceResponseSerializer.java 2007-09-11 13:11:53 UTC (rev 4548)
@@ -69,17 +69,17 @@
SOAPBody soapBody = soapMessage.getSOAPPart().getEnvelope().getBody();
Constants wsrmConstants = provider.getConstants();
- // read wsrm:CreateSequenceResponse
+ // read required wsrm:CreateSequenceResponse element
QName createSequenceResponseQName = wsrmConstants.getCreateSequenceResponseQName();
SOAPElement createSequenceResponseElement = getRequiredElement(soapBody, createSequenceResponseQName, "soap body");
- // read wsrm:identifier
+ // read required wsrm:Identifier element
QName identifierQName = wsrmConstants.getIdentifierQName();
SOAPElement identifierElement = getRequiredElement(createSequenceResponseElement, identifierQName, createSequenceResponseQName);
String identifier = getRequiredTextContent(identifierElement, identifierQName);
object.setIdentifier(identifier);
- // read wsrm:Expires
+ // read optional wsrm:Expires element
QName expiresQName = wsrmConstants.getExpiresQName();
SOAPElement expiresElement = getOptionalElement(createSequenceResponseElement, expiresQName, createSequenceResponseQName);
if (expiresElement != null)
@@ -88,7 +88,7 @@
object.setExpires(duration);
}
- // read wsrm:IncompleteSequenceBehavior
+ // read optional wsrm:IncompleteSequenceBehavior element
QName behaviorQName = wsrmConstants.getIncompleteSequenceBehaviorQName();
SOAPElement behaviorElement = getOptionalElement(createSequenceResponseElement, behaviorQName, createSequenceResponseQName);
if (behaviorElement != null)
@@ -97,14 +97,14 @@
object.setIncompleteSequenceBehavior(IncompleteSequenceBehavior.getValue(behaviorString));
}
- // read wsrm:Accept
+ // read optional wsrm:Accept element
QName acceptQName = wsrmConstants.getAcceptQName();
SOAPElement acceptElement = getOptionalElement(createSequenceResponseElement, acceptQName, createSequenceResponseQName);
if (acceptElement != null)
{
CreateSequenceResponse.Accept accept = object.newAccept();
- // read wsrm:AcksTo
+ // read required wsrm:AcksTo element
QName acksToQName = wsrmConstants.getAcksToQName();
SOAPElement acksToElement = getRequiredElement(acceptElement, acksToQName, acceptQName);
QName addressQName = ADDRESSING_CONSTANTS.getAddressQName();
@@ -112,6 +112,7 @@
String acksToAddress = getRequiredTextContent(acksToAddressElement, addressQName);
accept.setAcksTo(acksToAddress);
+ // set created accept
object.setAccept(accept);
}
}
@@ -138,24 +139,24 @@
// Add xmlns:wsrm declaration
soapEnvelope.addNamespaceDeclaration(wsrmConstants.getPrefix(), wsrmConstants.getNamespaceURI());
- // write wsrm:CreateSequenceResponse
+ // write required wsrm:CreateSequenceResponse element
QName createSequenceResponseQName = wsrmConstants.getCreateSequenceResponseQName();
SOAPElement createSequenceResponseElement = soapEnvelope.getBody().addChildElement(createSequenceResponseQName);
- // write wsrm:Identifier
+ // write required wsrm:Identifier element
QName identifierQName = wsrmConstants.getIdentifierQName();
createSequenceResponseElement.addChildElement(identifierQName).setValue(object.getIdentifier());
if (object.getExpires() != null)
{
- // write wsrm:Expires
+ // write optional wsrm:Expires element
QName expiresQName = wsrmConstants.getExpiresQName();
createSequenceResponseElement.addChildElement(expiresQName).setValue(object.getExpires());
}
if (object.getIncompleteSequenceBehavior() != null)
{
- // write wsrm:IncompleteSequenceBehavior
+ // write optional wsrm:IncompleteSequenceBehavior element
IncompleteSequenceBehavior behavior = object.getIncompleteSequenceBehavior();
QName behaviorQName = wsrmConstants.getIncompleteSequenceBehaviorQName();
SOAPElement behaviorElement = createSequenceResponseElement.addChildElement(behaviorQName);
@@ -164,11 +165,11 @@
if (object.getAccept() != null)
{
- // write wsrm:Accept
+ // write optional wsrm:Accept element
QName acceptQName = wsrmConstants.getAcceptQName();
SOAPElement acceptElement = createSequenceResponseElement.addChildElement(acceptQName);
- // write wsrm:AcksTo
+ // write required wsrm:AcksTo element
QName acksToQName = wsrmConstants.getAcksToQName();
QName addressQName = ADDRESSING_CONSTANTS.getAddressQName();
acceptElement.addChildElement(acksToQName)
Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CreateSequenceSerializer.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CreateSequenceSerializer.java 2007-09-11 12:45:34 UTC (rev 4547)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CreateSequenceSerializer.java 2007-09-11 13:11:53 UTC (rev 4548)
@@ -69,11 +69,11 @@
SOAPBody soapBody = soapMessage.getSOAPPart().getEnvelope().getBody();
Constants wsrmConstants = provider.getConstants();
- // read wsrm:CreateSequence
+ // read required wsrm:CreateSequence element
QName createSequenceQName = wsrmConstants.getCreateSequenceQName();
SOAPElement createSequenceElement = getRequiredElement(soapBody, createSequenceQName, "soap body");
- // read wsrm:AcksTo
+ // read required wsrm:AcksTo element
QName acksToQName = wsrmConstants.getAcksToQName();
SOAPElement acksToElement = getRequiredElement(createSequenceElement, acksToQName, createSequenceQName);
QName addressQName = ADDRESSING_CONSTANTS.getAddressQName();
@@ -81,7 +81,7 @@
String acksToAddress = getRequiredTextContent(acksToAddressElement, addressQName);
object.setAcksTo(acksToAddress);
- // read wsrm:Expires
+ // read optional wsrm:Expires element
QName expiresQName = wsrmConstants.getExpiresQName();
SOAPElement expiresElement = getOptionalElement(createSequenceElement, expiresQName, createSequenceQName);
if (expiresElement != null)
@@ -90,20 +90,20 @@
object.setExpires(duration);
}
- // read wsrm:Offer
+ // read optional wsrm:Offer element
QName offerQName = wsrmConstants.getOfferQName();
SOAPElement offerElement = getOptionalElement(createSequenceElement, offerQName, createSequenceQName);
if (offerElement != null)
{
CreateSequence.Offer offer = object.newOffer();
- // read wsrm:Identifier
+ // read required wsrm:Identifier element
QName identifierQName = wsrmConstants.getIdentifierQName();
SOAPElement identifierElement = getRequiredElement(offerElement, identifierQName, offerQName);
String identifier = getRequiredTextContent(identifierElement, identifierQName);
offer.setIdentifier(identifier);
- // read wsrm:Endpoint
+ // read optional wsrm:Endpoint element
QName endpointQName = wsrmConstants.getEndpointQName();
SOAPElement endpointElement = getOptionalElement(offerElement, endpointQName, offerQName);
if (endpointElement != null)
@@ -113,7 +113,7 @@
offer.setEndpoint(endpointAddress);
}
- // read wsrm:Expires
+ // read optional wsrm:Expires element
SOAPElement offerExpiresElement = getOptionalElement(offerElement, expiresQName, offerQName);
if (offerExpiresElement != null)
{
@@ -121,7 +121,7 @@
offer.setExpires(duration);
}
- // read wsrm:IncompleteSequenceBehavior
+ // read optional wsrm:IncompleteSequenceBehavior element
QName behaviorQName = wsrmConstants.getIncompleteSequenceBehaviorQName();
SOAPElement behaviorElement = getOptionalElement(offerElement, behaviorQName, offerQName);
if (behaviorElement != null)
@@ -157,11 +157,11 @@
// Add xmlns:wsrm declaration
soapEnvelope.addNamespaceDeclaration(wsrmConstants.getPrefix(), wsrmConstants.getNamespaceURI());
- // write wsrm:CreateSequence
+ // write required wsrm:CreateSequence element
QName createSequenceQName = wsrmConstants.getCreateSequenceQName();
SOAPElement createSequenceElement = soapEnvelope.getBody().addChildElement(createSequenceQName);
- // write wsrm:AcksTo
+ // write required wsrm:AcksTo element
QName acksToQName = wsrmConstants.getAcksToQName();
QName addressQName = ADDRESSING_CONSTANTS.getAddressQName();
createSequenceElement.addChildElement(acksToQName)
@@ -170,7 +170,7 @@
if (object.getExpires() != null)
{
- // write wsrm:Expires
+ // write optional wsrm:Expires element
QName expiresQName = wsrmConstants.getExpiresQName();
createSequenceElement.addChildElement(expiresQName).setValue(object.getExpires());
}
@@ -179,17 +179,17 @@
{
CreateSequence.Offer offer = object.getOffer();
- // write wsrm:Offer
+ // write optional wsrm:Offer element
QName offerQName = wsrmConstants.getOfferQName();
SOAPElement offerElement = createSequenceElement.addChildElement(offerQName);
- // write wsrm:Identifier
+ // write required wsrm:Identifier element
QName identifierQName = wsrmConstants.getIdentifierQName();
offerElement.addChildElement(identifierQName).setValue(offer.getIdentifier());
if (offer.getEndpoint() != null)
{
- // write wsrm:Endpoint
+ // write optional wsrm:Endpoint element
QName endpointQName = wsrmConstants.getEndpointQName();
offerElement.addChildElement(endpointQName)
.addChildElement(addressQName)
@@ -198,14 +198,14 @@
if (offer.getExpires() != null)
{
- // write wsrm:Expires
+ // write optional wsrm:Expires element
QName expiresQName = wsrmConstants.getExpiresQName();
offerElement.addChildElement(expiresQName).setValue(offer.getExpires());
}
if (offer.getIncompleteSequenceBehavior() != null)
{
- // write wsrm:IncompleteSequenceBehavior
+ // write optional wsrm:IncompleteSequenceBehavior element
IncompleteSequenceBehavior behavior = offer.getIncompleteSequenceBehavior();
QName behaviorQName = wsrmConstants.getIncompleteSequenceBehaviorQName();
SOAPElement behaviorElement = offerElement.addChildElement(behaviorQName);
Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/SequenceAcknowledgementSerializer.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/SequenceAcknowledgementSerializer.java 2007-09-11 12:45:34 UTC (rev 4547)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/SequenceAcknowledgementSerializer.java 2007-09-11 13:11:53 UTC (rev 4548)
@@ -21,13 +21,26 @@
*/
package org.jboss.ws.extensions.wsrm.common.serialization;
+import static org.jboss.ws.extensions.wsrm.common.serialization.SerializationHelper.stringToLong;
+import static org.jboss.ws.extensions.wsrm.common.serialization.SerializationHelper.getOptionalElement;
+import static org.jboss.ws.extensions.wsrm.common.serialization.SerializationHelper.getRequiredElement;
+import static org.jboss.ws.extensions.wsrm.common.serialization.SerializationHelper.getOptionalElements;
+import static org.jboss.ws.extensions.wsrm.common.serialization.SerializationHelper.getRequiredTextContent;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPHeader;
import javax.xml.soap.SOAPMessage;
-import org.jboss.util.NotImplementedException;
import org.jboss.ws.extensions.wsrm.ReliableMessagingException;
+import org.jboss.ws.extensions.wsrm.spi.Constants;
import org.jboss.ws.extensions.wsrm.spi.Provider;
import org.jboss.ws.extensions.wsrm.spi.protocol.SequenceAcknowledgement;
+import java.util.List;
+
/**
* <b>SequenceAcknowledgement</b> object de/serializer
* @author richard.opalka(a)jboss.com
@@ -49,7 +62,75 @@
public static void deserialize(SequenceAcknowledgement object, Provider provider, SOAPMessage soapMessage)
throws ReliableMessagingException
{
- throw new NotImplementedException();
+ try
+ {
+ SOAPHeader soapHeader = soapMessage.getSOAPPart().getEnvelope().getHeader();
+ Constants wsrmConstants = provider.getConstants();
+
+ // read required wsrm:SequenceAcknowledgement element
+ QName sequenceAckQName = wsrmConstants.getSequenceAcknowledgementQName();
+ SOAPElement sequenceAckElement = getRequiredElement(soapHeader, sequenceAckQName, "soap header");
+
+ // read required wsrm:Identifier element
+ QName identifierQName = wsrmConstants.getIdentifierQName();
+ SOAPElement identifierElement = getRequiredElement(sequenceAckElement, identifierQName, sequenceAckQName);
+ String identifier = getRequiredTextContent(identifierElement, identifierQName);
+ object.setIdentifier(identifier);
+
+ // read optional wsrm:Final element
+ QName finalQName = wsrmConstants.getFinalQName();
+ SOAPElement finalElement = getOptionalElement(sequenceAckElement, finalQName, sequenceAckQName);
+ if (finalElement != null)
+ {
+ object.setFinal();
+ }
+
+ // read optional wsrm:None element
+ QName noneQName = wsrmConstants.getNoneQName();
+ SOAPElement noneElement = getOptionalElement(sequenceAckElement, noneQName, sequenceAckQName);
+ if (noneElement != null)
+ {
+ object.setNone();
+ }
+
+ // read optional wsrm:Nack elements
+ QName nackQName = wsrmConstants.getNackQName();
+ List<SOAPElement> nackElements = getOptionalElements(sequenceAckElement, nackQName, sequenceAckQName);
+ for (SOAPElement nackElement : nackElements)
+ {
+ String messageId = getRequiredTextContent(nackElement, nackQName);
+ object.addNack(stringToLong(messageId, "Unable to parse Nack element text content"));
+ }
+
+ // read optional wsrm:AcknowledgementRange elements
+ QName ackRangeQName = wsrmConstants.getAcknowledgementRangeQName();
+ List<SOAPElement> ackRangeElements = getOptionalElements(sequenceAckElement, ackRangeQName, sequenceAckQName);
+ if (ackRangeElements.size() != 0)
+ {
+ QName upperQName = wsrmConstants.getUpperQName();
+ QName lowerQName = wsrmConstants.getLowerQName();
+
+ for (SOAPElement ackRangeElement : ackRangeElements)
+ {
+ SequenceAcknowledgement.AcknowledgementRange ackRange = object.newAcknowledgementRange();
+
+ // read required wsrm:Upper attribute
+ String upper = getRequiredTextContent(ackRangeElement, upperQName, ackRangeQName);
+ ackRange.setUpper(stringToLong(upper, "Unable to parse Upper attribute text content"));
+
+ // read required wsrm:Lower attribute
+ String lower = getRequiredTextContent(ackRangeElement, lowerQName, ackRangeQName);
+ ackRange.setLower(stringToLong(lower, "Unable to parse Lower attribute text content"));
+
+ // set created acknowledgement range
+ object.addAcknowledgementRange(ackRange);
+ }
+ }
+ }
+ catch (SOAPException se)
+ {
+ throw new ReliableMessagingException("Unable to deserialize RM message", se);
+ }
}
/**
@@ -61,7 +142,70 @@
public static void serialize(SequenceAcknowledgement object, Provider provider, SOAPMessage soapMessage)
throws ReliableMessagingException
{
- throw new NotImplementedException();
+ try
+ {
+ SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope();
+ Constants wsrmConstants = provider.getConstants();
+
+ // Add xmlns:wsrm declaration
+ soapEnvelope.addNamespaceDeclaration(wsrmConstants.getPrefix(), wsrmConstants.getNamespaceURI());
+
+ // write required wsrm:SequenceAcknowledgement element
+ QName sequenceAckQName = wsrmConstants.getSequenceAcknowledgementQName();
+ SOAPElement sequenceAckElement = soapEnvelope.getHeader().addChildElement(sequenceAckQName);
+
+ // write required wsrm:Identifier element
+ QName identifierQName = wsrmConstants.getIdentifierQName();
+ sequenceAckElement.addChildElement(identifierQName).setValue(object.getIdentifier());
+
+ if (object.isFinal())
+ {
+ // write optional wsrm:Final element
+ QName finalQName = wsrmConstants.getFinalQName();
+ sequenceAckElement.addChildElement(finalQName);
+ }
+
+ if (object.isNone())
+ {
+ // write optional wsrm:None element
+ QName noneQName = wsrmConstants.getNoneQName();
+ sequenceAckElement.addChildElement(noneQName);
+ }
+
+ List<Long> nacks = object.getNacks();
+ if (nacks.size() != 0)
+ {
+ QName nackQName = wsrmConstants.getNackQName();
+
+ // write optional wsrm:Nack elements
+ for (Long messageId : nacks)
+ {
+ sequenceAckElement.addChildElement(nackQName).setValue(String.valueOf(messageId));
+ }
+ }
+
+ List<SequenceAcknowledgement.AcknowledgementRange> ackRanges = object.getAcknowledgementRanges();
+ if (ackRanges.size() != 0)
+ {
+ QName acknowledgementRangeQName = wsrmConstants.getAcknowledgementRangeQName();
+ QName upperQName = wsrmConstants.getUpperQName();
+ QName lowerQName = wsrmConstants.getLowerQName();
+
+ // write optional wsrm:AcknowledgementRange elements
+ for (SequenceAcknowledgement.AcknowledgementRange ackRange : ackRanges)
+ {
+ SOAPElement acknowledgementRangeElement = sequenceAckElement.addChildElement(acknowledgementRangeQName);
+ // write required wsrm:Lower attribute
+ acknowledgementRangeElement.addAttribute(lowerQName, String.valueOf(ackRange.getLower()));
+ // write required wsrm:Upper attribute
+ acknowledgementRangeElement.addAttribute(upperQName, String.valueOf(ackRange.getUpper()));
+ }
+ }
+ }
+ catch (SOAPException se)
+ {
+ throw new ReliableMessagingException("Unable to serialize RM message", se);
+ }
}
}
Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/SequenceSerializer.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/SequenceSerializer.java 2007-09-11 12:45:34 UTC (rev 4547)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/SequenceSerializer.java 2007-09-11 13:11:53 UTC (rev 4548)
@@ -21,6 +21,7 @@
*/
package org.jboss.ws.extensions.wsrm.common.serialization;
+import static org.jboss.ws.extensions.wsrm.common.serialization.SerializationHelper.stringToLong;
import static org.jboss.ws.extensions.wsrm.common.serialization.SerializationHelper.getOptionalElement;
import static org.jboss.ws.extensions.wsrm.common.serialization.SerializationHelper.getRequiredElement;
import static org.jboss.ws.extensions.wsrm.common.serialization.SerializationHelper.getRequiredTextContent;
@@ -63,29 +64,24 @@
SOAPHeader soapHeader = soapMessage.getSOAPPart().getEnvelope().getHeader();
Constants wsrmConstants = provider.getConstants();
- // read wsrm:Sequence
+ // read required wsrm:Sequence element
QName sequenceQName = wsrmConstants.getSequenceQName();
SOAPElement sequenceElement = getRequiredElement(soapHeader, sequenceQName, "soap header");
- // read wsrm:Identifier
+ // read required wsrm:Identifier element
QName identifierQName = wsrmConstants.getIdentifierQName();
SOAPElement identifierElement = getRequiredElement(sequenceElement, identifierQName, sequenceQName);
String identifier = getRequiredTextContent(identifierElement, identifierQName);
object.setIdentifier(identifier);
- // read wsrm:MessageNumber
+ // read required wsrm:MessageNumber element
QName messageNumberQName = wsrmConstants.getMessageNumberQName();
SOAPElement messageNumberElement = getRequiredElement(sequenceElement, messageNumberQName, sequenceQName);
- try
- {
- long messageNumber = Long.valueOf(getRequiredTextContent(messageNumberElement, messageNumberQName));
- object.setMessageNumber(messageNumber);
- } catch (NumberFormatException nfe)
- {
- throw new ReliableMessagingException("Unable to parse MessageNumber element text content", nfe);
- }
+ String messageNumberString = getRequiredTextContent(messageNumberElement, messageNumberQName);
+ long messageNumberValue = stringToLong(messageNumberString, "Unable to parse MessageNumber element text content");
+ object.setMessageNumber(messageNumberValue);
- // read wsrm:LastMessage
+ // read optional wsrm:LastMessage element
QName lastMessageQName = wsrmConstants.getLastMessageQName();
SOAPElement lastMessageElement = getOptionalElement(sequenceElement, lastMessageQName, sequenceQName);
if (lastMessageElement != null)
@@ -116,22 +112,22 @@
// Add xmlns:wsrm declaration
soapEnvelope.addNamespaceDeclaration(wsrmConstants.getPrefix(), wsrmConstants.getNamespaceURI());
- // write wsrm:Sequence
+ // write required wsrm:Sequence element
QName sequenceQName = wsrmConstants.getSequenceQName();
SOAPElement sequenceElement = soapEnvelope.getHeader().addChildElement(sequenceQName);
- // write wsrm:Identifier
+ // write required wsrm:Identifier element
QName identifierQName = wsrmConstants.getIdentifierQName();
sequenceElement.addChildElement(identifierQName).setValue(object.getIdentifier());
- // write wsrm:MessageNumber
+ // write required wsrm:MessageNumber element
QName messageNumberQName = wsrmConstants.getMessageNumberQName();
SOAPElement messageNumberElement = sequenceElement.addChildElement(messageNumberQName);
messageNumberElement.setValue(String.valueOf(object.getMessageNumber()));
if (object.isLastMessage())
{
- // write wsrm:LastMessage
+ // write optional wsrm:LastMessage element
QName lastMessageQName = wsrmConstants.getLastMessageQName();
sequenceElement.addChildElement(lastMessageQName);
}
Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/SerializationHelper.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/SerializationHelper.java 2007-09-11 12:45:34 UTC (rev 4547)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/SerializationHelper.java 2007-09-11 13:11:53 UTC (rev 4548)
@@ -21,6 +21,10 @@
*/
package org.jboss.ws.extensions.wsrm.common.serialization;
+import static org.jboss.ws.extensions.wsrm.common.serialization.SerializationHelper.getRequiredTextContent;
+
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import javax.xml.namespace.QName;
import org.jboss.ws.extensions.wsrm.ReliableMessagingException;
@@ -40,11 +44,11 @@
// no instances
}
- public static String getRequiredTextContent(SOAPElement element, QName nodeName)
+ public static String getRequiredTextContent(SOAPElement element, QName elementQName)
{
if (!DOMUtils.hasTextChildNodesOnly(element))
throw new ReliableMessagingException(
- "Only text content is allowed for element " + nodeName.getLocalPart());
+ "Only text content is allowed for element " + elementQName.getLocalPart());
return DOMUtils.getTextContent(element).trim();
}
@@ -87,11 +91,55 @@
return getOptionalElementFromList(list, optionalQName, contextQName);
}
- public static SOAPElement getOptionalElement(SOAPElement element, QName optionalQName, QName contextQName)
+ public static String getRequiredTextContent(SOAPElement element, QName attributeQName, QName elementQName)
{
- return (SOAPElement)getOptionalElement((Element)element, optionalQName, contextQName);
+ String attributeValue = element.getAttributeValue(attributeQName);
+
+ if (attributeValue == null)
+ throw new ReliableMessagingException(
+ "Required attribute " + attributeQName.getLocalPart() + " is missing in element " + elementQName.getLocalPart());
+
+ return attributeValue;
}
+ public static SOAPElement getOptionalElement(SOAPElement contextElement, QName optionalQName, QName contextQName)
+ {
+ return (SOAPElement)getOptionalElement((Element)contextElement, optionalQName, contextQName);
+ }
+
+ public static List<SOAPElement> getOptionalElements(SOAPElement contextElement, QName optionalQName, QName contextQName)
+ {
+ // TODO: optimize this method - do not create new list
+ List<Element> temp = DOMUtils.getChildElementsAsList(contextElement, optionalQName);
+ if (temp.size() == 0)
+ {
+ return Collections.emptyList();
+ }
+ else
+ {
+ List<SOAPElement> retVal = new ArrayList<SOAPElement>();
+
+ for (Element e : temp)
+ {
+ retVal.add((SOAPElement)e);
+ }
+
+ return retVal;
+ }
+ }
+
+ public static long stringToLong(String toEvaluate, String errorMessage) throws ReliableMessagingException
+ {
+ try
+ {
+ return Long.valueOf(toEvaluate);
+ }
+ catch (NumberFormatException nfe)
+ {
+ throw new ReliableMessagingException(errorMessage, nfe);
+ }
+ }
+
private static Element getOptionalElementFromList(List<Element> list, QName requiredQName, QName contextQName)
{
return getOptionalElementFromList(list, requiredQName.getLocalPart(), contextQName.getLocalPart());
Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/TerminateSequenceResponseSerializer.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/TerminateSequenceResponseSerializer.java 2007-09-11 12:45:34 UTC (rev 4547)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/TerminateSequenceResponseSerializer.java 2007-09-11 13:11:53 UTC (rev 4548)
@@ -62,11 +62,11 @@
SOAPBody soapBody = soapMessage.getSOAPPart().getEnvelope().getBody();
Constants wsrmConstants = provider.getConstants();
- // read wsrm:TerminateSequenceResponse
+ // read required wsrm:TerminateSequenceResponse element
QName terminateSequenceResponseQName = wsrmConstants.getTerminateSequenceResponseQName();
SOAPElement terminateSequenceResponseElement = getRequiredElement(soapBody, terminateSequenceResponseQName, "soap body");
- // read wsrm:Identifier
+ // read required wsrm:Identifier element
QName identifierQName = wsrmConstants.getIdentifierQName();
SOAPElement identifierElement = getRequiredElement(terminateSequenceResponseElement, identifierQName, terminateSequenceResponseQName);
String identifier = getRequiredTextContent(identifierElement, identifierQName);
@@ -95,11 +95,11 @@
// Add xmlns:wsrm declaration
soapEnvelope.addNamespaceDeclaration(wsrmConstants.getPrefix(), wsrmConstants.getNamespaceURI());
- // write wsrm:TerminateSequenceResponse
+ // write required wsrm:TerminateSequenceResponse element
QName terminateSequenceResponseQName = wsrmConstants.getTerminateSequenceResponseQName();
SOAPElement terminateSequenceResponseElement = soapEnvelope.getBody().addChildElement(terminateSequenceResponseQName);
- // write wsrm:Identifier
+ // write required wsrm:Identifier element
QName identifierQName = wsrmConstants.getIdentifierQName();
terminateSequenceResponseElement.addChildElement(identifierQName).setValue(object.getIdentifier());
}
Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/TerminateSequenceSerializer.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/TerminateSequenceSerializer.java 2007-09-11 12:45:34 UTC (rev 4547)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/TerminateSequenceSerializer.java 2007-09-11 13:11:53 UTC (rev 4548)
@@ -21,6 +21,7 @@
*/
package org.jboss.ws.extensions.wsrm.common.serialization;
+import static org.jboss.ws.extensions.wsrm.common.serialization.SerializationHelper.stringToLong;
import static org.jboss.ws.extensions.wsrm.common.serialization.SerializationHelper.getOptionalElement;
import static org.jboss.ws.extensions.wsrm.common.serialization.SerializationHelper.getRequiredElement;
import static org.jboss.ws.extensions.wsrm.common.serialization.SerializationHelper.getRequiredTextContent;
@@ -63,29 +64,24 @@
SOAPBody soapBody = soapMessage.getSOAPPart().getEnvelope().getBody();
Constants wsrmConstants = provider.getConstants();
- // read wsrm:TerminateSequence
+ // read required wsrm:TerminateSequence element
QName terminateSequenceQName = wsrmConstants.getTerminateSequenceQName();
SOAPElement terminateSequenceElement = getRequiredElement(soapBody, terminateSequenceQName, "soap body");
- // read wsrm:Identifier
+ // read required wsrm:Identifier element
QName identifierQName = wsrmConstants.getIdentifierQName();
SOAPElement identifierElement = getRequiredElement(terminateSequenceElement, identifierQName, terminateSequenceQName);
String identifier = getRequiredTextContent(identifierElement, identifierQName);
object.setIdentifier(identifier);
- // read wsrm:LastMsgNumber
+ // read optional wsrm:LastMsgNumber element
QName lastMsgNumberQName = wsrmConstants.getLastMsgNumberQName();
SOAPElement lastMsgNumberElement = getOptionalElement(terminateSequenceElement, lastMsgNumberQName, terminateSequenceQName);
if (lastMsgNumberElement != null)
{
- try
- {
- long lastMsgNumber = Long.valueOf(getRequiredTextContent(lastMsgNumberElement, lastMsgNumberQName));
- object.setLastMsgNumber(lastMsgNumber);
- } catch (NumberFormatException nfe)
- {
- throw new ReliableMessagingException("Unable to parse LastMsgNumber element text content", nfe);
- }
+ String lastMsgNumberString = getRequiredTextContent(lastMsgNumberElement, lastMsgNumberQName);
+ long lastMsgNumberValue = stringToLong(lastMsgNumberString, "Unable to parse LastMsgNumber element text content");
+ object.setLastMsgNumber(lastMsgNumberValue);
}
}
catch (SOAPException se)
@@ -111,17 +107,17 @@
// Add xmlns:wsrm declaration
soapEnvelope.addNamespaceDeclaration(wsrmConstants.getPrefix(), wsrmConstants.getNamespaceURI());
- // write wsrm:TerminateSequence
+ // write required wsrm:TerminateSequence element
QName terminateSequenceQName = wsrmConstants.getTerminateSequenceQName();
SOAPElement terminateSequenceElement = soapEnvelope.getBody().addChildElement(terminateSequenceQName);
- // write wsrm:Identifier
+ // write required wsrm:Identifier element
QName identifierQName = wsrmConstants.getIdentifierQName();
terminateSequenceElement.addChildElement(identifierQName).setValue(object.getIdentifier());
if (object.getLastMsgNumber() != 0)
{
- // write wsrm:LastMsgNumber
+ // write optional wsrm:LastMsgNumber element
QName lastMsgNumberQName = wsrmConstants.getLastMsgNumberQName();
SOAPElement lastMsgNumberElement = terminateSequenceElement.addChildElement(lastMsgNumberQName);
lastMsgNumberElement.setValue(String.valueOf(object.getLastMsgNumber()));
18 years, 3 months
- 1
- 0
JBossWS SVN: r4547 - in stack/native/trunk/src: test/java/org/jboss/test/ws/tools and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-09-11 08:45:34 -0400 (Tue, 11 Sep 2007)
New Revision: 4547
Added:
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1801/
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java
stack/native/trunk/src/test/resources/tools/jbws1801/
stack/native/trunk/src/test/resources/tools/jbws1801/doclit/
stack/native/trunk/src/test/resources/tools/jbws1801/doclit/Person.java
stack/native/trunk/src/test/resources/tools/jbws1801/doclit/PhoneBook.wsdl
stack/native/trunk/src/test/resources/tools/jbws1801/doclit/PhoneBook_PortType.java
stack/native/trunk/src/test/resources/tools/jbws1801/doclit/TelephoneNumber.java
stack/native/trunk/src/test/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml
stack/native/trunk/src/test/resources/tools/jbws1801/doclit/wstools-config.xml
Removed:
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java
stack/native/trunk/src/test/resources/tools/jbws1801/doclit/
stack/native/trunk/src/test/resources/tools/jbws1801/doclit/Person.java
stack/native/trunk/src/test/resources/tools/jbws1801/doclit/PhoneBook.wsdl
stack/native/trunk/src/test/resources/tools/jbws1801/doclit/PhoneBook_PortType.java
stack/native/trunk/src/test/resources/tools/jbws1801/doclit/TelephoneNumber.java
stack/native/trunk/src/test/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml
stack/native/trunk/src/test/resources/tools/jbws1801/doclit/wstools-config.xml
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
Log:
[JBWS-1801] WSDL To Java - When an array if returned from a method on the SEI it is incorrectly ommitted from the generated JAX-RPC mapping.
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 2007-09-11 12:15:25 UTC (rev 4546)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-09-11 12:45:34 UTC (rev 4547)
@@ -489,7 +489,8 @@
if (isDocStyle())
{
XSTypeDefinition xt = getXSType(input);
- addJavaXMLTypeMap(xt, input.getElement().getLocalPart(), "", "", jwm, !isWrapped());
+ // Don't unwrap the actual parameter.
+ addJavaXMLTypeMap(xt, input.getElement().getLocalPart(), "", "", jwm, false);
}
else
{
@@ -503,7 +504,8 @@
if (isDocStyle())
{
XSTypeDefinition xt = getXSType(output);
- addJavaXMLTypeMap(xt, output.getElement().getLocalPart(), "", "", jwm, !isWrapped());
+ // Don't unwrap the response type.
+ addJavaXMLTypeMap(xt, output.getElement().getLocalPart(), "", "", jwm, false);
}
else
{
@@ -704,7 +706,7 @@
}
}
- if ((skipWrapperArray && isRepresentsArray(xt)) == false)
+ if ((skipWrapperArray && SchemaUtils.isWrapperArrayType(xt)) == false)
{
jxtm = new JavaXmlTypeMapping(jwm);
String javaType;
@@ -900,40 +902,6 @@
}
/**
- * Checks whether the type represents an array type
- *
- * @param xst
- * @return true: type represents an array
- */
- private boolean isRepresentsArray(XSTypeDefinition xst)
- {
- boolean bool = false;
- if (xst instanceof XSComplexTypeDefinition)
- {
- XSComplexTypeDefinition xc = (XSComplexTypeDefinition)xst;
- if (xc.getContentType() == XSComplexTypeDefinition.CONTENTTYPE_EMPTY)
- return false;
- XSParticle xsp = xc.getParticle();
-
- if (xsp == null)
- return false;
-
- XSTerm xsterm = xsp.getTerm();
- if (xsterm instanceof XSModelGroup)
- {
- XSModelGroup xm = (XSModelGroup)xsterm;
- XSObjectList xo = xm.getParticles();
- if (xo.getLength() == 1)
- {
- XSParticle xp = (XSParticle)xo.item(0);
- bool = xp.getMaxOccursUnbounded() || xp.getMaxOccurs() > 1;
- }
- }
- }
- return bool;
- }
-
- /**
* Any custom decisions that need to be made will be done here
*
* @param javaType
Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1801 (from rev 4543, stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/tools/jbws1801)
Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java
===================================================================
--- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java 2007-09-11 12:08:30 UTC (rev 4543)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java 2007-09-11 12:45:34 UTC (rev 4547)
@@ -1,108 +0,0 @@
-/*
- * 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.jbws1801;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-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;
-
-/**
- * Test case to test the following fix: -
- *
- * @see http://jira.jboss.com/jira/browse/JBWS-1801
- *
- * WSDL To Java - When an array if returned from a method
- * on the SEI it is incorrectly ommitted from the generated
- * JAX-RPC mapping.
- *
- * @author darran.lofthouse(a)jboss.com
- * @since Sep 11, 2007
- */
-public class JBWS1801TestCase extends JBossWSTest
-{
-
- public void testDocumentLiteral() throws Exception
- {
- generateScenario("doclit");
- }
-
- protected void generateScenario(final String scenario) throws Exception
- {
- String resourceDir = "resources/tools/jbws1801/" + scenario;
- String toolsDir = "tools/jbws1801/" + scenario;
- String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
- new WSTools().generate(args);
- File resourceDirFile = new File(resourceDir);
- String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
- public boolean accept(File dir, String name)
- {
- return name.endsWith(".java");
- }
- });
-
- for (int i = 0; i < expectedFiles.length; i++)
- {
- String currentFile = expectedFiles[i];
-
- try
- {
- compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1801/" + currentFile);
- }
- catch (Exception e)
- {
- throw new Exception("Validation of '" + currentFile + "' failed.", e);
- }
- }
-
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1801");
- String[] generatedFiles = packageDir.list();
- for (int i = 0; i < generatedFiles.length; i++)
- {
- String currentFile = generatedFiles[i];
-
- boolean matched = "PhoneBookService.java".equals(currentFile);
-
- for (int j = 0; j < expectedFiles.length && (matched == false); j++)
- matched = currentFile.equals(expectedFiles[j]);
-
- assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
- }
-
- 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();
- }
-
-}
Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java (from rev 4543, stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java)
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java 2007-09-11 12:45:34 UTC (rev 4547)
@@ -0,0 +1,108 @@
+/*
+ * 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.jbws1801;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+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;
+
+/**
+ * Test case to test the following fix: -
+ *
+ * @see http://jira.jboss.com/jira/browse/JBWS-1801
+ *
+ * WSDL To Java - When an array if returned from a method
+ * on the SEI it is incorrectly ommitted from the generated
+ * JAX-RPC mapping.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since Sep 11, 2007
+ */
+public class JBWS1801TestCase extends JBossWSTest
+{
+
+ public void testDocumentLiteral() throws Exception
+ {
+ generateScenario("doclit");
+ }
+
+ protected void generateScenario(final String scenario) throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1801/" + scenario;
+ String toolsDir = "tools/jbws1801/" + scenario;
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+ new WSTools().generate(args);
+ File resourceDirFile = new File(resourceDir);
+ String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
+ public boolean accept(File dir, String name)
+ {
+ return name.endsWith(".java");
+ }
+ });
+
+ for (int i = 0; i < expectedFiles.length; i++)
+ {
+ String currentFile = expectedFiles[i];
+
+ try
+ {
+ compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1801/" + currentFile);
+ }
+ catch (Exception e)
+ {
+ throw new Exception("Validation of '" + currentFile + "' failed.", e);
+ }
+ }
+
+ File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1801");
+ String[] generatedFiles = packageDir.list();
+ for (int i = 0; i < generatedFiles.length; i++)
+ {
+ String currentFile = generatedFiles[i];
+
+ boolean matched = "PhoneBookService.java".equals(currentFile);
+
+ for (int j = 0; j < expectedFiles.length && (matched == false); j++)
+ matched = currentFile.equals(expectedFiles[j]);
+
+ assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
+ }
+
+ 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();
+ }
+
+}
Copied: stack/native/trunk/src/test/resources/tools/jbws1801 (from rev 4543, stack/native/branches/native-2.0/src/test/resources/tools/jbws1801)
Copied: stack/native/trunk/src/test/resources/tools/jbws1801/doclit (from rev 4543, stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit)
Deleted: stack/native/trunk/src/test/resources/tools/jbws1801/doclit/Person.java
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/Person.java 2007-09-11 12:08:30 UTC (rev 4543)
+++ stack/native/trunk/src/test/resources/tools/jbws1801/doclit/Person.java 2007-09-11 12:45:34 UTC (rev 4547)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue Sep 11 12:13:54 BST 2007
- *
- * 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.jbws1801;
-
-
-public class Person
-{
-
-protected java.lang.String[] surname;
-public Person(){}
-
-public Person(java.lang.String[] surname){
-this.surname=surname;
-}
-public java.lang.String[] getSurname() { return surname ;}
-
-public void setSurname(java.lang.String[] surname){ this.surname=surname; }
-
-}
Copied: stack/native/trunk/src/test/resources/tools/jbws1801/doclit/Person.java (from rev 4543, stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/Person.java)
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1801/doclit/Person.java (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1801/doclit/Person.java 2007-09-11 12:45:34 UTC (rev 4547)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue Sep 11 12:13:54 BST 2007
+ *
+ * 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.jbws1801;
+
+
+public class Person
+{
+
+protected java.lang.String[] surname;
+public Person(){}
+
+public Person(java.lang.String[] surname){
+this.surname=surname;
+}
+public java.lang.String[] getSurname() { return surname ;}
+
+public void setSurname(java.lang.String[] surname){ this.surname=surname; }
+
+}
Deleted: stack/native/trunk/src/test/resources/tools/jbws1801/doclit/PhoneBook.wsdl
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/PhoneBook.wsdl 2007-09-11 12:08:30 UTC (rev 4543)
+++ stack/native/trunk/src/test/resources/tools/jbws1801/doclit/PhoneBook.wsdl 2007-09-11 12:45:34 UTC (rev 4547)
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook'
- targetNamespace='http://test.jboss.org/ws/jbws1801'
- xmlns='http://schemas.xmlsoap.org/wsdl/'
- xmlns:ns1='http://test.jboss.org/ws/jbws1801/types'
- xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
- xmlns:tns='http://test.jboss.org/ws/jbws1801'
- xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1801/types'
- xmlns='http://www.w3.org/2001/XMLSchema'
- xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
- xmlns:tns='http://test.jboss.org/ws/jbws1801/types'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
- <complexType name='Person'>
- <sequence>
- <element maxOccurs="unbounded" minOccurs="0" name="surname" nillable="true" type="string"/>
- </sequence>
- </complexType>
-
- <complexType name='TelephoneNumber'>
- <sequence>
- <element maxOccurs="unbounded" minOccurs="0" name="number" nillable="true" type="string"/>
- </sequence>
- </complexType>
-
- <element name='lookup' type='tns:Person'/>
- <element name='lookupResponse' type='tns:TelephoneNumber'/>
-
- </schema>
- </types>
-
- <message name='PhoneBook_lookup'>
- <part element='ns1:lookup' name='parameters'/>
- </message>
-
- <message name='PhoneBook_lookupResponse'>
- <part element='ns1:lookupResponse' name='result'/>
- </message>
-
- <portType name='PhoneBook'>
- <operation name='lookup'>
- <input message='tns:PhoneBook_lookup'/>
- <output message='tns:PhoneBook_lookupResponse'/>
- </operation>
- </portType>
-
- <binding name='PhoneBookBinding' type='tns:PhoneBook'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='lookup'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal' parts='parameters'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- </binding>
-
- <service name='PhoneBook'>
- <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-
-</definitions>
\ No newline at end of file
Copied: stack/native/trunk/src/test/resources/tools/jbws1801/doclit/PhoneBook.wsdl (from rev 4543, stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/PhoneBook.wsdl)
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1801/doclit/PhoneBook.wsdl (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1801/doclit/PhoneBook.wsdl 2007-09-11 12:45:34 UTC (rev 4547)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook'
+ targetNamespace='http://test.jboss.org/ws/jbws1801'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws1801/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1801'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1801/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1801/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element maxOccurs="unbounded" minOccurs="0" name="surname" nillable="true" type="string"/>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element maxOccurs="unbounded" minOccurs="0" name="number" nillable="true" type="string"/>
+ </sequence>
+ </complexType>
+
+ <element name='lookup' type='tns:Person'/>
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ </message>
+
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ </message>
+
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal' parts='parameters'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+
+</definitions>
\ No newline at end of file
Deleted: stack/native/trunk/src/test/resources/tools/jbws1801/doclit/PhoneBook_PortType.java
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/PhoneBook_PortType.java 2007-09-11 12:08:30 UTC (rev 4543)
+++ stack/native/trunk/src/test/resources/tools/jbws1801/doclit/PhoneBook_PortType.java 2007-09-11 12:45:34 UTC (rev 4547)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue Sep 11 12:13:54 BST 2007
- *
- * 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.jbws1801;
-public interface PhoneBook_PortType extends java.rmi.Remote
-{
-
- public org.jboss.test.ws.jbws1801.TelephoneNumber lookup(org.jboss.test.ws.jbws1801.Person lookup) throws java.rmi.RemoteException;
-}
Copied: stack/native/trunk/src/test/resources/tools/jbws1801/doclit/PhoneBook_PortType.java (from rev 4543, stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/PhoneBook_PortType.java)
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1801/doclit/PhoneBook_PortType.java (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1801/doclit/PhoneBook_PortType.java 2007-09-11 12:45:34 UTC (rev 4547)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue Sep 11 12:13:54 BST 2007
+ *
+ * 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.jbws1801;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public org.jboss.test.ws.jbws1801.TelephoneNumber lookup(org.jboss.test.ws.jbws1801.Person lookup) throws java.rmi.RemoteException;
+}
Deleted: stack/native/trunk/src/test/resources/tools/jbws1801/doclit/TelephoneNumber.java
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/TelephoneNumber.java 2007-09-11 12:08:30 UTC (rev 4543)
+++ stack/native/trunk/src/test/resources/tools/jbws1801/doclit/TelephoneNumber.java 2007-09-11 12:45:34 UTC (rev 4547)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue Sep 11 12:13:54 BST 2007
- *
- * 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.jbws1801;
-
-
-public class TelephoneNumber
-{
-
-protected java.lang.String[] number;
-public TelephoneNumber(){}
-
-public TelephoneNumber(java.lang.String[] number){
-this.number=number;
-}
-public java.lang.String[] getNumber() { return number ;}
-
-public void setNumber(java.lang.String[] number){ this.number=number; }
-
-}
Copied: stack/native/trunk/src/test/resources/tools/jbws1801/doclit/TelephoneNumber.java (from rev 4543, stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/TelephoneNumber.java)
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1801/doclit/TelephoneNumber.java (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1801/doclit/TelephoneNumber.java 2007-09-11 12:45:34 UTC (rev 4547)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue Sep 11 12:13:54 BST 2007
+ *
+ * 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.jbws1801;
+
+
+public class TelephoneNumber
+{
+
+protected java.lang.String[] number;
+public TelephoneNumber(){}
+
+public TelephoneNumber(java.lang.String[] number){
+this.number=number;
+}
+public java.lang.String[] getNumber() { return number ;}
+
+public void setNumber(java.lang.String[] number){ this.number=number; }
+
+}
Deleted: stack/native/trunk/src/test/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml 2007-09-11 12:08:30 UTC (rev 4543)
+++ stack/native/trunk/src/test/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml 2007-09-11 12:45:34 UTC (rev 4547)
@@ -1,59 +0,0 @@
-<?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>org.jboss.test.ws.jbws1801</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1801/types</namespaceURI>
- </package-mapping>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1801</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1801</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1801.Person</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1801/types'>typeNS:Person</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>surname</java-variable-name>
- <xml-element-name>surname</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1801.TelephoneNumber</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1801/types'>typeNS:TelephoneNumber</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>number</java-variable-name>
- <xml-element-name>number</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1801.PhoneBook_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1801'>serviceNS:PhoneBook</wsdl-service-name>
- <port-mapping>
- <port-name>PhoneBookPort</port-name>
- <java-port-name>PhoneBookPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jbws1801.PhoneBook_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1801'>portTypeNS:PhoneBook</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1801'>bindingNS:PhoneBookBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>lookup</java-method-name>
- <wsdl-operation>lookup</wsdl-operation>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>org.jboss.test.ws.jbws1801.Person</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1801'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
- <wsdl-message-part-name>parameters</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jbws1801.TelephoneNumber</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1801'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Copied: stack/native/trunk/src/test/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml (from rev 4543, stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml)
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml 2007-09-11 12:45:34 UTC (rev 4547)
@@ -0,0 +1,59 @@
+<?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>org.jboss.test.ws.jbws1801</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1801/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1801</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1801</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1801.Person</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1801/types'>typeNS:Person</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1801.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1801/types'>typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1801.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1801'>serviceNS:PhoneBook</wsdl-service-name>
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1801.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1801'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1801'>bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws1801.Person</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1801'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>parameters</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws1801.TelephoneNumber</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1801'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Deleted: stack/native/trunk/src/test/resources/tools/jbws1801/doclit/wstools-config.xml
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/wstools-config.xml 2007-09-11 12:08:30 UTC (rev 4543)
+++ stack/native/trunk/src/test/resources/tools/jbws1801/doclit/wstools-config.xml 2007-09-11 12:45:34 UTC (rev 4547)
@@ -1,6 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws1801/doclit/PhoneBook.wsdl"
- parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: stack/native/trunk/src/test/resources/tools/jbws1801/doclit/wstools-config.xml (from rev 4543, stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/wstools-config.xml)
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1801/doclit/wstools-config.xml (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1801/doclit/wstools-config.xml 2007-09-11 12:45:34 UTC (rev 4547)
@@ -0,0 +1,6 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1801/doclit/PhoneBook.wsdl"
+ parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
18 years, 3 months
- 1
- 0
JBossWS SVN: r4546 - legacy/branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-09-11 08:15:25 -0400 (Tue, 11 Sep 2007)
New Revision: 4546
Removed:
legacy/branches/dlofthouse/JBWS-1801/
Log:
No longer required.
18 years, 3 months
- 1
- 0
JBossWS SVN: r4545 - stack/native/branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-09-11 08:15:10 -0400 (Tue, 11 Sep 2007)
New Revision: 4545
Removed:
stack/native/branches/dlofthouse/JBWS-1801/
Log:
No longer required.
18 years, 3 months
- 1
- 0
JBossWS SVN: r4544 - stack/native/branches/native-2.0.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-09-11 08:10:49 -0400 (Tue, 11 Sep 2007)
New Revision: 4544
Modified:
stack/native/branches/native-2.0/mergeinfo.txt
Log:
[JBWS-1801] WSDL To Java - When an array if returned from a method on the SEI it is incorrectly ommitted from the generated JAX-RPC mapping.
Modified: stack/native/branches/native-2.0/mergeinfo.txt
===================================================================
--- stack/native/branches/native-2.0/mergeinfo.txt 2007-09-11 12:08:30 UTC (rev 4543)
+++ stack/native/branches/native-2.0/mergeinfo.txt 2007-09-11 12:10:49 UTC (rev 4544)
@@ -50,3 +50,6 @@
darran.lofthouse(a)jboss.com 23-August-2007
svn merge -r4489:4490 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
+
+darran.lofthouse(a)jboss.com 11-September-2007
+svn merge -r4542:4543 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
18 years, 3 months
- 1
- 0
JBossWS SVN: r4543 - in stack/native/branches/native-2.0/src: test/java/org/jboss/test/ws/tools and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-09-11 08:08:30 -0400 (Tue, 11 Sep 2007)
New Revision: 4543
Added:
stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/tools/jbws1801/
stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java
stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/
stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/
stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/Person.java
stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/PhoneBook.wsdl
stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/PhoneBook_PortType.java
stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/TelephoneNumber.java
stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml
stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/wstools-config.xml
Removed:
stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java
stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/
stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/Person.java
stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/PhoneBook.wsdl
stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/PhoneBook_PortType.java
stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/TelephoneNumber.java
stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml
stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/wstools-config.xml
Modified:
stack/native/branches/native-2.0/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
Log:
[JBWS-1801] WSDL To Java - When an array if returned from a method on the SEI it is incorrectly ommitted from the generated JAX-RPC mapping.
Modified: stack/native/branches/native-2.0/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- stack/native/branches/native-2.0/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-09-11 11:59:59 UTC (rev 4542)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-09-11 12:08:30 UTC (rev 4543)
@@ -489,7 +489,8 @@
if (isDocStyle())
{
XSTypeDefinition xt = getXSType(input);
- addJavaXMLTypeMap(xt, input.getElement().getLocalPart(), "", "", jwm, !isWrapped());
+ // Don't unwrap the actual parameter.
+ addJavaXMLTypeMap(xt, input.getElement().getLocalPart(), "", "", jwm, false);
}
else
{
@@ -503,7 +504,8 @@
if (isDocStyle())
{
XSTypeDefinition xt = getXSType(output);
- addJavaXMLTypeMap(xt, output.getElement().getLocalPart(), "", "", jwm, !isWrapped());
+ // Don't unwrap the response type.
+ addJavaXMLTypeMap(xt, output.getElement().getLocalPart(), "", "", jwm, false);
}
else
{
@@ -704,7 +706,7 @@
}
}
- if ((skipWrapperArray && isRepresentsArray(xt)) == false)
+ if ((skipWrapperArray && SchemaUtils.isWrapperArrayType(xt)) == false)
{
jxtm = new JavaXmlTypeMapping(jwm);
String javaType;
@@ -900,40 +902,6 @@
}
/**
- * Checks whether the type represents an array type
- *
- * @param xst
- * @return true: type represents an array
- */
- private boolean isRepresentsArray(XSTypeDefinition xst)
- {
- boolean bool = false;
- if (xst instanceof XSComplexTypeDefinition)
- {
- XSComplexTypeDefinition xc = (XSComplexTypeDefinition)xst;
- if (xc.getContentType() == XSComplexTypeDefinition.CONTENTTYPE_EMPTY)
- return false;
- XSParticle xsp = xc.getParticle();
-
- if (xsp == null)
- return false;
-
- XSTerm xsterm = xsp.getTerm();
- if (xsterm instanceof XSModelGroup)
- {
- XSModelGroup xm = (XSModelGroup)xsterm;
- XSObjectList xo = xm.getParticles();
- if (xo.getLength() == 1)
- {
- XSParticle xp = (XSParticle)xo.item(0);
- bool = xp.getMaxOccursUnbounded() || xp.getMaxOccurs() > 1;
- }
- }
- }
- return bool;
- }
-
- /**
* Any custom decisions that need to be made will be done here
*
* @param javaType
Copied: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/tools/jbws1801 (from rev 4542, stack/native/branches/dlofthouse/JBWS-1801/src/test/java/org/jboss/test/ws/tools/jbws1801)
Deleted: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1801/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java 2007-09-11 11:59:59 UTC (rev 4542)
+++ stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java 2007-09-11 12:08:30 UTC (rev 4543)
@@ -1,108 +0,0 @@
-/*
- * 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.jbws1801;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-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;
-
-/**
- * Test case to test the following fix: -
- *
- * @see http://jira.jboss.com/jira/browse/JBWS-1801
- *
- * WSDL To Java - When an array if returned from a method
- * on the SEI it is incorrectly ommitted from the generated
- * JAX-RPC mapping.
- *
- * @author darran.lofthouse(a)jboss.com
- * @since Sep 11, 2007
- */
-public class JBWS1801TestCase extends JBossWSTest
-{
-
- public void testDocumentLiteral() throws Exception
- {
- generateScenario("doclit");
- }
-
- protected void generateScenario(final String scenario) throws Exception
- {
- String resourceDir = "resources/tools/jbws1801/" + scenario;
- String toolsDir = "tools/jbws1801/" + scenario;
- String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
- new WSTools().generate(args);
- File resourceDirFile = new File(resourceDir);
- String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
- public boolean accept(File dir, String name)
- {
- return name.endsWith(".java");
- }
- });
-
- for (int i = 0; i < expectedFiles.length; i++)
- {
- String currentFile = expectedFiles[i];
-
- try
- {
- compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1801/" + currentFile);
- }
- catch (Exception e)
- {
- throw new Exception("Validation of '" + currentFile + "' failed.", e);
- }
- }
-
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1801");
- String[] generatedFiles = packageDir.list();
- for (int i = 0; i < generatedFiles.length; i++)
- {
- String currentFile = generatedFiles[i];
-
- boolean matched = "PhoneBookService.java".equals(currentFile);
-
- for (int j = 0; j < expectedFiles.length && (matched == false); j++)
- matched = currentFile.equals(expectedFiles[j]);
-
- assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
- }
-
- 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();
- }
-
-}
Copied: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java (from rev 4542, stack/native/branches/dlofthouse/JBWS-1801/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java)
===================================================================
--- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java (rev 0)
+++ stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java 2007-09-11 12:08:30 UTC (rev 4543)
@@ -0,0 +1,108 @@
+/*
+ * 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.jbws1801;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+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;
+
+/**
+ * Test case to test the following fix: -
+ *
+ * @see http://jira.jboss.com/jira/browse/JBWS-1801
+ *
+ * WSDL To Java - When an array if returned from a method
+ * on the SEI it is incorrectly ommitted from the generated
+ * JAX-RPC mapping.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since Sep 11, 2007
+ */
+public class JBWS1801TestCase extends JBossWSTest
+{
+
+ public void testDocumentLiteral() throws Exception
+ {
+ generateScenario("doclit");
+ }
+
+ protected void generateScenario(final String scenario) throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1801/" + scenario;
+ String toolsDir = "tools/jbws1801/" + scenario;
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+ new WSTools().generate(args);
+ File resourceDirFile = new File(resourceDir);
+ String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
+ public boolean accept(File dir, String name)
+ {
+ return name.endsWith(".java");
+ }
+ });
+
+ for (int i = 0; i < expectedFiles.length; i++)
+ {
+ String currentFile = expectedFiles[i];
+
+ try
+ {
+ compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1801/" + currentFile);
+ }
+ catch (Exception e)
+ {
+ throw new Exception("Validation of '" + currentFile + "' failed.", e);
+ }
+ }
+
+ File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1801");
+ String[] generatedFiles = packageDir.list();
+ for (int i = 0; i < generatedFiles.length; i++)
+ {
+ String currentFile = generatedFiles[i];
+
+ boolean matched = "PhoneBookService.java".equals(currentFile);
+
+ for (int j = 0; j < expectedFiles.length && (matched == false); j++)
+ matched = currentFile.equals(expectedFiles[j]);
+
+ assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
+ }
+
+ 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();
+ }
+
+}
Copied: stack/native/branches/native-2.0/src/test/resources/tools/jbws1801 (from rev 4542, stack/native/branches/dlofthouse/JBWS-1801/src/test/resources/tools/jbws1801)
Copied: stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit (from rev 4542, stack/native/branches/dlofthouse/JBWS-1801/src/test/resources/tools/jbws1801/doclit)
Deleted: stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/Person.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1801/src/test/resources/tools/jbws1801/doclit/Person.java 2007-09-11 11:59:59 UTC (rev 4542)
+++ stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/Person.java 2007-09-11 12:08:30 UTC (rev 4543)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue Sep 11 12:13:54 BST 2007
- *
- * 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.jbws1801;
-
-
-public class Person
-{
-
-protected java.lang.String[] surname;
-public Person(){}
-
-public Person(java.lang.String[] surname){
-this.surname=surname;
-}
-public java.lang.String[] getSurname() { return surname ;}
-
-public void setSurname(java.lang.String[] surname){ this.surname=surname; }
-
-}
Copied: stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/Person.java (from rev 4542, stack/native/branches/dlofthouse/JBWS-1801/src/test/resources/tools/jbws1801/doclit/Person.java)
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/Person.java (rev 0)
+++ stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/Person.java 2007-09-11 12:08:30 UTC (rev 4543)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue Sep 11 12:13:54 BST 2007
+ *
+ * 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.jbws1801;
+
+
+public class Person
+{
+
+protected java.lang.String[] surname;
+public Person(){}
+
+public Person(java.lang.String[] surname){
+this.surname=surname;
+}
+public java.lang.String[] getSurname() { return surname ;}
+
+public void setSurname(java.lang.String[] surname){ this.surname=surname; }
+
+}
Deleted: stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/PhoneBook.wsdl
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1801/src/test/resources/tools/jbws1801/doclit/PhoneBook.wsdl 2007-09-11 11:59:59 UTC (rev 4542)
+++ stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/PhoneBook.wsdl 2007-09-11 12:08:30 UTC (rev 4543)
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook'
- targetNamespace='http://test.jboss.org/ws/jbws1801'
- xmlns='http://schemas.xmlsoap.org/wsdl/'
- xmlns:ns1='http://test.jboss.org/ws/jbws1801/types'
- xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
- xmlns:tns='http://test.jboss.org/ws/jbws1801'
- xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1801/types'
- xmlns='http://www.w3.org/2001/XMLSchema'
- xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
- xmlns:tns='http://test.jboss.org/ws/jbws1801/types'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
- <complexType name='Person'>
- <sequence>
- <element maxOccurs="unbounded" minOccurs="0" name="surname" nillable="true" type="string"/>
- </sequence>
- </complexType>
-
- <complexType name='TelephoneNumber'>
- <sequence>
- <element maxOccurs="unbounded" minOccurs="0" name="number" nillable="true" type="string"/>
- </sequence>
- </complexType>
-
- <element name='lookup' type='tns:Person'/>
- <element name='lookupResponse' type='tns:TelephoneNumber'/>
-
- </schema>
- </types>
-
- <message name='PhoneBook_lookup'>
- <part element='ns1:lookup' name='parameters'/>
- </message>
-
- <message name='PhoneBook_lookupResponse'>
- <part element='ns1:lookupResponse' name='result'/>
- </message>
-
- <portType name='PhoneBook'>
- <operation name='lookup'>
- <input message='tns:PhoneBook_lookup'/>
- <output message='tns:PhoneBook_lookupResponse'/>
- </operation>
- </portType>
-
- <binding name='PhoneBookBinding' type='tns:PhoneBook'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='lookup'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal' parts='parameters'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- </binding>
-
- <service name='PhoneBook'>
- <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-
-</definitions>
\ No newline at end of file
Copied: stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/PhoneBook.wsdl (from rev 4542, stack/native/branches/dlofthouse/JBWS-1801/src/test/resources/tools/jbws1801/doclit/PhoneBook.wsdl)
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/PhoneBook.wsdl (rev 0)
+++ stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/PhoneBook.wsdl 2007-09-11 12:08:30 UTC (rev 4543)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook'
+ targetNamespace='http://test.jboss.org/ws/jbws1801'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws1801/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1801'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1801/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1801/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element maxOccurs="unbounded" minOccurs="0" name="surname" nillable="true" type="string"/>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element maxOccurs="unbounded" minOccurs="0" name="number" nillable="true" type="string"/>
+ </sequence>
+ </complexType>
+
+ <element name='lookup' type='tns:Person'/>
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ </message>
+
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ </message>
+
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal' parts='parameters'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+
+</definitions>
\ No newline at end of file
Deleted: stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/PhoneBook_PortType.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1801/src/test/resources/tools/jbws1801/doclit/PhoneBook_PortType.java 2007-09-11 11:59:59 UTC (rev 4542)
+++ stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/PhoneBook_PortType.java 2007-09-11 12:08:30 UTC (rev 4543)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue Sep 11 12:13:54 BST 2007
- *
- * 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.jbws1801;
-public interface PhoneBook_PortType extends java.rmi.Remote
-{
-
- public org.jboss.test.ws.jbws1801.TelephoneNumber lookup(org.jboss.test.ws.jbws1801.Person lookup) throws java.rmi.RemoteException;
-}
Copied: stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/PhoneBook_PortType.java (from rev 4542, stack/native/branches/dlofthouse/JBWS-1801/src/test/resources/tools/jbws1801/doclit/PhoneBook_PortType.java)
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/PhoneBook_PortType.java (rev 0)
+++ stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/PhoneBook_PortType.java 2007-09-11 12:08:30 UTC (rev 4543)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue Sep 11 12:13:54 BST 2007
+ *
+ * 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.jbws1801;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public org.jboss.test.ws.jbws1801.TelephoneNumber lookup(org.jboss.test.ws.jbws1801.Person lookup) throws java.rmi.RemoteException;
+}
Deleted: stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/TelephoneNumber.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1801/src/test/resources/tools/jbws1801/doclit/TelephoneNumber.java 2007-09-11 11:59:59 UTC (rev 4542)
+++ stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/TelephoneNumber.java 2007-09-11 12:08:30 UTC (rev 4543)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue Sep 11 12:13:54 BST 2007
- *
- * 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.jbws1801;
-
-
-public class TelephoneNumber
-{
-
-protected java.lang.String[] number;
-public TelephoneNumber(){}
-
-public TelephoneNumber(java.lang.String[] number){
-this.number=number;
-}
-public java.lang.String[] getNumber() { return number ;}
-
-public void setNumber(java.lang.String[] number){ this.number=number; }
-
-}
Copied: stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/TelephoneNumber.java (from rev 4542, stack/native/branches/dlofthouse/JBWS-1801/src/test/resources/tools/jbws1801/doclit/TelephoneNumber.java)
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/TelephoneNumber.java (rev 0)
+++ stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/TelephoneNumber.java 2007-09-11 12:08:30 UTC (rev 4543)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue Sep 11 12:13:54 BST 2007
+ *
+ * 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.jbws1801;
+
+
+public class TelephoneNumber
+{
+
+protected java.lang.String[] number;
+public TelephoneNumber(){}
+
+public TelephoneNumber(java.lang.String[] number){
+this.number=number;
+}
+public java.lang.String[] getNumber() { return number ;}
+
+public void setNumber(java.lang.String[] number){ this.number=number; }
+
+}
Deleted: stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1801/src/test/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml 2007-09-11 11:59:59 UTC (rev 4542)
+++ stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml 2007-09-11 12:08:30 UTC (rev 4543)
@@ -1,59 +0,0 @@
-<?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>org.jboss.test.ws.jbws1801</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1801/types</namespaceURI>
- </package-mapping>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1801</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1801</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1801.Person</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1801/types'>typeNS:Person</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>surname</java-variable-name>
- <xml-element-name>surname</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1801.TelephoneNumber</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1801/types'>typeNS:TelephoneNumber</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>number</java-variable-name>
- <xml-element-name>number</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1801.PhoneBook_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1801'>serviceNS:PhoneBook</wsdl-service-name>
- <port-mapping>
- <port-name>PhoneBookPort</port-name>
- <java-port-name>PhoneBookPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jbws1801.PhoneBook_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1801'>portTypeNS:PhoneBook</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1801'>bindingNS:PhoneBookBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>lookup</java-method-name>
- <wsdl-operation>lookup</wsdl-operation>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>org.jboss.test.ws.jbws1801.Person</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1801'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
- <wsdl-message-part-name>parameters</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jbws1801.TelephoneNumber</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1801'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Copied: stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml (from rev 4542, stack/native/branches/dlofthouse/JBWS-1801/src/test/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml)
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml (rev 0)
+++ stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml 2007-09-11 12:08:30 UTC (rev 4543)
@@ -0,0 +1,59 @@
+<?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>org.jboss.test.ws.jbws1801</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1801/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1801</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1801</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1801.Person</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1801/types'>typeNS:Person</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1801.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1801/types'>typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1801.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1801'>serviceNS:PhoneBook</wsdl-service-name>
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1801.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1801'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1801'>bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws1801.Person</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1801'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>parameters</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws1801.TelephoneNumber</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1801'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Deleted: stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/wstools-config.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1801/src/test/resources/tools/jbws1801/doclit/wstools-config.xml 2007-09-11 11:59:59 UTC (rev 4542)
+++ stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/wstools-config.xml 2007-09-11 12:08:30 UTC (rev 4543)
@@ -1,6 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws1801/doclit/PhoneBook.wsdl"
- parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/wstools-config.xml (from rev 4542, stack/native/branches/dlofthouse/JBWS-1801/src/test/resources/tools/jbws1801/doclit/wstools-config.xml)
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/wstools-config.xml (rev 0)
+++ stack/native/branches/native-2.0/src/test/resources/tools/jbws1801/doclit/wstools-config.xml 2007-09-11 12:08:30 UTC (rev 4543)
@@ -0,0 +1,6 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1801/doclit/PhoneBook.wsdl"
+ parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
18 years, 3 months
- 1
- 0