[jboss-svn-commits] JBossWS SVN: r673 - in trunk: . src/main/resources/samples/jsr181ejb src/test src/test/ant src/test/java/org/jboss/test/ws src/test/java/org/jboss/test/ws/benchmark src/test/java/org/jboss/test/ws/eventing src/test/java/org/jboss/test/ws/jbws434 src/test/java/org/jboss/test/ws/jsr181/webservice src/test/java/org/jboss/test/ws/samples/jsr181ejb src/test/java/org/jboss/test/ws/samples/mtom src/test/java/org/jboss/test/ws/xop src/test/java/org/jboss/test/ws/xop/doclit src/test/resources/benchmark/jmeter src/test/resources/eventing/WEB-INF src/test/resources/eventing/WEB-INF/wsdl src/test/resources/jbws434/WEB-INF src/test/resources/jbws434/WEB-INF/wsdl src/test/resources/samples/wseventing/WEB-INF src/test/resources/samples/wseventing/WEB-INF/wsdl src/test/resources/samples-override/mtom/WEB-INF src/test/resources/samples-override/mtom/WEB-INF/wsdl src/test/resources/xop/doclit/META-INF src/test/resources/xop/doclit/WEB-INF
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Aug 3 04:57:52 EDT 2006
Author: heiko.braun at jboss.com
Date: 2006-08-03 04:57:12 -0400 (Thu, 03 Aug 2006)
New Revision: 673
Modified:
trunk/src/main/resources/samples/jsr181ejb/build.xml
trunk/src/test/ant/build-jars.xml
trunk/src/test/build.xml
trunk/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java
trunk/src/test/java/org/jboss/test/ws/JBossWSTestSetup.java
trunk/src/test/java/org/jboss/test/ws/benchmark/OrderBL.java
trunk/src/test/java/org/jboss/test/ws/eventing/DIIClientTestCase.java
trunk/src/test/java/org/jboss/test/ws/jbws434/JBWS434TestCase.java
trunk/src/test/java/org/jboss/test/ws/jbws434/TestServiceEndpoint.java
trunk/src/test/java/org/jboss/test/ws/jbws434/TestServiceEndpointImpl.java
trunk/src/test/java/org/jboss/test/ws/jsr181/webservice/EJB21Bean03.java
trunk/src/test/java/org/jboss/test/ws/jsr181/webservice/EJB3Bean02.java
trunk/src/test/java/org/jboss/test/ws/samples/jsr181ejb/EJB3Bean01.java
trunk/src/test/java/org/jboss/test/ws/samples/mtom/XOPRpcTestCase.java
trunk/src/test/java/org/jboss/test/ws/samples/mtom/XOPTest.java
trunk/src/test/java/org/jboss/test/ws/samples/mtom/XOPTestImpl.java
trunk/src/test/java/org/jboss/test/ws/xop/XOPElementRPCTestCase.java
trunk/src/test/java/org/jboss/test/ws/xop/doclit/PingMsg.java
trunk/src/test/java/org/jboss/test/ws/xop/doclit/PingMsgResponse.java
trunk/src/test/java/org/jboss/test/ws/xop/doclit/TestServiceImpl.java
trunk/src/test/java/org/jboss/test/ws/xop/doclit/XOPElementDoclitTestCase.java
trunk/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx
trunk/src/test/resources/eventing/WEB-INF/jaxrpc-mapping.xml
trunk/src/test/resources/eventing/WEB-INF/wsdl/eventing.xsd
trunk/src/test/resources/jbws434/WEB-INF/jaxrpc-mapping.xml
trunk/src/test/resources/jbws434/WEB-INF/wsdl/TestService.wsdl
trunk/src/test/resources/samples-override/mtom/WEB-INF/jaxrpc-mapping.xml
trunk/src/test/resources/samples-override/mtom/WEB-INF/wsdl/TestService.wsdl
trunk/src/test/resources/samples/wseventing/WEB-INF/jaxrpc-mapping.xml
trunk/src/test/resources/samples/wseventing/WEB-INF/wsdl/jbwse.wsdl
trunk/src/test/resources/samples/wseventing/WEB-INF/wsdl/jbwse.xsd
trunk/src/test/resources/xop/doclit/META-INF/application-client.xml
trunk/src/test/resources/xop/doclit/WEB-INF/jaxrpc-mapping.xml
trunk/src/test/resources/xop/doclit/WEB-INF/webservices.xml
trunk/version.properties
Log:
merge from 1.0.3.DEV
Modified: trunk/src/main/resources/samples/jsr181ejb/build.xml
===================================================================
--- trunk/src/main/resources/samples/jsr181ejb/build.xml 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/main/resources/samples/jsr181ejb/build.xml 2006-08-03 08:57:12 UTC (rev 673)
@@ -38,6 +38,9 @@
<include name="org/jboss/test/ws/samples/jsr181ejb/EJB3Bean01.class"/>
<include name="org/jboss/test/ws/samples/jsr181ejb/EJB3RemoteInterface.class"/>
</fileset>
+ <fileset dir="${build.test.dir}/resources/samples/jsr181ejb">
+ <include name="config/ServerHandlers.xml"/>
+ </fileset>
</jar>
<jar jarfile="${build.test.dir}/libs/jbossws-samples-jsr181ejb-client.jar">
<fileset dir="${build.test.dir}/classes">
Modified: trunk/src/test/ant/build-jars.xml
===================================================================
--- trunk/src/test/ant/build-jars.xml 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/ant/build-jars.xml 2006-08-03 08:57:12 UTC (rev 673)
@@ -389,7 +389,8 @@
<classes dir="${build.test.dir}/classes">
<include name="org/jboss/test/ws/jbws434/TestServiceEndpoint.class"/>
<include name="org/jboss/test/ws/jbws434/TestServiceEndpointImpl.class"/>
- <include name="org/jboss/test/ws/jbws434/ArrayOfAny.class"/>
+ <include name="org/jboss/test/ws/jbws434/ArrayOfAny*.class"/>
+ <include name="org/jboss/test/ws/jbws434/TypeOfAny*.class"/>
</classes>
<webinf dir="${build.test.dir}/resources/jbws434/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
@@ -400,7 +401,8 @@
<jar destfile="${build.test.dir}/libs/jbossws-jbws434-client.jar">
<fileset dir="${build.test.dir}/classes">
<include name="org/jboss/test/ws/jbws434/TestServiceEndpoint.class"/>
- <include name="org/jboss/test/ws/jbws434/ArrayOfAny.class"/>
+ <include name="org/jboss/test/ws/jbws434/ArrayOfAny*.class"/>
+ <include name="org/jboss/test/ws/jbws434/TypeOfAny*.class"/>
</fileset>
<metainf dir="${build.test.dir}/resources/jbws434/META-INF">
<include name="application-client.xml"/>
@@ -608,6 +610,19 @@
<include name="org/jboss/test/ws/jbws871/RpcArrayEndpointImpl.class"/>
</classes>
</war>
+ <jar destfile="${build.test.dir}/libs/jbossws-jbws871-rpc-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws871/IntegerArray.class"/>
+ <include name="org/jboss/test/ws/jbws871/RpcArrayEndpoint.class"/>
+ <include name="org/jboss/test/ws/jbws871/RpcArrayEndpointService.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jbws871/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
<!-- jbossws-jbws944 -->
<jar jarfile="${build.test.dir}/libs/jbossws-jbws944.ejb3">
@@ -1022,7 +1037,9 @@
<webinf dir="${build.test.dir}/resources/samples/wseventing/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
- <include name="wsdl/**"/>
+ <include name="wsdl/sysmon.wsdl"/>
+ <include name="wsdl/jbwse.wsdl"/>
+ <include name="wsdl/jbwse.xsd"/>
</webinf>
</war>
<jar jarfile="${build.test.dir}/libs/jbossws-samples-eventing-client.jar">
@@ -1267,7 +1284,27 @@
<include name="org/jboss/test/ws/samples/jsr181ejb/EJB3Bean01.class"/>
<include name="org/jboss/test/ws/samples/jsr181ejb/EJB3RemoteInterface.class"/>
</fileset>
+ <fileset dir="${build.test.dir}/resources/samples/jsr181ejb">
+ <include name="config/ServerHandlers.xml"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/samples/jsr181ejb/META-INF">
+ <include name="jboss-wsse-server.xml"/>
+ <include name="wsse.*"/>
+ </metainf>
</jar>
+ <jar jarfile="${build.test.dir}/libs/jbossws-samples-jsr181ejb-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/samples/jsr181ejb/EndpointInterface.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/samples/jsr181ejb/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ <include name="jboss-wsse-client.xml"/>
+ <include name="wsse.*"/>
+ </metainf>
+ </jar>
<!-- jbossws-samples-jsr181pojo -->
<war warfile="${build.test.dir}/libs/jbossws-samples-jsr181pojo.war" webxml="${build.test.dir}/resources/samples/jsr181pojo/WEB-INF/web.xml">
@@ -1275,6 +1312,17 @@
<include name="org/jboss/test/ws/samples/jsr181pojo/JSEBean01.class"/>
</classes>
</war>
+ <jar jarfile="${build.test.dir}/libs/jbossws-samples-jsr181pojo-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/samples/jsr181pojo/EndpointInterface.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/samples/jsr181pojo/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
<!-- jbossws-samples-jsr181pojo-docwrapped -->
<war warfile="${build.test.dir}/libs/jbossws-samples-jsr181pojo-docwrapped.war" webxml="${build.test.dir}/resources/samples/jsr181pojo/docwrapped/WEB-INF/web.xml">
Modified: trunk/src/test/build.xml
===================================================================
--- trunk/src/test/build.xml 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/build.xml 2006-08-03 08:57:12 UTC (rev 673)
@@ -120,14 +120,14 @@
<!-- The jbossws client classpath -->
<path id="jbossws.client.classpath">
+ <!-- override jbossxb in jbossall-client.jar -->
+ <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
<pathelement location="${jboss.client}/activation.jar"/>
<pathelement location="${jboss.client}/commons-logging.jar"/>
<pathelement location="${jboss.client}/javassist.jar"/>
- <pathelement location="${jboss.client}/jboss-common.jar"/>
<pathelement location="${jboss.client}/jbossall-client.jar"/>
<pathelement location="${jboss.client}/jbossretro-rt.jar"/>
<pathelement location="${jboss.client}/jboss-backport-concurrent.jar"/>
- <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
<pathelement location="${jboss.client}/${jbossws.client.jar}"/>
<pathelement location="${jboss.client}/log4j.jar"/>
<pathelement location="${jboss.client}/mail.jar"/>
Modified: trunk/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java 2006-08-03 08:57:12 UTC (rev 673)
@@ -21,17 +21,13 @@
*/
package org.jboss.test.ws;
+import javax.management.MBeanServerConnection;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-import javax.management.MBeanServerConnection;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.xml.ws.Endpoint;
-
/**
* A JBossWS test helper that deals with test deployment/undeployment, etc.
*
@@ -96,7 +92,7 @@
}
/** Try to discover the URL for the deployment archive */
- private URL getArchiveURL(String archive) throws MalformedURLException
+ public URL getArchiveURL(String archive) throws MalformedURLException
{
URL url = null;
try
Modified: trunk/src/test/java/org/jboss/test/ws/JBossWSTestSetup.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/JBossWSTestSetup.java 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/java/org/jboss/test/ws/JBossWSTestSetup.java 2006-08-03 08:57:12 UTC (rev 673)
@@ -21,10 +21,14 @@
*/
package org.jboss.test.ws;
-import java.util.StringTokenizer;
import junit.extensions.TestSetup;
import junit.framework.TestSuite;
+import java.util.StringTokenizer;
+import java.util.List;
+import java.util.ArrayList;
+import java.net.URLClassLoader;
+import java.net.URL;
/**
* A test setup that deploys/undeploys archives
@@ -55,6 +59,7 @@
protected void setUp() throws Exception
{
+ List clientJars = new ArrayList();
for (int i = 0; i < archives.length; i++)
{
String archive = archives[i];
@@ -71,7 +76,24 @@
delegate.undeploy(archive);
}
}
+ if (isJ2EEClient)
+ {
+ URL archiveURL = delegate.getArchiveURL(archive);
+ clientJars.add(archiveURL);
+ }
}
+ // add the client jars to the classloader
+ if( !clientJars.isEmpty() )
+ {
+ ClassLoader parent = Thread.currentThread().getContextClassLoader();
+ URL[] urls = new URL[clientJars.size()];
+ for(int i=0; i<clientJars.size(); i++)
+ {
+ urls[i] = (URL)clientJars.get(i);
+ }
+ URLClassLoader cl = new URLClassLoader(urls, parent);
+ Thread.currentThread().setContextClassLoader(cl);
+ }
}
protected void tearDown() throws Exception
Modified: trunk/src/test/java/org/jboss/test/ws/benchmark/OrderBL.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/benchmark/OrderBL.java 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/java/org/jboss/test/ws/benchmark/OrderBL.java 2006-08-03 08:57:12 UTC (rev 673)
@@ -28,7 +28,7 @@
Customer customer = new Customer(customerId, "FirstName " + id, "LastName " + id, Integer.toString(id), new GregorianCalendar(), Integer.toString(id), Integer.toString(id), bill, ship);
- int numberLineItems = 50;
+ int numberLineItems = orderId;
ArrayList lines = new ArrayList();
Modified: trunk/src/test/java/org/jboss/test/ws/eventing/DIIClientTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/eventing/DIIClientTestCase.java 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/java/org/jboss/test/ws/eventing/DIIClientTestCase.java 2006-08-03 08:57:12 UTC (rev 673)
@@ -104,7 +104,8 @@
// construct service and setup handlers
ServiceFactoryImpl serviceFactory = (ServiceFactoryImpl)ServiceFactory.newInstance();
- ServiceExt service = (ServiceExt)serviceFactory.createService(new URL(wsdlLocation), SERVICE_NAME, mappingURL);
+ //ServiceExt service = (ServiceExt)serviceFactory.createService(new URL(wsdlLocation), SERVICE_NAME, mappingURL);
+ ServiceExt service = (ServiceExt)serviceFactory.createService(new URL(wsdlLocation), SERVICE_NAME);
setupHandlerRegistry(service);
return service;
Modified: trunk/src/test/java/org/jboss/test/ws/jbws434/JBWS434TestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jbws434/JBWS434TestCase.java 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/java/org/jboss/test/ws/jbws434/JBWS434TestCase.java 2006-08-03 08:57:12 UTC (rev 673)
@@ -65,7 +65,7 @@
}
}
- public void testArrayOfAny() throws Exception
+ public void testWildCardArrayWithOtherNS() throws Exception
{
SOAPFactory factory = SOAPFactory.newInstance();
@@ -89,6 +89,49 @@
}
}
+ public void testWildCardArrayWithAnyNS() throws Exception
+ {
+ SOAPFactory factory = SOAPFactory.newInstance();
+
+ SOAPElement el1 = factory.createElement("name", "ns1", "http://somens");
+ el1.setValue("Kermmit");
+ SOAPElement el2 = factory.createElement("product", "ns1", "http://somens");
+ el2.setValue("Ferrari");
+
+ ArrayOfAny2 inObj = new ArrayOfAny2(new SOAPElement[] { el1, el2 });
+ ArrayOfAny2 retObj = port.echo2(inObj);
+
+ assertNotNull(retObj);
+ assertNotNull(retObj._any);
+ assertEquals(inObj._any.length, retObj._any.length);
+
+ for(int i = 0; i < inObj._any.length; ++i)
+ {
+ SOAPElement inE = inObj._any[i];
+ SOAPElement retE = retObj._any[i];
+ assertEquals(inE, retE);
+ }
+ }
+
+ public void testWildCardArrayWithMaxOccurance() throws Exception
+ {
+ SOAPFactory factory = SOAPFactory.newInstance();
+
+ SOAPElement el1 = factory.createElement("name", "ns1", "http://somens");
+ el1.setValue("Kermmit");
+
+ TypeOfAny3 inObj = new TypeOfAny3(el1);
+ TypeOfAny3 retObj = port.echo3(inObj);
+
+ assertNotNull(retObj);
+ assertNotNull(retObj._any);
+
+ SOAPElement inE = inObj._any;
+ SOAPElement retE = retObj._any;
+ assertEquals(inE, retE);
+
+ }
+
private static void assertEquals(SOAPElement myE, SOAPElement otherE)
{
assertEquals(otherE.getLocalName(), myE.getLocalName());
Modified: trunk/src/test/java/org/jboss/test/ws/jbws434/TestServiceEndpoint.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jbws434/TestServiceEndpoint.java 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/java/org/jboss/test/ws/jbws434/TestServiceEndpoint.java 2006-08-03 08:57:12 UTC (rev 673)
@@ -27,4 +27,6 @@
public interface TestServiceEndpoint extends Remote
{
ArrayOfAny echo(ArrayOfAny param1) throws RemoteException;
+ ArrayOfAny2 echo2(ArrayOfAny2 param1) throws RemoteException;
+ TypeOfAny3 echo3(TypeOfAny3 param1) throws RemoteException;
}
Modified: trunk/src/test/java/org/jboss/test/ws/jbws434/TestServiceEndpointImpl.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jbws434/TestServiceEndpointImpl.java 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/java/org/jboss/test/ws/jbws434/TestServiceEndpointImpl.java 2006-08-03 08:57:12 UTC (rev 673)
@@ -23,6 +23,8 @@
import org.jboss.logging.Logger;
+import java.rmi.RemoteException;
+
public class TestServiceEndpointImpl implements TestServiceEndpoint
{
// Provide logging
@@ -33,4 +35,14 @@
log.info("echo: " + param1);
return param1;
}
+
+ public ArrayOfAny2 echo2(ArrayOfAny2 param1) throws RemoteException {
+ log.info("echo: " + param1);
+ return param1;
+ }
+
+ public TypeOfAny3 echo3(TypeOfAny3 param1) throws RemoteException {
+ log.info("echo: " + param1);
+ return param1;
+ }
}
Modified: trunk/src/test/java/org/jboss/test/ws/jsr181/webservice/EJB21Bean03.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jsr181/webservice/EJB21Bean03.java 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/java/org/jboss/test/ws/jsr181/webservice/EJB21Bean03.java 2006-08-03 08:57:12 UTC (rev 673)
@@ -36,6 +36,7 @@
@WebService(endpointInterface = "org.jboss.test.ws.jsr181.webservice.EndpointInterface03")
public class EJB21Bean03 implements SessionBean
{
+ private SessionContext sessionContext;
public String echo(String input)
{
return input;
@@ -45,6 +46,7 @@
public void setSessionContext(SessionContext ctx) throws EJBException, RemoteException
{
+ this.sessionContext = ctx;
}
public void ejbCreate()
Modified: trunk/src/test/java/org/jboss/test/ws/jsr181/webservice/EJB3Bean02.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jsr181/webservice/EJB3Bean02.java 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/java/org/jboss/test/ws/jsr181/webservice/EJB3Bean02.java 2006-08-03 08:57:12 UTC (rev 673)
@@ -29,6 +29,8 @@
import javax.jws.soap.SOAPBinding;
import javax.ejb.Remote;
import javax.ejb.Stateless;
+import javax.ejb.SessionContext;
+import javax.annotation.Resource;
/**
* Test the JSR-181 javax.jws.WebService annotation on an EJB3 endpoint.
@@ -46,6 +48,7 @@
@Stateless
public class EJB3Bean02 implements EJB3RemoteInterface
{
+ @Resource SessionContext sessionContext;
@WebMethod
public String echo(String input)
{
Modified: trunk/src/test/java/org/jboss/test/ws/samples/jsr181ejb/EJB3Bean01.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/samples/jsr181ejb/EJB3Bean01.java 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/java/org/jboss/test/ws/samples/jsr181ejb/EJB3Bean01.java 2006-08-03 08:57:12 UTC (rev 673)
@@ -26,6 +26,7 @@
import javax.ejb.Stateless;
import javax.jws.WebMethod;
import javax.jws.WebService;
+import javax.jws.HandlerChain;
import javax.jws.soap.SOAPBinding;
import org.jboss.annotation.ejb.RemoteBinding;
@@ -52,6 +53,7 @@
@RemoteBinding(jndiBinding = "/ejb3/EJB3EndpointInterface")
@PortComponent(authMethod="BASIC", transportGuarantee="NONE")
@SecurityDomain("JBossWS")
+ at HandlerChain(file = "resource://config/ServerHandlers.xml", name = "SecureHandlerChain")
public class EJB3Bean01 implements EJB3RemoteInterface
{
@WebMethod
Modified: trunk/src/test/java/org/jboss/test/ws/samples/mtom/XOPRpcTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/samples/mtom/XOPRpcTestCase.java 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/java/org/jboss/test/ws/samples/mtom/XOPRpcTestCase.java 2006-08-03 08:57:12 UTC (rev 673)
@@ -24,30 +24,26 @@
import junit.framework.Test;
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.test.ws.samples.message.MessageTestService;
import org.jboss.ws.jaxrpc.ServiceFactoryImpl;
import javax.activation.DataHandler;
-import javax.activation.DataSource;
import javax.activation.FileDataSource;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMultipart;
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.xml.transform.Source;
+import javax.xml.transform.stream.StreamSource;
import java.awt.*;
-import java.awt.image.PixelGrabber;
-import java.awt.image.MemoryImageSource;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
import java.net.URL;
/**
* Test SOAP with XOP through the JAXRPC dynamic proxy layer.
*
* @author Thomas.Diesler at jboss.org
+ * @author Heiko.Braun at jboss.org
* @since 18-Jan-2006
*/
public class XOPRpcTestCase extends JBossWSTest
@@ -82,12 +78,15 @@
port = (XOPTest)service.getPort(XOPTest.class);
((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jbossws-samples-mtom");
}
+
}
+
+ //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8081/jbossws-samples-mtom");
}
- /** Send a multipart message with a text/plain attachment part
+ /** Send a multipart message with a image/gif attachment part
*/
- public void testSendMimeImageGIF() throws Exception
+ /*public void testSendMimeImageGIF() throws Exception
{
URL url = new File("resources/samples/mtom/attach.gif").toURL();
@@ -110,9 +109,29 @@
assertNotNull(value);
assertTrue("Wrong return value type", value instanceof Image);
}
+ } */
+
+ /** Send unknown file that actually is converted into a DataHandler
+ */
+ public void testSendOctets() throws Exception
+ {
+ Object value = port.sendOctets("Some text message", new DataHandler(
+ new FileDataSource("resources/samples/mtom/disguised_jpeg.xcf")
+ ));
+ assertNotNull(value);
+ assertTrue("Wrong return value type", value instanceof DataHandler);
}
- /** Send uknown file that actually is a jpeg that will turns into octet-stream
+ /**
+ * A disguised element is send when the actual SEI java parameter
+ * doesn't map with the content-type set on the mimepart.
+ * .NET loves do this...
+ *
+ * In this case we try to 'force' convert that object according to
+ * the expected java parameter.
+ *
+ * @throws Exception
+ * @see org.jboss.ws.soap.SOAPContentElement#getObjectValue()
*/
public void testSendDisguised() throws Exception
{
@@ -123,7 +142,7 @@
assertTrue("Wrong return value type", value instanceof Image);
}
- /** Send a multipart message with a text/plain attachment part
+ /** Send a multipart message with a image/jpeg attachment part
*/
public void testSendMimeImageJPEG() throws Exception
{
@@ -158,11 +177,11 @@
assertNotNull(value);
}
- /** Send a multipart message with a text/plain attachment part
+ /** Send a multipart message with a multipart attachment part
*/
public void testSendMimeMultipart() throws Exception
{
- URL url = new File("resources/samples/mtom/attach.txt").toURL();
+ /*URL url = new File("resources/samples/mtom/attach.txt").toURL();
MimeMultipart multipart = new MimeMultipart("mixed");
MimeBodyPart bodyPart = new MimeBodyPart();
bodyPart.setDataHandler(new DataHandler(url));
@@ -173,9 +192,12 @@
Object value = port.sendMimeMultipart("Some text message", multipart);
assertNotNull(value);
assertTrue("Wrong return value type", value instanceof MimeMultipart);
+ */
+
+ System.out.println("FIXME 'testSendMimeMultipart()'");
}
- /** Send a multipart message with a text/plain attachment part
+ /** Send a multipart message with a text/xml attachment part
*/
public void testSendMimeTextXML() throws Exception
{
@@ -187,7 +209,7 @@
assertTrue("Wrong return value type", value instanceof Source);
}
- /** Send a multipart message with a text/plain attachment part
+ /** Send a multipart message with a application/xml attachment part
*/
public void testSendMimeApplicationXML() throws Exception
{
@@ -198,48 +220,4 @@
assertNotNull(value);
assertTrue("Wrong return value type", value instanceof Source);
}
-
- private class ObjectDataSource implements DataSource
- {
- private Object obj;
- private byte[] bytes;
-
- public ObjectDataSource(Object obj) {
-
- if(! (obj instanceof Serializable) )
- throw new IllegalArgumentException("Object must be serializable");
-
- this.obj = obj;
-
- try
- {
- ByteArrayOutputStream bout = new ByteArrayOutputStream();
- ObjectOutputStream os = new ObjectOutputStream(bout);
- os.writeObject(obj);
- this.bytes = bout.toByteArray();
- }
- catch (Exception e)
- {
- throw new IllegalStateException(e.getMessage());
- }
- }
-
- public String getContentType() {
- return "application/octet-stream";
- }
-
- public InputStream getInputStream() throws IOException {
- ByteArrayInputStream in = new ByteArrayInputStream(bytes);
- return new ObjectInputStream(in);
- }
-
- public String getName() {
- return obj.getClass().getName();
- }
-
- public OutputStream getOutputStream() throws IOException {
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- return new ObjectOutputStream(out) ;
- }
- }
}
Modified: trunk/src/test/java/org/jboss/test/ws/samples/mtom/XOPTest.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/samples/mtom/XOPTest.java 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/java/org/jboss/test/ws/samples/mtom/XOPTest.java 2006-08-03 08:57:12 UTC (rev 673)
@@ -27,6 +27,7 @@
import javax.mail.internet.MimeMultipart;
import javax.xml.transform.Source;
+import javax.activation.DataHandler;
/**
* Service Endpoint Interface for XOP
@@ -66,4 +67,6 @@
/** Service endpoint method for application/xml
*/
Object sendMimeApplicationXML(String message, Source xoppart) throws RemoteException;
+
+ DataHandler sendOctets(String message, DataHandler xoppart) throws RemoteException;
}
Modified: trunk/src/test/java/org/jboss/test/ws/samples/mtom/XOPTestImpl.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/samples/mtom/XOPTestImpl.java 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/java/org/jboss/test/ws/samples/mtom/XOPTestImpl.java 2006-08-03 08:57:12 UTC (rev 673)
@@ -30,6 +30,7 @@
import javax.xml.soap.AttachmentPart;
import javax.xml.soap.SOAPMessage;
import javax.xml.transform.Source;
+import javax.activation.DataHandler;
import java.awt.*;
import java.rmi.RemoteException;
import java.util.Iterator;
@@ -132,6 +133,16 @@
return xoppart;
}
+ public DataHandler sendOctets(String message, DataHandler xoppart) throws RemoteException {
+ StringBuffer buffer = new StringBuffer();
+ validateStringMessage(buffer, message);
+
+ String expContentType = "application/octet-stream";
+ validateAttachmentPart(buffer, expContentType, xoppart);
+
+ return xoppart;
+ }
+
private void validateStringMessage(StringBuffer buffer, String message)
{
if ("Some text message".equals(message) == false)
@@ -140,6 +151,8 @@
private void validateAttachmentPart(StringBuffer buffer, String expContentType, Object xoppart)
{
+ if(null==xoppart)
+ throw new IllegalArgumentException("XOP Parameter was null");
SOAPMessageContext msgContext = (SOAPMessageContext)context.getMessageContext();
SOAPMessage soapMessage = msgContext.getMessage();
@@ -219,6 +232,11 @@
if ((content instanceof Source) == false)
buffer.append("[content=" + content + "]");
}
+ else if (contentType.equals("application/octet-stream") )
+ {
+ if ((content instanceof DataHandler) == false)
+ buffer.append("[content=" + content + "]");
+ }
else
{
throw new IllegalArgumentException("Unsupported mime type: " + contentType);
Modified: trunk/src/test/java/org/jboss/test/ws/xop/XOPElementRPCTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/xop/XOPElementRPCTestCase.java 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/java/org/jboss/test/ws/xop/XOPElementRPCTestCase.java 2006-08-03 08:57:12 UTC (rev 673)
@@ -22,21 +22,17 @@
package org.jboss.test.ws.xop;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.util.xml.DOMWriter;
import org.jboss.ws.Constants;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.jaxrpc.handler.SOAPMessageContextJAXRPC;
import org.jboss.ws.metadata.OperationMetaData;
import org.jboss.ws.metadata.ParameterMetaData;
import org.jboss.ws.soap.*;
-import org.jboss.ws.soap.attachment.MimeConstants;
-import javax.mail.internet.ContentType;
import javax.xml.namespace.QName;
-import javax.xml.soap.*;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPBodyElement;
+import javax.xml.soap.SOAPMessage;
/**
* Test the SOAPElement
Modified: trunk/src/test/java/org/jboss/test/ws/xop/doclit/PingMsg.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/xop/doclit/PingMsg.java 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/java/org/jboss/test/ws/xop/doclit/PingMsg.java 2006-08-03 08:57:12 UTC (rev 673)
@@ -13,24 +13,24 @@
public class PingMsg
{
protected String message;
- protected Image image;
+ protected Image imagejpeg;
public PingMsg(){}
public PingMsg(String message, Image img){
this.message=message;
- this.image = img;
+ this.imagejpeg = img;
}
public java.lang.String getMessage() { return message ;}
public void setMessage(java.lang.String message){ this.message=message; }
- public Image getImage() {
- return image;
+ public Image getImagejpeg() {
+ return imagejpeg;
}
- public void setImage(Image image) {
- this.image = image;
+ public void setImagejpeg(Image imagejpeg) {
+ this.imagejpeg = imagejpeg;
}
}
Modified: trunk/src/test/java/org/jboss/test/ws/xop/doclit/PingMsgResponse.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/xop/doclit/PingMsgResponse.java 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/java/org/jboss/test/ws/xop/doclit/PingMsgResponse.java 2006-08-03 08:57:12 UTC (rev 673)
@@ -12,20 +12,20 @@
public class PingMsgResponse
{
- protected Image image;
+ protected Image imagejpeg;
public PingMsgResponse(){
}
public PingMsgResponse(Image image) {
- this.image = image;
+ this.imagejpeg = image;
}
- public Image getImage() {
- return image;
+ public Image getImagejpeg() {
+ return imagejpeg;
}
- public void setImage(Image image) {
- this.image = image;
+ public void setImagejpeg(Image imagejpeg) {
+ this.imagejpeg = imagejpeg;
}
}
Modified: trunk/src/test/java/org/jboss/test/ws/xop/doclit/TestServiceImpl.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/xop/doclit/TestServiceImpl.java 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/java/org/jboss/test/ws/xop/doclit/TestServiceImpl.java 2006-08-03 08:57:12 UTC (rev 673)
@@ -10,6 +10,6 @@
*/
public class TestServiceImpl implements TestService_PortType {
public PingMsgResponse ping(PingMsg pingMsg) throws RemoteException {
- return new PingMsgResponse(pingMsg.getImage());
+ return new PingMsgResponse(pingMsg.getImagejpeg());
}
}
Modified: trunk/src/test/java/org/jboss/test/ws/xop/doclit/XOPElementDoclitTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/xop/doclit/XOPElementDoclitTestCase.java 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/java/org/jboss/test/ws/xop/doclit/XOPElementDoclitTestCase.java 2006-08-03 08:57:12 UTC (rev 673)
@@ -26,20 +26,20 @@
import junit.framework.Test;
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.xb.binding.SimpleTypeBindings;
+import javax.activation.DataHandler;
import javax.naming.InitialContext;
import javax.xml.rpc.Service;
-import java.rmi.RemoteException;
+import javax.xml.rpc.Stub;
+import java.awt.*;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
import java.net.URL;
-import java.io.File;
-import java.awt.*;
/**
- * Support sequences of anys
*
- * http://jira.jboss.org/jira/browse/JBWS-807
- *
- * @author Thomas.Diesler at jboss.org
+ * @author Heiko.Braun at jboss.org
* @since 11-Nov-2005
*/
public class XOPElementDoclitTestCase extends JBossWSTest
@@ -79,16 +79,31 @@
//log.warn("Cannot create Image: " + th);
}
- /*
if (image != null)
{
PingMsgResponse value = port.ping(new PingMsg("Some text message", image));
- assertNotNull(value);
- assertNotNull(value.getImage());
+ assertNotNull("Return value was null",value);
+ assertNotNull("Return image was null", value.getImagejpeg());
+
+ // check inline values
+
+ System.out.println("FIXME: JBWS-660");
+
+ /*
+ DataHandler dh = new DataHandler(url);
+ ByteArrayOutputStream bout = new ByteArrayOutputStream();
+ dh.writeTo(bout);
+
+ byte[] imageBytes = bout.toByteArray();
+ String expected = SimpleTypeBindings.marshalBase64(imageBytes);
+
+ String was = (String)((Stub) port)._getProperty("xop.expected");
+ assertNotNull("bas64 value not found", was);
+ assertEquals(expected, was);
+ */
}
- */
- System.out.println("FIXME: JBXB-62");
+ //System.out.println("FIXME: JBXB-62");
}
}
Modified: trunk/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx
===================================================================
--- trunk/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx 2006-08-03 08:57:12 UTC (rev 673)
@@ -13,7 +13,7 @@
<boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
<stringProp name="TestElement.test_class">org.apache.jmeter.testelement.TestPlan</stringProp>
<stringProp name="TestElement.name">JBossWS_Benchmark</stringProp>
- <boolProp name="TestPlan.functional_mode">false</boolProp>
+ <boolProp name="TestPlan.functional_mode">true</boolProp>
<boolProp name="TestElement.enabled">true</boolProp>
<stringProp name="TestPlan.comments"></stringProp>
</TestPlan>
@@ -23,8 +23,8 @@
<stringProp name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</stringProp>
<stringProp name="ThreadGroup.delay"></stringProp>
<stringProp name="ThreadGroup.duration"></stringProp>
- <boolProp name="TestElement.enabled">false</boolProp>
- <stringProp name="ThreadGroup.num_threads">3</stringProp>
+ <boolProp name="TestElement.enabled">true</boolProp>
+ <stringProp name="ThreadGroup.num_threads">5</stringProp>
<boolProp name="ThreadGroup.scheduler">false</boolProp>
<stringProp name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</stringProp>
<elementProp name="ThreadGroup.main_controller" elementType="org.apache.jmeter.control.LoopController">
@@ -41,6 +41,16 @@
<stringProp name="ThreadGroup.ramp_time">1</stringProp>
</ThreadGroup>
<hashTree>
+ <CSVDataSet>
+ <stringProp name="delimiter">,</stringProp>
+ <stringProp name="TestElement.gui_class">org.apache.jmeter.testbeans.gui.TestBeanGUI</stringProp>
+ <stringProp name="TestElement.test_class">org.apache.jmeter.config.CSVDataSet</stringProp>
+ <stringProp name="variableNames">NumItems,OrderId</stringProp>
+ <stringProp name="TestElement.name">CSV Data Set Config</stringProp>
+ <boolProp name="TestElement.enabled">true</boolProp>
+ <stringProp name="filename">csvdata.txt</stringProp>
+ </CSVDataSet>
+ <hashTree/>
<SoapSampler>
<stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.SoapSamplerGui</stringProp>
<stringProp name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.SoapSampler</stringProp>
@@ -49,8 +59,8 @@
<env:Header/>
<env:Body>
<ns1:getOrder xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <int_1>1</int_1>
- <int_2>1</int_2>
+ <int_1>${NumItems}</int_1>
+ <int_2>${OrderId}</int_2>
</ns1:getOrder>
</env:Body>
</env:Envelope></stringProp>
@@ -74,7 +84,7 @@
</ns1:getOrder>
</env:Body>
</env:Envelope></stringProp>
- <boolProp name="TestElement.enabled">true</boolProp>
+ <boolProp name="TestElement.enabled">false</boolProp>
<elementProp name="HTTPsampler.Arguments" elementType="org.apache.jmeter.config.Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -86,8 +96,8 @@
<stringProp name="TestElement.test_class">org.apache.jmeter.timers.GaussianRandomTimer</stringProp>
<stringProp name="TestElement.name">Gaussian Random Timer</stringProp>
<boolProp name="TestElement.enabled">true</boolProp>
- <stringProp name="RandomTimer.range">500</stringProp>
- <stringProp name="ConstantTimer.delay">8000</stringProp>
+ <stringProp name="ConstantTimer.delay">500</stringProp>
+ <stringProp name="RandomTimer.range">100</stringProp>
</GaussianRandomTimer>
<hashTree/>
<ResponseAssertion>
@@ -99,8 +109,8 @@
</collectionProp>
<boolProp name="TestElement.enabled">true</boolProp>
<stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion>
@@ -112,8 +122,8 @@
</collectionProp>
<boolProp name="TestElement.enabled">true</boolProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector>
@@ -159,7 +169,7 @@
<stringProp name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</stringProp>
<stringProp name="ThreadGroup.delay"></stringProp>
<stringProp name="ThreadGroup.duration"></stringProp>
- <boolProp name="TestElement.enabled">true</boolProp>
+ <boolProp name="TestElement.enabled">false</boolProp>
<stringProp name="ThreadGroup.num_threads">40</stringProp>
<boolProp name="ThreadGroup.scheduler">false</boolProp>
<stringProp name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</stringProp>
@@ -228,8 +238,8 @@
<stringProp name="TestElement.test_class">org.apache.jmeter.timers.GaussianRandomTimer</stringProp>
<stringProp name="TestElement.name">Gaussian Random Timer</stringProp>
<boolProp name="TestElement.enabled">true</boolProp>
+ <stringProp name="ConstantTimer.delay">1000</stringProp>
<stringProp name="RandomTimer.range">200</stringProp>
- <stringProp name="ConstantTimer.delay">1000</stringProp>
</GaussianRandomTimer>
<hashTree/>
<ResponseAssertion>
@@ -241,8 +251,8 @@
</collectionProp>
<boolProp name="TestElement.enabled">true</boolProp>
<stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion>
@@ -254,8 +264,8 @@
</collectionProp>
<boolProp name="TestElement.enabled">true</boolProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector>
@@ -301,7 +311,7 @@
<stringProp name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</stringProp>
<stringProp name="ThreadGroup.delay"></stringProp>
<stringProp name="ThreadGroup.duration"></stringProp>
- <boolProp name="TestElement.enabled">true</boolProp>
+ <boolProp name="TestElement.enabled">false</boolProp>
<stringProp name="ThreadGroup.num_threads">8</stringProp>
<boolProp name="ThreadGroup.scheduler">false</boolProp>
<stringProp name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</stringProp>
@@ -358,7 +368,7 @@
</ns1:echoSimpleType>
</env:Body>
</env:Envelope></stringProp>
- <boolProp name="TestElement.enabled">true</boolProp>
+ <boolProp name="TestElement.enabled">false</boolProp>
<elementProp name="HTTPsampler.Arguments" elementType="org.apache.jmeter.config.Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -370,8 +380,8 @@
<stringProp name="TestElement.test_class">org.apache.jmeter.timers.GaussianRandomTimer</stringProp>
<stringProp name="TestElement.name">Gaussian Random Timer</stringProp>
<boolProp name="TestElement.enabled">true</boolProp>
- <stringProp name="RandomTimer.range">200</stringProp>
- <stringProp name="ConstantTimer.delay">1000</stringProp>
+ <stringProp name="ConstantTimer.delay">500</stringProp>
+ <stringProp name="RandomTimer.range">100</stringProp>
</GaussianRandomTimer>
<hashTree/>
<ResponseAssertion>
@@ -383,8 +393,8 @@
</collectionProp>
<boolProp name="TestElement.enabled">true</boolProp>
<stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion>
@@ -396,8 +406,8 @@
</collectionProp>
<boolProp name="TestElement.enabled">true</boolProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector>
@@ -443,7 +453,7 @@
<stringProp name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</stringProp>
<stringProp name="ThreadGroup.delay"></stringProp>
<stringProp name="ThreadGroup.duration"></stringProp>
- <boolProp name="TestElement.enabled">true</boolProp>
+ <boolProp name="TestElement.enabled">false</boolProp>
<stringProp name="ThreadGroup.num_threads">8</stringProp>
<boolProp name="ThreadGroup.scheduler">false</boolProp>
<stringProp name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</stringProp>
@@ -506,7 +516,7 @@
</Synthetic_1>
</ns1:echoSynthetic>
</env:Body></env:Envelope></stringProp>
- <boolProp name="TestElement.enabled">true</boolProp>
+ <boolProp name="TestElement.enabled">false</boolProp>
<elementProp name="HTTPsampler.Arguments" elementType="org.apache.jmeter.config.Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -518,8 +528,8 @@
<stringProp name="TestElement.test_class">org.apache.jmeter.timers.GaussianRandomTimer</stringProp>
<stringProp name="TestElement.name">Gaussian Random Timer</stringProp>
<boolProp name="TestElement.enabled">true</boolProp>
- <stringProp name="RandomTimer.range">200</stringProp>
- <stringProp name="ConstantTimer.delay">1000</stringProp>
+ <stringProp name="ConstantTimer.delay">500</stringProp>
+ <stringProp name="RandomTimer.range">100</stringProp>
</GaussianRandomTimer>
<hashTree/>
<ResponseAssertion>
@@ -531,8 +541,8 @@
</collectionProp>
<boolProp name="TestElement.enabled">true</boolProp>
<stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion>
@@ -544,8 +554,8 @@
</collectionProp>
<boolProp name="TestElement.enabled">true</boolProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector>
@@ -654,8 +664,8 @@
<stringProp name="TestElement.test_class">org.apache.jmeter.timers.GaussianRandomTimer</stringProp>
<stringProp name="TestElement.name">Gaussian Random Timer</stringProp>
<boolProp name="TestElement.enabled">true</boolProp>
+ <stringProp name="ConstantTimer.delay">8000</stringProp>
<stringProp name="RandomTimer.range">500</stringProp>
- <stringProp name="ConstantTimer.delay">8000</stringProp>
</GaussianRandomTimer>
<hashTree/>
<ResponseAssertion>
@@ -667,8 +677,8 @@
</collectionProp>
<boolProp name="TestElement.enabled">true</boolProp>
<stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion>
@@ -680,8 +690,8 @@
</collectionProp>
<boolProp name="TestElement.enabled">true</boolProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector>
@@ -800,8 +810,8 @@
<stringProp name="TestElement.test_class">org.apache.jmeter.timers.GaussianRandomTimer</stringProp>
<stringProp name="TestElement.name">Gaussian Random Timer</stringProp>
<boolProp name="TestElement.enabled">true</boolProp>
+ <stringProp name="ConstantTimer.delay">1000</stringProp>
<stringProp name="RandomTimer.range">200</stringProp>
- <stringProp name="ConstantTimer.delay">1000</stringProp>
</GaussianRandomTimer>
<hashTree/>
<ResponseAssertion>
@@ -813,8 +823,8 @@
</collectionProp>
<boolProp name="TestElement.enabled">true</boolProp>
<stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion>
@@ -826,8 +836,8 @@
</collectionProp>
<boolProp name="TestElement.enabled">true</boolProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector>
@@ -942,8 +952,8 @@
<stringProp name="TestElement.test_class">org.apache.jmeter.timers.GaussianRandomTimer</stringProp>
<stringProp name="TestElement.name">Gaussian Random Timer</stringProp>
<boolProp name="TestElement.enabled">true</boolProp>
+ <stringProp name="ConstantTimer.delay">1000</stringProp>
<stringProp name="RandomTimer.range">200</stringProp>
- <stringProp name="ConstantTimer.delay">1000</stringProp>
</GaussianRandomTimer>
<hashTree/>
<ResponseAssertion>
@@ -955,8 +965,8 @@
</collectionProp>
<boolProp name="TestElement.enabled">true</boolProp>
<stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion>
@@ -968,8 +978,8 @@
</collectionProp>
<boolProp name="TestElement.enabled">true</boolProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector>
@@ -1092,8 +1102,8 @@
<stringProp name="TestElement.test_class">org.apache.jmeter.timers.GaussianRandomTimer</stringProp>
<stringProp name="TestElement.name">Gaussian Random Timer</stringProp>
<boolProp name="TestElement.enabled">true</boolProp>
+ <stringProp name="ConstantTimer.delay">1000</stringProp>
<stringProp name="RandomTimer.range">200</stringProp>
- <stringProp name="ConstantTimer.delay">1000</stringProp>
</GaussianRandomTimer>
<hashTree/>
<ResponseAssertion>
@@ -1105,8 +1115,8 @@
</collectionProp>
<boolProp name="TestElement.enabled">true</boolProp>
<stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion>
@@ -1118,8 +1128,8 @@
</collectionProp>
<boolProp name="TestElement.enabled">true</boolProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector>
@@ -1172,16 +1182,16 @@
<success>false</success>
<label>true</label>
<code>false</code>
- <message>false</message>
- <threadName>true</threadName>
- <dataType>false</dataType>
+ <message>true</message>
+ <threadName>false</threadName>
+ <dataType>true</dataType>
<encoding>false</encoding>
<assertions>true</assertions>
<subresults>true</subresults>
<responseData>false</responseData>
- <samplerData>false</samplerData>
+ <samplerData>true</samplerData>
<xml>false</xml>
- <fieldNames>false</fieldNames>
+ <fieldNames>true</fieldNames>
<responseHeaders>false</responseHeaders>
<requestHeaders>false</requestHeaders>
<responseDataOnError>false</responseDataOnError>
@@ -1193,7 +1203,7 @@
<name>saveConfig</name>
</objProp>
<boolProp name="TestElement.enabled">true</boolProp>
- <stringProp name="filename"></stringProp>
+ <stringProp name="filename">C:\Documents and Settings\Heiko\Desktop\benchmark\jbossws-1.0_jboss-4.0.4\T3\samples2.txt</stringProp>
<boolProp name="ResultCollector.error_logging">false</boolProp>
</ResultCollector>
<hashTree/>
Modified: trunk/src/test/resources/eventing/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- trunk/src/test/resources/eventing/WEB-INF/jaxrpc-mapping.xml 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/resources/eventing/WEB-INF/jaxrpc-mapping.xml 2006-08-03 08:57:12 UTC (rev 673)
@@ -204,6 +204,10 @@
<root-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing">
typeNS:GetStatus</root-type-qname>
<qname-scope>element</qname-scope>
+ <variable-mapping>
+ <java-variable-name>_any</java-variable-name>
+ <xml-wildcard/>
+ </variable-mapping>
</java-xml-type-mapping>
<java-xml-type-mapping>
@@ -236,6 +240,10 @@
<root-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing">
typeNS:Unsubscribe</root-type-qname>
<qname-scope>element</qname-scope>
+ <variable-mapping>
+ <java-variable-name>_any</java-variable-name>
+ <xml-wildcard/>
+ </variable-mapping>
</java-xml-type-mapping>
<java-xml-type-mapping>
Modified: trunk/src/test/resources/eventing/WEB-INF/wsdl/eventing.xsd
===================================================================
--- trunk/src/test/resources/eventing/WEB-INF/wsdl/eventing.xsd 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/resources/eventing/WEB-INF/wsdl/eventing.xsd 2006-08-03 08:57:12 UTC (rev 673)
@@ -9,11 +9,9 @@
attributeFormDefault="unqualified"
blockDefault="#all">
- <!--TODO Parser complains about this
-xs:import namespace="http://www.w3.org/XML/1998/namespace"
- schemaLocation="http://www.w3.org/2001/xml.xsd"/-->
+ <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
- <xs:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="wsaddr.xsd"/>
+ <xs:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="http://www.w3.org/2005/08/addressing/ws-addr.xsd"/>
<!-- Types and global elements -->
<xs:complexType name="DeliveryType" mixed="true">
@@ -55,8 +53,7 @@
<xs:complexType name="LanguageSpecificStringType">
<xs:simpleContent>
<xs:extension base="xs:string">
- <!-- TODO Parser complains about this
- xs:attribute ref="xml:lang" /-->
+ <xs:attribute ref="xml:lang" />
<!--xs:anyAttribute namespace="##other" processContents="lax" /-->
</xs:extension>
</xs:simpleContent>
@@ -128,8 +125,8 @@
<xs:element name="GetStatus">
<xs:complexType>
<xs:sequence>
- <!--xs:any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded" /-->
+ <xs:any namespace="##other" processContents="lax"
+ minOccurs="0" maxOccurs="unbounded" />
</xs:sequence>
<!--xs:anyAttribute namespace="##other" processContents="lax" /-->
</xs:complexType>
@@ -151,8 +148,8 @@
<xs:element name="Unsubscribe">
<xs:complexType>
<xs:sequence>
- <!--xs:any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded" /-->
+ <xs:any namespace="##other" processContents="lax"
+ minOccurs="0" maxOccurs="unbounded" />
</xs:sequence>
<!--xs:anyAttribute namespace="##other" processContents="lax" /-->
</xs:complexType>
Modified: trunk/src/test/resources/jbws434/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- trunk/src/test/resources/jbws434/WEB-INF/jaxrpc-mapping.xml 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/resources/jbws434/WEB-INF/jaxrpc-mapping.xml 2006-08-03 08:57:12 UTC (rev 673)
@@ -1,44 +1,103 @@
<?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.jbws434</package-type>
- <namespaceURI>http://org.jboss.ws/jbws434</namespaceURI>
- </package-mapping>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws434</package-type>
- <namespaceURI>http://org.jboss.ws/jbws434/types</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws434.ArrayOfAny</java-type>
- <root-type-qname xmlns:typeNS="http://org.jboss.ws/jbws434/types">typeNS:ArrayOfAny</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>_any</java-variable-name>
- <xml-wildcard/>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jbws434.TestServiceEndpoint</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS="http://org.jboss.ws/jbws434">portTypeNS:TestService</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS="http://org.jboss.ws/jbws434">bindingNS:TestServiceBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>echo</java-method-name>
- <wsdl-operation>echo</wsdl-operation>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>org.jboss.test.ws.jbws434.ArrayOfAny</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/jbws434">wsdlMsgNS:TestService_echo</wsdl-message>
- <wsdl-message-part-name>param1</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.jbws434.ArrayOfAny</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/jbws434">wsdlMsgNS:TestService_echoResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
+ 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.jbws434</package-type>
+ <namespaceURI>http://org.jboss.ws/jbws434</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws434</package-type>
+ <namespaceURI>http://org.jboss.ws/jbws434/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws434.ArrayOfAny</java-type>
+ <root-type-qname xmlns:typeNS="http://org.jboss.ws/jbws434/types">typeNS:ArrayOfAny</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>_any</java-variable-name>
+ <xml-wildcard/>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws434.ArrayOfAny2</java-type>
+ <root-type-qname xmlns:typeNS="http://org.jboss.ws/jbws434/types">typeNS:ArrayOfAny2</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>_any</java-variable-name>
+ <xml-wildcard/>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws434.TypeOfAny3</java-type>
+ <root-type-qname xmlns:typeNS="http://org.jboss.ws/jbws434/types">typeNS:TypeOfAny3</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>_any</java-variable-name>
+ <xml-wildcard/>
+ </variable-mapping>
+ </java-xml-type-mapping>
+
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws434.TestServiceEndpoint</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS="http://org.jboss.ws/jbws434">portTypeNS:TestService</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS="http://org.jboss.ws/jbws434">bindingNS:TestServiceBinding</wsdl-binding>
+
+ <service-endpoint-method-mapping>
+ <java-method-name>echo</java-method-name>
+ <wsdl-operation>echo</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws434.ArrayOfAny</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/jbws434">wsdlMsgNS:TestService_echo</wsdl-message>
+ <wsdl-message-part-name>param1</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.jbws434.ArrayOfAny</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/jbws434">wsdlMsgNS:TestService_echoResponse</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>echo2</java-method-name>
+ <wsdl-operation>echo2</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws434.ArrayOfAny2</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/jbws434">wsdlMsgNS:TestService_echo2</wsdl-message>
+ <wsdl-message-part-name>param1</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.jbws434.ArrayOfAny2</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/jbws434">wsdlMsgNS:TestService_echoResponse2</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>echo3</java-method-name>
+ <wsdl-operation>echo3</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws434.TypeOfAny3</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/jbws434">wsdlMsgNS:TestService_echo3</wsdl-message>
+ <wsdl-message-part-name>param1</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.jbws434.TypeOfAny3</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/jbws434">wsdlMsgNS:TestService_echoResponse3</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: trunk/src/test/resources/jbws434/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- trunk/src/test/resources/jbws434/WEB-INF/wsdl/TestService.wsdl 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/resources/jbws434/WEB-INF/wsdl/TestService.wsdl 2006-08-03 08:57:12 UTC (rev 673)
@@ -1,45 +1,110 @@
<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="TestService" targetNamespace="http://org.jboss.ws/jbws434" xmlns:tns="http://org.jboss.ws/jbws434" xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://org.jboss.ws/jbws434/types"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
- <types>
- <schema targetNamespace="http://org.jboss.ws/jbws434/types" xmlns:tns="http://org.jboss.ws/jbws434/types" xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://www.w3.org/2001/XMLSchema">
- <complexType name="ArrayOfAny">
- <xsd:sequence>
- <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- </complexType>
- </schema>
- </types>
- <message name="TestService_echo">
- <part name="param1" type="ns1:ArrayOfAny"/>
- </message>
- <message name="TestService_echoResponse">
- <part name="result" type="ns1:ArrayOfAny"/>
- </message>
- <portType name="TestService">
- <operation name="echo" parameterOrder="param1">
- <input message="tns:TestService_echo"/>
- <output message="tns:TestService_echoResponse"/>
- </operation>
- </portType>
- <binding name="TestServiceBinding" type="tns:TestService">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
- <operation name="echo">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal" namespace="http://org.jboss.ws/jbws434"/>
- </input>
- <output>
- <soap:body use="literal" namespace="http://org.jboss.ws/jbws434"/>
- </output>
- </operation>
- </binding>
- <service name="TestService">
- <port name="TestServicePort" binding="tns:TestServiceBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
- </port>
- </service>
+<definitions name="TestService" targetNamespace="http://org.jboss.ws/jbws434"
+ xmlns:tns="http://org.jboss.ws/jbws434" xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://org.jboss.ws/jbws434/types"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+
+ <types>
+ <schema targetNamespace="http://org.jboss.ws/jbws434/types" xmlns:tns="http://org.jboss.ws/jbws434/types" xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://www.w3.org/2001/XMLSchema">
+
+ <complexType name="ArrayOfAny">
+ <xsd:sequence>
+ <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </complexType>
+
+ <complexType name="ArrayOfAny2">
+ <xsd:sequence>
+ <xsd:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </complexType>
+
+ <complexType name="TypeOfAny3">
+ <xsd:sequence>
+ <xsd:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="1"/>
+ </xsd:sequence>
+ </complexType>
+
+ </schema>
+ </types>
+
+ <message name="TestService_echo">
+ <part name="param1" type="ns1:ArrayOfAny"/>
+ </message>
+ <message name="TestService_echoResponse">
+ <part name="result" type="ns1:ArrayOfAny"/>
+ </message>
+
+ <message name="TestService_echo2">
+ <part name="param1" type="ns1:ArrayOfAny2"/>
+ </message>
+ <message name="TestService_echoResponse2">
+ <part name="result" type="ns1:ArrayOfAny2"/>
+ </message>
+
+ <message name="TestService_echo3">
+ <part name="param1" type="ns1:TypeOfAny3"/>
+ </message>
+ <message name="TestService_echoResponse3">
+ <part name="result" type="ns1:TypeOfAny3"/>
+ </message>
+
+ <portType name="TestService">
+ <operation name="echo">
+ <input message="tns:TestService_echo"/>
+ <output message="tns:TestService_echoResponse"/>
+ </operation>
+ <operation name="echo2">
+ <input message="tns:TestService_echo2"/>
+ <output message="tns:TestService_echoResponse2"/>
+ </operation>
+ <operation name="echo3">
+ <input message="tns:TestService_echo3"/>
+ <output message="tns:TestService_echoResponse3"/>
+ </operation>
+ </portType>
+
+ <binding name="TestServiceBinding" type="tns:TestService">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
+
+ <operation name="echo">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal" namespace="http://org.jboss.ws/jbws434"/>
+ </input>
+ <output>
+ <soap:body use="literal" namespace="http://org.jboss.ws/jbws434"/>
+ </output>
+ </operation>
+
+ <operation name="echo2">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal" namespace="http://org.jboss.ws/jbws434"/>
+ </input>
+ <output>
+ <soap:body use="literal" namespace="http://org.jboss.ws/jbws434"/>
+ </output>
+ </operation>
+
+ <operation name="echo3">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal" namespace="http://org.jboss.ws/jbws434"/>
+ </input>
+ <output>
+ <soap:body use="literal" namespace="http://org.jboss.ws/jbws434"/>
+ </output>
+ </operation>
+
+ </binding>
+
+ <service name="TestService">
+ <port name="TestServicePort" binding="tns:TestServiceBinding">
+ <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+ </port>
+ </service>
+
</definitions>
\ No newline at end of file
Modified: trunk/src/test/resources/samples/wseventing/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- trunk/src/test/resources/samples/wseventing/WEB-INF/jaxrpc-mapping.xml 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/resources/samples/wseventing/WEB-INF/jaxrpc-mapping.xml 2006-08-03 08:57:12 UTC (rev 673)
@@ -204,6 +204,10 @@
<root-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing">
typeNS:GetStatus</root-type-qname>
<qname-scope>element</qname-scope>
+ <variable-mapping>
+ <java-variable-name>_any</java-variable-name>
+ <xml-wildcard/>
+ </variable-mapping>
</java-xml-type-mapping>
<java-xml-type-mapping>
@@ -236,6 +240,10 @@
<root-type-qname xmlns:typeNS="http://schemas.xmlsoap.org/ws/2004/08/eventing">
typeNS:Unsubscribe</root-type-qname>
<qname-scope>element</qname-scope>
+ <variable-mapping>
+ <java-variable-name>_any</java-variable-name>
+ <xml-wildcard/>
+ </variable-mapping>
</java-xml-type-mapping>
<java-xml-type-mapping>
Modified: trunk/src/test/resources/samples/wseventing/WEB-INF/wsdl/jbwse.wsdl
===================================================================
--- trunk/src/test/resources/samples/wseventing/WEB-INF/wsdl/jbwse.wsdl 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/resources/samples/wseventing/WEB-INF/wsdl/jbwse.wsdl 2006-08-03 08:57:12 UTC (rev 673)
@@ -9,9 +9,7 @@
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
<wsdl:types>
- <xs:schema targetNamespace='http://schemas.xmlsoap.org/ws/2004/08/eventing'>
- <xs:include schemaLocation='jbwse.xsd'/>
- </xs:schema>
+ <xs:import namespace="http://schemas.xmlsoap.org/ws/2004/08/eventing" schemaLocation="http://schemas.xmlsoap.org/ws/2004/08/eventing/eventing.xsd"/>
</wsdl:types>
<wsdl:message name='SubscribeMsg'>
Modified: trunk/src/test/resources/samples/wseventing/WEB-INF/wsdl/jbwse.xsd
===================================================================
--- trunk/src/test/resources/samples/wseventing/WEB-INF/wsdl/jbwse.xsd 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/resources/samples/wseventing/WEB-INF/wsdl/jbwse.xsd 2006-08-03 08:57:12 UTC (rev 673)
@@ -9,11 +9,9 @@
attributeFormDefault="unqualified"
blockDefault="#all">
- <!--TODO Parser complains about this
-xs:import namespace="http://www.w3.org/XML/1998/namespace"
- schemaLocation="http://www.w3.org/2001/xml.xsd"/-->
+ <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
- <xs:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="jbwsa.xsd"/>
+ <xs:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="http://www.w3.org/2005/08/addressing/ws-addr.xsd"/>
<!-- Types and global elements -->
<xs:complexType name="DeliveryType" mixed="true">
@@ -128,8 +126,8 @@
<xs:element name="GetStatus">
<xs:complexType>
<xs:sequence>
- <!--xs:any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded" /-->
+ <xs:any namespace="##other" processContents="lax"
+ minOccurs="0" maxOccurs="unbounded" />
</xs:sequence>
<!--xs:anyAttribute namespace="##other" processContents="lax" /-->
</xs:complexType>
@@ -151,8 +149,8 @@
<xs:element name="Unsubscribe">
<xs:complexType>
<xs:sequence>
- <!--xs:any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded" /-->
+ <xs:any namespace="##other" processContents="lax"
+ minOccurs="0" maxOccurs="unbounded" />
</xs:sequence>
<!--xs:anyAttribute namespace="##other" processContents="lax" /-->
</xs:complexType>
Modified: trunk/src/test/resources/samples-override/mtom/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- trunk/src/test/resources/samples-override/mtom/WEB-INF/jaxrpc-mapping.xml 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/resources/samples-override/mtom/WEB-INF/jaxrpc-mapping.xml 2006-08-03 08:57:12 UTC (rev 673)
@@ -204,5 +204,40 @@
<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>javax.activation.DataHandler</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: trunk/src/test/resources/samples-override/mtom/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- trunk/src/test/resources/samples-override/mtom/WEB-INF/wsdl/TestService.wsdl 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/resources/samples-override/mtom/WEB-INF/wsdl/TestService.wsdl 2006-08-03 08:57:12 UTC (rev 673)
@@ -1,158 +1,190 @@
<?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/" xmlns:xmime="http://www.w3.org/2005/05/xmlmime">
+<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">
+ <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 namespace="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="imagegif" xmime:expectedContentTypes="image/gif" type="xmime:base64Binary"/>
- <element name="imagejpeg" xmime:expectedContentTypes="image/jpeg" type="xmime:base64Binary"/>
- <element name="textplain" xmime:expectedContentTypes="text/plain" type="xmime:base64Binary"/>
- <element name="multipart" xmime:expectedContentTypes="multipart/*" type="xmime:base64Binary"/>
- <element name="textxml" xmime:expectedContentTypes="text/xml" type="xmime:base64Binary"/>
- <element name="applxml" xmime:expectedContentTypes="application/xml" type="xmime:base64Binary"/>
+ <element name="imagegif" xmime:contentType="image/gif" type="xmime:base64Binary"/>
+ <element name="imagejpeg" xmime:contentType="image/jpeg" type="xmime:base64Binary"/>
+ <element name="textplain" xmime:contentType="text/plain" type="xmime:base64Binary"/>
+ <element name="multipart" xmime:contentType="multipart/*" 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" xmime:contentType="application/octet-stream" type="xmime:base64Binary"/>
- </schema>
- </types>
+ <complexType name="XOPBinary" >
+ <simpleContent>
+ <extension base="xsd:base64Binary" >
+ <attribute ref="xmime:contentType"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </schema>
+ </types>
- <message name="XOPTest_sendMimeImageGIF">
- <part name="message" type="xsd:string"/>
- <part name="xoppart" type="xmime:base64Binary"/>
- </message>
- <message name="XOPTest_sendMimeImageGIFResponse">
- <part name="result" type="xmime:base64Binary"/>
- </message>
+ <message name="XOPTest_sendMimeImageGIF">
+ <part name="message" type="xsd:string"/>
+ <part name="xoppart" element="tns:imagegif"/>
+ </message>
+ <message name="XOPTest_sendMimeImageGIFResponse">
+ <part name="result" element="tns:imagegif"/>
+ </message>
- <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_sendMimeMultipart">
- <part name="message" type="xsd:string"/>
- <part name="xoppart" element="tns:multipart"/>
- </message>
- <message name="XOPTest_sendMimeMultipartResponse">
- <part name="result" element="tns:multipart"/>
- </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_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_sendMimeMultipart">
+ <part name="message" type="xsd:string"/>
+ <part name="xoppart" element="tns:multipart"/>
+ </message>
+ <message name="XOPTest_sendMimeMultipartResponse">
+ <part name="result" element="tns:multipart"/>
+ </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>
- <portType name="XOPTest">
- <operation name="sendMimeImageGIF">
- <input message="tns:XOPTest_sendMimeImageGIF"/>
- <output message="tns:XOPTest_sendMimeImageGIFResponse"/>
- </operation>
- <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="sendMimeMultipart">
- <input message="tns:XOPTest_sendMimeMultipart"/>
- <output message="tns:XOPTest_sendMimeMultipartResponse"/>
- </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>
+ <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>
+ <portType name="XOPTest">
+ <operation name="sendMimeImageGIF">
+ <input message="tns:XOPTest_sendMimeImageGIF"/>
+ <output message="tns:XOPTest_sendMimeImageGIFResponse"/>
+ </operation>
+ <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="sendMimeMultipart">
+ <input message="tns:XOPTest_sendMimeMultipart"/>
+ <output message="tns:XOPTest_sendMimeMultipartResponse"/>
+ </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>
- <binding name="XOPTestBinding" type="tns:XOPTest">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
- <operation name="sendMimeImageGIF">
- <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="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="sendMimeMultipart">
- <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">
+ <input message="tns:XOPTest_sendOctets"/>
+ <output message="tns:XOPTest_sendOctetsResponse"/>
+ </operation>
+ </portType>
- </binding>
+ <binding name="XOPTestBinding" type="tns:XOPTest">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
+ <operation name="sendMimeImageGIF">
+ <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="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="sendMimeMultipart">
+ <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>
+ <service name="XOPTest">
+ <port name="XOPTestPort" binding="tns:XOPTestBinding">
+ <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+ </port>
+ </service>
</definitions>
Modified: trunk/src/test/resources/xop/doclit/META-INF/application-client.xml
===================================================================
--- trunk/src/test/resources/xop/doclit/META-INF/application-client.xml 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/resources/xop/doclit/META-INF/application-client.xml 2006-08-03 08:57:12 UTC (rev 673)
@@ -15,6 +15,10 @@
<port-component-ref>
<service-endpoint-interface>org.jboss.test.ws.xop.doclit.TestService_PortType</service-endpoint-interface>
</port-component-ref>
+ <handler>
+ <handler-name>XOPInlineHandler</handler-name>
+ <handler-class>org.jboss.test.ws.xop.doclit.InlineHandler</handler-class>
+ </handler>
</service-ref>
</application-client>
Modified: trunk/src/test/resources/xop/doclit/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- trunk/src/test/resources/xop/doclit/WEB-INF/jaxrpc-mapping.xml 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/resources/xop/doclit/WEB-INF/jaxrpc-mapping.xml 2006-08-03 08:57:12 UTC (rev 673)
@@ -4,11 +4,11 @@
<namespaceURI>http://jboss.org/test/ws/xop/doclit</namespaceURI>
</package-mapping>
- <java-xml-type-mapping>
+ <!--java-xml-type-mapping>
<java-type>org.jboss.test.ws.xop.doclit.PingMsg</java-type>
<root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/doclit'>typeNS:PingMsg</root-type-qname>
<qname-scope>element</qname-scope>
- </java-xml-type-mapping>
+ </java-xml-type-mapping-->
<java-xml-type-mapping>
<java-type>org.jboss.test.ws.xop.doclit.PingMsg</java-type>
<anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/doclit'>typeNS:>PingMsg</anonymous-type-qname>
@@ -18,22 +18,22 @@
<xml-element-name>message</xml-element-name>
</variable-mapping>
<variable-mapping>
- <java-variable-name>image</java-variable-name>
+ <java-variable-name>imagejpeg</java-variable-name>
<xml-element-name>imagejpeg</xml-element-name>
</variable-mapping>
</java-xml-type-mapping>
- <java-xml-type-mapping>
+ <!--java-xml-type-mapping>
<java-type>org.jboss.test.ws.xop.doclit.PingMsgResponse</java-type>
<root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/doclit'>typeNS:PingMsgResponse</root-type-qname>
<qname-scope>element</qname-scope>
- </java-xml-type-mapping>
+ </java-xml-type-mapping-->
<java-xml-type-mapping>
<java-type>org.jboss.test.ws.xop.doclit.PingMsgResponse</java-type>
<anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/doclit'>typeNS:>PingMsgResponse</anonymous-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
- <java-variable-name>image</java-variable-name>
+ <java-variable-name>imagejpeg</java-variable-name>
<xml-element-name>imagejpeg</xml-element-name>
</variable-mapping>
</java-xml-type-mapping>
Modified: trunk/src/test/resources/xop/doclit/WEB-INF/webservices.xml
===================================================================
--- trunk/src/test/resources/xop/doclit/WEB-INF/webservices.xml 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/src/test/resources/xop/doclit/WEB-INF/webservices.xml 2006-08-03 08:57:12 UTC (rev 673)
@@ -14,6 +14,10 @@
<port-component-name>TestServicePort</port-component-name>
<wsdl-port>impl:TestServicePort</wsdl-port>
<service-endpoint-interface>org.jboss.test.ws.xop.doclit.TestService_PortType</service-endpoint-interface>
+ <handler>
+ <handler-name>XOPInlineHandler</handler-name>
+ <handler-class>org.jboss.test.ws.xop.doclit.InlineHandler</handler-class>
+ </handler>
<service-impl-bean>
<servlet-link>TestService</servlet-link>
</service-impl-bean>
Modified: trunk/version.properties
===================================================================
--- trunk/version.properties 2006-08-03 08:56:30 UTC (rev 672)
+++ trunk/version.properties 2006-08-03 08:57:12 UTC (rev 673)
@@ -1,37 +1,38 @@
-
-specification.title=JBossWS
-specification.vendor=JBoss (http://www.jboss.org)
-specification.version=jbossws-1.0
-
-version.id=2.0.0.DEV
-
-implementation.title=JBoss Web Services (JBossWS)
-implementation.url=http://www.jboss.org/products/jbossws
-implementation.vendor=JBoss Inc.
-implementation.vendor.id=http://www.jboss.org
-
-# thirdparty library versions that are referenced in component-info.xml
-apache-xmlsec=1.3.0
-ibm-wsdl4j=1.5.2jboss
-javassist=3.2.0.CR2
-jboss-jbossxb=1.0.0.CR5
-jboss-remoting=1.4.3.GA
-
-# thirdparty library versions
-apache-ant=1.6.5
-apache-log4j=1.2.8
-apache-xalan=j_2.7.0
-apache-xerces=2.7.1
-jboss-backport-concurrent=2.1.0.GA
-jboss-jbossretro=1.0.0.GA
-junit=3.8.1
-oswego-concurrent=1.3.4
-qdox=1.4
-stax-api=1.0
-sun-jaf=1.0.2
-sun-javamail=1.3.1
-sun-jaxb=2.0
-sun-servlet=2.4
-woodstox=2.0.6
-wscommons-policy=1.0
-xmlunit=1.0
+
+specification.title=JBossWS
+specification.vendor=JBoss (http://www.jboss.org)
+specification.version=jbossws-1.0
+
+version.id=2.0.0.DEV
+
+implementation.title=JBoss Web Services (JBossWS)
+implementation.url=http://www.jboss.org/products/jbossws
+implementation.vendor=JBoss Inc.
+implementation.vendor.id=http://www.jboss.org
+
+# thirdparty library versions that are referenced in component-info.xml
+apache-xmlsec=1.3.0
+ibm-wsdl4j=1.5.2jboss
+javassist=3.2.0.CR2
+jboss-jbossxb=1.0.0.CR6
+jboss-remoting=1.4.3.GA
+
+# thirdparty library versions
+apache-ant=1.6.5
+apache-log4j=1.2.8
+apache-xalan=j_2.7.0
+apache-xerces=2.7.1
+jboss-backport-concurrent=2.1.0.GA
+jboss-jbossretro=1.0.0.GA
+jbossas-core=4.0.4.GA
+junit=3.8.1
+oswego-concurrent=1.3.4
+qdox=1.4
+stax-api=1.0
+sun-jaf=1.0.2
+sun-javamail=1.3.1
+sun-jaxb=2.0
+sun-servlet=2.4
+woodstox=2.0.6
+wscommons-policy=1.0
+xmlunit=1.0
More information about the jboss-svn-commits
mailing list