Author: heiko.braun(a)jboss.com Date: 2006-10-27 07:46:30 -0400 (Fri, 27 Oct 2006) New Revision: 1320 Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java Removed: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/JBossXBContentAdapter.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10Encrypt/WEB-INF/wsdl/wsdl0.wsdl branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/META-INF/application-client.xml branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/web.xml branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml Log: XOP type conversion based on target property class Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java 2006-10-27 11:44:08 UTC (rev 1319) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java 2006-10-27 11:46:30 UTC (rev 1320) @@ -43,7 +43,6 @@ import org.jboss.ws.xop.XOPContext; import org.w3c.dom.*; -import javax.activation.DataHandler; import javax.xml.namespace.QName; import javax.xml.soap.Name; import javax.xml.soap.SOAPElement; Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/JBossXBContentAdapter.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/JBossXBContentAdapter.java 2006-10-27 11:44:08 UTC (rev 1319) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/JBossXBContentAdapter.java 2006-10-27 11:46:30 UTC (rev 1320) @@ -22,15 +22,18 @@ package org.jboss.ws.xop; import org.jboss.logging.Logger; +import org.jboss.ws.Constants; import org.jboss.ws.WSException; -import org.jboss.ws.Constants; import org.jboss.ws.soap.attachment.ContentHandlerRegistry; import org.jboss.ws.soap.attachment.SwapableMemoryDataSource; import org.jboss.ws.utils.IOUtils; import org.jboss.ws.utils.MimeUtils; import org.jboss.xb.binding.sunday.marshalling.MarshallingContext; import org.jboss.xb.binding.sunday.marshalling.TermBeforeMarshallingCallback; -import org.jboss.xb.binding.sunday.unmarshalling.*; +import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; +import org.jboss.xb.binding.sunday.unmarshalling.TermBeforeSetParentCallback; +import org.jboss.xb.binding.sunday.unmarshalling.TypeBinding; +import org.jboss.xb.binding.sunday.unmarshalling.UnmarshallingContext; import javax.activation.DataHandler; import javax.activation.DataSource; @@ -38,6 +41,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.io.InputStream; /** * Adopts raw binary contents to java types. @@ -106,13 +110,12 @@ Class targetClass = ctx.resolvePropertyType(); if(null==targetClass) { - log.warn("Failed to resolve target property on " + ctx.getParticle()); - log.debug("Parent particle is " + ctx.getParentParticle()); + throw new WSException("Failed targte property type on "+ ctx.getParticle()); } boolean isRegularMessage = !XOPContext.isXOPMessage(); boolean isSimpleType = (object instanceof byte[]); - boolean doTypesMatch = (targetClass!=null && targetClass.equals(object.getClass())); + boolean doTypesMatch = ( targetClass.equals(object.getClass()) ); // Handle inlined requests. // In this case XB treats binaries as simple types that are unmarshalled to byte[] @@ -144,19 +147,24 @@ // In this case we are be able to instantiate the correct content object // from the data handler, with the exception of content-type 'application/octet-stream'. // These attachments will be returned as DataHandler instances. - else if(XOPContext.isXOPMessage() && (object instanceof DataHandler)) + else if(XOPContext.isXOPMessage() && (object instanceof DataHandler) && !doTypesMatch) { try { - DataHandler attachmentHandle = (DataHandler)object; - String contentType = attachmentHandle.getContentType(); + String contentType = MimeUtils.resolveMimeType(targetClass); log.debug("Adopt DataHandler to " + targetClass +", contentType "+ contentType); - // TODO: fix me as soon as targetClass info is available - if(!contentType.equals("application/octet-stream")) + DataHandler dh = new DataHandler( + wrapAsDataSource(object, contentType) + ); + object = dh.getContent(); + + // 'application/octet-stream' will return a byte[] instead fo the stream + if(object instanceof InputStream) { - DataHandler dh = new DataHandler(attachmentHandle.getDataSource()); - object = dh.getContent(); + ByteArrayOutputStream bout = new ByteArrayOutputStream(); + dh.writeTo(bout); + object = bout.toByteArray(); } } catch (IOException e) @@ -176,6 +184,10 @@ { ds = new SwapableMemoryDataSource(new ByteArrayInputStream((byte[])object), contentType); } + else if(object instanceof DataHandler) + { + ds = new SwapableMemoryDataSource(((DataHandler)object).getInputStream(), contentType); + } else { throw new IllegalArgumentException("Failed to wrap as data source: "+object.getClass()); @@ -206,7 +218,7 @@ xmimeBase64Type.setBeforeSetParentCallback( contentAdapter ); // xop:Include - ModelGroupBinding modelGroup = (ModelGroupBinding)xmimeBase64Type.getParticle().getTerm(); + /*ModelGroupBinding modelGroup = (ModelGroupBinding)xmimeBase64Type.getParticle().getTerm(); ParticleBinding particle = (ParticleBinding)modelGroup.getParticles().iterator().next(); ElementBinding xopInclude = (ElementBinding)particle.getTerm(); @@ -214,7 +226,8 @@ throw new WSException("Looks like the JBossXB XOP implementation has changed, please open a JIRA issue"); xopInclude.setBeforeMarshallingCallback(contentAdapter); - xopInclude.setBeforeSetParentCallback(contentAdapter); + xopInclude.setBeforeSetParentCallback(contentAdapter); + */ } } Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java 2006-10-27 11:44:08 UTC (rev 1319) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java 2006-10-27 11:46:30 UTC (rev 1320) @@ -84,7 +84,14 @@ public static DataHandler createDataHandler() { - DataHandler dataHandler = new DataHandler("<more><nestedXML/></more>", "application/octet-stream"); - return dataHandler; + try + { + URL url = new File("resources/jaxrpc/xop/shared/attach.jpeg").toURL(); + return new DataHandler(url); + } + catch (MalformedURLException e) + { + throw new RuntimeException(e); + } } } Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2006-10-27 11:44:08 UTC (rev 1319) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2006-10-27 11:46:30 UTC (rev 1320) @@ -1,180 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.test.ws.jaxrpc.xop.doclit; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport; -import org.jboss.test.ws.jaxrpc.xop.shared.*; -import org.jboss.ws.jaxrpc.StubExt; -import org.jboss.ws.utils.IOUtils; - -import javax.activation.DataHandler; -import javax.xml.rpc.Stub; -import javax.xml.transform.Source; -import java.io.File; -import java.awt.*; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com&gt; - * @version $Id$ - * @since Sep 25, 2006 - */ -public abstract class XOPBase extends JBossWSTest { - - protected TestService_PortType port; - - /* - public void testRequestResponseOptimized() throws Exception { - - DataHandler dh = new DataHandler("Another plain text attachment", "text/plain"); - byte[] bytesIn = IOUtils.convertToBytes(dh); - PingMsgResponse value = port.ping(new PingMsg("1|1", bytesIn)); - assertNotNull("Return value was null", value); - byte[] bytesOut = value.getXopContent(); - assertNotNull("Returned xopContent was null", bytesOut); - assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); - } - - - public void testResponseOptimized() throws Exception { - - byte[] bytesIn = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/samples/mtom/attach.jpeg")); - - // disable MTOM - ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - - PingMsgResponse value = port.ping(new PingMsg("0|1", bytesIn)); - assertNotNull("Return value was null",value); - byte[] bytesOut = value.getXopContent(); - assertNotNull("Return xopContent was null", bytesOut); - assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); - } - - public void testRequestOptimized() throws Exception { - - byte[] bytesIn = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/samples/mtom/attach.jpeg")); - - // reusing the stub means cleaning the previous state - ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); - - PingMsgResponse value = port.ping(new PingMsg("1|0", bytesIn)); - assertNotNull("Return value was null",value); - byte[] bytesOut = value.getXopContent(); - assertNotNull("Return xopContent was null", bytesOut); - assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); - } */ - - // --------------------------------------------------------------------------------- - // Test the before and after marshalling handlers - - public void testImageResponseOptimized() throws Exception { - - Image image = XOPTestSupport.createTestImage(); - - // disable MTOM - ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - - PingImage pingImage = new PingImage("0|1", image); - PingImageResponse response = port.pingImage(pingImage); - assertNotNull("Return xopContent was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - } - - public void testImageRequestOptimized() throws Exception { - - Image image = XOPTestSupport.createTestImage(); - - // enable MTOM - ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); - - PingImage pingImage = new PingImage("1|0", image); - PingImageResponse response = port.pingImage(pingImage); - assertNotNull("Response was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - - } - - public void testSourceResponseOptimized() throws Exception { - - Source source = XOPTestSupport.createTestSource(); - - // disable MTOM - ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - - PingSource pingSource = new PingSource(); - pingSource.setMessage("0|1"); - pingSource.setXopContent(source); - - PingSourceResponse response = port.pingSource(pingSource); - assertNotNull("Response was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - - } - - public void testSourceRequestOptimized() throws Exception { - - Source source = XOPTestSupport.createTestSource(); - - // enable MTOM - ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); - - PingSource pingSource = new PingSource(); - pingSource.setMessage("1|0"); - pingSource.setXopContent(source); - - PingSourceResponse response = port.pingSource(pingSource); - assertNotNull("Response was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - } - - public void testDHResponseOptimized() throws Exception { - - DataHandler dh = XOPTestSupport.createDataHandler(); - - // disable MTOM - ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - - PingDataHandler reqest = new PingDataHandler(dh); - reqest.setMessage("0|1"); - - PingDataHandlerResponse response = port.pingDataHandler(reqest); - assertNotNull("Response was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - - } - - public void testDHRequestOptimized() throws Exception { - - DataHandler dh = XOPTestSupport.createDataHandler(); - - // enable MTOM - ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); - - - PingDataHandler reqest = new PingDataHandler(dh); - reqest.setMessage("1|0"); - - PingDataHandlerResponse response = port.pingDataHandler(reqest); - assertNotNull("Response was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - } -} Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2006-10-27 11:44:08 UTC (rev 1319) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2006-10-27 11:46:30 UTC (rev 1320) @@ -0,0 +1,180 @@ +/* +* 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.jaxrpc.xop.doclit; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport; +import org.jboss.test.ws.jaxrpc.xop.shared.*; +import org.jboss.ws.jaxrpc.StubExt; +import org.jboss.ws.utils.IOUtils; + +import javax.activation.DataHandler; +import javax.xml.rpc.Stub; +import javax.xml.transform.Source; +import java.awt.*; +import java.io.File; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com&gt; + * @version $Id$ + * @since Sep 25, 2006 + */ +public abstract class XOPBase extends JBossWSTest { + + protected abstract XOPPing getPort(); + + // --------------------------------------------------------------------------------- + // Test raw binary data + + public void testRequestResponseOptimized() throws Exception { + + DataHandler dh = new DataHandler("Another plain text attachment", "text/plain"); + byte[] bytesIn = IOUtils.convertToBytes(dh); + PingMsgResponse value = getPort().ping(new PingMsg("1|1", bytesIn)); + assertNotNull("Return value was null", value); + byte[] bytesOut = value.getXopContent(); + assertNotNull("Returned xopContent was null", bytesOut); + assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); + } + + public void testResponseOptimized() throws Exception { + + byte[] bytesIn = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/samples/mtom/attach.jpeg")); + + // disable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); + + PingMsgResponse value = getPort().ping(new PingMsg("0|1", bytesIn)); + assertNotNull("Return value was null",value); + byte[] bytesOut = value.getXopContent(); + assertNotNull("Return xopContent was null", bytesOut); + assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); + } + + public void testRequestOptimized() throws Exception { + + byte[] bytesIn = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/samples/mtom/attach.jpeg")); + + // reusing the stub means cleaning the previous state + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); + + PingMsgResponse value = getPort().ping(new PingMsg("1|0", bytesIn)); + assertNotNull("Return value was null",value); + byte[] bytesOut = value.getXopContent(); + assertNotNull("Return xopContent was null", bytesOut); + assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); + } + + // --------------------------------------------------------------------------------- + // Test concrete java types + + public void testImageResponseOptimized() throws Exception { + + Image image = XOPTestSupport.createTestImage(); + + // disable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); + + PingImage pingImage = new PingImage("0|1", image); + PingImageResponse response = getPort().pingImage(pingImage); + assertNotNull("Return xopContent was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + } + + public void testImageRequestOptimized() throws Exception { + + Image image = XOPTestSupport.createTestImage(); + + // enable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); + + PingImage pingImage = new PingImage("1|0", image); + PingImageResponse response = getPort().pingImage(pingImage); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + + } + + public void testSourceResponseOptimized() throws Exception { + + Source source = XOPTestSupport.createTestSource(); + + // disable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); + + PingSource pingSource = new PingSource(); + pingSource.setMessage("0|1"); + pingSource.setXopContent(source); + + PingSourceResponse response = getPort().pingSource(pingSource); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + + } + + public void testSourceRequestOptimized() throws Exception { + + Source source = XOPTestSupport.createTestSource(); + + // enable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); + + PingSource pingSource = new PingSource(); + pingSource.setMessage("1|0"); + pingSource.setXopContent(source); + + PingSourceResponse response = getPort().pingSource(pingSource); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + } + + public void testDHResponseOptimized() throws Exception { + + DataHandler dh = XOPTestSupport.createDataHandler(); + + // disable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); + + PingDataHandler reqest = new PingDataHandler(dh); + reqest.setMessage("0|1"); + + PingDataHandlerResponse response = getPort().pingDataHandler(reqest); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + + } + + public void testDHRequestOptimized() throws Exception { + + DataHandler dh = XOPTestSupport.createDataHandler(); + + // enable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); + + PingDataHandler reqest = new PingDataHandler(dh); + reqest.setMessage("1|0"); + + PingDataHandlerResponse response = getPort().pingDataHandler(reqest); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + } +} Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2006-10-27 11:44:08 UTC (rev 1319) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2006-10-27 11:46:30 UTC (rev 1320) @@ -23,18 +23,9 @@ import junit.framework.Test; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; -import org.jboss.ws.utils.IOUtils; -import org.jboss.ws.jaxrpc.StubExt; import javax.naming.InitialContext; import javax.xml.rpc.Service; -import javax.xml.rpc.Stub; -import javax.activation.DataHandler; -import java.io.File; /** * Test MTOM functionality with jaxrpc-handlers in place.<br> @@ -47,6 +38,8 @@ */ public class XOPHandlerTestCase extends XOPBase { + private XOPPing port; + public static Test suite() { return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxrpc-xop-doclit_handler.war, jaxrpc-xop-doclit_handler-client.jar"); @@ -59,9 +52,13 @@ { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPHandlerTestCase"); - port = (TestService_PortType)service.getPort(TestService_PortType.class); + port = (XOPPing)service.getPort(XOPPing.class); } //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-xop-doclit_handler"); } + + protected XOPPing getPort() { + return port; + } } Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java 2006-10-27 11:44:08 UTC (rev 1319) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java 2006-10-27 11:46:30 UTC (rev 1320) @@ -24,19 +24,10 @@ // $Id$ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; -import org.jboss.ws.jaxrpc.StubExt; -import org.jboss.ws.utils.IOUtils; -import javax.activation.DataHandler; import javax.naming.InitialContext; import javax.xml.rpc.Service; -import javax.xml.rpc.Stub; -import java.io.File; /** * Test MTOM functionaly without any jaxrpc handlers in place. @@ -46,6 +37,8 @@ */ public class XOPTestCase extends XOPBase { + private XOPPing port; + public static Test suite() { return JBossWSTestSetup.newTestSetup(XOPTestCase.class, "jaxrpc-xop-doclit.war, jaxrpc-xop-doclit-client.jar"); @@ -58,10 +51,15 @@ { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPTestCase"); - port = (TestService_PortType)service.getPort(TestService_PortType.class); + port = (XOPPing)service.getPort(XOPPing.class); } //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-xop-doclit"); } + protected XOPPing getPort() + { + return port; + } + } Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2006-10-27 11:44:08 UTC (rev 1319) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2006-10-27 11:46:30 UTC (rev 1320) @@ -1,103 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.test.ws.jaxrpc.xop.rpclit; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; -import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport; -import org.jboss.ws.utils.IOUtils; -import org.jboss.ws.jaxrpc.StubExt; - -import javax.activation.DataHandler; -import javax.xml.rpc.Stub; -import java.io.File; -import java.util.StringTokenizer; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com&gt; - * @version $Id$ - * @since Sep 25, 2006 - */ -public abstract class XOPBase extends JBossWSTest { - - protected TestService_PortType port; - - /*public void testRequestResponseOptimized() throws Exception { - - DataHandler dh = new DataHandler("Another plain text attachment", "text/plain"); - byte[] bytesIn = IOUtils.convertToBytes(dh); - requestComplex(new PingMsg("1|1", bytesIn)); - - } - - public void testResponseOptimized() throws Exception { - - byte[] bytesIn = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/samples/mtom/attach.jpeg")); - requestComplex(new PingMsg("0|1", bytesIn)); - - } - - public void testRequestOptimized() throws Exception { - - byte[] bytesIn = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/samples/mtom/attach.jpeg")); - requestComplex(new PingMsg("1|0", bytesIn)); - - }*/ - - private void requestComplex(PingMsg payload) throws Exception - { - StringTokenizer tok =new StringTokenizer(payload.getMessage(), "|"); - boolean mtomEnabled = tok.nextToken().equals("1"); - ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.valueOf(mtomEnabled)); - - PingMsgResponse value = port.pingComplex(payload); - assertNotNull("Return value was null",value); - byte[] bytesOut = value.getXopContent(); - assertNotNull("Return xopContent was null", bytesOut); - assertEquals("Content length doesn't match", payload.getXopContent().length, bytesOut.length); - } - - public void testSimpleTypesOptimized() throws Exception - { - DataHandler dh = new DataHandler("Simple type plain text attachment", "text/plain"); - byte[] bytesIn = IOUtils.convertToBytes(dh); - ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); - byte[] bytesOut = port.pingSimple("s1|s1", bytesIn); - - assertNotNull("Return xopContent was null", bytesOut); - assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); - } - - public void testSimpleTypesResponseOptimized() throws Exception - { - DataHandler dh = new DataHandler("Simple type plain text attachment", "text/plain"); - byte[] bytesIn = IOUtils.convertToBytes(dh); - ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - - byte[] bytesOut = port.pingSimple("s0|s1", bytesIn); - - assertNotNull("Return xopContent was null", bytesOut); - assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); - - } -} Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2006-10-27 11:44:08 UTC (rev 1319) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2006-10-27 11:46:30 UTC (rev 1320) @@ -0,0 +1,195 @@ +/* +* 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.jaxrpc.xop.rpclit; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport; +import org.jboss.test.ws.jaxrpc.xop.shared.*; +import org.jboss.ws.jaxrpc.StubExt; +import org.jboss.ws.utils.IOUtils; + +import javax.activation.DataHandler; +import javax.xml.rpc.Stub; +import javax.xml.transform.Source; +import java.io.File; +import java.util.StringTokenizer; +import java.awt.*; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com&gt; + * @version $Id$ + * @since Sep 25, 2006 + */ +public abstract class XOPBase extends JBossWSTest { + + protected abstract XOPPing getPort(); + + public void testRequestResponseOptimized() throws Exception { + + DataHandler dh = new DataHandler("Another plain text attachment", "text/plain"); + byte[] bytesIn = IOUtils.convertToBytes(dh); + requestComplex(new PingMsg("1|1", bytesIn)); + + } + + public void testResponseOptimized() throws Exception { + + byte[] bytesIn = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/samples/mtom/attach.jpeg")); + requestComplex(new PingMsg("0|1", bytesIn)); + + } + + public void testRequestOptimized() throws Exception { + + byte[] bytesIn = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/samples/mtom/attach.jpeg")); + requestComplex(new PingMsg("1|0", bytesIn)); + + } + + private void requestComplex(PingMsg payload) throws Exception + { + StringTokenizer tok =new StringTokenizer(payload.getMessage(), "|"); + boolean mtomEnabled = tok.nextToken().equals("1"); + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.valueOf(mtomEnabled)); + + PingMsgResponse value = getPort().ping(payload); + assertNotNull("Return value was null",value); + byte[] bytesOut = value.getXopContent(); + assertNotNull("Return xopContent was null", bytesOut); + assertEquals("Content length doesn't match", payload.getXopContent().length, bytesOut.length); + } + + public void testSimpleTypesOptimized() throws Exception + { + DataHandler dh = new DataHandler("Simple type plain text attachment", "text/plain"); + byte[] bytesIn = IOUtils.convertToBytes(dh); + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); + byte[] bytesOut = getPort().pingSimple("s1|s1", bytesIn); + + assertNotNull("Return xopContent was null", bytesOut); + assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); + } + + public void testSimpleTypesResponseOptimized() throws Exception + { + DataHandler dh = new DataHandler("Simple type plain text attachment", "text/plain"); + byte[] bytesIn = IOUtils.convertToBytes(dh); + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); + + byte[] bytesOut = getPort().pingSimple("s0|s1", bytesIn); + + assertNotNull("Return xopContent was null", bytesOut); + assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); + } + + public void testImageResponseOptimized() throws Exception { + + Image image = XOPTestSupport.createTestImage(); + + // disable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); + + PingImage pingImage = new PingImage("0|1", image); + PingImageResponse response = getPort().pingImage(pingImage); + assertNotNull("Return xopContent was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + } + + public void testImageRequestOptimized() throws Exception { + + Image image = XOPTestSupport.createTestImage(); + + // enable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); + + PingImage pingImage = new PingImage("1|0", image); + PingImageResponse response = getPort().pingImage(pingImage); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + + } + + public void testSourceResponseOptimized() throws Exception { + + Source source = XOPTestSupport.createTestSource(); + + // disable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); + + PingSource pingSource = new PingSource(); + pingSource.setMessage("0|1"); + pingSource.setXopContent(source); + + PingSourceResponse response = getPort().pingSource(pingSource); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + + } + + public void testSourceRequestOptimized() throws Exception { + + Source source = XOPTestSupport.createTestSource(); + + // enable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); + + PingSource pingSource = new PingSource(); + pingSource.setMessage("1|0"); + pingSource.setXopContent(source); + + PingSourceResponse response = getPort().pingSource(pingSource); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + } + + public void testDHResponseOptimized() throws Exception { + + DataHandler dh = XOPTestSupport.createDataHandler(); + + // disable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); + + PingDataHandler reqest = new PingDataHandler(dh); + reqest.setMessage("0|1"); + + PingDataHandlerResponse response = getPort().pingDataHandler(reqest); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + + } + + public void testDHRequestOptimized() throws Exception { + + DataHandler dh = XOPTestSupport.createDataHandler(); + + // enable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); + + PingDataHandler reqest = new PingDataHandler(dh); + reqest.setMessage("1|0"); + + PingDataHandlerResponse response = getPort().pingDataHandler(reqest); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + } + +} Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java 2006-10-27 11:44:08 UTC (rev 1319) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java 2006-10-27 11:46:30 UTC (rev 1320) @@ -23,26 +23,19 @@ import junit.framework.Test; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; -import org.jboss.ws.utils.IOUtils; -import org.jboss.ws.jaxrpc.StubExt; import javax.naming.InitialContext; import javax.xml.rpc.Service; -import javax.xml.rpc.Stub; -import javax.activation.DataHandler; -import java.io.File; /** * @author Heiko Braun <heiko.braun(a)jboss.com&gt; * @version $Id$ * @since Sep 22, 2006 */ -public class XOPHandlerTestCase extends XOPBase { +public class XOPHandlerTestCase extends XOPBase { + private XOPPing port; + public static Test suite() { return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxrpc-xop-rpclit_handler.war, jaxrpc-xop-rpclit_handler-client.jar"); @@ -55,9 +48,13 @@ { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPHandlerTestCaseRPC"); - port = (TestService_PortType)service.getPort(TestService_PortType.class); + port = (XOPPing)service.getPort(XOPPing.class); } //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-xop-rpclit_handler"); } + + protected XOPPing getPort() { + return port; + } } Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java 2006-10-27 11:44:08 UTC (rev 1319) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java 2006-10-27 11:46:30 UTC (rev 1320) @@ -24,19 +24,10 @@ // $Id$ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; -import org.jboss.ws.jaxrpc.StubExt; -import org.jboss.ws.utils.IOUtils; -import javax.activation.DataHandler; import javax.naming.InitialContext; import javax.xml.rpc.Service; -import javax.xml.rpc.Stub; -import java.io.File; /** * @@ -45,6 +36,8 @@ */ public class XOPTestCase extends XOPBase { + private XOPPing port; + public static Test suite() { return JBossWSTestSetup.newTestSetup(XOPTestCase.class, "jaxrpc-xop-rpclit.war, jaxrpc-xop-rpclit-client.jar"); @@ -57,10 +50,14 @@ { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPTestCaseRPC"); - port = (TestService_PortType)service.getPort(TestService_PortType.class); + port = (XOPPing)service.getPort(XOPPing.class); } //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-xop-rpclit"); } + protected XOPPing getPort() { + return port; + } + } Modified: branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10Encrypt/WEB-INF/wsdl/wsdl0.wsdl =================================================================== --- branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10Encrypt/WEB-INF/wsdl/wsdl0.wsdl 2006-10-27 11:44:08 UTC (rev 1319) +++ branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10Encrypt/WEB-INF/wsdl/wsdl0.wsdl 2006-10-27 11:46:30 UTC (rev 1320) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <wsdl:definitions targetNamespace="http://InteropBaseAddress/interop" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsap10="http://www.w3.org/2005/08/addressing" Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/META-INF/application-client.xml 2006-10-27 11:44:08 UTC (rev 1319) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/META-INF/application-client.xml 2006-10-27 11:46:30 UTC (rev 1320) @@ -13,7 +13,7 @@ <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.TestService_PortType</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> </port-component-ref> </service-ref> Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml 2006-10-27 11:44:08 UTC (rev 1319) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml 2006-10-27 11:46:30 UTC (rev 1320) @@ -1,12 +1,12 @@ <?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.jaxrpc.xop.doclit</package-type> - <namespaceURI>http://jboss.org/test/ws/xop/doclit</namespaceURI> + <namespaceURI>http://jboss.org/test/ws/xop</namespaceURI> </package-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/doclit'>typeNS:&... + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:&gt;Pin... <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>message</java-variable-name> @@ -20,7 +20,7 @@ <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/doclit'>typeNS:&... + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:&gt;Pin... <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>xopContent</java-variable-name> @@ -30,7 +30,7 @@ <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/doclit'>typeNS:&... + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:&gt;Pin... <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>message</java-variable-name> @@ -44,7 +44,7 @@ <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/doclit'>typeNS:&... + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:&gt;Pin... <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>xopContent</java-variable-name> @@ -54,7 +54,7 @@ <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/doclit'>typeNS:&... + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:&gt;Pin... <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>message</java-variable-name> @@ -68,7 +68,7 @@ <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/doclit'>typeNS:&... + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:&gt;Pin... <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>xopContent</java-variable-name> @@ -78,7 +78,7 @@ <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/doclit'>typeNS:&... + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:&gt;Pin... <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>message</java-variable-name> @@ -92,7 +92,7 @@ <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/doclit'>typeNS:&... + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:&gt;Pin... <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>xopContent</java-variable-name> @@ -101,8 +101,8 @@ </java-xml-type-mapping> <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.xop.doclit.TestService_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://jboss.org/test/ws/xop/doclit'>serviceN... + <service-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPingService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://jboss.org/test/ws/xop'>serviceNS:TestS... <port-mapping> <port-name>TestServicePort</port-name> <java-port-name>TestServicePort</java-port-name> @@ -110,9 +110,9 @@ </service-interface-mapping> <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.TestService_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://jboss.org/test/ws/xop/doclit'>portTyp... - <wsdl-binding xmlns:bindingNS='http://jboss.org/test/ws/xop/doclit'>bindingN... + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://jboss.org/test/ws/xop'>portTypeNS:Tes... + <wsdl-binding xmlns:bindingNS='http://jboss.org/test/ws/xop'>bindingNS:TestS... <service-endpoint-method-mapping> <java-method-name>ping</java-method-name> @@ -121,14 +121,14 @@ <param-position>0</param-position> <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</param-type> <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/doclit'>wsdlMsgN... + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingI... <wsdl-message-part-name>parameters</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/doclit'>wsdlMsgN... + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingO... <wsdl-message-part-name>parameters</wsdl-message-part-name> </wsdl-return-value-mapping> </service-endpoint-method-mapping> @@ -140,14 +140,14 @@ <param-position>0</param-position> <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</param-type> <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/doclit'>wsdlMsgN... + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingI... <wsdl-message-part-name>parameters</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/doclit'>wsdlMsgN... + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingI... <wsdl-message-part-name>parameters</wsdl-message-part-name> </wsdl-return-value-mapping> </service-endpoint-method-mapping> @@ -159,14 +159,14 @@ <param-position>0</param-position> <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</param-type> <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/doclit'>wsdlMsgN... + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingS... <wsdl-message-part-name>parameters</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/doclit'>wsdlMsgN... + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingS... <wsdl-message-part-name>parameters</wsdl-message-part-name> </wsdl-return-value-mapping> </service-endpoint-method-mapping> @@ -178,14 +178,14 @@ <param-position>0</param-position> <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</param-type> <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/doclit'>wsdlMsgN... + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingD... <wsdl-message-part-name>parameters</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/doclit'>wsdlMsgN... + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingD... <wsdl-message-part-name>parameters</wsdl-message-part-name> </wsdl-return-value-mapping> </service-endpoint-method-mapping> Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/web.xml 2006-10-27 11:44:08 UTC (rev 1319) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/web.xml 2006-10-27 11:46:30 UTC (rev 1320) @@ -7,7 +7,7 @@ <servlet> <servlet-name>TestService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.xop.doclit.TestServiceImpl</servlet-class> + <servlet-class>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPingImpl</servlet-class> </servlet> <servlet-mapping> Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml 2006-10-27 11:44:08 UTC (rev 1319) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml 2006-10-27 11:46:30 UTC (rev 1320) @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <webservices xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:impl="http://jboss.org/test/ws/xop/doclit" + xmlns:impl="http://jboss.org/test/ws/xop" 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_web_services_1_1.xsd" version="1.1"> <webservice-description> <webservice-description-name>XOP DOC/Lit without handlers</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> + <wsdl-file>WEB-INF/wsdl/service-doclit.wsdl</wsdl-file> <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component> <port-component-name>TestServicePort</port-component-name> <wsdl-port>impl:TestServicePort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.TestService_PortType</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> <service-impl-bean> <servlet-link>TestService</servlet-link> </service-impl-bean> Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml 2006-10-27 11:44:08 UTC (rev 1319) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml 2006-10-27 11:46:30 UTC (rev 1320) @@ -13,7 +13,7 @@ <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.TestService_PortType</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> </port-component-ref> <handler> <handler-name>XOPInlineHandler</handler-name> Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml 2006-10-27 11:44:08 UTC (rev 1319) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml 2006-10-27 11:46:30 UTC (rev 1320) @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <webservices xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:impl="http://jboss.org/test/ws/xop/doclit" + xmlns:impl="http://jboss.org/test/ws/xop" 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_web_services_1_1.xsd" version="1.1"> <webservice-description> <webservice-description-name>XOP DOC/Lit with handlers</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> + <wsdl-file>WEB-INF/wsdl/service-doclit.wsdl</wsdl-file> <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component> <port-component-name>TestServicePort</port-component-name> <wsdl-port>impl:TestServicePort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.TestService_PortType</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> <handler> <handler-name>XOPInlineHandler</handler-name> <handler-class>org.jboss.test.ws.jaxrpc.xop.doclit.InlineHandler</handler-class> Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml 2006-10-27 11:44:08 UTC (rev 1319) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml 2006-10-27 11:46:30 UTC (rev 1320) @@ -13,7 +13,7 @@ <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.TestService_PortType</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> </port-component-ref> </service-ref> Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml 2006-10-27 11:44:08 UTC (rev 1319) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml 2006-10-27 11:46:30 UTC (rev 1320) @@ -5,12 +5,16 @@ 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.jaxrpc.xop.rpclit</package-type> - <namespaceURI>http://jboss.org/test/ws/xop/rpclit</namespaceURI> + <namespaceURI>http://jboss.org/test/ws/xop</namespaceURI> </package-mapping> - + <package-mapping> + <package-type>org.jboss.test.ws.jaxrpc.xop.shared</package-type> + <namespaceURI>http://jboss.org/test/ws/xop</namespaceURI> + </package-mapping> + <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</java-type> - <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/rpclit'>typeNS:Ping... + <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingInType&... <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>message</java-variable-name> @@ -24,7 +28,7 @@ <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</java-type> - <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/rpclit'>typeNS:Ping... + <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingOutType... <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>xopContent</java-variable-name> @@ -32,9 +36,81 @@ </variable-mapping> </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</java-type> + <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingImageTy... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>message</java-variable-name> + <xml-element-name>message</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</java-type> + <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingImageOu... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</java-type> + <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingSourceT... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>message</java-variable-name> + <xml-element-name>message</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</java-type> + <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingSourceO... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</java-type> + <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingDataHan... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>message</java-variable-name> + <xml-element-name>message</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</java-type> + <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingDataHan... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.TestService_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://jboss.org/test/ws/xop/rpclit'>serviceN... + <service-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPingService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://jboss.org/test/ws/xop'>serviceNS:TestS... <port-mapping> <port-name>TestServicePort</port-name> <java-port-name>TestServicePort</java-port-name> @@ -42,25 +118,26 @@ </service-interface-mapping> <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.TestService_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://jboss.org/test/ws/xop/rpclit'>portTyp... - <wsdl-binding xmlns:bindingNS='http://jboss.org/test/ws/xop/rpclit'>bindingN... + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://jboss.org/test/ws/xop'>portTypeNS:Tes... + <wsdl-binding xmlns:bindingNS='http://jboss.org/test/ws/xop'>bindingNS:TestS... + <service-endpoint-method-mapping> - <java-method-name>pingComplex</java-method-name> - <wsdl-operation>pingComplex</wsdl-operation> + <java-method-name>ping</java-method-name> + <wsdl-operation>ping</wsdl-operation> <method-param-parts-mapping> <param-position>0</param-position> <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</param-type> <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/rpclit'>wsdlMsgN... + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingI... <wsdl-message-part-name>parameters</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/rpclit'>wsdlMsgN... + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingO... <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> </service-endpoint-method-mapping> @@ -72,7 +149,7 @@ <param-position>0</param-position> <param-type>java.lang.String</param-type> <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/rpclit'>wsdlMsgN... + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:Octet... <wsdl-message-part-name>message</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> @@ -81,16 +158,74 @@ <param-position>1</param-position> <param-type>java.lang.Object</param-type> <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/rpclit'>wsdlMsgN... + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:Octet... <wsdl-message-part-name>xopContent</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> <method-return-value>java.lang.Object</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/rpclit'>wsdlMsgN... + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:Octet... <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> </service-endpoint-method-mapping> + + <service-endpoint-method-mapping> + <java-method-name>pingImage</java-method-name> + <wsdl-operation>pingImage</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingI... + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingI... + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + + <service-endpoint-method-mapping> + <java-method-name>pingSource</java-method-name> + <wsdl-operation>pingSource</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingS... + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingS... + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + + <service-endpoint-method-mapping> + <java-method-name>pingDataHandler</java-method-name> + <wsdl-operation>pingDataHandler</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingD... + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingD... + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> </java-wsdl-mapping> \ No newline at end of file Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml 2006-10-27 11:44:08 UTC (rev 1319) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml 2006-10-27 11:46:30 UTC (rev 1320) @@ -7,7 +7,7 @@ <servlet> <servlet-name>TestService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.xop.rpclit.TestServiceImpl</servlet-class> + <servlet-class>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPingImpl</servlet-class> </servlet> <servlet-mapping> Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml 2006-10-27 11:44:08 UTC (rev 1319) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml 2006-10-27 11:46:30 UTC (rev 1320) @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <webservices xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:impl="http://jboss.org/test/ws/xop/rpclit" + xmlns:impl="http://jboss.org/test/ws/xop" 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_web_services_1_1.xsd" version="1.1"> <webservice-description> <webservice-description-name>XOP RPC/Lit without handlers</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> + <wsdl-file>WEB-INF/wsdl/service-rpclit.wsdl</wsdl-file> <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component> <port-component-name>TestServicePort</port-component-name> <wsdl-port>impl:TestServicePort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.TestService_PortType</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> <service-impl-bean> <servlet-link>TestService</servlet-link> </service-impl-bean> Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml 2006-10-27 11:44:08 UTC (rev 1319) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml 2006-10-27 11:46:30 UTC (rev 1320) @@ -13,7 +13,7 @@ <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.TestService_PortType</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> </port-component-ref> <handler> <handler-name>XOPInlineHandler</handler-name> Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml 2006-10-27 11:44:08 UTC (rev 1319) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml 2006-10-27 11:46:30 UTC (rev 1320) @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <webservices xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:impl="http://jboss.org/test/ws/xop/rpclit" + xmlns:impl="http://jboss.org/test/ws/xop" 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_web_services_1_1.xsd" version="1.1"> <webservice-description> <webservice-description-name>XOP RPC/Lit with handlers</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> + <wsdl-file>WEB-INF/wsdl/service-rpclit.wsdl</wsdl-file> <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component> <port-component-name>TestServicePort</port-component-name> <wsdl-port>impl:TestServicePort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.TestService_PortType</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> <handler> <handler-name>XOPInlineHandler</handler-name> <handler-class>org.jboss.test.ws.jaxrpc.xop.rpclit.InlineHandler</handler-class>