Author: heiko.braun(a)jboss.com Date: 2006-10-27 10:55:38 -0400 (Fri, 27 Oct 2006) New Revision: 1323 Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/Employee.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/EmployeeRecords.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/EmployeeRecordsImpl.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/HRService.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/Query.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/Status.java branches/jbossws-1.0/src/test/resources/jaxrpc/samples-override/mtom/WEB-INF/wsdl/EmployeeService.wsdl Removed: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/XOPRpcTestCase.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/XOPTest.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/XOPTestImpl.java branches/jbossws-1.0/src/test/resources/jaxrpc/samples-override/mtom/WEB-INF/wsdl/TestService.wsdl branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/attach.gif branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/attach.html branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/attach.jpeg branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/attach.txt branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/attach.xml branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/disguised_jpeg.xcf Modified: branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml branches/jbossws-1.0/src/test/resources/jaxrpc/samples-override/mtom/WEB-INF/jaxrpc-mapping.xml branches/jbossws-1.0/src/test/resources/jaxrpc/samples-override/mtom/WEB-INF/webservices.xml branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/META-INF/application-client.xml branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/WEB-INF/web.xml branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/wstools-config.xml Log: Created new MTOM sample. Get rid of rpc/lit exmamples Modified: branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml =================================================================== --- branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml 2006-10-27 13:27:04 UTC (rev 1322) +++ branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml 2006-10-27 14:55:38 UTC (rev 1323) @@ -1327,8 +1327,7 @@ <!-- jaxrpc-samples-mtom --> <war warfile="${build.test.dir}/libs/jaxrpc-samples-mtom.war" webxml="${build.test.dir}/resources/jaxrpc/samples/mtom/WEB-INF/web.xml"> <classes dir="${build.test.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/mtom/XOPTestImpl.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/mtom/XOPTest.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/mtom/*.class"/> </classes> <webinf dir="${build.test.dir}/resources/jaxrpc/samples/mtom/WEB-INF"> <include name="jaxrpc-mapping.xml"/> Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/Employee.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/Employee.java 2006-10-27 13:27:04 UTC (rev 1322) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/Employee.java 2006-10-27 14:55:38 UTC (rev 1323) @@ -0,0 +1,60 @@ +/* +* 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.samples.mtom; + +import javax.activation.DataHandler; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com&gt; + * @version $Id$ + * @since Oct 27, 2006 + */ +public class Employee { + + private String firstname; + private String lastname; + private DataHandler legacyData; + + public String getFirstname() { + return firstname; + } + + public void setFirstname(String firstname) { + this.firstname = firstname; + } + + public String getLastname() { + return lastname; + } + + public void setLastname(String lastname) { + this.lastname = lastname; + } + + public DataHandler getLegacyData() { + return legacyData; + } + + public void setLegacyData(DataHandler legacyData) { + this.legacyData = legacyData; + } +} Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/Employee.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/EmployeeRecords.java (from rev 1317, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/XOPTest.java) =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/XOPTest.java 2006-10-27 07:43:19 UTC (rev 1317) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/EmployeeRecords.java 2006-10-27 14:55:38 UTC (rev 1323) @@ -0,0 +1,47 @@ +/* + * 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.samples.mtom; + +import java.rmi.Remote; +import java.rmi.RemoteException; + +import javax.activation.DataHandler; +import javax.xml.transform.Source; + +/** + * Service Endpoint Interface for XOP + * + * image/gif java.awt.Image + * image/jpeg java.awt.Image + * text/plain java.lang.String + * multipart/* javax.mail.internet.MimeMultipart + * text/xml javax.xml.transform.Source + * application/xml javax.xml.transform.Source + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-Jan-2006 + */ +public interface EmployeeRecords extends Remote +{ + public Status updateEmployee(Employee employee) throws RemoteException; + public Employee queryEmployee(Query query) throws RemoteException; +} Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/EmployeeRecords.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/EmployeeRecordsImpl.java (from rev 1317, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/XOPTestImpl.java) =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/XOPTestImpl.java 2006-10-27 07:43:19 UTC (rev 1317) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/EmployeeRecordsImpl.java 2006-10-27 14:55:38 UTC (rev 1323) @@ -0,0 +1,100 @@ +/* + * 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.samples.mtom; + +import java.io.IOException; +import java.io.ByteArrayInputStream; +import java.rmi.RemoteException; + +import javax.activation.DataHandler; +import javax.xml.rpc.ServiceException; +import javax.xml.rpc.server.ServiceLifecycle; +import javax.xml.rpc.server.ServletEndpointContext; +import javax.xml.transform.Source; +import javax.xml.transform.stream.StreamSource; + +import org.jboss.ws.WSException; +import org.jboss.ws.utils.IOUtils; + +/** + * EmployeeRecords service endpoint + * + * @author Heiko.Braun(a)jboss.org + */ +public class EmployeeRecordsImpl implements EmployeeRecords +{ + public Status updateEmployee(Employee employee) throws RemoteException { + + try + { + DataHandler dataHandler = employee.getLegacyData(); + String contentType = dataHandler.getContentType(); + + // Note: An MTOM request is ambiguous. + // Some vendors do XOP encoding dpending on a threshold. + // In that case you might receive an inlined request for + // an MTOM capable endpoint. The example below shows how deal with it. + + if("text/xml".equals(contentType)) + { + StreamSource xmlStream = (StreamSource)dataHandler.getContent(); + IOUtils.copyStream(System.out, xmlStream.getInputStream()); + } + else if("application/octet-stream".equals(contentType)) + { + IOUtils.copyStream(System.out, dataHandler.getInputStream()); + } + + return new Status("OK"); + } + catch (IOException e) + { + throw new RemoteException(e.getMessage()); + } + } + + public Employee queryEmployee(Query query) throws RemoteException { + Employee employee = new Employee(); + employee.setFirstname("Peter"); + employee.setLastname("Pan"); + employee.setLegacyData( getLegacyData() ); + + return employee; + } + + private DataHandler getLegacyData() + { + try + { + return new DataHandler( + new StreamSource( + new ByteArrayInputStream("<Payroll><Data/></Payroll>".getBytes()) + ), + "application/xml" + ); + } + catch (Exception e) + { + throw new RuntimeException(e); + } + } +} Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/EmployeeRecordsImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/HRService.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/HRService.java 2006-10-27 13:27:04 UTC (rev 1322) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/HRService.java 2006-10-27 14:55:38 UTC (rev 1323) @@ -0,0 +1,33 @@ +/* +* 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.samples.mtom; + +import javax.xml.rpc.ServiceException; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com&gt; + * @version $Id$ + * @since Oct 27, 2006 + */ +public interface HRService extends javax.xml.rpc.Service{ + public EmployeeRecords getEmployeeRecordsPort() throws ServiceException; +} Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/HRService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java (from rev 1322, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/XOPRpcTestCase.java) =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/XOPRpcTestCase.java 2006-10-27 13:27:04 UTC (rev 1322) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java 2006-10-27 14:55:38 UTC (rev 1323) @@ -0,0 +1,136 @@ +/* + * 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.samples.mtom; + +import java.io.File; +import java.io.ByteArrayInputStream; +import java.net.URL; + +import javax.naming.InitialContext; +import javax.xml.namespace.QName; +import javax.xml.rpc.Service; +import javax.xml.rpc.Stub; +import javax.xml.transform.stream.StreamSource; +import javax.activation.DataHandler; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.jaxrpc.ServiceFactoryImpl; +import org.jboss.ws.jaxrpc.StubExt; +import org.jboss.ws.utils.IOUtils; + +/** + * Test SOAP with XOP through the JAXRPC dynamic proxy layer. + * + * @author Thomas.Diesler(a)jboss.org + * @author Heiko.Braun(a)jboss.org + * @since 18-Jan-2006 + */ +public class MTOMTestCase extends JBossWSTest +{ + private static EmployeeRecords port; + + /** Deploy the test ear */ + public static Test suite() throws Exception + { + return JBossWSTestSetup.newTestSetup(MTOMTestCase.class, "jaxrpc-samples-mtom.war, jaxrpc-samples-mtom-client.jar"); + } + + protected void setUp() throws Exception + { + super.setUp(); + + if (port == null) + { + if (isTargetServerJBoss()) + { + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPTestService"); + port = (EmployeeRecords)service.getPort(EmployeeRecords.class); + } + else + { + ServiceFactoryImpl factory = new ServiceFactoryImpl(); + URL wsdlURL = new File("resources/jaxrpc/samples/mtom/WEB-INF/wsdl/EmployeeService.wsdl").toURL(); + URL mappingURL = new File("resources/jaxrpc/samples/mtom/WEB-INF/jaxrpc-mapping.xml").toURL(); + QName qname = new QName("http://org.jboss.ws/samples/mtom", "EmployeeRecords"); + Service service = factory.createService(wsdlURL, qname, mappingURL); + port = (EmployeeRecords)service.getPort(EmployeeRecords.class); + ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-mtom"); + } + + } + } + + public void testUpdate() throws Exception + { + Employee employee = new Employee(); + employee.setFirstname("Peter"); + employee.setLastname("Pan"); + employee.setLegacyData( getLegacyData() ); + + Status status = port.updateEmployee(employee); + assertEquals("OK", status.getCode()); + } + + public void testUpdateMTOMDisabled() throws Exception + { + setMTOMEnabled(Boolean.FALSE); + testUpdate(); + } + + public void testQuery() throws Exception + { + Query query = new Query("Peter", "Pan"); + Employee employee = port.queryEmployee(query); + assertNotNull(employee); + assertNotNull(employee.getLegacyData()); + + StreamSource xmlStream = (StreamSource)employee.getLegacyData().getContent(); + IOUtils.copyStream(System.out, xmlStream.getInputStream()); + } + + private DataHandler getLegacyData() + { + try + { + return new DataHandler( + new StreamSource( + new ByteArrayInputStream("<Payroll><Data/></Payroll>".getBytes()) + ), + "application/xml" + ); + } + catch (Exception e) + { + throw new RuntimeException(e); + } + } + + private void setMTOMEnabled(Boolean b) + { + ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, b); + } + +} Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/Query.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/Query.java 2006-10-27 13:27:04 UTC (rev 1322) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/Query.java 2006-10-27 14:55:38 UTC (rev 1323) @@ -0,0 +1,57 @@ +/* +* 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.samples.mtom; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com&gt; + * @version $Id$ + * @since Oct 27, 2006 + */ +public class Query { + + private String firstname; + private String lastname; + + public Query() { + } + + public Query(String firstname, String lastname) { + this.firstname = firstname; + this.lastname = lastname; + } + + public String getFirstname() { + return firstname; + } + + public void setFirstname(String firstname) { + this.firstname = firstname; + } + + public String getLastname() { + return lastname; + } + + public void setLastname(String lastname) { + this.lastname = lastname; + } +} Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/Query.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/Status.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/Status.java 2006-10-27 13:27:04 UTC (rev 1322) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/Status.java 2006-10-27 14:55:38 UTC (rev 1323) @@ -0,0 +1,46 @@ +/* +* 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.samples.mtom; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com&gt; + * @version $Id$ + * @since Oct 27, 2006 + */ +public class Status { + private String code; + + public Status() { + } + + public Status(String code) { + this.code = code; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } +} Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/Status.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/XOPRpcTestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/XOPRpcTestCase.java 2006-10-27 13:27:04 UTC (rev 1322) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/XOPRpcTestCase.java 2006-10-27 14:55:38 UTC (rev 1323) @@ -1,154 +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.samples.mtom; - -import java.io.File; -import java.io.FileInputStream; -import java.net.URL; - -import javax.activation.DataHandler; -import javax.activation.FileDataSource; -import javax.naming.InitialContext; -import javax.xml.namespace.QName; -import javax.xml.rpc.Service; -import javax.xml.rpc.Stub; -import javax.xml.transform.Source; -import javax.xml.transform.stream.StreamSource; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.jaxrpc.ServiceFactoryImpl; -import org.jboss.ws.utils.IOUtils; - -/** - * Test SOAP with XOP through the JAXRPC dynamic proxy layer. - * - * @author Thomas.Diesler(a)jboss.org - * @author Heiko.Braun(a)jboss.org - * @since 18-Jan-2006 - */ -public class XOPRpcTestCase extends JBossWSTest -{ - private static XOPTest port; - - /** Deploy the test ear */ - public static Test suite() throws Exception - { - return JBossWSTestSetup.newTestSetup(XOPRpcTestCase.class, "jaxrpc-samples-mtom.war, jaxrpc-samples-mtom-client.jar"); - } - - protected void setUp() throws Exception - { - super.setUp(); - - if (port == null) - { - if (isTargetServerJBoss()) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPTestService"); - port = (XOPTest)service.getPort(XOPTest.class); - } - else - { - ServiceFactoryImpl factory = new ServiceFactoryImpl(); - URL wsdlURL = new File("resources/jaxrpc/samples/mtom/WEB-INF/wsdl/TestService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/samples/mtom/WEB-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.ws/samples/mtom", "XOPTest"); - Service service = factory.createService(wsdlURL, qname, mappingURL); - port = (XOPTest)service.getPort(XOPTest.class); - ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-mtom"); - } - - } - - //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8081/jaxrpc-samples-mtom"); - } - - public void testSimpleBinary() throws Exception - { - DataHandler dh = new DataHandler( - new FileDataSource("resources/jaxrpc/samples/mtom/disguised_jpeg.xcf") - ); - byte[] bytesIn = IOUtils.convertToBytes(dh); - byte[] bytesOut = port.sendOctets("Some text message", bytesIn); - assertNotNull(bytesOut); - assertTrue("Content length is different", bytesIn.length == bytesOut.length); - } - - public void testAbstractParameterTypes() throws Exception - { - URL url = new File("resources/jaxrpc/samples/mtom/attach.jpeg").toURL(); - DataHandler value = port.sendMimeImageJPEG("Some text message", new DataHandler(url)); - assertNotNull(value); - assertTrue("Wrong return content-type returned", value.getContentType().equals("image/jpeg")); - } - - public void testConcreteParameterTypes() throws Exception - { - String xoppart = "This is a plain text attachment."; - String value = port.sendMimeTextPlain("Some text message", xoppart); - assertNotNull(value); - assertEquals("Value mismatch", value, xoppart); - } - - public void testParameterConversion() throws Exception - { - FileInputStream stream = new FileInputStream("resources/jaxrpc/samples/mtom/attach.xml"); - StreamSource source = new StreamSource(stream); - - Source value = port.sendMimeTextXML("Some text message", new DataHandler(source, "text/xml")); - assertNotNull(value); - assertTrue("Wrong return value type", value instanceof Source); - } - - public void testParameterConversionReverse() throws Exception - { - FileInputStream stream = new FileInputStream("resources/jaxrpc/samples/mtom/attach.xml"); - StreamSource source = new StreamSource(stream); - - DataHandler value = port.sendMimeApplicationXML("Some text message", source); - assertNotNull(value); - assertTrue("Wrong return value content-type", value.getContentType().equals("application/xml")); - } - - public void testMTOMDisabledClientside() throws Exception - { - URL url = new File("resources/jaxrpc/samples/mtom/attach.jpeg").toURL(); - - setMTOMEnabled(Boolean.FALSE); - - DataHandler dh = new DataHandler(url); - byte[] bytesIn = IOUtils.convertToBytes(dh); - byte[] bytesOut = port.sendOctets("MTOM disabled request", bytesIn); - assertNotNull(bytesOut); - assertTrue("Content length is different", bytesIn.length == bytesOut.length); - assertEquals(bytesIn, bytesOut); - } - - private void setMTOMEnabled(Boolean b) - { - ((Stub)port)._setProperty("org.jboss.ws.mtom.enabled", b); - } -} Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/XOPTest.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/XOPTest.java 2006-10-27 13:27:04 UTC (rev 1322) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/XOPTest.java 2006-10-27 14:55:38 UTC (rev 1323) @@ -1,62 +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.samples.mtom; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -import javax.activation.DataHandler; -import javax.xml.transform.Source; - -/** - * Service Endpoint Interface for XOP - * - * image/gif java.awt.Image - * image/jpeg java.awt.Image - * text/plain java.lang.String - * multipart/* javax.mail.internet.MimeMultipart - * text/xml javax.xml.transform.Source - * application/xml javax.xml.transform.Source - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Jan-2006 - */ -public interface XOPTest extends Remote -{ - /** Service endpoint method for image/jpeg - */ - DataHandler sendMimeImageJPEG(String message, DataHandler xoppart) throws RemoteException; - - /** Service endpoint method for text/plain - */ - String sendMimeTextPlain(String message, String xoppart) throws RemoteException; - - /** Service endpoint method for text/xml - */ - Source sendMimeTextXML(String message, DataHandler xoppart) throws RemoteException; - - /** Service endpoint method for application/xml - */ - DataHandler sendMimeApplicationXML(String message, Source xoppart) throws RemoteException; - - byte[] sendOctets(String message, byte[] xoppart) throws RemoteException; -} Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/XOPTestImpl.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/XOPTestImpl.java 2006-10-27 13:27:04 UTC (rev 1322) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/XOPTestImpl.java 2006-10-27 14:55:38 UTC (rev 1323) @@ -1,111 +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.samples.mtom; - -import java.io.IOException; -import java.rmi.RemoteException; - -import javax.activation.DataHandler; -import javax.xml.rpc.ServiceException; -import javax.xml.rpc.server.ServiceLifecycle; -import javax.xml.rpc.server.ServletEndpointContext; -import javax.xml.transform.Source; - -import org.jboss.ws.WSException; - -/** - * Service Endpoint for XOP - * - * image/jpeg java.awt.Image - * text/plain java.lang.String - * text/xml javax.xml.transform.Source - * application/xml javax.xml.transform.Source - * - * @author Thomas.Diesler(a)jboss.org - * @author Heiko.Braun(a)jboss.org - * - * @since 18-Jan-2006 - */ -public class XOPTestImpl implements XOPTest, ServiceLifecycle -{ - private ServletEndpointContext context; - - /** - * Service endpoint method that processes inlined and optimized values. - */ - public DataHandler sendMimeImageJPEG(String message, DataHandler xoppart) throws RemoteException - { - String expContentType = message.equals("MTOM disabled request") ? "application/octet-stream" : "image/jpeg"; - - if(! xoppart.getContentType().equals(expContentType)) - throw new IllegalArgumentException("Wrong content-type: expected "+expContentType+", but was " + xoppart.getContentType()); - return xoppart; - } - - /** - * Service endpoint method for text/plain - */ - public String sendMimeTextPlain(String message, String xoppart) throws RemoteException - { - return xoppart; - } - - /** - * Service endpoint method for text/xml - */ - public Source sendMimeTextXML(String message, DataHandler xoppart) throws RemoteException - { - if(! xoppart.getContentType().equals("text/xml")) - throw new IllegalArgumentException("Wrong content-type: expected 'text/xml', but was " + xoppart.getContentType()); - try - { - Source payload = (Source)xoppart.getContent(); - return payload; - } - catch (IOException e) - { - throw new WSException(e.getMessage()); - } - } - - /** - * Service endpoint method for application/xml - */ - public DataHandler sendMimeApplicationXML(String message, Source xoppart) throws RemoteException - { - return new DataHandler(xoppart, "application/xml"); - } - - public byte[] sendOctets(String message, byte[] xoppart) throws RemoteException { - return xoppart; - } - - public void init(Object context) throws ServiceException - { - this.context = (ServletEndpointContext)context; - } - - public void destroy() - { - this.context = null; - } -} Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/META-INF/application-client.xml 2006-10-27 13:27:04 UTC (rev 1322) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/META-INF/application-client.xml 2006-10-27 14:55:38 UTC (rev 1323) @@ -10,10 +10,10 @@ <service-ref> <service-ref-name>service/XOPTestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> + <wsdl-file>META-INF/wsdl/EmployeeService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.mtom.XOPTest</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.mtom.EmployeeRecords</service-endpoint-interface> </port-component-ref> </service-ref> Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/WEB-INF/web.xml 2006-10-27 13:27:04 UTC (rev 1322) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/WEB-INF/web.xml 2006-10-27 14:55:38 UTC (rev 1323) @@ -6,12 +6,12 @@ version="2.4"> <servlet> - <servlet-name>XOPTestJSE</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.samples.mtom.XOPTestImpl</servlet-class> + <servlet-name>EmployeeEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxrpc.samples.mtom.EmployeeRecordsImpl</servlet-class> </servlet> <servlet-mapping> - <servlet-name>XOPTestJSE</servlet-name> + <servlet-name>EmployeeEndpoint</servlet-name> <url-pattern>/*</url-pattern> </servlet-mapping> Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/attach.gif =================================================================== (Binary files differ) Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/attach.html =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/attach.html 2006-10-27 13:27:04 UTC (rev 1322) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/attach.html 2006-10-27 14:55:38 UTC (rev 1323) @@ -1,40 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> -<head> -<title>Welcome to the JAXM TCK, Version 1.1</title> -</head> -<body bgcolor="#ffffff"> -<CENTER><h1>Your Starting Point</h1></center><hr> - - -<h2>Guide to Documentation</h2> - -<p>The <a href="COPYRIGHT-jaxm.html">JAXM Copyright</a> provides - the copyright information notice for the JAXM TCK, Version 1.1.<p> - -<p>The <a href="ReleaseNotes-jaxm.html">JAXM ReleaseNotes</a> provide the - information that you need to install, set up, and run the JAXM TCK, Version 1.1.<p> - -<p>The <a href="JAXMJavadocAssertions.html">Javadoc Assertion List</a> lists all the javadoc assertions that are tested by the JAXM TCK. - -<p>The <a href="JAXMSpecAssertions.html">Specification Assertion List</a> lists all the specification assertions that are tested by the JAXM TCK. - -<p>Additional documentation includes the JavaTest README file, ReleaseNotes - file, and user's guide: - -<ul> -<li><p>The <a href="JavaTest3.0/README-javatest.html">README</a> file contains - basic information about the JavaTest, Version 3.0.2 harness.</p></li> - -<li><p>The <a href="JavaTest3.0/javatest.pdf"><em>JavaTest User's Guide</em></a>, - in PDF format, contains information about using the test harness tool.</p></li> - -<li><p>The <a href="JavaTest3.0/ReleaseNotes-javatest.html">ReleaseNotes</a> - provide information that is not contained in the <em>JavaTest User's - Guide</em> manual, and which supercede any information in the manual.<p></li> -</ul> - -<p>&nbsp;</p> -<rule> -<p><em>Copyright &copy; 2002 Sun Microsystems, Inc. All rights reserved</em></p> -</body> -</html> Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/attach.jpeg =================================================================== (Binary files differ) Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/attach.txt =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/attach.txt 2006-10-27 13:27:04 UTC (rev 1322) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/attach.txt 2006-10-27 14:55:38 UTC (rev 1323) @@ -1 +0,0 @@ -This is a plain text attachment. Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/attach.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/attach.xml 2006-10-27 13:27:04 UTC (rev 1322) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/attach.xml 2006-10-27 14:55:38 UTC (rev 1323) @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<mime-message>This is an xml attachment.</mime-message> Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/disguised_jpeg.xcf =================================================================== (Binary files differ) Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/wstools-config.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/wstools-config.xml 2006-10-27 13:27:04 UTC (rev 1322) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/samples/mtom/wstools-config.xml 2006-10-27 14:55:38 UTC (rev 1323) @@ -8,7 +8,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> <java-wsdl> - <service name="TestService" style="rpc" endpoint="org.jboss.test.ws.jaxrpc.samples.mtom.XOPTest"> + <service name="TestService" style="rpc" endpoint="org.jboss.test.ws.jaxrpc.samples.mtom.EmployeeRecords"> <operation> <name>sendMimeImageGIF</name> <parameter> Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/samples-override/mtom/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/samples-override/mtom/WEB-INF/jaxrpc-mapping.xml 2006-10-27 13:27:04 UTC (rev 1322) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/samples-override/mtom/WEB-INF/jaxrpc-mapping.xml 2006-10-27 14:55:38 UTC (rev 1323) @@ -1,184 +1,111 @@ <?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" - 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.samples.mtom</package-type> - <namespaceURI>http://org.jboss.ws/samples/mtom</namespaceURI> - </package-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.samples.mtom.XOPTest_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://org.jboss.ws/samples/mtom">serviceNS:XOPTest</wsdl-service-name> - <port-mapping> - <port-name>XOPTestPort</port-name> - <java-port-name>XOPTestPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.mtom.XOPTest</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://org.jboss.ws/samples/mtom">portTypeNS:XOPTest</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://org.jboss.ws/samples/mtom">bindingNS:XOPTestBinding</wsdl-binding> +<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee + http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <service-endpoint-method-mapping> - <java-method-name>sendMimeImageJPEG</java-method-name> - <wsdl-operation>sendMimeImageJPEG</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://org.jboss.ws/samples/mtom">wsdlMsgNS:XOPTest_sendMimeImageJPEG</wsdl-message> - <wsdl-message-part-name>message</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jaxrpc.samples.mtom</package-type> + <namespaceURI>http://org.jboss.ws/samples/mtom</namespaceURI> + </package-mapping> - <!-- BEGIN manual modification --> - <method-param-parts-mapping> - <param-position>1</param-position> - <param-type>javax.activation.DataHandler</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/samples/mtom">wsdlMsgNS:XOPTest_sendMimeImageJPEG</wsdl-message> - <wsdl-message-part-name>xoppart</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <!-- END manual modification --> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.samples.mtom.Employee</java-type> + <anonymous-type-qname xmlns:typeNS='http://org.jboss.ws/samples/mtom'>typeNS:&gt;Employee</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstname</java-variable-name> + <xml-element-name>firstname</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>lastname</java-variable-name> + <xml-element-name>lastname</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>legacyData</java-variable-name> + <xml-element-name>legacyData</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> - <wsdl-return-value-mapping> - <method-return-value>javax.activation.DataHandler</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/samples/mtom">wsdlMsgNS:XOPTest_sendMimeImageJPEGResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.samples.mtom.Status</java-type> + <anonymous-type-qname xmlns:typeNS='http://org.jboss.ws/samples/mtom'>typeNS:&gt;Status</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>code</java-variable-name> + <xml-element-name>code</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> - <service-endpoint-method-mapping> - <java-method-name>sendMimeTextPlain</java-method-name> - <wsdl-operation>sendMimeTextPlain</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://org.jboss.ws/samples/mtom">wsdlMsgNS:XOPTest_sendMimeTextPlain</wsdl-message> - <wsdl-message-part-name>message</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.samples.mtom.Query</java-type> + <anonymous-type-qname xmlns:typeNS='http://org.jboss.ws/samples/mtom'>typeNS:&gt;Query</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstname</java-variable-name> + <xml-element-name>firstname</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>lastname</java-variable-name> + <xml-element-name>lastname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> - <!-- BEGIN manual modification --> - <method-param-parts-mapping> - <param-position>1</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/samples/mtom">wsdlMsgNS:XOPTest_sendMimeTextPlain</wsdl-message> - <wsdl-message-part-name>xoppart</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <!-- END manual modification --> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jaxrpc.samples.mtom.HRService</service-interface> + <wsdl-service-name xmlns:serviceNS="http://org.jboss.ws/samples/mtom">serviceNS:EmployeeService</wsdl-service-name> + <port-mapping> + <port-name>EmployeeRecordsPort</port-name> + <java-port-name>EmployeeRecordsPort</java-port-name> + </port-mapping> + </service-interface-mapping> - <wsdl-return-value-mapping> - <method-return-value>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/samples/mtom">wsdlMsgNS:XOPTest_sendMimeTextPlainResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.mtom.EmployeeRecords</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS="http://org.jboss.ws/samples/mtom">portTypeNS:EmployeeRecords</wsdl-port-type> + <wsdl-binding xmlns:bindingNS="http://org.jboss.ws/samples/mtom">bindingNS:EmployeeRecordsBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>sendMimeTextXML</java-method-name> - <wsdl-operation>sendMimeTextXML</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://org.jboss.ws/samples/mtom">wsdlMsgNS:XOPTest_sendMimeTextXML</wsdl-message> - <wsdl-message-part-name>message</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> + <service-endpoint-method-mapping> + <java-method-name>updateEmployee</java-method-name> + <wsdl-operation>updateEmployee</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jaxrpc.samples.mtom.Employee</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/samples/mtom">wsdlMsgNS:UpdateRequest</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> - <!-- BEGIN manual modification --> - <method-param-parts-mapping> - <param-position>1</param-position> - <param-type>javax.activation.DataHandler</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/samples/mtom">wsdlMsgNS:XOPTest_sendMimeTextXML</wsdl-message> - <wsdl-message-part-name>xoppart</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <!-- END manual modification --> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jaxrpc.samples.mtom.Status</method-return-value> + <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/samples/mtom">wsdlMsgNS:UpdateResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> - <wsdl-return-value-mapping> - <method-return-value>javax.xml.transform.Source</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/samples/mtom">wsdlMsgNS:XOPTest_sendMimeTextXMLResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> + <service-endpoint-method-mapping> + <java-method-name>queryEmployee</java-method-name> + <wsdl-operation>queryEmployee</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jaxrpc.samples.mtom.Query</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/samples/mtom">wsdlMsgNS:QueryRequest</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> - <service-endpoint-method-mapping> - <java-method-name>sendMimeApplicationXML</java-method-name> - <wsdl-operation>sendMimeApplicationXML</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://org.jboss.ws/samples/mtom">wsdlMsgNS:XOPTest_sendMimeApplicationXML</wsdl-message> - <wsdl-message-part-name>message</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.samples.mtom.Employee</method-return-value> + <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/samples/mtom">wsdlMsgNS:QueryResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> - <!-- BEGIN manual modification --> - <method-param-parts-mapping> - <param-position>1</param-position> - <param-type>javax.xml.transform.Source</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/samples/mtom">wsdlMsgNS:XOPTest_sendMimeApplicationXML</wsdl-message> - <wsdl-message-part-name>xoppart</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <!-- END manual modification --> + </service-endpoint-interface-mapping> - <wsdl-return-value-mapping> - <method-return-value>javax.activation.DataHandler</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/samples/mtom">wsdlMsgNS:XOPTest_sendMimeApplicationXMLResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - <service-endpoint-method-mapping> - <java-method-name>sendOctets</java-method-name> - <wsdl-operation>sendOctets</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://org.jboss.ws/samples/mtom">wsdlMsgNS:XOPTest_sendMimeApplicationXML</wsdl-message> - <wsdl-message-part-name>message</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - - <!-- BEGIN manual modification --> - <method-param-parts-mapping> - <param-position>1</param-position> - <param-type>java.lang.Object</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/samples/mtom">wsdlMsgNS:XOPTest_sendMimeApplicationXML</wsdl-message> - <wsdl-message-part-name>xoppart</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <!-- END manual modification --> - - <wsdl-return-value-mapping> - <method-return-value>javax.activation.DataHandler</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/samples/mtom">wsdlMsgNS:XOPTest_sendMimeApplicationXMLResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - - </service-endpoint-interface-mapping> - - </java-wsdl-mapping> \ No newline at end of file Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/samples-override/mtom/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/samples-override/mtom/WEB-INF/webservices.xml 2006-10-27 13:27:04 UTC (rev 1322) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/samples-override/mtom/WEB-INF/webservices.xml 2006-10-27 14:55:38 UTC (rev 1323) @@ -8,14 +8,14 @@ <webservice-description> <webservice-description-name>XOPTestService</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> + <wsdl-file>WEB-INF/wsdl/EmployeeService.wsdl</wsdl-file> <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component> - <port-component-name>XOPTestPort</port-component-name> - <wsdl-port>impl:XOPTestPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.mtom.XOPTest</service-endpoint-interface> + <port-component-name>EmployeeRecordsPort</port-component-name> + <wsdl-port>impl:EmployeeRecordsPort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.mtom.EmployeeRecords</service-endpoint-interface> <service-impl-bean> - <servlet-link>XOPTestJSE</servlet-link> + <servlet-link>EmployeeEndpoint</servlet-link> </service-impl-bean> </port-component> </webservice-description> Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/samples-override/mtom/WEB-INF/wsdl/EmployeeService.wsdl (from rev 1317, branches/jbossws-1.0/src/test/resources/jaxrpc/samples-override/mtom/WEB-INF/wsdl/TestService.wsdl) =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/samples-override/mtom/WEB-INF/wsdl/TestService.wsdl 2006-10-27 07:43:19 UTC (rev 1317) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/samples-override/mtom/WEB-INF/wsdl/EmployeeService.wsdl 2006-10-27 14:55:38 UTC (rev 1323) @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<definitions name="XOPTest" targetNamespace="http://org.jboss.ws/samples/mtom" + xmlns:tns="http://org.jboss.ws/samples/mtom" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + + <types> + <schema xmlns="http://www.w3.org/2001/XMLSchema" + targetNamespace="http://org.jboss.ws/samples/mtom" + xmlns:xmime="http://www.w3.org/2005/05/xmlmime"> + + <import schemaLocation="http://www.w3.org/2005/05/xmlmime" namespace="http://www.w3.org/2005/05/xmlmime"/> + + <element name="Employee"> + <complexType> + <sequence> + <element name="firstname" type="xsd:string"/> + <element name="lastname" type="xsd:string"/> + <element name="legacyData" xmime:expectedContentTypes="text/xml" type="xmime:base64Binary"/> + </sequence> + </complexType> + </element> + + <element name="Status"> + <complexType> + <sequence> + <element name="code" type="xsd:string"/> + </sequence> + </complexType> + </element> + + <element name="Query"> + <complexType> + <sequence> + <element name="firstname" type="xsd:string"/> + <element name="lastname" type="xsd:string"/> + </sequence> + </complexType> + </element> + </schema> + </types> + + <message name="UpdateRequest"> + <part name="parameters" element="tns:Employee"/> + </message> + + <message name="UpdateResponse"> + <part name="result" element="tns:Status"/> + </message> + + <message name="QueryRequest"> + <part name="parameters" element="tns:Query"/> + </message> + + <message name="QueryResponse"> + <part name="result" element="tns:Employee"/> + </message> + + <portType name="EmployeeRecords"> + <operation name="updateEmployee"> + <input message="tns:UpdateRequest"/> + <output message="tns:UpdateResponse"/> + </operation> + <operation name="queryEmployee"> + <input message="tns:QueryRequest"/> + <output message="tns:QueryResponse"/> + </operation> + </portType> + + <binding name="EmployeeRecordsBinding" type="tns:EmployeeRecords"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> + <operation name="updateEmployee"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal" namespace="http://org.jboss.ws/samples/mtom"/> + </input> + <output> + <soap:body use="literal" namespace="http://org.jboss.ws/samples/mtom"/> + </output> + </operation> + <operation name="queryEmployee"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal" namespace="http://org.jboss.ws/samples/mtom"/> + </input> + <output> + <soap:body use="literal" namespace="http://org.jboss.ws/samples/mtom"/> + </output> + </operation> + </binding> + + <service name="EmployeeService"> + <port name="EmployeeRecordsPort" binding="tns:EmployeeRecordsBinding"> + <soap:address location="REPLACE_WITH_ACTUAL_URL"/> + </port> + </service> +</definitions> Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/samples-override/mtom/WEB-INF/wsdl/EmployeeService.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/samples-override/mtom/WEB-INF/wsdl/TestService.wsdl =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/samples-override/mtom/WEB-INF/wsdl/TestService.wsdl 2006-10-27 13:27:04 UTC (rev 1322) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/samples-override/mtom/WEB-INF/wsdl/TestService.wsdl 2006-10-27 14:55:38 UTC (rev 1323) @@ -1,147 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<definitions name="XOPTest" targetNamespace="http://org.jboss.ws/samples/mtom" - xmlns:tns="http://org.jboss.ws/samples/mtom" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> - - <types> - <schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://org.jboss.ws/samples/mtom" - xmlns:xmime="http://www.w3.org/2005/05/xmlmime"> - - <import schemaLocation="http://www.w3.org/2005/05/xmlmime" namespace="http://www.w3.org/2005/05/xmlmime"/> - - <element name="imagejpeg" xmime:contentType="image/jpeg" type="xmime:base64Binary"/> - <element name="textplain" xmime:contentType="text/plain" type="xmime:base64Binary"/> - <element name="textxml" xmime:contentType="text/xml" type="xmime:base64Binary"/> - <element name="applxml" xmime:contentType="application/xml" type="xmime:base64Binary"/> - <element name="octets" type="xsd:base64Binary"/> - - <complexType name="XOPBinary" > - <simpleContent> - <extension base="xsd:base64Binary" > - <attribute ref="xmime:contentType"/> - </extension> - </simpleContent> - </complexType> - </schema> - </types> - - <message name="XOPTest_sendMimeImageJPEG"> - <part name="message" type="xsd:string"/> - <part name="xoppart" element="tns:imagejpeg"/> - </message> - <message name="XOPTest_sendMimeImageJPEGResponse"> - <part name="result" element="tns:imagejpeg"/> - </message> - <message name="XOPTest_sendMimeTextPlain"> - <part name="message" type="xsd:string"/> - <part name="xoppart" element="tns:textplain"/> - </message> - <message name="XOPTest_sendMimeTextPlainResponse"> - <part name="result" element="tns:textplain"/> - </message> - <message name="XOPTest_sendMimeTextXML"> - <part name="message" type="xsd:string"/> - <part name="xoppart" element="tns:textxml"/> - </message> - <message name="XOPTest_sendMimeTextXMLResponse"> - <part name="result" element="tns:textxml"/> - </message> - <message name="XOPTest_sendMimeApplicationXML"> - <part name="message" type="xsd:string"/> - <part name="xoppart" element="tns:applxml"/> - </message> - <message name="XOPTest_sendMimeApplicationXMLResponse"> - <part name="result" element="tns:applxml"/> - </message> - - <message name="XOPTest_sendOctets"> - <part name="message" type="xsd:string"/> - <part name="xoppart" element="tns:octets"/> - </message> - <message name="XOPTest_sendOctetsResponse"> - <part name="result" element="tns:octets"/> - </message> - - <portType name="XOPTest"> - <operation name="sendMimeImageJPEG"> - <input message="tns:XOPTest_sendMimeImageJPEG"/> - <output message="tns:XOPTest_sendMimeImageJPEGResponse"/> - </operation> - <operation name="sendMimeTextPlain"> - <input message="tns:XOPTest_sendMimeTextPlain"/> - <output message="tns:XOPTest_sendMimeTextPlainResponse"/> - </operation> - <operation name="sendMimeTextXML"> - <input message="tns:XOPTest_sendMimeTextXML"/> - <output message="tns:XOPTest_sendMimeTextXMLResponse"/> - </operation> - <operation name="sendMimeApplicationXML"> - <input message="tns:XOPTest_sendMimeApplicationXML"/> - <output message="tns:XOPTest_sendMimeApplicationXMLResponse"/> - </operation> - - <operation name="sendOctets"> - <input message="tns:XOPTest_sendOctets"/> - <output message="tns:XOPTest_sendOctetsResponse"/> - </operation> - </portType> - - <binding name="XOPTestBinding" type="tns:XOPTest"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/> - <operation name="sendMimeImageJPEG"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal" namespace="http://org.jboss.ws/samples/mtom"/> - </input> - <output> - <soap:body use="literal" namespace="http://org.jboss.ws/samples/mtom"/> - </output> - </operation> - <operation name="sendMimeTextPlain"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal" namespace="http://org.jboss.ws/samples/mtom"/> - </input> - <output> - <soap:body use="literal" namespace="http://org.jboss.ws/samples/mtom"/> - </output> - </operation> - <operation name="sendMimeTextXML"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal" namespace="http://org.jboss.ws/samples/mtom"/> - </input> - <output> - <soap:body use="literal" namespace="http://org.jboss.ws/samples/mtom"/> - </output> - </operation> - <operation name="sendMimeApplicationXML"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal" namespace="http://org.jboss.ws/samples/mtom"/> - </input> - <output> - <soap:body use="literal" namespace="http://org.jboss.ws/samples/mtom"/> - </output> - </operation> - <operation name="sendOctets"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal" namespace="http://org.jboss.ws/samples/mtom"/> - </input> - <output> - <soap:body use="literal" namespace="http://org.jboss.ws/samples/mtom"/> - </output> - </operation> - </binding> - - <service name="XOPTest"> - <port name="XOPTestPort" binding="tns:XOPTestBinding"> - <soap:address location="REPLACE_WITH_ACTUAL_URL"/> - </port> - </service> -</definitions>