JBossWS SVN: r3468 - branches/jbossws-2.0.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-06-06 08:30:00 -0400 (Wed, 06 Jun 2007)
New Revision: 3468
Modified:
branches/jbossws-2.0/mergeinfo.txt
Log:
Added merge for JBWS-1697
Modified: branches/jbossws-2.0/mergeinfo.txt
===================================================================
--- branches/jbossws-2.0/mergeinfo.txt 2007-06-06 12:29:35 UTC (rev 3467)
+++ branches/jbossws-2.0/mergeinfo.txt 2007-06-06 12:30:00 UTC (rev 3468)
@@ -11,4 +11,6 @@
darran.lofthouse(a)jboss.com 05-Jun-2007
svn merge -r 3450:3451 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0 .
+darran.lofthouse(a)jboss.com 06-Jun-2007
+svn merge -r 3465:3466 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0 .
18 years, 10 months
- 1
- 0
JBossWS SVN: r3467 - in trunk/jbossws-core/src: main/java/org/jboss/ws/tools/helpers and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-06-06 08:29:35 -0400 (Wed, 06 Jun 2007)
New Revision: 3467
Added:
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java
trunk/jbossws-core/src/test/resources/tools/jbws1697/
trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/
trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl
trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java
trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml
trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/wstools-config.xml
trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/
trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl
trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java
trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml
trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/wstools-config.xml
Removed:
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java
trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/
trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl
trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java
trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml
trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/wstools-config.xml
trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/
trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl
trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java
trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml
trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/wstools-config.xml
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
Log:
JBWS-1697 - WSDL To Java - Incorrect handling of Simple types derived by restriction for holders.
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-06-06 11:07:27 UTC (rev 3466)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-06-06 12:29:35 UTC (rev 3467)
@@ -441,7 +441,10 @@
XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI());
XSTypeDefinition xt = xe.getTypeDefinition();
QName xmlType = new QName(xt.getNamespace(), xt.getName());
-
+
+ // Replace the xt with the real type from the schema.
+ xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI());
+
if (buf.length() > 0)
{
buf.append(", ");
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-06-06 11:07:27 UTC (rev 3466)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-06-06 12:29:35 UTC (rev 3467)
@@ -373,6 +373,11 @@
XSTypeDefinition xt = xe.getTypeDefinition();
QName xmlType = new QName(xt.getNamespace(), xt.getName());
+ // Replace the xt with the real type from the schema.
+ xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI());
+ if (xt instanceof XSSimpleTypeDefinition)
+ xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt);
+
String partName = header.getPartName();
MethodParamPartsMapping mpin = getMethodParamPartsMapping(semm, elementName, xmlType, paramPosition, wsdlMessageName, mode, partName, false, true);
@@ -460,11 +465,11 @@
wrvm.setWsdlMessagePartName(partName);
semm.setWsdlReturnValueMapping(wrvm);
}
-
+
if (bindingOperation != null)
{
constructHeaderParameters(semm, wiop, bindingOperation);
- }
+ }
}
public void constructJavaXmlTypeMapping(JavaWsdlMapping jwm)
Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697 (from rev 3466, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697)
Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java 2007-06-06 11:07:27 UTC (rev 3466)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java 2007-06-06 12:29:35 UTC (rev 3467)
@@ -1,121 +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.jbws1697;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-import org.jboss.test.ws.tools.WSToolsTest;
-import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
-import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
-import org.jboss.ws.tools.WSTools;
-
-/**
- * Test case for http://jira.jboss.com/jira/browse/JBWS-1697
- *
- * WSDL to Java, handling of holders for simple types defined by restriction.
- *
- * @author darran.lofthouse(a)jboss.com
- * @since Jun 6, 2007
- */
-public class JBWS1697TestCase extends WSToolsTest
-{
-
- /**
- * Test WSDL to Java with the a document/literal endpoint
- * where the message part is the same for both the input
- * and output message.
- *
- */
- public void testGenerateDocLitInOut() throws Exception
- {
- generateScenario("doclit_inout");
- }
-
- /**
- * Test WSDL to Java with a rpc/literal endpoint
- * where a matching message part is in the request
- * and response messages.
- *
- */
- public void testGenerateRpcLitInOut() throws Exception
- {
- generateScenario("rpclit_inout");
- }
-
- protected void generateScenario(final String scenario) throws Exception
- {
- String resourceDir = "resources/tools/jbws1697/" + scenario;
- String toolsDir = "tools/jbws1697/" + 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/jbws1697/" + currentFile);
- }
- catch (Exception e)
- {
- throw new Exception("Validation of '" + currentFile + "' failed.", e);
- }
- }
-
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1697");
- 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: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java (from rev 3466, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java)
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java 2007-06-06 12:29:35 UTC (rev 3467)
@@ -0,0 +1,121 @@
+/*
+ * 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.jbws1697;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+
+/**
+ * Test case for http://jira.jboss.com/jira/browse/JBWS-1697
+ *
+ * WSDL to Java, handling of holders for simple types defined by restriction.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since Jun 6, 2007
+ */
+public class JBWS1697TestCase extends WSToolsTest
+{
+
+ /**
+ * Test WSDL to Java with the a document/literal endpoint
+ * where the message part is the same for both the input
+ * and output message.
+ *
+ */
+ public void testGenerateDocLitInOut() throws Exception
+ {
+ generateScenario("doclit_inout");
+ }
+
+ /**
+ * Test WSDL to Java with a rpc/literal endpoint
+ * where a matching message part is in the request
+ * and response messages.
+ *
+ */
+ public void testGenerateRpcLitInOut() throws Exception
+ {
+ generateScenario("rpclit_inout");
+ }
+
+ protected void generateScenario(final String scenario) throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1697/" + scenario;
+ String toolsDir = "tools/jbws1697/" + 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/jbws1697/" + currentFile);
+ }
+ catch (Exception e)
+ {
+ throw new Exception("Validation of '" + currentFile + "' failed.", e);
+ }
+ }
+
+ File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1697");
+ 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: trunk/jbossws-core/src/test/resources/tools/jbws1697 (from rev 3466, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697)
Copied: trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout (from rev 3466, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout)
Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl 2007-06-06 11:07:27 UTC (rev 3466)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl 2007-06-06 12:29:35 UTC (rev 3467)
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1697'
- xmlns='http://schemas.xmlsoap.org/wsdl/'
- xmlns:ns1='http://test.jboss.org/ws/jbws1697/types'
- xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
- xmlns:tns='http://test.jboss.org/ws/jbws1697'
- xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
-
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1697/types'
- xmlns='http://www.w3.org/2001/XMLSchema'
- xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
- xmlns:tns='http://test.jboss.org/ws/jbws1697/types'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
- <simpleType name='Person'>
- <restriction base='string'>
- <pattern value="[a-zA-Z]*"/>
- </restriction>
- </simpleType>
-
- <simpleType name='BillingAccount'>
- <restriction base='string'>
- <pattern value="[a-zA-Z]*"/>
- </restriction>
- </simpleType>
-
- <element name='lookup' type='tns:Person'/>
- <element name='account' type='tns:BillingAccount'/>
- </schema>
- </types>
-
- <message name='PhoneBook_lookup'>
- <part element='ns1:lookup' name='lookup'/>
- <part element='ns1:account' name='header'/>
- </message>
- <message name='PhoneBook_lookupResponse'>
- <part element='ns1:lookup' name='lookup'/>
- <part element='ns1:account' name='header'/>
- </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='lookup'/>
- <soap:header use='literal' message='tns:PhoneBook_lookup' part='header' />
- </input>
- <output>
- <soap:body use='literal' parts='lookup'/>
- <soap:header use='literal' message='tns:PhoneBook_lookupResponse' part='header' />
- </output>
- </operation>
- </binding>
- <service name='PhoneBook'>
- <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
Copied: trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl (from rev 3466, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl 2007-06-06 12:29:35 UTC (rev 3467)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1697'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws1697/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1697'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1697/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1697/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <simpleType name='Person'>
+ <restriction base='string'>
+ <pattern value="[a-zA-Z]*"/>
+ </restriction>
+ </simpleType>
+
+ <simpleType name='BillingAccount'>
+ <restriction base='string'>
+ <pattern value="[a-zA-Z]*"/>
+ </restriction>
+ </simpleType>
+
+ <element name='lookup' type='tns:Person'/>
+ <element name='account' type='tns:BillingAccount'/>
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='lookup'/>
+ <part element='ns1:account' name='header'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookup' name='lookup'/>
+ <part element='ns1:account' name='header'/>
+ </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='lookup'/>
+ <soap:header use='literal' message='tns:PhoneBook_lookup' part='header' />
+ </input>
+ <output>
+ <soap:body use='literal' parts='lookup'/>
+ <soap:header use='literal' message='tns:PhoneBook_lookupResponse' part='header' />
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java 2007-06-06 11:07:27 UTC (rev 3466)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java 2007-06-06 12:29:35 UTC (rev 3467)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Jun 06 11:54:39 CEST 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.jbws1697;
-public interface PhoneBook_PortType extends java.rmi.Remote
-{
-
- public void lookup(javax.xml.rpc.holders.StringHolder lookup, javax.xml.rpc.holders.StringHolder header) throws java.rmi.RemoteException;
-}
Copied: trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java (from rev 3466, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java 2007-06-06 12:29:35 UTC (rev 3467)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Jun 06 11:54:39 CEST 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.jbws1697;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public void lookup(javax.xml.rpc.holders.StringHolder lookup, javax.xml.rpc.holders.StringHolder header) throws java.rmi.RemoteException;
+}
Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml 2007-06-06 11:07:27 UTC (rev 3466)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml 2007-06-06 12:29:35 UTC (rev 3467)
@@ -1,41 +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.jbws1697</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1697</namespaceURI>
- </package-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1697.PhoneBook_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1697'>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.jbws1697.PhoneBook_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1697'>portTypeNS:PhoneBook</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1697'>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>java.lang.String</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1697'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
- <wsdl-message-part-name>lookup</wsdl-message-part-name>
- <parameter-mode>INOUT</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <method-param-parts-mapping>
- <param-position>1</param-position>
- <param-type>java.lang.String</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1697'>wsdlMsgNS:PhoneBook</wsdl-message>
- <wsdl-message-part-name>header</wsdl-message-part-name>
- <parameter-mode>INOUT</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Copied: trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml (from rev 3466, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml 2007-06-06 12:29:35 UTC (rev 3467)
@@ -0,0 +1,41 @@
+<?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.jbws1697</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1697</namespaceURI>
+ </package-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1697.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1697'>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.jbws1697.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1697'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1697'>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>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1697'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>lookup</wsdl-message-part-name>
+ <parameter-mode>INOUT</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping>
+ <param-position>1</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1697'>wsdlMsgNS:PhoneBook</wsdl-message>
+ <wsdl-message-part-name>header</wsdl-message-part-name>
+ <parameter-mode>INOUT</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/wstools-config.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/wstools-config.xml 2007-06-06 11:07:27 UTC (rev 3466)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/wstools-config.xml 2007-06-06 12:29:35 UTC (rev 3467)
@@ -1,5 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl" parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/wstools-config.xml (from rev 3466, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/wstools-config.xml)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/wstools-config.xml (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/wstools-config.xml 2007-06-06 12:29:35 UTC (rev 3467)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl" parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Copied: trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout (from rev 3466, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout)
Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl 2007-06-06 11:07:27 UTC (rev 3466)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl 2007-06-06 12:29:35 UTC (rev 3467)
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook'
- targetNamespace='http://test.jboss.org/ws/jbws1697'
- xmlns='http://schemas.xmlsoap.org/wsdl/'
- xmlns:ns1='http://test.jboss.org/ws/jbws1697/types'
- xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
- xmlns:tns='http://test.jboss.org/ws/jbws1697'
- xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1697/types'
- xmlns='http://www.w3.org/2001/XMLSchema'
- xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
- xmlns:tns='http://test.jboss.org/ws/jbws1697/types'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
- <simpleType name='Person'>
- <restriction base='string'>
- <pattern value="[a-zA-Z]*"/>
- </restriction>
- </simpleType>
-
- <simpleType name='BillingAccount'>
- <restriction base='string'>
- <pattern value="[a-zA-Z]*"/>
- </restriction>
- </simpleType>
-
- <element name='billingAccount' type='tns:BillingAccount'/>
- </schema>
- </types>
-
- <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'>
- <part name='Person_1' type='ns1:Person'/>
- <part name='Account_1' element='ns1:billingAccount'/>
- </message>
- <message name='PhoneBook_lookupResponse'>
- <part name='Person_1' type='ns1:Person'/>
- <part name='Account_1' element='ns1:billingAccount'/>
- </message>
-
- <portType name='PhoneBook'>
- <operation name='lookup' parameterOrder='Person_1'>
- <input message='tns:PhoneBook_lookup'/>
- <output message='tns:PhoneBook_lookupResponse'/>
- </operation>
- </portType>
-
- <binding name='PhoneBookBinding' type='tns:PhoneBook'>
- <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='lookup'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' />
- <soap:header message="tns:PhoneBook_lookup"
- part="Account_1" use="literal" />
- </input>
- <output>
- <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/>
- <soap:header message="tns:PhoneBook_lookupResponse"
- part="Account_1" 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: trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl (from rev 3466, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl 2007-06-06 12:29:35 UTC (rev 3467)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook'
+ targetNamespace='http://test.jboss.org/ws/jbws1697'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws1697/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1697'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1697/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1697/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <simpleType name='Person'>
+ <restriction base='string'>
+ <pattern value="[a-zA-Z]*"/>
+ </restriction>
+ </simpleType>
+
+ <simpleType name='BillingAccount'>
+ <restriction base='string'>
+ <pattern value="[a-zA-Z]*"/>
+ </restriction>
+ </simpleType>
+
+ <element name='billingAccount' type='tns:BillingAccount'/>
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <part name='Person_1' type='ns1:Person'/>
+ <part name='Account_1' element='ns1:billingAccount'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part name='Person_1' type='ns1:Person'/>
+ <part name='Account_1' element='ns1:billingAccount'/>
+ </message>
+
+ <portType name='PhoneBook'>
+ <operation name='lookup' parameterOrder='Person_1'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' />
+ <soap:header message="tns:PhoneBook_lookup"
+ part="Account_1" use="literal" />
+ </input>
+ <output>
+ <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/>
+ <soap:header message="tns:PhoneBook_lookupResponse"
+ part="Account_1" 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: trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java 2007-06-06 11:07:27 UTC (rev 3466)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java 2007-06-06 12:29:35 UTC (rev 3467)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Jun 06 12:40:50 CEST 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.jbws1697;
-public interface PhoneBook_PortType extends java.rmi.Remote
-{
-
- public void lookup(javax.xml.rpc.holders.StringHolder person_1, javax.xml.rpc.holders.StringHolder Account_1) throws java.rmi.RemoteException;
-}
Copied: trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java (from rev 3466, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java 2007-06-06 12:29:35 UTC (rev 3467)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Jun 06 12:40:50 CEST 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.jbws1697;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public void lookup(javax.xml.rpc.holders.StringHolder person_1, javax.xml.rpc.holders.StringHolder Account_1) throws java.rmi.RemoteException;
+}
Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml 2007-06-06 11:07:27 UTC (rev 3466)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml 2007-06-06 12:29:35 UTC (rev 3467)
@@ -1,41 +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.jbws1697</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1697</namespaceURI>
- </package-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1697.PhoneBook_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1697'>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.jbws1697.PhoneBook_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1697'>portTypeNS:PhoneBook</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1697'>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>java.lang.String</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1697'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
- <wsdl-message-part-name>Person_1</wsdl-message-part-name>
- <parameter-mode>INOUT</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <method-param-parts-mapping>
- <param-position>1</param-position>
- <param-type>java.lang.String</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1697'>wsdlMsgNS:PhoneBook</wsdl-message>
- <wsdl-message-part-name>Account_1</wsdl-message-part-name>
- <parameter-mode>INOUT</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Copied: trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml (from rev 3466, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml 2007-06-06 12:29:35 UTC (rev 3467)
@@ -0,0 +1,41 @@
+<?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.jbws1697</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1697</namespaceURI>
+ </package-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1697.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1697'>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.jbws1697.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1697'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1697'>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>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1697'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>Person_1</wsdl-message-part-name>
+ <parameter-mode>INOUT</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping>
+ <param-position>1</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1697'>wsdlMsgNS:PhoneBook</wsdl-message>
+ <wsdl-message-part-name>Account_1</wsdl-message-part-name>
+ <parameter-mode>INOUT</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/wstools-config.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/wstools-config.xml 2007-06-06 11:07:27 UTC (rev 3466)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/wstools-config.xml 2007-06-06 12:29:35 UTC (rev 3467)
@@ -1,5 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl" parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/wstools-config.xml (from rev 3466, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/wstools-config.xml)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/wstools-config.xml (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/wstools-config.xml 2007-06-06 12:29:35 UTC (rev 3467)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl" parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
18 years, 10 months
- 1
- 0
JBossWS SVN: r3466 - in branches/jbossws-2.0/jbossws-core/src: main/java/org/jboss/ws/tools/helpers and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-06-06 07:07:27 -0400 (Wed, 06 Jun 2007)
New Revision: 3466
Added:
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/wstools-config.xml
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/wstools-config.xml
Removed:
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/wstools-config.xml
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/wstools-config.xml
Modified:
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
Log:
JBWS-1697 - WSDL To Java - Incorrect handling of Simple types derived by restriction for holders.
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-06-06 10:42:57 UTC (rev 3465)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-06-06 11:07:27 UTC (rev 3466)
@@ -441,7 +441,10 @@
XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI());
XSTypeDefinition xt = xe.getTypeDefinition();
QName xmlType = new QName(xt.getNamespace(), xt.getName());
-
+
+ // Replace the xt with the real type from the schema.
+ xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI());
+
if (buf.length() > 0)
{
buf.append(", ");
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-06-06 10:42:57 UTC (rev 3465)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-06-06 11:07:27 UTC (rev 3466)
@@ -373,6 +373,11 @@
XSTypeDefinition xt = xe.getTypeDefinition();
QName xmlType = new QName(xt.getNamespace(), xt.getName());
+ // Replace the xt with the real type from the schema.
+ xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI());
+ if (xt instanceof XSSimpleTypeDefinition)
+ xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt);
+
String partName = header.getPartName();
MethodParamPartsMapping mpin = getMethodParamPartsMapping(semm, elementName, xmlType, paramPosition, wsdlMessageName, mode, partName, false, true);
@@ -460,11 +465,11 @@
wrvm.setWsdlMessagePartName(partName);
semm.setWsdlReturnValueMapping(wrvm);
}
-
+
if (bindingOperation != null)
{
constructHeaderParameters(semm, wiop, bindingOperation);
- }
+ }
}
public void constructJavaXmlTypeMapping(JavaWsdlMapping jwm)
Copied: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697 (from rev 3465, branches/dlofthouse/JBWS-1697/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697)
Deleted: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java
===================================================================
--- branches/dlofthouse/JBWS-1697/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java 2007-06-06 10:42:57 UTC (rev 3465)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java 2007-06-06 11:07:27 UTC (rev 3466)
@@ -1,121 +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.jbws1697;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-import org.jboss.test.ws.tools.WSToolsTest;
-import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
-import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
-import org.jboss.ws.tools.WSTools;
-
-/**
- * Test case for http://jira.jboss.com/jira/browse/JBWS-1697
- *
- * WSDL to Java, handling of holders for simple types defined by restriction.
- *
- * @author darran.lofthouse(a)jboss.com
- * @since Jun 6, 2007
- */
-public class JBWS1697TestCase extends WSToolsTest
-{
-
- /**
- * Test WSDL to Java with the a document/literal endpoint
- * where the message part is the same for both the input
- * and output message.
- *
- */
- public void testGenerateDocLitInOut() throws Exception
- {
- generateScenario("doclit_inout");
- }
-
- /**
- * Test WSDL to Java with a rpc/literal endpoint
- * where a matching message part is in the request
- * and response messages.
- *
- */
- public void testGenerateRpcLitInOut() throws Exception
- {
- generateScenario("rpclit_inout");
- }
-
- protected void generateScenario(final String scenario) throws Exception
- {
- String resourceDir = "resources/tools/jbws1697/" + scenario;
- String toolsDir = "tools/jbws1697/" + 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/jbws1697/" + currentFile);
- }
- catch (Exception e)
- {
- throw new Exception("Validation of '" + currentFile + "' failed.", e);
- }
- }
-
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1697");
- 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: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java (from rev 3465, branches/dlofthouse/JBWS-1697/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java 2007-06-06 11:07:27 UTC (rev 3466)
@@ -0,0 +1,121 @@
+/*
+ * 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.jbws1697;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+
+/**
+ * Test case for http://jira.jboss.com/jira/browse/JBWS-1697
+ *
+ * WSDL to Java, handling of holders for simple types defined by restriction.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since Jun 6, 2007
+ */
+public class JBWS1697TestCase extends WSToolsTest
+{
+
+ /**
+ * Test WSDL to Java with the a document/literal endpoint
+ * where the message part is the same for both the input
+ * and output message.
+ *
+ */
+ public void testGenerateDocLitInOut() throws Exception
+ {
+ generateScenario("doclit_inout");
+ }
+
+ /**
+ * Test WSDL to Java with a rpc/literal endpoint
+ * where a matching message part is in the request
+ * and response messages.
+ *
+ */
+ public void testGenerateRpcLitInOut() throws Exception
+ {
+ generateScenario("rpclit_inout");
+ }
+
+ protected void generateScenario(final String scenario) throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1697/" + scenario;
+ String toolsDir = "tools/jbws1697/" + 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/jbws1697/" + currentFile);
+ }
+ catch (Exception e)
+ {
+ throw new Exception("Validation of '" + currentFile + "' failed.", e);
+ }
+ }
+
+ File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1697");
+ 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: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697 (from rev 3465, branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697)
Copied: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout (from rev 3465, branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout)
Deleted: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl 2007-06-06 10:42:57 UTC (rev 3465)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl 2007-06-06 11:07:27 UTC (rev 3466)
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1697'
- xmlns='http://schemas.xmlsoap.org/wsdl/'
- xmlns:ns1='http://test.jboss.org/ws/jbws1697/types'
- xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
- xmlns:tns='http://test.jboss.org/ws/jbws1697'
- xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
-
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1697/types'
- xmlns='http://www.w3.org/2001/XMLSchema'
- xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
- xmlns:tns='http://test.jboss.org/ws/jbws1697/types'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
- <simpleType name='Person'>
- <restriction base='string'>
- <pattern value="[a-zA-Z]*"/>
- </restriction>
- </simpleType>
-
- <simpleType name='BillingAccount'>
- <restriction base='string'>
- <pattern value="[a-zA-Z]*"/>
- </restriction>
- </simpleType>
-
- <element name='lookup' type='tns:Person'/>
- <element name='account' type='tns:BillingAccount'/>
- </schema>
- </types>
-
- <message name='PhoneBook_lookup'>
- <part element='ns1:lookup' name='lookup'/>
- <part element='ns1:account' name='header'/>
- </message>
- <message name='PhoneBook_lookupResponse'>
- <part element='ns1:lookup' name='lookup'/>
- <part element='ns1:account' name='header'/>
- </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='lookup'/>
- <soap:header use='literal' message='tns:PhoneBook_lookup' part='header' />
- </input>
- <output>
- <soap:body use='literal' parts='lookup'/>
- <soap:header use='literal' message='tns:PhoneBook_lookupResponse' part='header' />
- </output>
- </operation>
- </binding>
- <service name='PhoneBook'>
- <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
Copied: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl (from rev 3465, branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl 2007-06-06 11:07:27 UTC (rev 3466)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1697'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws1697/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1697'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1697/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1697/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <simpleType name='Person'>
+ <restriction base='string'>
+ <pattern value="[a-zA-Z]*"/>
+ </restriction>
+ </simpleType>
+
+ <simpleType name='BillingAccount'>
+ <restriction base='string'>
+ <pattern value="[a-zA-Z]*"/>
+ </restriction>
+ </simpleType>
+
+ <element name='lookup' type='tns:Person'/>
+ <element name='account' type='tns:BillingAccount'/>
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='lookup'/>
+ <part element='ns1:account' name='header'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookup' name='lookup'/>
+ <part element='ns1:account' name='header'/>
+ </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='lookup'/>
+ <soap:header use='literal' message='tns:PhoneBook_lookup' part='header' />
+ </input>
+ <output>
+ <soap:body use='literal' parts='lookup'/>
+ <soap:header use='literal' message='tns:PhoneBook_lookupResponse' part='header' />
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
Deleted: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java
===================================================================
--- branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java 2007-06-06 10:42:57 UTC (rev 3465)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java 2007-06-06 11:07:27 UTC (rev 3466)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Jun 06 11:54:39 CEST 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.jbws1697;
-public interface PhoneBook_PortType extends java.rmi.Remote
-{
-
- public void lookup(javax.xml.rpc.holders.StringHolder lookup, javax.xml.rpc.holders.StringHolder header) throws java.rmi.RemoteException;
-}
Copied: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java (from rev 3465, branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java 2007-06-06 11:07:27 UTC (rev 3466)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Jun 06 11:54:39 CEST 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.jbws1697;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public void lookup(javax.xml.rpc.holders.StringHolder lookup, javax.xml.rpc.holders.StringHolder header) throws java.rmi.RemoteException;
+}
Deleted: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml 2007-06-06 10:42:57 UTC (rev 3465)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml 2007-06-06 11:07:27 UTC (rev 3466)
@@ -1,41 +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.jbws1697</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1697</namespaceURI>
- </package-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1697.PhoneBook_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1697'>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.jbws1697.PhoneBook_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1697'>portTypeNS:PhoneBook</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1697'>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>java.lang.String</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1697'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
- <wsdl-message-part-name>lookup</wsdl-message-part-name>
- <parameter-mode>INOUT</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <method-param-parts-mapping>
- <param-position>1</param-position>
- <param-type>java.lang.String</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1697'>wsdlMsgNS:PhoneBook</wsdl-message>
- <wsdl-message-part-name>header</wsdl-message-part-name>
- <parameter-mode>INOUT</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Copied: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml (from rev 3465, branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml 2007-06-06 11:07:27 UTC (rev 3466)
@@ -0,0 +1,41 @@
+<?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.jbws1697</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1697</namespaceURI>
+ </package-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1697.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1697'>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.jbws1697.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1697'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1697'>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>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1697'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>lookup</wsdl-message-part-name>
+ <parameter-mode>INOUT</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping>
+ <param-position>1</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1697'>wsdlMsgNS:PhoneBook</wsdl-message>
+ <wsdl-message-part-name>header</wsdl-message-part-name>
+ <parameter-mode>INOUT</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Deleted: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/wstools-config.xml 2007-06-06 10:42:57 UTC (rev 3465)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/wstools-config.xml 2007-06-06 11:07:27 UTC (rev 3466)
@@ -1,5 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl" parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/wstools-config.xml (from rev 3465, branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/wstools-config.xml)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/wstools-config.xml (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/wstools-config.xml 2007-06-06 11:07:27 UTC (rev 3466)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl" parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Copied: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout (from rev 3465, branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout)
Deleted: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl 2007-06-06 10:42:57 UTC (rev 3465)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl 2007-06-06 11:07:27 UTC (rev 3466)
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook'
- targetNamespace='http://test.jboss.org/ws/jbws1697'
- xmlns='http://schemas.xmlsoap.org/wsdl/'
- xmlns:ns1='http://test.jboss.org/ws/jbws1697/types'
- xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
- xmlns:tns='http://test.jboss.org/ws/jbws1697'
- xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1697/types'
- xmlns='http://www.w3.org/2001/XMLSchema'
- xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
- xmlns:tns='http://test.jboss.org/ws/jbws1697/types'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
- <simpleType name='Person'>
- <restriction base='string'>
- <pattern value="[a-zA-Z]*"/>
- </restriction>
- </simpleType>
-
- <simpleType name='BillingAccount'>
- <restriction base='string'>
- <pattern value="[a-zA-Z]*"/>
- </restriction>
- </simpleType>
-
- <element name='billingAccount' type='tns:BillingAccount'/>
- </schema>
- </types>
-
- <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'>
- <part name='Person_1' type='ns1:Person'/>
- <part name='Account_1' element='ns1:billingAccount'/>
- </message>
- <message name='PhoneBook_lookupResponse'>
- <part name='Person_1' type='ns1:Person'/>
- <part name='Account_1' element='ns1:billingAccount'/>
- </message>
-
- <portType name='PhoneBook'>
- <operation name='lookup' parameterOrder='Person_1'>
- <input message='tns:PhoneBook_lookup'/>
- <output message='tns:PhoneBook_lookupResponse'/>
- </operation>
- </portType>
-
- <binding name='PhoneBookBinding' type='tns:PhoneBook'>
- <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='lookup'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' />
- <soap:header message="tns:PhoneBook_lookup"
- part="Account_1" use="literal" />
- </input>
- <output>
- <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/>
- <soap:header message="tns:PhoneBook_lookupResponse"
- part="Account_1" 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: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl (from rev 3465, branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl 2007-06-06 11:07:27 UTC (rev 3466)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook'
+ targetNamespace='http://test.jboss.org/ws/jbws1697'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws1697/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1697'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1697/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1697/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <simpleType name='Person'>
+ <restriction base='string'>
+ <pattern value="[a-zA-Z]*"/>
+ </restriction>
+ </simpleType>
+
+ <simpleType name='BillingAccount'>
+ <restriction base='string'>
+ <pattern value="[a-zA-Z]*"/>
+ </restriction>
+ </simpleType>
+
+ <element name='billingAccount' type='tns:BillingAccount'/>
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <part name='Person_1' type='ns1:Person'/>
+ <part name='Account_1' element='ns1:billingAccount'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part name='Person_1' type='ns1:Person'/>
+ <part name='Account_1' element='ns1:billingAccount'/>
+ </message>
+
+ <portType name='PhoneBook'>
+ <operation name='lookup' parameterOrder='Person_1'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' />
+ <soap:header message="tns:PhoneBook_lookup"
+ part="Account_1" use="literal" />
+ </input>
+ <output>
+ <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/>
+ <soap:header message="tns:PhoneBook_lookupResponse"
+ part="Account_1" 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: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java
===================================================================
--- branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java 2007-06-06 10:42:57 UTC (rev 3465)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java 2007-06-06 11:07:27 UTC (rev 3466)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Jun 06 12:40:50 CEST 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.jbws1697;
-public interface PhoneBook_PortType extends java.rmi.Remote
-{
-
- public void lookup(javax.xml.rpc.holders.StringHolder person_1, javax.xml.rpc.holders.StringHolder Account_1) throws java.rmi.RemoteException;
-}
Copied: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java (from rev 3465, branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java 2007-06-06 11:07:27 UTC (rev 3466)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Jun 06 12:40:50 CEST 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.jbws1697;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public void lookup(javax.xml.rpc.holders.StringHolder person_1, javax.xml.rpc.holders.StringHolder Account_1) throws java.rmi.RemoteException;
+}
Deleted: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml 2007-06-06 10:42:57 UTC (rev 3465)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml 2007-06-06 11:07:27 UTC (rev 3466)
@@ -1,41 +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.jbws1697</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1697</namespaceURI>
- </package-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1697.PhoneBook_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1697'>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.jbws1697.PhoneBook_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1697'>portTypeNS:PhoneBook</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1697'>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>java.lang.String</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1697'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
- <wsdl-message-part-name>Person_1</wsdl-message-part-name>
- <parameter-mode>INOUT</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <method-param-parts-mapping>
- <param-position>1</param-position>
- <param-type>java.lang.String</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1697'>wsdlMsgNS:PhoneBook</wsdl-message>
- <wsdl-message-part-name>Account_1</wsdl-message-part-name>
- <parameter-mode>INOUT</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Copied: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml (from rev 3465, branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml 2007-06-06 11:07:27 UTC (rev 3466)
@@ -0,0 +1,41 @@
+<?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.jbws1697</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1697</namespaceURI>
+ </package-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1697.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1697'>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.jbws1697.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1697'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1697'>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>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1697'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>Person_1</wsdl-message-part-name>
+ <parameter-mode>INOUT</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping>
+ <param-position>1</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1697'>wsdlMsgNS:PhoneBook</wsdl-message>
+ <wsdl-message-part-name>Account_1</wsdl-message-part-name>
+ <parameter-mode>INOUT</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Deleted: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/wstools-config.xml 2007-06-06 10:42:57 UTC (rev 3465)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/wstools-config.xml 2007-06-06 11:07:27 UTC (rev 3466)
@@ -1,5 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl" parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/wstools-config.xml (from rev 3465, branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/wstools-config.xml)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/wstools-config.xml (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/wstools-config.xml 2007-06-06 11:07:27 UTC (rev 3466)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl" parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
18 years, 10 months
- 1
- 0
JBossWS SVN: r3465 - in branches/dlofthouse/JBWS-1697/jbossws-core/src/test: resources/tools/jbws1697 and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-06-06 06:42:57 -0400 (Wed, 06 Jun 2007)
New Revision: 3465
Added:
branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/
branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl
branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java
branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml
branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/wstools-config.xml
Modified:
branches/dlofthouse/JBWS-1697/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java
Log:
RPC/Literal INOUT test case.
Modified: branches/dlofthouse/JBWS-1697/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java
===================================================================
--- branches/dlofthouse/JBWS-1697/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java 2007-06-06 10:12:16 UTC (rev 3464)
+++ branches/dlofthouse/JBWS-1697/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java 2007-06-06 10:42:57 UTC (rev 3465)
@@ -50,6 +50,17 @@
{
generateScenario("doclit_inout");
}
+
+ /**
+ * Test WSDL to Java with a rpc/literal endpoint
+ * where a matching message part is in the request
+ * and response messages.
+ *
+ */
+ public void testGenerateRpcLitInOut() throws Exception
+ {
+ generateScenario("rpclit_inout");
+ }
protected void generateScenario(final String scenario) throws Exception
{
Added: branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl (rev 0)
+++ branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl 2007-06-06 10:42:57 UTC (rev 3465)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook'
+ targetNamespace='http://test.jboss.org/ws/jbws1697'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws1697/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1697'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1697/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1697/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <simpleType name='Person'>
+ <restriction base='string'>
+ <pattern value="[a-zA-Z]*"/>
+ </restriction>
+ </simpleType>
+
+ <simpleType name='BillingAccount'>
+ <restriction base='string'>
+ <pattern value="[a-zA-Z]*"/>
+ </restriction>
+ </simpleType>
+
+ <element name='billingAccount' type='tns:BillingAccount'/>
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <part name='Person_1' type='ns1:Person'/>
+ <part name='Account_1' element='ns1:billingAccount'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part name='Person_1' type='ns1:Person'/>
+ <part name='Account_1' element='ns1:billingAccount'/>
+ </message>
+
+ <portType name='PhoneBook'>
+ <operation name='lookup' parameterOrder='Person_1'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' />
+ <soap:header message="tns:PhoneBook_lookup"
+ part="Account_1" use="literal" />
+ </input>
+ <output>
+ <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/>
+ <soap:header message="tns:PhoneBook_lookupResponse"
+ part="Account_1" 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
Property changes on: branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java
===================================================================
--- branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java (rev 0)
+++ branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java 2007-06-06 10:42:57 UTC (rev 3465)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Jun 06 12:40:50 CEST 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.jbws1697;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public void lookup(javax.xml.rpc.holders.StringHolder person_1, javax.xml.rpc.holders.StringHolder Account_1) throws java.rmi.RemoteException;
+}
Property changes on: branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml (rev 0)
+++ branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml 2007-06-06 10:42:57 UTC (rev 3465)
@@ -0,0 +1,41 @@
+<?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.jbws1697</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1697</namespaceURI>
+ </package-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1697.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1697'>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.jbws1697.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1697'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1697'>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>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1697'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>Person_1</wsdl-message-part-name>
+ <parameter-mode>INOUT</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping>
+ <param-position>1</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1697'>wsdlMsgNS:PhoneBook</wsdl-message>
+ <wsdl-message-part-name>Account_1</wsdl-message-part-name>
+ <parameter-mode>INOUT</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Property changes on: branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/wstools-config.xml (rev 0)
+++ branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/wstools-config.xml 2007-06-06 10:42:57 UTC (rev 3465)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl" parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years, 10 months
- 1
- 0
JBossWS SVN: r3464 - trunk/jbossws-core/src/main/etc.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-06 06:12:16 -0400 (Wed, 06 Jun 2007)
New Revision: 3464
Modified:
trunk/jbossws-core/src/main/etc/default.mf
Log:
Class-Path: jbossws-spi.jar jboss-jaxrpc.jar jboss-jaxws.jar jboss-saaj.jar
jboss-xml-binding.jar javassist.jar mail.jar activation.jar
jaxb-api.jar jaxb-impl.jar policy.jar wsdl4j.jar
Modified: trunk/jbossws-core/src/main/etc/default.mf
===================================================================
--- trunk/jbossws-core/src/main/etc/default.mf 2007-06-06 10:09:04 UTC (rev 3463)
+++ trunk/jbossws-core/src/main/etc/default.mf 2007-06-06 10:12:16 UTC (rev 3464)
@@ -8,5 +8,6 @@
Implementation-Version: @implementation.version@ (build=(a)build.id@)
Implementation-Vendor: @implementation.vendor@
Implementation-Vendor-Id: @implementation.vendor.id@
-Class-Path: jbossws-spi.jar jboss-jaxrpc.jar jboss-jaxws.jar
- jboss-saaj.jar
\ No newline at end of file
+Class-Path: jbossws-spi.jar jboss-jaxrpc.jar jboss-jaxws.jar jboss-saaj.jar
+ jboss-xml-binding.jar javassist.jar mail.jar activation.jar
+ jaxb-api.jar jaxb-impl.jar policy.jar wsdl4j.jar
\ No newline at end of file
18 years, 10 months
- 1
- 0
JBossWS SVN: r3463 - in branches/jbossws-2.0/jbossws-core: src/test/java/org/jboss/test/ws/jaxws and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-06 06:09:04 -0400 (Wed, 06 Jun 2007)
New Revision: 3463
Added:
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283Endpoint.java
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283EndpointImpl.java
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/jaxws-handlers-server.xml
Modified:
branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml
Log:
Fix JBWS-1283
Modified: branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-06 10:06:08 UTC (rev 3462)
+++ branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-06 10:09:04 UTC (rev 3463)
@@ -236,7 +236,14 @@
</metainf>
</jar>
- <!-- jaxws namespace -->
+ <!-- jaxws-jbws1283 -->
+ <jar destfile="${tests.output.dir}/libs/jaxws-jbws1283.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1283/*.*"/>
+ </fileset>
+ </jar>
+
+ <!-- jaxws namespace -->
<war warfile="${tests.output.dir}/libs/jaxws-namespace.war" webxml="${tests.output.dir}/resources/jaxws/namespace/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jaxws/namespace/EndpointBean.class"/>
Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java 2007-06-06 10:09:04 UTC (rev 3463)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1283;
+
+import org.jboss.wsf.spi.handler.GenericSOAPHandler;
+
+import javax.activation.DataHandler;
+import javax.xml.soap.AttachmentPart;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+
+/**
+ * Appends attachments to outbound message.
+ *
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public class AttachmentHandler extends GenericSOAPHandler
+{
+ protected boolean handleOutbound(MessageContext msgContext)
+ {
+ System.out.println("AttachmentHandler: Adding attachment ot message");
+ SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
+ AttachmentPart attachment = soapMessage.createAttachmentPart(new DataHandler("Server data", "text/plain"));
+ soapMessage.addAttachmentPart(attachment);
+ return true;
+ }
+}
Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283Endpoint.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283Endpoint.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283Endpoint.java 2007-06-06 10:09:04 UTC (rev 3463)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1283;
+
+import javax.jws.WebService;
+import javax.ejb.Remote;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+
+@WebService(targetNamespace = "http://org.jboss.test.ws/jbws1283")
+@Remote
+public interface JBWS1283Endpoint
+{
+ void requestAttachmentData();
+}
Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283Endpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283EndpointImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283EndpointImpl.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283EndpointImpl.java 2007-06-06 10:09:04 UTC (rev 3463)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1283;
+
+import org.jboss.wsf.spi.annotation.WebContext;
+
+import javax.jws.WebService;
+import javax.jws.HandlerChain;
+import javax.ejb.Stateless;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+@WebService(
+ endpointInterface = "org.jboss.test.ws.jaxws.jbws1283.JBWS1283Endpoint",
+ serviceName = "JBWS1283Service",
+ targetNamespace = "http://org.jboss.test.ws/jbws1283"
+ )
+@HandlerChain(file = "jaxws-handlers-server.xml")
+@WebContext(contextRoot = "jaxws-jbws1283")
+@Stateless
+public class JBWS1283EndpointImpl implements JBWS1283Endpoint
+{
+
+ public void requestAttachmentData()
+ {
+ System.out.println("AttachmentData will be added within Handler.handleResponse()");
+ }
+}
Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283EndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java 2007-06-06 10:09:04 UTC (rev 3463)
@@ -0,0 +1,114 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1283;
+
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
+import org.jboss.wsf.spi.handler.GenericSOAPHandler;
+import org.jboss.test.ws.jaxws.jbws1357.JBWS1357;
+import junit.framework.Test;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.handler.Handler;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.soap.AttachmentPart;
+import javax.xml.soap.SOAPException;
+import javax.activation.DataHandler;
+import java.net.URL;
+import java.net.HttpURLConnection;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+/**
+ * Attachment dropped on outbound messages if they have been
+ * added thorugh a handler
+ *
+ * http://jira.jboss.org/jira/browse/JBWS-1283
+ *
+ * @version $Revision:1370 $
+ */
+public class JBWS1283TestCase extends JBossWSTest
+{
+ private String targetNS = "http://org.jboss.test.ws/jbws1283";
+ private JBWS1283Endpoint port;
+
+ public static Test suite()
+ {
+ return JBossWSTestSetup.newTestSetup(JBWS1283TestCase.class, "jaxws-jbws1283.jar");
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ QName serviceName = new QName(targetNS, "JBWS1283Service");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1283/JBWS1283EndpointImpl?wsdl");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ port = (JBWS1283Endpoint)service.getPort(JBWS1283Endpoint.class);
+ }
+
+ public void testAttachmentResponse() throws Exception
+ {
+ // Add a client-side handler that verifes existence of the attachment
+ BindingProvider bindingProvider = (BindingProvider)port;
+ List<Handler> handlerChain = new ArrayList<Handler>();
+ handlerChain.add(new VerifyAttachmentHandler());
+ bindingProvider.getBinding().setHandlerChain(handlerChain);
+
+ port.requestAttachmentData();
+ }
+
+ // handler that verifies the attachment that have been added on the server-side
+ class VerifyAttachmentHandler extends GenericSOAPHandler
+ {
+
+ protected boolean handleInbound(MessageContext msgContext)
+ {
+ SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
+ Iterator it = soapMessage.getAttachments();
+ while(it.hasNext())
+ {
+ try
+ {
+ AttachmentPart attachment = (AttachmentPart)it.next();
+ System.out.println("Recv " + attachment.getContentType() + " attachment:");
+ System.out.println("'"+attachment.getContent()+"'");
+ return true;
+ }
+ catch (SOAPException e)
+ {
+ throw new RuntimeException("Failed to access attachment data");
+ }
+ }
+
+ throw new IllegalStateException("Missing attachment on the client side");
+ }
+ }
+
+}
Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/jaxws-handlers-server.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/jaxws-handlers-server.xml (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/jaxws-handlers-server.xml 2007-06-06 10:09:04 UTC (rev 3463)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<handler-chains xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd">
+
+ <handler-chain>
+ <protocol-bindings>##SOAP11_HTTP</protocol-bindings>
+ <handler>
+ <handler-name>AttachmentHandler</handler-name>
+ <handler-class>org.jboss.test.ws.jaxws.jbws1283.AttachmentHandler</handler-class>
+ </handler>
+ </handler-chain>
+</handler-chains>
\ No newline at end of file
Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/jaxws-handlers-server.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years, 10 months
- 1
- 0
JBossWS SVN: r3462 - in trunk/jbossws-core: src/test/java/org/jboss/test/ws/jaxws and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-06 06:06:08 -0400 (Wed, 06 Jun 2007)
New Revision: 3462
Added:
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283Endpoint.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283EndpointImpl.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/jaxws-handlers-server.xml
Modified:
trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml
Log:
Fix JBWS-1283
Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-06 10:03:39 UTC (rev 3461)
+++ trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-06 10:06:08 UTC (rev 3462)
@@ -236,7 +236,14 @@
</metainf>
</jar>
- <!-- jaxws namespace -->
+ <!-- jaxws-jbws1283 -->
+ <jar destfile="${tests.output.dir}/libs/jaxws-jbws1283.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1283/*.*"/>
+ </fileset>
+ </jar>
+
+ <!-- jaxws namespace -->
<war warfile="${tests.output.dir}/libs/jaxws-namespace.war" webxml="${tests.output.dir}/resources/jaxws/namespace/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jaxws/namespace/EndpointBean.class"/>
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java 2007-06-06 10:06:08 UTC (rev 3462)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1283;
+
+import org.jboss.wsf.spi.handler.GenericSOAPHandler;
+
+import javax.activation.DataHandler;
+import javax.xml.soap.AttachmentPart;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+
+/**
+ * Appends attachments to outbound message.
+ *
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public class AttachmentHandler extends GenericSOAPHandler
+{
+ protected boolean handleOutbound(MessageContext msgContext)
+ {
+ System.out.println("AttachmentHandler: Adding attachment ot message");
+ SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
+ AttachmentPart attachment = soapMessage.createAttachmentPart(new DataHandler("Server data", "text/plain"));
+ soapMessage.addAttachmentPart(attachment);
+ return true;
+ }
+}
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283Endpoint.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283Endpoint.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283Endpoint.java 2007-06-06 10:06:08 UTC (rev 3462)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1283;
+
+import javax.jws.WebService;
+import javax.ejb.Remote;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+
+@WebService(targetNamespace = "http://org.jboss.test.ws/jbws1283")
+@Remote
+public interface JBWS1283Endpoint
+{
+ void requestAttachmentData();
+}
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283Endpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283EndpointImpl.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283EndpointImpl.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283EndpointImpl.java 2007-06-06 10:06:08 UTC (rev 3462)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1283;
+
+import org.jboss.wsf.spi.annotation.WebContext;
+
+import javax.jws.WebService;
+import javax.jws.HandlerChain;
+import javax.ejb.Stateless;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+@WebService(
+ endpointInterface = "org.jboss.test.ws.jaxws.jbws1283.JBWS1283Endpoint",
+ serviceName = "JBWS1283Service",
+ targetNamespace = "http://org.jboss.test.ws/jbws1283"
+ )
+@HandlerChain(file = "jaxws-handlers-server.xml")
+@WebContext(contextRoot = "jaxws-jbws1283")
+@Stateless
+public class JBWS1283EndpointImpl implements JBWS1283Endpoint
+{
+
+ public void requestAttachmentData()
+ {
+ System.out.println("AttachmentData will be added within Handler.handleResponse()");
+ }
+}
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283EndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java 2007-06-06 10:06:08 UTC (rev 3462)
@@ -0,0 +1,114 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1283;
+
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
+import org.jboss.wsf.spi.handler.GenericSOAPHandler;
+import org.jboss.test.ws.jaxws.jbws1357.JBWS1357;
+import junit.framework.Test;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.handler.Handler;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.soap.AttachmentPart;
+import javax.xml.soap.SOAPException;
+import javax.activation.DataHandler;
+import java.net.URL;
+import java.net.HttpURLConnection;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+/**
+ * Attachment dropped on outbound messages if they have been
+ * added thorugh a handler
+ *
+ * http://jira.jboss.org/jira/browse/JBWS-1283
+ *
+ * @version $Revision:1370 $
+ */
+public class JBWS1283TestCase extends JBossWSTest
+{
+ private String targetNS = "http://org.jboss.test.ws/jbws1283";
+ private JBWS1283Endpoint port;
+
+ public static Test suite()
+ {
+ return JBossWSTestSetup.newTestSetup(JBWS1283TestCase.class, "jaxws-jbws1283.jar");
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ QName serviceName = new QName(targetNS, "JBWS1283Service");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1283/JBWS1283EndpointImpl?wsdl");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ port = (JBWS1283Endpoint)service.getPort(JBWS1283Endpoint.class);
+ }
+
+ public void testAttachmentResponse() throws Exception
+ {
+ // Add a client-side handler that verifes existence of the attachment
+ BindingProvider bindingProvider = (BindingProvider)port;
+ List<Handler> handlerChain = new ArrayList<Handler>();
+ handlerChain.add(new VerifyAttachmentHandler());
+ bindingProvider.getBinding().setHandlerChain(handlerChain);
+
+ port.requestAttachmentData();
+ }
+
+ // handler that verifies the attachment that have been added on the server-side
+ class VerifyAttachmentHandler extends GenericSOAPHandler
+ {
+
+ protected boolean handleInbound(MessageContext msgContext)
+ {
+ SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
+ Iterator it = soapMessage.getAttachments();
+ while(it.hasNext())
+ {
+ try
+ {
+ AttachmentPart attachment = (AttachmentPart)it.next();
+ System.out.println("Recv " + attachment.getContentType() + " attachment:");
+ System.out.println("'"+attachment.getContent()+"'");
+ return true;
+ }
+ catch (SOAPException e)
+ {
+ throw new RuntimeException("Failed to access attachment data");
+ }
+ }
+
+ throw new IllegalStateException("Missing attachment on the client side");
+ }
+ }
+
+}
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/jaxws-handlers-server.xml
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/jaxws-handlers-server.xml (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/jaxws-handlers-server.xml 2007-06-06 10:06:08 UTC (rev 3462)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<handler-chains xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd">
+
+ <handler-chain>
+ <protocol-bindings>##SOAP11_HTTP</protocol-bindings>
+ <handler>
+ <handler-name>AttachmentHandler</handler-name>
+ <handler-class>org.jboss.test.ws.jaxws.jbws1283.AttachmentHandler</handler-class>
+ </handler>
+ </handler-chain>
+</handler-chains>
\ No newline at end of file
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/jaxws-handlers-server.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years, 10 months
- 1
- 0
JBossWS SVN: r3461 - in branches/dlofthouse/JBWS-1697/jbossws-core/src: main/java/org/jboss/ws/tools/helpers and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-06-06 06:03:39 -0400 (Wed, 06 Jun 2007)
New Revision: 3461
Added:
branches/dlofthouse/JBWS-1697/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/
branches/dlofthouse/JBWS-1697/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java
branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/
branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/
branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl
branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java
branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml
branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/wstools-config.xml
Modified:
branches/dlofthouse/JBWS-1697/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java
branches/dlofthouse/JBWS-1697/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
Log:
Initial implementation and first test case.
Modified: branches/dlofthouse/JBWS-1697/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- branches/dlofthouse/JBWS-1697/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-06-06 10:02:29 UTC (rev 3460)
+++ branches/dlofthouse/JBWS-1697/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-06-06 10:03:39 UTC (rev 3461)
@@ -441,7 +441,10 @@
XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI());
XSTypeDefinition xt = xe.getTypeDefinition();
QName xmlType = new QName(xt.getNamespace(), xt.getName());
-
+
+ // Replace the xt with the real type from the schema.
+ xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI());
+
if (buf.length() > 0)
{
buf.append(", ");
Modified: branches/dlofthouse/JBWS-1697/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- branches/dlofthouse/JBWS-1697/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-06-06 10:02:29 UTC (rev 3460)
+++ branches/dlofthouse/JBWS-1697/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-06-06 10:03:39 UTC (rev 3461)
@@ -373,6 +373,11 @@
XSTypeDefinition xt = xe.getTypeDefinition();
QName xmlType = new QName(xt.getNamespace(), xt.getName());
+ // Replace the xt with the real type from the schema.
+ xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI());
+ if (xt instanceof XSSimpleTypeDefinition)
+ xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt);
+
String partName = header.getPartName();
MethodParamPartsMapping mpin = getMethodParamPartsMapping(semm, elementName, xmlType, paramPosition, wsdlMessageName, mode, partName, false, true);
@@ -460,11 +465,11 @@
wrvm.setWsdlMessagePartName(partName);
semm.setWsdlReturnValueMapping(wrvm);
}
-
+
if (bindingOperation != null)
{
constructHeaderParameters(semm, wiop, bindingOperation);
- }
+ }
}
public void constructJavaXmlTypeMapping(JavaWsdlMapping jwm)
Added: branches/dlofthouse/JBWS-1697/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java
===================================================================
--- branches/dlofthouse/JBWS-1697/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java (rev 0)
+++ branches/dlofthouse/JBWS-1697/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java 2007-06-06 10:03:39 UTC (rev 3461)
@@ -0,0 +1,110 @@
+/*
+ * 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.jbws1697;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+
+/**
+ * Test case for http://jira.jboss.com/jira/browse/JBWS-1697
+ *
+ * WSDL to Java, handling of holders for simple types defined by restriction.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since Jun 6, 2007
+ */
+public class JBWS1697TestCase extends WSToolsTest
+{
+
+ /**
+ * Test WSDL to Java with the a document/literal endpoint
+ * where the message part is the same for both the input
+ * and output message.
+ *
+ */
+ public void testGenerateDocLitInOut() throws Exception
+ {
+ generateScenario("doclit_inout");
+ }
+
+ protected void generateScenario(final String scenario) throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1697/" + scenario;
+ String toolsDir = "tools/jbws1697/" + 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/jbws1697/" + currentFile);
+ }
+ catch (Exception e)
+ {
+ throw new Exception("Validation of '" + currentFile + "' failed.", e);
+ }
+ }
+
+ File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1697");
+ 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();
+ }
+
+}
Property changes on: branches/dlofthouse/JBWS-1697/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl (rev 0)
+++ branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl 2007-06-06 10:03:39 UTC (rev 3461)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1697'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws1697/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1697'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1697/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1697/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <simpleType name='Person'>
+ <restriction base='string'>
+ <pattern value="[a-zA-Z]*"/>
+ </restriction>
+ </simpleType>
+
+ <simpleType name='BillingAccount'>
+ <restriction base='string'>
+ <pattern value="[a-zA-Z]*"/>
+ </restriction>
+ </simpleType>
+
+ <element name='lookup' type='tns:Person'/>
+ <element name='account' type='tns:BillingAccount'/>
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='lookup'/>
+ <part element='ns1:account' name='header'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookup' name='lookup'/>
+ <part element='ns1:account' name='header'/>
+ </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='lookup'/>
+ <soap:header use='literal' message='tns:PhoneBook_lookup' part='header' />
+ </input>
+ <output>
+ <soap:body use='literal' parts='lookup'/>
+ <soap:header use='literal' message='tns:PhoneBook_lookupResponse' part='header' />
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
Property changes on: branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java
===================================================================
--- branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java (rev 0)
+++ branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java 2007-06-06 10:03:39 UTC (rev 3461)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Jun 06 11:54:39 CEST 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.jbws1697;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public void lookup(javax.xml.rpc.holders.StringHolder lookup, javax.xml.rpc.holders.StringHolder header) throws java.rmi.RemoteException;
+}
Property changes on: branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml (rev 0)
+++ branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml 2007-06-06 10:03:39 UTC (rev 3461)
@@ -0,0 +1,41 @@
+<?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.jbws1697</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1697</namespaceURI>
+ </package-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1697.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1697'>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.jbws1697.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1697'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1697'>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>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1697'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>lookup</wsdl-message-part-name>
+ <parameter-mode>INOUT</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping>
+ <param-position>1</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1697'>wsdlMsgNS:PhoneBook</wsdl-message>
+ <wsdl-message-part-name>header</wsdl-message-part-name>
+ <parameter-mode>INOUT</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Property changes on: branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/wstools-config.xml (rev 0)
+++ branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/wstools-config.xml 2007-06-06 10:03:39 UTC (rev 3461)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl" parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: branches/dlofthouse/JBWS-1697/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years, 10 months
- 1
- 0
JBossWS SVN: r3460 - branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-06-06 06:02:29 -0400 (Wed, 06 Jun 2007)
New Revision: 3460
Added:
branches/dlofthouse/JBWS-1697/
Log:
Branch for JBWS-1697
Copied: branches/dlofthouse/JBWS-1697 (from rev 3459, branches/jbossws-2.0)
18 years, 10 months
- 1
- 0
JBossWS SVN: r3459 - branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-06-06 06:01:35 -0400 (Wed, 06 Jun 2007)
New Revision: 3459
Removed:
branches/dlofthouse/JBWS-1597/
Log:
No longer required.
18 years, 10 months
- 1
- 0