JBossWS SVN: r1326 - in trunk/src: main/java/org/jboss/ws/deployment test/java/org/jboss/test/ws/jaxws/samples/wsaddressing
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-10-27 12:07:39 -0400 (Fri, 27 Oct 2006)
New Revision: 1326
Modified:
trunk/src/main/java/org/jboss/ws/deployment/AnnotationsMetaDataBuilder.java
trunk/src/main/java/org/jboss/ws/deployment/JAXWSProviderMetaDataBuilderJSE.java
trunk/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java
trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java
trunk/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java
trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java
trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.java
Log:
Refactor service endpoint address handling.
All JSE endpoints must derive the url-pattern from web.xml
Modified: trunk/src/main/java/org/jboss/ws/deployment/AnnotationsMetaDataBuilder.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/deployment/AnnotationsMetaDataBuilder.java 2006-10-27 15:29:21 UTC (rev 1325)
+++ trunk/src/main/java/org/jboss/ws/deployment/AnnotationsMetaDataBuilder.java 2006-10-27 16:07:39 UTC (rev 1326)
@@ -23,26 +23,13 @@
// $Id:AnnotationsMetaDataBuilder.java 732 2006-08-12 18:40:21Z thomas.diesler(a)jboss.com $
-import java.io.File;
-import java.io.IOException;
-import java.io.Writer;
-
import javax.xml.ws.BindingType;
import org.jboss.logging.Logger;
-import org.jboss.ws.Constants;
-import org.jboss.ws.WSException;
import org.jboss.ws.annotation.PortComponent;
+import org.jboss.ws.deployment.UnifiedDeploymentInfo.DeploymentType;
import org.jboss.ws.metadata.EndpointMetaData;
import org.jboss.ws.metadata.ServerEndpointMetaData;
-import org.jboss.ws.metadata.ServiceMetaData;
-import org.jboss.ws.metadata.UnifiedMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData;
-import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
-import org.jboss.ws.server.ServerConfig;
-import org.jboss.ws.server.ServerConfigFactory;
-import org.jboss.ws.tools.JavaToWSDL;
-import org.jboss.ws.utils.IOUtils;
/** An abstract annotation meta data builder.
*
@@ -68,83 +55,78 @@
}
}
- protected void processPortComponent(UnifiedDeploymentInfo udi, Class wsClass, String linkName, ServerEndpointMetaData epMetaData)
+ protected void processPortComponent(UnifiedDeploymentInfo udi, Class wsClass, String linkName, ServerEndpointMetaData sepMetaData)
{
- String contextRoot = null;
-
- // init contextRoot from jboss-web.xml
- if (udi.metaData instanceof UnifiedWebMetaData)
- {
- UnifiedWebMetaData webMetaData = (UnifiedWebMetaData)udi.metaData;
- contextRoot = webMetaData.getContextRoot();
- }
-
PortComponent anPortComponent = (PortComponent)wsClass.getAnnotation(PortComponent.class);
if (anPortComponent != null)
{
// setup config name
- String configName = anPortComponent.configName();
- if (configName.length() > 0)
- epMetaData.setConfigName(configName);
+ if (anPortComponent.configName().length() > 0)
+ {
+ String configName = anPortComponent.configName();
+ sepMetaData.setConfigName(configName);
+ }
// setup config file
- String configFile = anPortComponent.configFile();
- if (configFile.length() > 0)
- epMetaData.setConfigFile(configFile);
+ if (anPortComponent.configFile().length() > 0)
+ {
+ String configFile = anPortComponent.configFile();
+ sepMetaData.setConfigFile(configFile);
+ }
- // setup endpoint url
+ boolean isJSEEndpoint = udi.type == DeploymentType.JSR181_JSE || udi.type == DeploymentType.JAXWS_PROVIDER_JSE;
+
+ // context-root
if (anPortComponent.contextRoot().length() > 0)
{
- contextRoot = anPortComponent.contextRoot();
+ if (isJSEEndpoint)
+ log.warn("@PortComponent.contextRoot is only valid on EJB endpoints");
+
+ if (isJSEEndpoint == false)
+ {
+ String contextRoot = anPortComponent.contextRoot();
+ sepMetaData.setContextRoot(contextRoot);
+ }
}
- else
- {
- String shortName = udi.shortName;
- contextRoot = "/" + shortName.substring(0, shortName.indexOf('.'));
- }
- epMetaData.setContextRoot(contextRoot);
- String urlPattern;
+ // url-pattern
if (anPortComponent.urlPattern().length() > 0)
{
- urlPattern = anPortComponent.urlPattern();
+ if (isJSEEndpoint)
+ log.warn("@PortComponent.urlPattern is only valid on EJB endpoints");
+
+ if (isJSEEndpoint == false)
+ {
+ String urlPattern = anPortComponent.urlPattern();
+ sepMetaData.setURLPattern(urlPattern);
+ }
}
- else
+
+ // auth-method
+ if (anPortComponent.authMethod().length() > 0)
{
- urlPattern = "/" + linkName;
+ if (isJSEEndpoint)
+ log.warn("@PortComponent.authMethod is only valid on EJB endpoints");
+
+ if (isJSEEndpoint == false)
+ {
+ String authMethod = anPortComponent.authMethod();
+ sepMetaData.setAuthMethod(authMethod);
+ }
}
- epMetaData.setURLPattern(urlPattern);
- String servicePath = contextRoot + urlPattern;
- epMetaData.setEndpointAddress(getServiceEndpointAddress(null, servicePath));
-
- // setup authetication method
- String authMethod = anPortComponent.authMethod();
- if (authMethod.length() > 0)
- epMetaData.setAuthMethod(authMethod);
-
- // setup transport guarantee
- String transportGuarantee = anPortComponent.transportGuarantee();
- if (transportGuarantee.length() > 0)
- epMetaData.setTransportGuarantee(transportGuarantee);
- }
- else
- {
- if (contextRoot == null)
+ // transport-guarantee
+ if (anPortComponent.transportGuarantee().length() > 0)
{
- String shortName = udi.shortName;
- contextRoot = "/" + shortName.substring(0, shortName.indexOf('.'));
- }
- epMetaData.setContextRoot(contextRoot);
+ if (isJSEEndpoint)
+ log.warn("@PortComponent.transportGuarantee is only valid on EJB endpoints");
- String urlPattern = "/" + linkName;
- epMetaData.setURLPattern(urlPattern);
-
- String servicePath = contextRoot + urlPattern;
- epMetaData.setEndpointAddress(getServiceEndpointAddress(null, servicePath));
+ if (isJSEEndpoint == false)
+ {
+ String transportGuarantee = anPortComponent.transportGuarantee();
+ sepMetaData.setTransportGuarantee(transportGuarantee);
+ }
+ }
}
-
- // replace the SOAP address
- replaceAddressLocation(epMetaData);
}
}
Modified: trunk/src/main/java/org/jboss/ws/deployment/JAXWSProviderMetaDataBuilderJSE.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/deployment/JAXWSProviderMetaDataBuilderJSE.java 2006-10-27 15:29:21 UTC (rev 1325)
+++ trunk/src/main/java/org/jboss/ws/deployment/JAXWSProviderMetaDataBuilderJSE.java 2006-10-27 16:07:39 UTC (rev 1326)
@@ -177,6 +177,12 @@
// Set the endpoint address
processPortComponent(udi, sepClass, linkName, sepMetaData);
+ // Init the endpoint address
+ initEndpointAddress(udi, sepMetaData, linkName);
+
+ // replace the SOAP address
+ replaceAddressLocation(sepMetaData);
+
// init service endpoint id
ObjectName sepID = getServiceEndpointID(udi, sepMetaData);
sepMetaData.setServiceEndpointID(sepID);
Modified: trunk/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java 2006-10-27 15:29:21 UTC (rev 1325)
+++ trunk/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java 2006-10-27 16:07:39 UTC (rev 1326)
@@ -26,7 +26,6 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.util.Iterator;
-import java.util.Map;
import java.util.Set;
import javax.management.ObjectName;
@@ -131,13 +130,13 @@
ServerEndpointMetaData sepMetaData = new ServerEndpointMetaData(serviceMetaData, portName, interfaceQName, Type.JAXRPC);
sepMetaData.setPortComponentName(pcMetaData.getPortComponentName());
- String ejbLink = pcMetaData.getEjbLink();
- String servletLink = pcMetaData.getServletLink();
- sepMetaData.setLinkName(servletLink != null ? servletLink : ejbLink);
+ String linkName = pcMetaData.getEjbLink() != null ? pcMetaData.getEjbLink() : pcMetaData.getServletLink();
+ sepMetaData.setLinkName(linkName);
serviceMetaData.addEndpoint(sepMetaData);
- // Init the service encoding style
initEndpointEncodingStyle(sepMetaData);
+
+ initEndpointAddress(udi, sepMetaData, linkName);
if (udi.metaData instanceof UnifiedApplicationMetaData)
{
@@ -150,9 +149,9 @@
serviceMetaData.setWsdlPublishLocation(wsdlPublishLocation);
// Copy <port-component> meta data
- UnifiedBeanMetaData beanMetaData = (UnifiedBeanMetaData)apMetaData.getBeanByEjbName(ejbLink);
+ UnifiedBeanMetaData beanMetaData = (UnifiedBeanMetaData)apMetaData.getBeanByEjbName(linkName);
if (beanMetaData == null)
- throw new WSException("Cannot obtain UnifiedBeanMetaData for: " + ejbLink);
+ throw new WSException("Cannot obtain UnifiedBeanMetaData for: " + linkName);
String configName = apMetaData.getConfigName();
if (configName != null)
@@ -178,15 +177,13 @@
sepMetaData.setURLPattern(bpcMetaData.getURLPattern());
}
-
- initServicePathEJB(udi, sepMetaData, ejbLink);
}
else if (udi.metaData instanceof UnifiedWebMetaData)
{
UnifiedWebMetaData webMetaData = (UnifiedWebMetaData)udi.metaData;
wsMetaData.setSecurityDomain(webMetaData.getSecurityDomain());
- String targetBean = webMetaData.getServletClassMap().get(servletLink);
+ String targetBean = webMetaData.getServletClassMap().get(linkName);
sepMetaData.setServiceEndpointImplName(targetBean);
// Copy the wsdl publish location from jboss-web.xml
@@ -202,8 +199,7 @@
if (configFile != null)
sepMetaData.setConfigFile(configFile);
- initServicePathJSE(udi, sepMetaData, servletLink);
- initTransportGuaranteeJSE(udi, sepMetaData, servletLink);
+ initTransportGuaranteeJSE(udi, sepMetaData, linkName);
}
// init service endpoint id
@@ -272,64 +268,6 @@
return wsdlEndpoint;
}
- private void initServicePathEJB(UnifiedDeploymentInfo udi, ServerEndpointMetaData epMetaData, String ejbLink)
- {
- UnifiedApplicationMetaData applMetaData = (UnifiedApplicationMetaData)udi.metaData;
- UnifiedBeanMetaData beanMetaData = (UnifiedBeanMetaData)applMetaData.getBeanByEjbName(ejbLink);
- if (beanMetaData == null)
- throw new WSException("Cannot obtain meta data for ejb link: " + ejbLink);
-
- // Use the webservice context root if we have one
- String contextRoot = applMetaData.getWebServiceContextRoot();
-
- // If not, derive the context root from the deployment short name
- if (contextRoot == null)
- {
- String shortName = udi.shortName;
- contextRoot = shortName.substring(0, shortName.indexOf('.'));
- contextRoot = "/" + contextRoot;
- }
- epMetaData.setContextRoot(contextRoot);
-
- String urlPattern;
- UnifiedEjbPortComponentMetaData ejbpcMetaData = beanMetaData.getPortComponent();
- if (ejbpcMetaData != null && ejbpcMetaData.getPortComponentURI() != null)
- {
- urlPattern = ejbpcMetaData.getPortComponentURI();
- }
- else
- {
- urlPattern = "/" + ejbLink;
- }
- epMetaData.setURLPattern(urlPattern);
- }
-
- private void initServicePathJSE(UnifiedDeploymentInfo udi, ServerEndpointMetaData epMetaData, String servletLink)
- {
- UnifiedWebMetaData webMetaData = (UnifiedWebMetaData)udi.metaData;
- Map<String, String> servletMappings = webMetaData.getServletMappings();
-
- String contextRoot = webMetaData.getContextRoot();
-
- // If not, derive the context root from the deployment short name
- if (contextRoot == null)
- {
- String shortName = udi.shortName;
- contextRoot = shortName.substring(0, shortName.indexOf('.'));
- contextRoot = "/" + contextRoot;
- }
- epMetaData.setContextRoot(contextRoot);
-
- String urlPattern = (String)servletMappings.get(servletLink);
- if (urlPattern == null)
- throw new WSException("Cannot obtain servlet mapping for servlet link: " + servletLink);
-
- if (urlPattern.startsWith("/") == false)
- urlPattern = "/" + urlPattern;
-
- epMetaData.setURLPattern(urlPattern);
- }
-
/**
* Read the transport guarantee from web.xml
*/
Modified: trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-10-27 15:29:21 UTC (rev 1325)
+++ trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-10-27 16:07:39 UTC (rev 1326)
@@ -63,6 +63,8 @@
import org.jboss.ws.WSException;
import org.jboss.ws.addressing.AddressingPropertiesImpl;
import org.jboss.ws.addressing.metadata.AddressingOpMetaExt;
+import org.jboss.ws.annotation.PortComponent;
+import org.jboss.ws.deployment.UnifiedDeploymentInfo.DeploymentType;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.jaxrpc.Use;
import org.jboss.ws.jaxws.DynamicWrapperGenerator;
@@ -80,6 +82,7 @@
import org.jboss.ws.metadata.ParameterMetaData.WrappedParameter;
import org.jboss.ws.metadata.config.jaxws.WSEndpointConfigJAXWS;
import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
+import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData;
import org.jboss.ws.metadata.jsr181.HandlerChainFactory;
import org.jboss.ws.metadata.jsr181.HandlerChainMetaData;
import org.jboss.ws.metadata.jsr181.HandlerChainsMetaData;
@@ -209,6 +212,12 @@
// Set the endpoint address
processPortComponent(udi, wsClass, linkName, sepMetaData);
+ // Init the endpoint address
+ initEndpointAddress(udi, sepMetaData, linkName);
+
+ // replace the SOAP address
+ replaceAddressLocation(sepMetaData);
+
// Process an optional @SOAPMessageHandlers annotation
if (sepClass.isAnnotationPresent(SOAPMessageHandlers.class) || wsClass.isAnnotationPresent(SOAPMessageHandlers.class))
log.warn("@SOAPMessageHandlers is deprecated as of JSR-181 2.0 with no replacement.");
Modified: trunk/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java 2006-10-27 15:29:21 UTC (rev 1325)
+++ trunk/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java 2006-10-27 16:07:39 UTC (rev 1326)
@@ -64,6 +64,7 @@
import org.jboss.ws.metadata.TypesMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData;
+import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedMessageDrivenMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData;
import org.jboss.ws.metadata.wsdl.NCName;
@@ -206,16 +207,81 @@
}
}
+ protected void initEndpointAddress(UnifiedDeploymentInfo udi, ServerEndpointMetaData sepMetaData, String linkName)
+ {
+ String contextRoot = sepMetaData.getContextRoot();
+ String urlPattern = sepMetaData.getURLPattern();
+
+ if (udi.metaData instanceof UnifiedWebMetaData)
+ {
+ UnifiedWebMetaData webMetaData = (UnifiedWebMetaData)udi.metaData;
+ String jbwebContextRoot = webMetaData.getContextRoot();
+ if (jbwebContextRoot != null)
+ contextRoot = jbwebContextRoot;
+
+ Map<String, String> servletMappings = webMetaData.getServletMappings();
+ urlPattern = (String)servletMappings.get(linkName);
+ if (urlPattern == null)
+ throw new WSException("Cannot obtain url pattern for servlet name: " + linkName);
+ }
+
+ if (udi.metaData instanceof UnifiedApplicationMetaData)
+ {
+ UnifiedApplicationMetaData applMetaData = (UnifiedApplicationMetaData)udi.metaData;
+ UnifiedBeanMetaData beanMetaData = (UnifiedBeanMetaData)applMetaData.getBeanByEjbName(linkName);
+ if (beanMetaData == null)
+ throw new WSException("Cannot obtain meta data for ejb link: " + linkName);
+
+ String wsContextRoot = applMetaData.getWebServiceContextRoot();
+ if (wsContextRoot != null)
+ contextRoot = wsContextRoot;
+
+ UnifiedEjbPortComponentMetaData ejbpcMetaData = beanMetaData.getPortComponent();
+ if (ejbpcMetaData != null && ejbpcMetaData.getPortComponentURI() != null)
+ {
+ String pcUrlPattern = ejbpcMetaData.getPortComponentURI();
+ if (pcUrlPattern != null)
+ urlPattern = pcUrlPattern;
+ }
+ }
+
+ // If not, derive the context root from the deployment
+ if (contextRoot == null)
+ {
+ contextRoot = "/";
+ if (udi.parent != null)
+ {
+ String shortName = udi.parent.shortName;
+ shortName = shortName.substring(0, shortName.indexOf('.'));
+ contextRoot += shortName + "-";
+ }
+ String shortName = udi.shortName;
+ shortName = shortName.substring(0, shortName.indexOf('.'));
+ contextRoot += shortName;
+ }
+
+ if (urlPattern == null)
+ urlPattern = "/" + linkName;
+ if (urlPattern.startsWith("/") == false)
+ urlPattern = "/" + urlPattern;
+
+ sepMetaData.setContextRoot(contextRoot);
+ sepMetaData.setURLPattern(urlPattern);
+
+ String servicePath = contextRoot + urlPattern;
+ sepMetaData.setEndpointAddress(getServiceEndpointAddress(null, servicePath));
+ }
+
protected ObjectName getServiceEndpointID(UnifiedDeploymentInfo udi, ServerEndpointMetaData sepMetaData)
{
- String endpoint = sepMetaData.getLinkName();
+ String linkName = sepMetaData.getLinkName();
String context = sepMetaData.getContextRoot();
if (context.startsWith("/"))
context = context.substring(1);
StringBuilder idstr = new StringBuilder(ServerEndpointMetaData.SEPID_DOMAIN + ":");
idstr.append(ServerEndpointMetaData.SEPID_PROPERTY_CONTEXT + "=" + context);
- idstr.append("," + ServerEndpointMetaData.SEPID_PROPERTY_ENDPOINT + "=" + endpoint);
+ idstr.append("," + ServerEndpointMetaData.SEPID_PROPERTY_ENDPOINT + "=" + linkName);
// Add JMS destination JNDI name for MDB endpoints
if (udi.metaData instanceof UnifiedApplicationMetaData)
Modified: trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java 2006-10-27 15:29:21 UTC (rev 1325)
+++ trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java 2006-10-27 16:07:39 UTC (rev 1326)
@@ -65,135 +65,175 @@
this.epManager = epManager;
}
- public void create(UnifiedDeploymentInfo udi) throws Throwable
+ public void create(UnifiedDeploymentInfo udi)
{
log.debug("create: " + udi.url);
-
- UnifiedMetaData wsMetaData;
- if (udi.type == UnifiedDeploymentInfo.DeploymentType.JSR109_JSE)
+ try
{
- JSR109ServerMetaDataBuilder builder = new JSR109ServerMetaDataBuilder();
- builder.setClassLoader(null); // the web context loader is not available yet
- builder.setResourceLoader(udi.localCl);
- wsMetaData = builder.buildMetaData((JSR109Deployment)udi);
- }
- else if (udi.type == UnifiedDeploymentInfo.DeploymentType.JSR109_EJB21)
- {
- JSR109ServerMetaDataBuilder builder = new JSR109ServerMetaDataBuilder();
- builder.setClassLoader(udi.ucl);
- builder.setResourceLoader(udi.localCl);
- wsMetaData = builder.buildMetaData((JSR109Deployment)udi);
- }
- else if (udi.type == UnifiedDeploymentInfo.DeploymentType.JSR181_JSE)
- {
- JSR181MetaDataBuilderJSE builder = new JSR181MetaDataBuilderJSE();
- builder.setClassLoader(udi.annotationsCl);
- builder.setResourceLoader(udi.localCl);
- wsMetaData = builder.buildMetaData(udi);
- }
- else if (udi.type == UnifiedDeploymentInfo.DeploymentType.JSR181_EJB21)
- {
- JSR181MetaDataBuilderEJB21 builder = new JSR181MetaDataBuilderEJB21();
- builder.setClassLoader(udi.annotationsCl);
- builder.setResourceLoader(udi.localCl);
- wsMetaData = builder.buildMetaData(udi);
- }
- else if (udi.type == UnifiedDeploymentInfo.DeploymentType.JSR181_EJB3)
- {
- JSR181MetaDataBuilderEJB3 builder = new JSR181MetaDataBuilderEJB3();
- builder.setClassLoader(udi.annotationsCl);
- builder.setResourceLoader(udi.localCl);
- wsMetaData = builder.buildMetaData(udi);
- }
- else if (udi.type == UnifiedDeploymentInfo.DeploymentType.JAXWS_PROVIDER_JSE)
- {
- JAXWSProviderMetaDataBuilderJSE builder = new JAXWSProviderMetaDataBuilderJSE();
- builder.setClassLoader(udi.annotationsCl);
- builder.setResourceLoader(udi.localCl);
- wsMetaData = builder.buildMetaData(udi);
- }
- else
- {
- throw new WSException("Invalid type: " + udi.type);
- }
+ UnifiedMetaData wsMetaData;
+ if (udi.type == UnifiedDeploymentInfo.DeploymentType.JSR109_JSE)
+ {
+ JSR109ServerMetaDataBuilder builder = new JSR109ServerMetaDataBuilder();
+ builder.setClassLoader(null); // the web context loader is not available yet
+ builder.setResourceLoader(udi.localCl);
+ wsMetaData = builder.buildMetaData((JSR109Deployment)udi);
+ }
+ else if (udi.type == UnifiedDeploymentInfo.DeploymentType.JSR109_EJB21)
+ {
+ JSR109ServerMetaDataBuilder builder = new JSR109ServerMetaDataBuilder();
+ builder.setClassLoader(udi.ucl);
+ builder.setResourceLoader(udi.localCl);
+ wsMetaData = builder.buildMetaData((JSR109Deployment)udi);
+ }
+ else if (udi.type == UnifiedDeploymentInfo.DeploymentType.JSR181_JSE)
+ {
+ JSR181MetaDataBuilderJSE builder = new JSR181MetaDataBuilderJSE();
+ builder.setClassLoader(udi.annotationsCl);
+ builder.setResourceLoader(udi.localCl);
+ wsMetaData = builder.buildMetaData(udi);
+ }
+ else if (udi.type == UnifiedDeploymentInfo.DeploymentType.JSR181_EJB21)
+ {
+ JSR181MetaDataBuilderEJB21 builder = new JSR181MetaDataBuilderEJB21();
+ builder.setClassLoader(udi.annotationsCl);
+ builder.setResourceLoader(udi.localCl);
+ wsMetaData = builder.buildMetaData(udi);
+ }
+ else if (udi.type == UnifiedDeploymentInfo.DeploymentType.JSR181_EJB3)
+ {
+ JSR181MetaDataBuilderEJB3 builder = new JSR181MetaDataBuilderEJB3();
+ builder.setClassLoader(udi.annotationsCl);
+ builder.setResourceLoader(udi.localCl);
+ wsMetaData = builder.buildMetaData(udi);
+ }
+ else if (udi.type == UnifiedDeploymentInfo.DeploymentType.JAXWS_PROVIDER_JSE)
+ {
+ JAXWSProviderMetaDataBuilderJSE builder = new JAXWSProviderMetaDataBuilderJSE();
+ builder.setClassLoader(udi.annotationsCl);
+ builder.setResourceLoader(udi.localCl);
+ wsMetaData = builder.buildMetaData(udi);
+ }
+ else
+ {
+ throw new IllegalStateException("Invalid type: " + udi.type);
+ }
- metaDataMap.put(udi.url.toExternalForm(), wsMetaData);
+ metaDataMap.put(udi.url.toExternalForm(), wsMetaData);
- for (ServiceMetaData serviceMetaData : wsMetaData.getServices())
- {
- for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints())
+ for (ServiceMetaData serviceMetaData : wsMetaData.getServices())
{
- ServiceEndpointInfo seInfo = new ServiceEndpointInfo(udi, (ServerEndpointMetaData)epMetaData);
- epManager.createServiceEndpoint(seInfo);
+ for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints())
+ {
+ ServiceEndpointInfo seInfo = new ServiceEndpointInfo(udi, (ServerEndpointMetaData)epMetaData);
+ epManager.createServiceEndpoint(seInfo);
+ }
}
}
+ catch (Exception ex)
+ {
+ log.error("Cannot create service endpoint", ex);
+ if (ex instanceof RuntimeException)
+ throw (RuntimeException)ex;
+
+ throw new WSException(ex);
+ }
}
- public void start(UnifiedDeploymentInfo udi) throws Throwable
+ public void start(UnifiedDeploymentInfo udi)
{
log.debug("start: " + udi.url);
-
- UnifiedMetaData wsMetaData = getUnifiedMetaData(udi);
- if (wsMetaData != null)
+ try
{
- // late initialization of the web context loader
- if (wsMetaData.getClassLoader() != udi.ucl)
- wsMetaData.setClassLoader(udi.ucl);
-
- // Publish the WSDL file
- WSDLFilePublisher wsdlfp = new WSDLFilePublisher(udi);
- wsdlfp.publishWsdlFiles(wsMetaData);
- for (ServiceMetaData serviceMetaData : wsMetaData.getServices())
+ UnifiedMetaData wsMetaData = getUnifiedMetaData(udi);
+ if (wsMetaData != null)
{
- for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints())
+ // late initialization of the web context loader
+ if (wsMetaData.getClassLoader() != udi.ucl)
+ wsMetaData.setClassLoader(udi.ucl);
+
+ // Publish the WSDL file
+ WSDLFilePublisher wsdlfp = new WSDLFilePublisher(udi);
+ wsdlfp.publishWsdlFiles(wsMetaData);
+ for (ServiceMetaData serviceMetaData : wsMetaData.getServices())
{
- ObjectName sepID = ((ServerEndpointMetaData)epMetaData).getServiceEndpointID();
- epManager.startServiceEndpoint(sepID);
+ for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints())
+ {
+ ObjectName sepID = ((ServerEndpointMetaData)epMetaData).getServiceEndpointID();
+ epManager.startServiceEndpoint(sepID);
+ }
}
}
- }
+ }
+ catch (Exception ex)
+ {
+ log.error("Cannot start service endpoint", ex);
+ if (ex instanceof RuntimeException)
+ throw (RuntimeException)ex;
+
+ throw new WSException(ex);
+ }
}
- public void stop(UnifiedDeploymentInfo udi) throws Throwable
+ public void stop(UnifiedDeploymentInfo udi)
{
log.debug("stop: " + udi.url);
-
- UnifiedMetaData wsMetaData = getUnifiedMetaData(udi);
- if (wsMetaData != null)
+ try
{
- // Stop the service endpoints
- for (ServiceMetaData serviceMetaData : wsMetaData.getServices())
+ UnifiedMetaData wsMetaData = getUnifiedMetaData(udi);
+ if (wsMetaData != null)
{
- for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints())
+ // Stop the service endpoints
+ for (ServiceMetaData serviceMetaData : wsMetaData.getServices())
{
- ObjectName sepID = ((ServerEndpointMetaData)epMetaData).getServiceEndpointID();
- epManager.stopServiceEndpoint(sepID);
+ for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints())
+ {
+ ObjectName sepID = ((ServerEndpointMetaData)epMetaData).getServiceEndpointID();
+ epManager.stopServiceEndpoint(sepID);
+ }
}
+
+ // Unpublish the WSDL file
+ WSDLFilePublisher wsdlfp = new WSDLFilePublisher(udi);
+ wsdlfp.unpublishWsdlFiles();
}
-
- // Unpublish the WSDL file
- WSDLFilePublisher wsdlfp = new WSDLFilePublisher(udi);
- wsdlfp.unpublishWsdlFiles();
- }
+ }
+ catch (Exception ex)
+ {
+ log.error("Cannot stop service endpoint", ex);
+ if (ex instanceof RuntimeException)
+ throw (RuntimeException)ex;
+
+ throw new WSException(ex);
+ }
}
- public void destroy(UnifiedDeploymentInfo udi) throws Throwable
+ public void destroy(UnifiedDeploymentInfo udi)
{
log.debug("destroy: " + udi.url);
-
- UnifiedMetaData wsMetaData = getUnifiedMetaData(udi);
- if (wsMetaData != null)
+ try
{
- // Destroy the service endpoints
- for (ServiceMetaData serviceMetaData : wsMetaData.getServices())
+ UnifiedMetaData wsMetaData = getUnifiedMetaData(udi);
+ if (wsMetaData != null)
{
- for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints())
+ // Destroy the service endpoints
+ for (ServiceMetaData serviceMetaData : wsMetaData.getServices())
{
- ObjectName sepID = ((ServerEndpointMetaData)epMetaData).getServiceEndpointID();
- epManager.destroyServiceEndpoint(sepID);
+ for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints())
+ {
+ ObjectName sepID = ((ServerEndpointMetaData)epMetaData).getServiceEndpointID();
+ epManager.destroyServiceEndpoint(sepID);
+ }
}
}
- }
+ }
+ catch (Exception ex)
+ {
+ log.error("Cannot destroy service endpoint", ex);
+ if (ex instanceof RuntimeException)
+ throw (RuntimeException)ex;
+
+ throw new WSException(ex);
+ }
}
public UnifiedMetaData getUnifiedMetaData(UnifiedDeploymentInfo udi)
Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.java 2006-10-27 15:29:21 UTC (rev 1325)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.java 2006-10-27 16:07:39 UTC (rev 1326)
@@ -31,7 +31,6 @@
import javax.annotation.Resource;
import javax.jws.HandlerChain;
import javax.jws.WebMethod;
-import javax.jws.WebParam;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
import javax.xml.namespace.QName;
18 years, 2 months
- 1
- 0
JBossWS SVN: r1325 - branches/jbossws-1.0/docs/user-guide/project/en/modules
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2006-10-27 11:29:21 -0400 (Fri, 27 Oct 2006)
New Revision: 1325
Modified:
branches/jbossws-1.0/docs/user-guide/project/en/modules/introduction.xml
Log:
removed policy from feature list
Modified: branches/jbossws-1.0/docs/user-guide/project/en/modules/introduction.xml
===================================================================
--- branches/jbossws-1.0/docs/user-guide/project/en/modules/introduction.xml 2006-10-27 15:26:48 UTC (rev 1324)
+++ branches/jbossws-1.0/docs/user-guide/project/en/modules/introduction.xml 2006-10-27 15:29:21 UTC (rev 1325)
@@ -52,11 +52,8 @@
<para>WS-Eventing</para>
</listitem>
<listitem>
- <para>WS-Policy</para>
+ <para>MTOM/XOP for optimized binary transport</para>
</listitem>
- <listitem>
- <para>MTOM/XOP</para>
- </listitem>
</itemizedlist>
</sect1>
18 years, 2 months
- 1
- 0
JBossWS SVN: r1324 - branches/jbossws-1.0/docs/user-guide/project/en/modules/mtom-xop
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2006-10-27 11:26:48 -0400 (Fri, 27 Oct 2006)
New Revision: 1324
Modified:
branches/jbossws-1.0/docs/user-guide/project/en/modules/mtom-xop/mtom-xop.xml
Log:
Updated the MTOM documentation
Modified: branches/jbossws-1.0/docs/user-guide/project/en/modules/mtom-xop/mtom-xop.xml
===================================================================
--- branches/jbossws-1.0/docs/user-guide/project/en/modules/mtom-xop/mtom-xop.xml 2006-10-27 14:55:38 UTC (rev 1323)
+++ branches/jbossws-1.0/docs/user-guide/project/en/modules/mtom-xop/mtom-xop.xml 2006-10-27 15:26:48 UTC (rev 1324)
@@ -12,9 +12,6 @@
and <ulink url="http://www.w3.org/TR/xop10/">XML-binary Optimized Packaging (XOP)</ulink>
</para>
- <para>The MTOM/XOP example uses a service endpoint interface with the same operations as in <link linkend="attachments">SOAP with Attachments</link>
- </para>
-
<sect1 id="mtom-schema-elements">
<title>MTOM schema elements</title>
@@ -49,7 +46,7 @@
</orderedlist>
The JBossWS MTOM implementation scans the associated schema
- and will treat any xmime:base64Binary occurance as a MTOM optimizable parameter.
+ and will treat any xsd:base64Binary occurance as a MTOM optimizable parameter.
</para>
</sect1>
@@ -89,6 +86,35 @@
</sect1>
<sect1>
+ <title>Enabling MTOM in JBossWS</title>
+
+ <para>
+ Since JBossWS 1.0.2 MTOM is enabled for all schema types that picked up by the XOPScanner.
+ These are basically all xsd:Base64Binaries. But this also means that regardless of wether or not the receiving
+ side of the message is capable of processing MTOM request, JBossWS will always send particular schema types xop encoded
+ over the wire.
+ </para>
+
+ <para>
+ This behaviour can be disabled by either using a MessageContext ('org.jboss.ws.mtom.enabled') property or referring
+ a <link linkend="template-config">configuration template</link> that disables MTOM.
+ </para>
+ </sect1>
+
+ <note>
+ <title>A note on JAXRPC handlers</title>
+
+ <para>
+ The fact that a SOAP message might be XOP encoded is actually transparent to any SOAP intermediary.
+ This also applies to <link linkend="headers-handlers">JAXRPC handlers</link>. What does this mean?
+ It means that JAXRPC handlers don't get to see the XOP encoded wireformat (xop:Include), instead they can access
+ the message as if it was inlined. This is necessary in order not to break any SOAP processing modules
+ that work on the real payload (i.e. Security). In JBossWS this results in the binary data being transformed into
+ a base64 representation, which can easily negate the optimization efforts in the first place.
+ </para>
+ </note>
+
+ <sect1>
<title>An example MTOM request</title>
<para>The incomming message is multipart/related. The first part is the SOAP Envelope.</para>
18 years, 2 months
- 1
- 0
JBossWS SVN: r1323 - in branches/jbossws-1.0/src/test: ant java/org/jboss/test/ws/jaxrpc/samples/mtom resources/jaxrpc/samples/mtom resources/jaxrpc/samples/mtom/META-INF resources/jaxrpc/samples/mtom/WEB-INF resources/jaxrpc/samples-override/mtom/WEB-INF resources/jaxrpc/samples-override/mtom/WEB-INF/wsdl
by jbossws-commits＠lists.jboss.org
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>
+ * @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>
+ * @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>
+ * @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>
+ * @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> </p>
-<rule>
-<p><em>Copyright © 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:>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:>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:>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>
18 years, 2 months
- 1
- 0
JBossWS SVN: r1322 - in branches/jbossws-1.0/src: main/java/org/jboss/ws/soap main/java/org/jboss/ws/xop test/java/org/jboss/test/ws/jaxrpc/samples/mtom test/java/org/jboss/test/ws/jaxrpc/xop/doclit test/java/org/jboss/test/ws/jaxrpc/xop/rpclit
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2006-10-27 09:27:04 -0400 (Fri, 27 Oct 2006)
New Revision: 1322
Modified:
branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/JBossXBContentAdapter.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/XOPRpcTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java
Log:
fixed xop samples
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java 2006-10-27 11:47:18 UTC (rev 1321)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java 2006-10-27 13:27:04 UTC (rev 1322)
@@ -26,6 +26,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
+import org.jboss.ws.soap.attachment.SwapableMemoryDataSource;
import org.jboss.ws.binding.BindingException;
import org.jboss.ws.binding.DeserializerSupport;
import org.jboss.ws.binding.SerializationContext;
@@ -40,6 +41,7 @@
import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.utils.JavaUtils;
+import org.jboss.ws.utils.MimeUtils;
import org.jboss.ws.xop.XOPContext;
import org.w3c.dom.*;
@@ -47,8 +49,12 @@
import javax.xml.soap.Name;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
+import javax.activation.DataHandler;
+import javax.activation.DataSource;
import java.io.IOException;
import java.io.Writer;
+import java.io.InputStream;
+import java.io.ByteArrayOutputStream;
import java.lang.reflect.Array;
import java.lang.reflect.Method;
import java.util.Iterator;
@@ -279,7 +285,33 @@
if (isAssignable == false)
{
- throw new WSException("Java type '" + javaType + "' is not assignable from: " + objType.getName());
+ // handle XOP simple types, i.e. in RPC/LIT
+ try
+ {
+ String contentType = MimeUtils.resolveMimeType(javaType);
+ log.debug("Adopt DataHandler to " + javaType +", contentType "+ contentType);
+
+ DataSource ds = new SwapableMemoryDataSource(((DataHandler)obj).getInputStream(), contentType);
+ DataHandler dh = new DataHandler(ds);
+ obj = dh.getContent();
+
+ // 'application/octet-stream' will return a byte[] instead fo the stream
+ if(obj instanceof InputStream)
+ {
+ ByteArrayOutputStream bout = new ByteArrayOutputStream();
+ dh.writeTo(bout);
+ obj = bout.toByteArray();
+ }
+ }
+ catch (IOException e)
+ {
+ throw new WSException("Failed to adopt XOP content type", e);
+ }
+
+ if(!JavaUtils.isAssignableFrom(javaType, obj.getClass()))
+ {
+ throw new WSException("Java type '" + javaType + "' is not assignable from: " + objType.getName());
+ }
}
}
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/JBossXBContentAdapter.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/JBossXBContentAdapter.java 2006-10-27 11:47:18 UTC (rev 1321)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/JBossXBContentAdapter.java 2006-10-27 13:27:04 UTC (rev 1322)
@@ -110,7 +110,7 @@
Class targetClass = ctx.resolvePropertyType();
if(null==targetClass) {
- throw new WSException("Failed targte property type on "+ ctx.getParticle());
+ throw new WSException("Failed to resolve target property type on "+ ctx.getParticle());
}
boolean isRegularMessage = !XOPContext.isXOPMessage();
Modified: 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 11:47:18 UTC (rev 1321)
+++ 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)
@@ -86,8 +86,7 @@
//((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8081/jaxrpc-samples-mtom");
}
-
- /*public void testSimpleBinary() throws Exception
+ public void testSimpleBinary() throws Exception
{
DataHandler dh = new DataHandler(
new FileDataSource("resources/jaxrpc/samples/mtom/disguised_jpeg.xcf")
@@ -98,28 +97,13 @@
assertTrue("Content length is different", bytesIn.length == bytesOut.length);
}
- public void testMTOMDisabledClientside() throws Exception
- {
- URL url = new File("resources/jaxrpc/samples/mtom/attach.jpeg").toURL();
-
- // disable MTOM
- ((Stub)port)._setProperty("org.jboss.ws.mtom.enabled", 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);
- }
-
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
{
@@ -129,7 +113,7 @@
assertEquals("Value mismatch", value, xoppart);
}
- /*public void testParameterConversion() throws Exception
+ public void testParameterConversion() throws Exception
{
FileInputStream stream = new FileInputStream("resources/jaxrpc/samples/mtom/attach.xml");
StreamSource source = new StreamSource(stream);
@@ -147,5 +131,24 @@
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);
+ }
}
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2006-10-27 11:47:18 UTC (rev 1321)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2006-10-27 13:27:04 UTC (rev 1322)
@@ -35,7 +35,7 @@
/**
* @author Heiko Braun <heiko.braun(a)jboss.com>
- * @version $Id$
+ * @version $Id:XOPBase.java 1321 2006-10-27 11:47:18Z heiko.braun(a)jboss.com $
* @since Sep 25, 2006
*/
public abstract class XOPBase extends JBossWSTest {
@@ -91,27 +91,32 @@
Image image = XOPTestSupport.createTestImage();
- // disable MTOM
- ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
+ if(image!=null)
+ {
+ // disable MTOM
+ ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
- PingImage pingImage = new PingImage("0|1", image);
- PingImageResponse response = getPort().pingImage(pingImage);
- assertNotNull("Return xopContent was null", response);
- assertNotNull("Return xopContent was null", response.getXopContent());
+ PingImage pingImage = new PingImage("0|1", image);
+ PingImageResponse response = getPort().pingImage(pingImage);
+ assertNotNull("Return xopContent was null", response);
+ assertNotNull("Return xopContent was null", response.getXopContent());
+ }
}
public void testImageRequestOptimized() throws Exception {
Image image = XOPTestSupport.createTestImage();
- // enable MTOM
- ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE);
+ if(image!=null)
+ {
+ // enable MTOM
+ ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE);
- PingImage pingImage = new PingImage("1|0", image);
- PingImageResponse response = getPort().pingImage(pingImage);
- assertNotNull("Response was null", response);
- assertNotNull("Return xopContent was null", response.getXopContent());
-
+ PingImage pingImage = new PingImage("1|0", image);
+ PingImageResponse response = getPort().pingImage(pingImage);
+ assertNotNull("Response was null", response);
+ assertNotNull("Return xopContent was null", response.getXopContent());
+ }
}
public void testSourceResponseOptimized() throws Exception {
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2006-10-27 11:47:18 UTC (rev 1321)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2006-10-27 13:27:04 UTC (rev 1322)
@@ -36,7 +36,7 @@
/**
* @author Heiko Braun <heiko.braun(a)jboss.com>
- * @version $Id$
+ * @version $Id:XOPBase.java 1321 2006-10-27 11:47:18Z heiko.braun(a)jboss.com $
* @since Sep 25, 2006
*/
public abstract class XOPBase extends JBossWSTest {
@@ -105,27 +105,32 @@
Image image = XOPTestSupport.createTestImage();
- // disable MTOM
- ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
+ if(image!=null)
+ {
+ // disable MTOM
+ ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
- PingImage pingImage = new PingImage("0|1", image);
- PingImageResponse response = getPort().pingImage(pingImage);
- assertNotNull("Return xopContent was null", response);
- assertNotNull("Return xopContent was null", response.getXopContent());
+ PingImage pingImage = new PingImage("0|1", image);
+ PingImageResponse response = getPort().pingImage(pingImage);
+ assertNotNull("Return xopContent was null", response);
+ assertNotNull("Return xopContent was null", response.getXopContent());
+ }
}
public void testImageRequestOptimized() throws Exception {
Image image = XOPTestSupport.createTestImage();
- // enable MTOM
- ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE);
+ if(image!=null)
+ {
+ // enable MTOM
+ ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE);
- PingImage pingImage = new PingImage("1|0", image);
- PingImageResponse response = getPort().pingImage(pingImage);
- assertNotNull("Response was null", response);
- assertNotNull("Return xopContent was null", response.getXopContent());
-
+ PingImage pingImage = new PingImage("1|0", image);
+ PingImageResponse response = getPort().pingImage(pingImage);
+ assertNotNull("Response was null", response);
+ assertNotNull("Return xopContent was null", response.getXopContent());
+ }
}
public void testSourceResponseOptimized() throws Exception {
18 years, 2 months
- 1
- 0
JBossWS SVN: r1321 - in branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop: doclit rpclit
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2006-10-27 07:47:18 -0400 (Fri, 27 Oct 2006)
New Revision: 1321
Modified:
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java
Log:
XOP type conversion based on target property class
Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years, 2 months
- 1
- 0
JBossWS SVN: r1320 - in branches/jbossws-1.0/src: main/java/org/jboss/ws/soap main/java/org/jboss/ws/xop test/java/org/jboss/test/ws/jaxrpc/xop test/java/org/jboss/test/ws/jaxrpc/xop/doclit test/java/org/jboss/test/ws/jaxrpc/xop/rpclit test/resources/interop/microsoft/security/wsse10Encrypt/WEB-INF/wsdl test/resources/jaxrpc/xop/doclit/META-INF test/resources/jaxrpc/xop/doclit/WEB-INF test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF test/resources/jaxrpc/xop/doclit/handlerconfig/WEB
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2006-10-27 07:46:30 -0400 (Fri, 27 Oct 2006)
New Revision: 1320
Added:
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java
Removed:
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java
Modified:
branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/JBossXBContentAdapter.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java
branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10Encrypt/WEB-INF/wsdl/wsdl0.wsdl
branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/META-INF/application-client.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/web.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml
Log:
XOP type conversion based on target property class
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java 2006-10-27 11:44:08 UTC (rev 1319)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java 2006-10-27 11:46:30 UTC (rev 1320)
@@ -43,7 +43,6 @@
import org.jboss.ws.xop.XOPContext;
import org.w3c.dom.*;
-import javax.activation.DataHandler;
import javax.xml.namespace.QName;
import javax.xml.soap.Name;
import javax.xml.soap.SOAPElement;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/JBossXBContentAdapter.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/JBossXBContentAdapter.java 2006-10-27 11:44:08 UTC (rev 1319)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/JBossXBContentAdapter.java 2006-10-27 11:46:30 UTC (rev 1320)
@@ -22,15 +22,18 @@
package org.jboss.ws.xop;
import org.jboss.logging.Logger;
+import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.Constants;
import org.jboss.ws.soap.attachment.ContentHandlerRegistry;
import org.jboss.ws.soap.attachment.SwapableMemoryDataSource;
import org.jboss.ws.utils.IOUtils;
import org.jboss.ws.utils.MimeUtils;
import org.jboss.xb.binding.sunday.marshalling.MarshallingContext;
import org.jboss.xb.binding.sunday.marshalling.TermBeforeMarshallingCallback;
-import org.jboss.xb.binding.sunday.unmarshalling.*;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding;
+import org.jboss.xb.binding.sunday.unmarshalling.TermBeforeSetParentCallback;
+import org.jboss.xb.binding.sunday.unmarshalling.TypeBinding;
+import org.jboss.xb.binding.sunday.unmarshalling.UnmarshallingContext;
import javax.activation.DataHandler;
import javax.activation.DataSource;
@@ -38,6 +41,7 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.io.InputStream;
/**
* Adopts raw binary contents to java types.
@@ -106,13 +110,12 @@
Class targetClass = ctx.resolvePropertyType();
if(null==targetClass) {
- log.warn("Failed to resolve target property on " + ctx.getParticle());
- log.debug("Parent particle is " + ctx.getParentParticle());
+ throw new WSException("Failed targte property type on "+ ctx.getParticle());
}
boolean isRegularMessage = !XOPContext.isXOPMessage();
boolean isSimpleType = (object instanceof byte[]);
- boolean doTypesMatch = (targetClass!=null && targetClass.equals(object.getClass()));
+ boolean doTypesMatch = ( targetClass.equals(object.getClass()) );
// Handle inlined requests.
// In this case XB treats binaries as simple types that are unmarshalled to byte[]
@@ -144,19 +147,24 @@
// In this case we are be able to instantiate the correct content object
// from the data handler, with the exception of content-type 'application/octet-stream'.
// These attachments will be returned as DataHandler instances.
- else if(XOPContext.isXOPMessage() && (object instanceof DataHandler))
+ else if(XOPContext.isXOPMessage() && (object instanceof DataHandler) && !doTypesMatch)
{
try
{
- DataHandler attachmentHandle = (DataHandler)object;
- String contentType = attachmentHandle.getContentType();
+ String contentType = MimeUtils.resolveMimeType(targetClass);
log.debug("Adopt DataHandler to " + targetClass +", contentType "+ contentType);
- // TODO: fix me as soon as targetClass info is available
- if(!contentType.equals("application/octet-stream"))
+ DataHandler dh = new DataHandler(
+ wrapAsDataSource(object, contentType)
+ );
+ object = dh.getContent();
+
+ // 'application/octet-stream' will return a byte[] instead fo the stream
+ if(object instanceof InputStream)
{
- DataHandler dh = new DataHandler(attachmentHandle.getDataSource());
- object = dh.getContent();
+ ByteArrayOutputStream bout = new ByteArrayOutputStream();
+ dh.writeTo(bout);
+ object = bout.toByteArray();
}
}
catch (IOException e)
@@ -176,6 +184,10 @@
{
ds = new SwapableMemoryDataSource(new ByteArrayInputStream((byte[])object), contentType);
}
+ else if(object instanceof DataHandler)
+ {
+ ds = new SwapableMemoryDataSource(((DataHandler)object).getInputStream(), contentType);
+ }
else
{
throw new IllegalArgumentException("Failed to wrap as data source: "+object.getClass());
@@ -206,7 +218,7 @@
xmimeBase64Type.setBeforeSetParentCallback( contentAdapter );
// xop:Include
- ModelGroupBinding modelGroup = (ModelGroupBinding)xmimeBase64Type.getParticle().getTerm();
+ /*ModelGroupBinding modelGroup = (ModelGroupBinding)xmimeBase64Type.getParticle().getTerm();
ParticleBinding particle = (ParticleBinding)modelGroup.getParticles().iterator().next();
ElementBinding xopInclude = (ElementBinding)particle.getTerm();
@@ -214,7 +226,8 @@
throw new WSException("Looks like the JBossXB XOP implementation has changed, please open a JIRA issue");
xopInclude.setBeforeMarshallingCallback(contentAdapter);
- xopInclude.setBeforeSetParentCallback(contentAdapter);
+ xopInclude.setBeforeSetParentCallback(contentAdapter);
+ */
}
}
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java 2006-10-27 11:44:08 UTC (rev 1319)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java 2006-10-27 11:46:30 UTC (rev 1320)
@@ -84,7 +84,14 @@
public static DataHandler createDataHandler()
{
- DataHandler dataHandler = new DataHandler("<more><nestedXML/></more>", "application/octet-stream");
- return dataHandler;
+ try
+ {
+ URL url = new File("resources/jaxrpc/xop/shared/attach.jpeg").toURL();
+ return new DataHandler(url);
+ }
+ catch (MalformedURLException e)
+ {
+ throw new RuntimeException(e);
+ }
}
}
Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2006-10-27 11:44:08 UTC (rev 1319)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2006-10-27 11:46:30 UTC (rev 1320)
@@ -1,180 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.ws.jaxrpc.xop.doclit;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport;
-import org.jboss.test.ws.jaxrpc.xop.shared.*;
-import org.jboss.ws.jaxrpc.StubExt;
-import org.jboss.ws.utils.IOUtils;
-
-import javax.activation.DataHandler;
-import javax.xml.rpc.Stub;
-import javax.xml.transform.Source;
-import java.io.File;
-import java.awt.*;
-
-/**
- * @author Heiko Braun <heiko.braun(a)jboss.com>
- * @version $Id$
- * @since Sep 25, 2006
- */
-public abstract class XOPBase extends JBossWSTest {
-
- protected TestService_PortType port;
-
- /*
- public void testRequestResponseOptimized() throws Exception {
-
- DataHandler dh = new DataHandler("Another plain text attachment", "text/plain");
- byte[] bytesIn = IOUtils.convertToBytes(dh);
- PingMsgResponse value = port.ping(new PingMsg("1|1", bytesIn));
- assertNotNull("Return value was null", value);
- byte[] bytesOut = value.getXopContent();
- assertNotNull("Returned xopContent was null", bytesOut);
- assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length);
- }
-
-
- public void testResponseOptimized() throws Exception {
-
- byte[] bytesIn = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/samples/mtom/attach.jpeg"));
-
- // disable MTOM
- ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
-
- PingMsgResponse value = port.ping(new PingMsg("0|1", bytesIn));
- assertNotNull("Return value was null",value);
- byte[] bytesOut = value.getXopContent();
- assertNotNull("Return xopContent was null", bytesOut);
- assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length);
- }
-
- public void testRequestOptimized() throws Exception {
-
- byte[] bytesIn = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/samples/mtom/attach.jpeg"));
-
- // reusing the stub means cleaning the previous state
- ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE);
-
- PingMsgResponse value = port.ping(new PingMsg("1|0", bytesIn));
- assertNotNull("Return value was null",value);
- byte[] bytesOut = value.getXopContent();
- assertNotNull("Return xopContent was null", bytesOut);
- assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length);
- } */
-
- // ---------------------------------------------------------------------------------
- // Test the before and after marshalling handlers
-
- public void testImageResponseOptimized() throws Exception {
-
- Image image = XOPTestSupport.createTestImage();
-
- // disable MTOM
- ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
-
- PingImage pingImage = new PingImage("0|1", image);
- PingImageResponse response = port.pingImage(pingImage);
- assertNotNull("Return xopContent was null", response);
- assertNotNull("Return xopContent was null", response.getXopContent());
- }
-
- public void testImageRequestOptimized() throws Exception {
-
- Image image = XOPTestSupport.createTestImage();
-
- // enable MTOM
- ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE);
-
- PingImage pingImage = new PingImage("1|0", image);
- PingImageResponse response = port.pingImage(pingImage);
- assertNotNull("Response was null", response);
- assertNotNull("Return xopContent was null", response.getXopContent());
-
- }
-
- public void testSourceResponseOptimized() throws Exception {
-
- Source source = XOPTestSupport.createTestSource();
-
- // disable MTOM
- ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
-
- PingSource pingSource = new PingSource();
- pingSource.setMessage("0|1");
- pingSource.setXopContent(source);
-
- PingSourceResponse response = port.pingSource(pingSource);
- assertNotNull("Response was null", response);
- assertNotNull("Return xopContent was null", response.getXopContent());
-
- }
-
- public void testSourceRequestOptimized() throws Exception {
-
- Source source = XOPTestSupport.createTestSource();
-
- // enable MTOM
- ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE);
-
- PingSource pingSource = new PingSource();
- pingSource.setMessage("1|0");
- pingSource.setXopContent(source);
-
- PingSourceResponse response = port.pingSource(pingSource);
- assertNotNull("Response was null", response);
- assertNotNull("Return xopContent was null", response.getXopContent());
- }
-
- public void testDHResponseOptimized() throws Exception {
-
- DataHandler dh = XOPTestSupport.createDataHandler();
-
- // disable MTOM
- ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
-
- PingDataHandler reqest = new PingDataHandler(dh);
- reqest.setMessage("0|1");
-
- PingDataHandlerResponse response = port.pingDataHandler(reqest);
- assertNotNull("Response was null", response);
- assertNotNull("Return xopContent was null", response.getXopContent());
-
- }
-
- public void testDHRequestOptimized() throws Exception {
-
- DataHandler dh = XOPTestSupport.createDataHandler();
-
- // enable MTOM
- ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE);
-
-
- PingDataHandler reqest = new PingDataHandler(dh);
- reqest.setMessage("1|0");
-
- PingDataHandlerResponse response = port.pingDataHandler(reqest);
- assertNotNull("Response was null", response);
- assertNotNull("Return xopContent was null", response.getXopContent());
- }
-}
Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2006-10-27 11:44:08 UTC (rev 1319)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2006-10-27 11:46:30 UTC (rev 1320)
@@ -0,0 +1,180 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.ws.jaxrpc.xop.doclit;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport;
+import org.jboss.test.ws.jaxrpc.xop.shared.*;
+import org.jboss.ws.jaxrpc.StubExt;
+import org.jboss.ws.utils.IOUtils;
+
+import javax.activation.DataHandler;
+import javax.xml.rpc.Stub;
+import javax.xml.transform.Source;
+import java.awt.*;
+import java.io.File;
+
+/**
+ * @author Heiko Braun <heiko.braun(a)jboss.com>
+ * @version $Id$
+ * @since Sep 25, 2006
+ */
+public abstract class XOPBase extends JBossWSTest {
+
+ protected abstract XOPPing getPort();
+
+ // ---------------------------------------------------------------------------------
+ // Test raw binary data
+
+ public void testRequestResponseOptimized() throws Exception {
+
+ DataHandler dh = new DataHandler("Another plain text attachment", "text/plain");
+ byte[] bytesIn = IOUtils.convertToBytes(dh);
+ PingMsgResponse value = getPort().ping(new PingMsg("1|1", bytesIn));
+ assertNotNull("Return value was null", value);
+ byte[] bytesOut = value.getXopContent();
+ assertNotNull("Returned xopContent was null", bytesOut);
+ assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length);
+ }
+
+ public void testResponseOptimized() throws Exception {
+
+ byte[] bytesIn = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/samples/mtom/attach.jpeg"));
+
+ // disable MTOM
+ ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
+
+ PingMsgResponse value = getPort().ping(new PingMsg("0|1", bytesIn));
+ assertNotNull("Return value was null",value);
+ byte[] bytesOut = value.getXopContent();
+ assertNotNull("Return xopContent was null", bytesOut);
+ assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length);
+ }
+
+ public void testRequestOptimized() throws Exception {
+
+ byte[] bytesIn = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/samples/mtom/attach.jpeg"));
+
+ // reusing the stub means cleaning the previous state
+ ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE);
+
+ PingMsgResponse value = getPort().ping(new PingMsg("1|0", bytesIn));
+ assertNotNull("Return value was null",value);
+ byte[] bytesOut = value.getXopContent();
+ assertNotNull("Return xopContent was null", bytesOut);
+ assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length);
+ }
+
+ // ---------------------------------------------------------------------------------
+ // Test concrete java types
+
+ public void testImageResponseOptimized() throws Exception {
+
+ Image image = XOPTestSupport.createTestImage();
+
+ // disable MTOM
+ ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
+
+ PingImage pingImage = new PingImage("0|1", image);
+ PingImageResponse response = getPort().pingImage(pingImage);
+ assertNotNull("Return xopContent was null", response);
+ assertNotNull("Return xopContent was null", response.getXopContent());
+ }
+
+ public void testImageRequestOptimized() throws Exception {
+
+ Image image = XOPTestSupport.createTestImage();
+
+ // enable MTOM
+ ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE);
+
+ PingImage pingImage = new PingImage("1|0", image);
+ PingImageResponse response = getPort().pingImage(pingImage);
+ assertNotNull("Response was null", response);
+ assertNotNull("Return xopContent was null", response.getXopContent());
+
+ }
+
+ public void testSourceResponseOptimized() throws Exception {
+
+ Source source = XOPTestSupport.createTestSource();
+
+ // disable MTOM
+ ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
+
+ PingSource pingSource = new PingSource();
+ pingSource.setMessage("0|1");
+ pingSource.setXopContent(source);
+
+ PingSourceResponse response = getPort().pingSource(pingSource);
+ assertNotNull("Response was null", response);
+ assertNotNull("Return xopContent was null", response.getXopContent());
+
+ }
+
+ public void testSourceRequestOptimized() throws Exception {
+
+ Source source = XOPTestSupport.createTestSource();
+
+ // enable MTOM
+ ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE);
+
+ PingSource pingSource = new PingSource();
+ pingSource.setMessage("1|0");
+ pingSource.setXopContent(source);
+
+ PingSourceResponse response = getPort().pingSource(pingSource);
+ assertNotNull("Response was null", response);
+ assertNotNull("Return xopContent was null", response.getXopContent());
+ }
+
+ public void testDHResponseOptimized() throws Exception {
+
+ DataHandler dh = XOPTestSupport.createDataHandler();
+
+ // disable MTOM
+ ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
+
+ PingDataHandler reqest = new PingDataHandler(dh);
+ reqest.setMessage("0|1");
+
+ PingDataHandlerResponse response = getPort().pingDataHandler(reqest);
+ assertNotNull("Response was null", response);
+ assertNotNull("Return xopContent was null", response.getXopContent());
+
+ }
+
+ public void testDHRequestOptimized() throws Exception {
+
+ DataHandler dh = XOPTestSupport.createDataHandler();
+
+ // enable MTOM
+ ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE);
+
+ PingDataHandler reqest = new PingDataHandler(dh);
+ reqest.setMessage("1|0");
+
+ PingDataHandlerResponse response = getPort().pingDataHandler(reqest);
+ assertNotNull("Response was null", response);
+ assertNotNull("Return xopContent was null", response.getXopContent());
+ }
+}
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2006-10-27 11:44:08 UTC (rev 1319)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2006-10-27 11:46:30 UTC (rev 1320)
@@ -23,18 +23,9 @@
import junit.framework.Test;
import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse;
-import org.jboss.ws.utils.IOUtils;
-import org.jboss.ws.jaxrpc.StubExt;
import javax.naming.InitialContext;
import javax.xml.rpc.Service;
-import javax.xml.rpc.Stub;
-import javax.activation.DataHandler;
-import java.io.File;
/**
* Test MTOM functionality with jaxrpc-handlers in place.<br>
@@ -47,6 +38,8 @@
*/
public class XOPHandlerTestCase extends XOPBase {
+ private XOPPing port;
+
public static Test suite()
{
return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxrpc-xop-doclit_handler.war, jaxrpc-xop-doclit_handler-client.jar");
@@ -59,9 +52,13 @@
{
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPHandlerTestCase");
- port = (TestService_PortType)service.getPort(TestService_PortType.class);
+ port = (XOPPing)service.getPort(XOPPing.class);
}
//((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-xop-doclit_handler");
}
+
+ protected XOPPing getPort() {
+ return port;
+ }
}
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java 2006-10-27 11:44:08 UTC (rev 1319)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java 2006-10-27 11:46:30 UTC (rev 1320)
@@ -24,19 +24,10 @@
// $Id$
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse;
-import org.jboss.ws.jaxrpc.StubExt;
-import org.jboss.ws.utils.IOUtils;
-import javax.activation.DataHandler;
import javax.naming.InitialContext;
import javax.xml.rpc.Service;
-import javax.xml.rpc.Stub;
-import java.io.File;
/**
* Test MTOM functionaly without any jaxrpc handlers in place.
@@ -46,6 +37,8 @@
*/
public class XOPTestCase extends XOPBase {
+ private XOPPing port;
+
public static Test suite()
{
return JBossWSTestSetup.newTestSetup(XOPTestCase.class, "jaxrpc-xop-doclit.war, jaxrpc-xop-doclit-client.jar");
@@ -58,10 +51,15 @@
{
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPTestCase");
- port = (TestService_PortType)service.getPort(TestService_PortType.class);
+ port = (XOPPing)service.getPort(XOPPing.class);
}
//((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-xop-doclit");
}
+ protected XOPPing getPort()
+ {
+ return port;
+ }
+
}
Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2006-10-27 11:44:08 UTC (rev 1319)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2006-10-27 11:46:30 UTC (rev 1320)
@@ -1,103 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.ws.jaxrpc.xop.rpclit;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg;
-import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport;
-import org.jboss.ws.utils.IOUtils;
-import org.jboss.ws.jaxrpc.StubExt;
-
-import javax.activation.DataHandler;
-import javax.xml.rpc.Stub;
-import java.io.File;
-import java.util.StringTokenizer;
-
-/**
- * @author Heiko Braun <heiko.braun(a)jboss.com>
- * @version $Id$
- * @since Sep 25, 2006
- */
-public abstract class XOPBase extends JBossWSTest {
-
- protected TestService_PortType port;
-
- /*public void testRequestResponseOptimized() throws Exception {
-
- DataHandler dh = new DataHandler("Another plain text attachment", "text/plain");
- byte[] bytesIn = IOUtils.convertToBytes(dh);
- requestComplex(new PingMsg("1|1", bytesIn));
-
- }
-
- public void testResponseOptimized() throws Exception {
-
- byte[] bytesIn = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/samples/mtom/attach.jpeg"));
- requestComplex(new PingMsg("0|1", bytesIn));
-
- }
-
- public void testRequestOptimized() throws Exception {
-
- byte[] bytesIn = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/samples/mtom/attach.jpeg"));
- requestComplex(new PingMsg("1|0", bytesIn));
-
- }*/
-
- private void requestComplex(PingMsg payload) throws Exception
- {
- StringTokenizer tok =new StringTokenizer(payload.getMessage(), "|");
- boolean mtomEnabled = tok.nextToken().equals("1");
- ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.valueOf(mtomEnabled));
-
- PingMsgResponse value = port.pingComplex(payload);
- assertNotNull("Return value was null",value);
- byte[] bytesOut = value.getXopContent();
- assertNotNull("Return xopContent was null", bytesOut);
- assertEquals("Content length doesn't match", payload.getXopContent().length, bytesOut.length);
- }
-
- public void testSimpleTypesOptimized() throws Exception
- {
- DataHandler dh = new DataHandler("Simple type plain text attachment", "text/plain");
- byte[] bytesIn = IOUtils.convertToBytes(dh);
- ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE);
- byte[] bytesOut = port.pingSimple("s1|s1", bytesIn);
-
- assertNotNull("Return xopContent was null", bytesOut);
- assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length);
- }
-
- public void testSimpleTypesResponseOptimized() throws Exception
- {
- DataHandler dh = new DataHandler("Simple type plain text attachment", "text/plain");
- byte[] bytesIn = IOUtils.convertToBytes(dh);
- ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
-
- byte[] bytesOut = port.pingSimple("s0|s1", bytesIn);
-
- assertNotNull("Return xopContent was null", bytesOut);
- assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length);
-
- }
-}
Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2006-10-27 11:44:08 UTC (rev 1319)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2006-10-27 11:46:30 UTC (rev 1320)
@@ -0,0 +1,195 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.ws.jaxrpc.xop.rpclit;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport;
+import org.jboss.test.ws.jaxrpc.xop.shared.*;
+import org.jboss.ws.jaxrpc.StubExt;
+import org.jboss.ws.utils.IOUtils;
+
+import javax.activation.DataHandler;
+import javax.xml.rpc.Stub;
+import javax.xml.transform.Source;
+import java.io.File;
+import java.util.StringTokenizer;
+import java.awt.*;
+
+/**
+ * @author Heiko Braun <heiko.braun(a)jboss.com>
+ * @version $Id$
+ * @since Sep 25, 2006
+ */
+public abstract class XOPBase extends JBossWSTest {
+
+ protected abstract XOPPing getPort();
+
+ public void testRequestResponseOptimized() throws Exception {
+
+ DataHandler dh = new DataHandler("Another plain text attachment", "text/plain");
+ byte[] bytesIn = IOUtils.convertToBytes(dh);
+ requestComplex(new PingMsg("1|1", bytesIn));
+
+ }
+
+ public void testResponseOptimized() throws Exception {
+
+ byte[] bytesIn = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/samples/mtom/attach.jpeg"));
+ requestComplex(new PingMsg("0|1", bytesIn));
+
+ }
+
+ public void testRequestOptimized() throws Exception {
+
+ byte[] bytesIn = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/samples/mtom/attach.jpeg"));
+ requestComplex(new PingMsg("1|0", bytesIn));
+
+ }
+
+ private void requestComplex(PingMsg payload) throws Exception
+ {
+ StringTokenizer tok =new StringTokenizer(payload.getMessage(), "|");
+ boolean mtomEnabled = tok.nextToken().equals("1");
+ ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.valueOf(mtomEnabled));
+
+ PingMsgResponse value = getPort().ping(payload);
+ assertNotNull("Return value was null",value);
+ byte[] bytesOut = value.getXopContent();
+ assertNotNull("Return xopContent was null", bytesOut);
+ assertEquals("Content length doesn't match", payload.getXopContent().length, bytesOut.length);
+ }
+
+ public void testSimpleTypesOptimized() throws Exception
+ {
+ DataHandler dh = new DataHandler("Simple type plain text attachment", "text/plain");
+ byte[] bytesIn = IOUtils.convertToBytes(dh);
+ ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE);
+ byte[] bytesOut = getPort().pingSimple("s1|s1", bytesIn);
+
+ assertNotNull("Return xopContent was null", bytesOut);
+ assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length);
+ }
+
+ public void testSimpleTypesResponseOptimized() throws Exception
+ {
+ DataHandler dh = new DataHandler("Simple type plain text attachment", "text/plain");
+ byte[] bytesIn = IOUtils.convertToBytes(dh);
+ ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
+
+ byte[] bytesOut = getPort().pingSimple("s0|s1", bytesIn);
+
+ assertNotNull("Return xopContent was null", bytesOut);
+ assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length);
+ }
+
+ public void testImageResponseOptimized() throws Exception {
+
+ Image image = XOPTestSupport.createTestImage();
+
+ // disable MTOM
+ ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
+
+ PingImage pingImage = new PingImage("0|1", image);
+ PingImageResponse response = getPort().pingImage(pingImage);
+ assertNotNull("Return xopContent was null", response);
+ assertNotNull("Return xopContent was null", response.getXopContent());
+ }
+
+ public void testImageRequestOptimized() throws Exception {
+
+ Image image = XOPTestSupport.createTestImage();
+
+ // enable MTOM
+ ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE);
+
+ PingImage pingImage = new PingImage("1|0", image);
+ PingImageResponse response = getPort().pingImage(pingImage);
+ assertNotNull("Response was null", response);
+ assertNotNull("Return xopContent was null", response.getXopContent());
+
+ }
+
+ public void testSourceResponseOptimized() throws Exception {
+
+ Source source = XOPTestSupport.createTestSource();
+
+ // disable MTOM
+ ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
+
+ PingSource pingSource = new PingSource();
+ pingSource.setMessage("0|1");
+ pingSource.setXopContent(source);
+
+ PingSourceResponse response = getPort().pingSource(pingSource);
+ assertNotNull("Response was null", response);
+ assertNotNull("Return xopContent was null", response.getXopContent());
+
+ }
+
+ public void testSourceRequestOptimized() throws Exception {
+
+ Source source = XOPTestSupport.createTestSource();
+
+ // enable MTOM
+ ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE);
+
+ PingSource pingSource = new PingSource();
+ pingSource.setMessage("1|0");
+ pingSource.setXopContent(source);
+
+ PingSourceResponse response = getPort().pingSource(pingSource);
+ assertNotNull("Response was null", response);
+ assertNotNull("Return xopContent was null", response.getXopContent());
+ }
+
+ public void testDHResponseOptimized() throws Exception {
+
+ DataHandler dh = XOPTestSupport.createDataHandler();
+
+ // disable MTOM
+ ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
+
+ PingDataHandler reqest = new PingDataHandler(dh);
+ reqest.setMessage("0|1");
+
+ PingDataHandlerResponse response = getPort().pingDataHandler(reqest);
+ assertNotNull("Response was null", response);
+ assertNotNull("Return xopContent was null", response.getXopContent());
+
+ }
+
+ public void testDHRequestOptimized() throws Exception {
+
+ DataHandler dh = XOPTestSupport.createDataHandler();
+
+ // enable MTOM
+ ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE);
+
+ PingDataHandler reqest = new PingDataHandler(dh);
+ reqest.setMessage("1|0");
+
+ PingDataHandlerResponse response = getPort().pingDataHandler(reqest);
+ assertNotNull("Response was null", response);
+ assertNotNull("Return xopContent was null", response.getXopContent());
+ }
+
+}
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java 2006-10-27 11:44:08 UTC (rev 1319)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java 2006-10-27 11:46:30 UTC (rev 1320)
@@ -23,26 +23,19 @@
import junit.framework.Test;
import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse;
-import org.jboss.ws.utils.IOUtils;
-import org.jboss.ws.jaxrpc.StubExt;
import javax.naming.InitialContext;
import javax.xml.rpc.Service;
-import javax.xml.rpc.Stub;
-import javax.activation.DataHandler;
-import java.io.File;
/**
* @author Heiko Braun <heiko.braun(a)jboss.com>
* @version $Id$
* @since Sep 22, 2006
*/
-public class XOPHandlerTestCase extends XOPBase {
+public class XOPHandlerTestCase extends XOPBase {
+ private XOPPing port;
+
public static Test suite()
{
return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxrpc-xop-rpclit_handler.war, jaxrpc-xop-rpclit_handler-client.jar");
@@ -55,9 +48,13 @@
{
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPHandlerTestCaseRPC");
- port = (TestService_PortType)service.getPort(TestService_PortType.class);
+ port = (XOPPing)service.getPort(XOPPing.class);
}
//((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-xop-rpclit_handler");
}
+
+ protected XOPPing getPort() {
+ return port;
+ }
}
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java 2006-10-27 11:44:08 UTC (rev 1319)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java 2006-10-27 11:46:30 UTC (rev 1320)
@@ -24,19 +24,10 @@
// $Id$
import junit.framework.Test;
-import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse;
-import org.jboss.ws.jaxrpc.StubExt;
-import org.jboss.ws.utils.IOUtils;
-import javax.activation.DataHandler;
import javax.naming.InitialContext;
import javax.xml.rpc.Service;
-import javax.xml.rpc.Stub;
-import java.io.File;
/**
*
@@ -45,6 +36,8 @@
*/
public class XOPTestCase extends XOPBase {
+ private XOPPing port;
+
public static Test suite()
{
return JBossWSTestSetup.newTestSetup(XOPTestCase.class, "jaxrpc-xop-rpclit.war, jaxrpc-xop-rpclit-client.jar");
@@ -57,10 +50,14 @@
{
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPTestCaseRPC");
- port = (TestService_PortType)service.getPort(TestService_PortType.class);
+ port = (XOPPing)service.getPort(XOPPing.class);
}
//((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-xop-rpclit");
}
+ protected XOPPing getPort() {
+ return port;
+ }
+
}
Modified: branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10Encrypt/WEB-INF/wsdl/wsdl0.wsdl
===================================================================
--- branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10Encrypt/WEB-INF/wsdl/wsdl0.wsdl 2006-10-27 11:44:08 UTC (rev 1319)
+++ branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10Encrypt/WEB-INF/wsdl/wsdl0.wsdl 2006-10-27 11:46:30 UTC (rev 1320)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<wsdl:definitions targetNamespace="http://InteropBaseAddress/interop"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
xmlns:wsap10="http://www.w3.org/2005/08/addressing"
Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/META-INF/application-client.xml 2006-10-27 11:44:08 UTC (rev 1319)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/META-INF/application-client.xml 2006-10-27 11:46:30 UTC (rev 1320)
@@ -13,7 +13,7 @@
<wsdl-file>use overwrite in jboss-client.xml</wsdl-file>
<jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
<port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.TestService_PortType</service-endpoint-interface>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface>
</port-component-ref>
</service-ref>
Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml 2006-10-27 11:44:08 UTC (rev 1319)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml 2006-10-27 11:46:30 UTC (rev 1320)
@@ -1,12 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
<package-mapping>
<package-type>org.jboss.test.ws.jaxrpc.xop.doclit</package-type>
- <namespaceURI>http://jboss.org/test/ws/xop/doclit</namespaceURI>
+ <namespaceURI>http://jboss.org/test/ws/xop</namespaceURI>
</package-mapping>
<java-xml-type-mapping>
<java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</java-type>
- <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/doclit'>typeNS:>PingMsg</anonymous-type-qname>
+ <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingMsg</anonymous-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
<java-variable-name>message</java-variable-name>
@@ -20,7 +20,7 @@
<java-xml-type-mapping>
<java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</java-type>
- <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/doclit'>typeNS:>PingMsgResponse</anonymous-type-qname>
+ <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingMsgResponse</anonymous-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
<java-variable-name>xopContent</java-variable-name>
@@ -30,7 +30,7 @@
<java-xml-type-mapping>
<java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</java-type>
- <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/doclit'>typeNS:>PingImage</anonymous-type-qname>
+ <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingImage</anonymous-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
<java-variable-name>message</java-variable-name>
@@ -44,7 +44,7 @@
<java-xml-type-mapping>
<java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</java-type>
- <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/doclit'>typeNS:>PingImageResponse</anonymous-type-qname>
+ <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingImageResponse</anonymous-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
<java-variable-name>xopContent</java-variable-name>
@@ -54,7 +54,7 @@
<java-xml-type-mapping>
<java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</java-type>
- <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/doclit'>typeNS:>PingSource</anonymous-type-qname>
+ <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingSource</anonymous-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
<java-variable-name>message</java-variable-name>
@@ -68,7 +68,7 @@
<java-xml-type-mapping>
<java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</java-type>
- <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/doclit'>typeNS:>PingSourceResponse</anonymous-type-qname>
+ <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingSourceResponse</anonymous-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
<java-variable-name>xopContent</java-variable-name>
@@ -78,7 +78,7 @@
<java-xml-type-mapping>
<java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</java-type>
- <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/doclit'>typeNS:>PingDataHandler</anonymous-type-qname>
+ <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingDataHandler</anonymous-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
<java-variable-name>message</java-variable-name>
@@ -92,7 +92,7 @@
<java-xml-type-mapping>
<java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</java-type>
- <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/doclit'>typeNS:>PingDataHandlerResponse</anonymous-type-qname>
+ <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingDataHandlerResponse</anonymous-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
<java-variable-name>xopContent</java-variable-name>
@@ -101,8 +101,8 @@
</java-xml-type-mapping>
<service-interface-mapping>
- <service-interface>org.jboss.test.ws.jaxrpc.xop.doclit.TestService_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://jboss.org/test/ws/xop/doclit'>serviceNS:TestService</wsdl-service-name>
+ <service-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPingService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://jboss.org/test/ws/xop'>serviceNS:TestService</wsdl-service-name>
<port-mapping>
<port-name>TestServicePort</port-name>
<java-port-name>TestServicePort</java-port-name>
@@ -110,9 +110,9 @@
</service-interface-mapping>
<service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.TestService_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://jboss.org/test/ws/xop/doclit'>portTypeNS:TestService</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://jboss.org/test/ws/xop/doclit'>bindingNS:TestServiceBinding</wsdl-binding>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://jboss.org/test/ws/xop'>portTypeNS:TestService</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://jboss.org/test/ws/xop'>bindingNS:TestServiceBinding</wsdl-binding>
<service-endpoint-method-mapping>
<java-method-name>ping</java-method-name>
@@ -121,14 +121,14 @@
<param-position>0</param-position>
<param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</param-type>
<wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/doclit'>wsdlMsgNS:PingIn</wsdl-message>
+ <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingIn</wsdl-message>
<wsdl-message-part-name>parameters</wsdl-message-part-name>
<parameter-mode>IN</parameter-mode>
</wsdl-message-mapping>
</method-param-parts-mapping>
<wsdl-return-value-mapping>
<method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/doclit'>wsdlMsgNS:PingOut</wsdl-message>
+ <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingOut</wsdl-message>
<wsdl-message-part-name>parameters</wsdl-message-part-name>
</wsdl-return-value-mapping>
</service-endpoint-method-mapping>
@@ -140,14 +140,14 @@
<param-position>0</param-position>
<param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</param-type>
<wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/doclit'>wsdlMsgNS:PingImageIn</wsdl-message>
+ <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingImageIn</wsdl-message>
<wsdl-message-part-name>parameters</wsdl-message-part-name>
<parameter-mode>IN</parameter-mode>
</wsdl-message-mapping>
</method-param-parts-mapping>
<wsdl-return-value-mapping>
<method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/doclit'>wsdlMsgNS:PingImageOut</wsdl-message>
+ <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingImageOut</wsdl-message>
<wsdl-message-part-name>parameters</wsdl-message-part-name>
</wsdl-return-value-mapping>
</service-endpoint-method-mapping>
@@ -159,14 +159,14 @@
<param-position>0</param-position>
<param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</param-type>
<wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/doclit'>wsdlMsgNS:PingSourceIn</wsdl-message>
+ <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingSourceIn</wsdl-message>
<wsdl-message-part-name>parameters</wsdl-message-part-name>
<parameter-mode>IN</parameter-mode>
</wsdl-message-mapping>
</method-param-parts-mapping>
<wsdl-return-value-mapping>
<method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/doclit'>wsdlMsgNS:PingSourceOut</wsdl-message>
+ <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingSourceOut</wsdl-message>
<wsdl-message-part-name>parameters</wsdl-message-part-name>
</wsdl-return-value-mapping>
</service-endpoint-method-mapping>
@@ -178,14 +178,14 @@
<param-position>0</param-position>
<param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</param-type>
<wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/doclit'>wsdlMsgNS:PingDataHandlerIn</wsdl-message>
+ <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingDataHandlerIn</wsdl-message>
<wsdl-message-part-name>parameters</wsdl-message-part-name>
<parameter-mode>IN</parameter-mode>
</wsdl-message-mapping>
</method-param-parts-mapping>
<wsdl-return-value-mapping>
<method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/doclit'>wsdlMsgNS:PingDataHandlerOut</wsdl-message>
+ <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingDataHandlerOut</wsdl-message>
<wsdl-message-part-name>parameters</wsdl-message-part-name>
</wsdl-return-value-mapping>
</service-endpoint-method-mapping>
Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/web.xml 2006-10-27 11:44:08 UTC (rev 1319)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/web.xml 2006-10-27 11:46:30 UTC (rev 1320)
@@ -7,7 +7,7 @@
<servlet>
<servlet-name>TestService</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxrpc.xop.doclit.TestServiceImpl</servlet-class>
+ <servlet-class>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPingImpl</servlet-class>
</servlet>
<servlet-mapping>
Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml 2006-10-27 11:44:08 UTC (rev 1319)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml 2006-10-27 11:46:30 UTC (rev 1320)
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:impl="http://jboss.org/test/ws/xop/doclit"
+ xmlns:impl="http://jboss.org/test/ws/xop"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
version="1.1">
<webservice-description>
<webservice-description-name>XOP DOC/Lit without handlers</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file>
+ <wsdl-file>WEB-INF/wsdl/service-doclit.wsdl</wsdl-file>
<jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
<port-component>
<port-component-name>TestServicePort</port-component-name>
<wsdl-port>impl:TestServicePort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.TestService_PortType</service-endpoint-interface>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface>
<service-impl-bean>
<servlet-link>TestService</servlet-link>
</service-impl-bean>
Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml 2006-10-27 11:44:08 UTC (rev 1319)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml 2006-10-27 11:46:30 UTC (rev 1320)
@@ -13,7 +13,7 @@
<wsdl-file>use overwrite in jboss-client.xml</wsdl-file>
<jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
<port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.TestService_PortType</service-endpoint-interface>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface>
</port-component-ref>
<handler>
<handler-name>XOPInlineHandler</handler-name>
Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml 2006-10-27 11:44:08 UTC (rev 1319)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml 2006-10-27 11:46:30 UTC (rev 1320)
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:impl="http://jboss.org/test/ws/xop/doclit"
+ xmlns:impl="http://jboss.org/test/ws/xop"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
version="1.1">
<webservice-description>
<webservice-description-name>XOP DOC/Lit with handlers</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file>
+ <wsdl-file>WEB-INF/wsdl/service-doclit.wsdl</wsdl-file>
<jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
<port-component>
<port-component-name>TestServicePort</port-component-name>
<wsdl-port>impl:TestServicePort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.TestService_PortType</service-endpoint-interface>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface>
<handler>
<handler-name>XOPInlineHandler</handler-name>
<handler-class>org.jboss.test.ws.jaxrpc.xop.doclit.InlineHandler</handler-class>
Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml 2006-10-27 11:44:08 UTC (rev 1319)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml 2006-10-27 11:46:30 UTC (rev 1320)
@@ -13,7 +13,7 @@
<wsdl-file>use overwrite in jboss-client.xml</wsdl-file>
<jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
<port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.TestService_PortType</service-endpoint-interface>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface>
</port-component-ref>
</service-ref>
Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml 2006-10-27 11:44:08 UTC (rev 1319)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml 2006-10-27 11:46:30 UTC (rev 1320)
@@ -5,12 +5,16 @@
xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
<package-mapping>
<package-type>org.jboss.test.ws.jaxrpc.xop.rpclit</package-type>
- <namespaceURI>http://jboss.org/test/ws/xop/rpclit</namespaceURI>
+ <namespaceURI>http://jboss.org/test/ws/xop</namespaceURI>
</package-mapping>
-
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jaxrpc.xop.shared</package-type>
+ <namespaceURI>http://jboss.org/test/ws/xop</namespaceURI>
+ </package-mapping>
+
<java-xml-type-mapping>
<java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</java-type>
- <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/rpclit'>typeNS:PingInType</root-type-qname>
+ <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingInType</root-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
<java-variable-name>message</java-variable-name>
@@ -24,7 +28,7 @@
<java-xml-type-mapping>
<java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</java-type>
- <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/rpclit'>typeNS:PingOutType</root-type-qname>
+ <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingOutType</root-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
<java-variable-name>xopContent</java-variable-name>
@@ -32,9 +36,81 @@
</variable-mapping>
</java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</java-type>
+ <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingImageType</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>message</java-variable-name>
+ <xml-element-name>message</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>xopContent</java-variable-name>
+ <xml-element-name>xopContent</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</java-type>
+ <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingImageOutType</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>xopContent</java-variable-name>
+ <xml-element-name>xopContent</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</java-type>
+ <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingSourceType</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>message</java-variable-name>
+ <xml-element-name>message</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>xopContent</java-variable-name>
+ <xml-element-name>xopContent</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</java-type>
+ <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingSourceOutType</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>xopContent</java-variable-name>
+ <xml-element-name>xopContent</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</java-type>
+ <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingDataHandlerType</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>message</java-variable-name>
+ <xml-element-name>message</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>xopContent</java-variable-name>
+ <xml-element-name>xopContent</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</java-type>
+ <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingDataHandlerOutType</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>xopContent</java-variable-name>
+ <xml-element-name>xopContent</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+
<service-interface-mapping>
- <service-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.TestService_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://jboss.org/test/ws/xop/rpclit'>serviceNS:TestService</wsdl-service-name>
+ <service-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPingService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://jboss.org/test/ws/xop'>serviceNS:TestService</wsdl-service-name>
<port-mapping>
<port-name>TestServicePort</port-name>
<java-port-name>TestServicePort</java-port-name>
@@ -42,25 +118,26 @@
</service-interface-mapping>
<service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.TestService_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://jboss.org/test/ws/xop/rpclit'>portTypeNS:TestService</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://jboss.org/test/ws/xop/rpclit'>bindingNS:TestServiceBinding</wsdl-binding>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://jboss.org/test/ws/xop'>portTypeNS:TestService</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://jboss.org/test/ws/xop'>bindingNS:TestServiceBinding</wsdl-binding>
+
<service-endpoint-method-mapping>
- <java-method-name>pingComplex</java-method-name>
- <wsdl-operation>pingComplex</wsdl-operation>
+ <java-method-name>ping</java-method-name>
+ <wsdl-operation>ping</wsdl-operation>
<method-param-parts-mapping>
<param-position>0</param-position>
<param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</param-type>
<wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/rpclit'>wsdlMsgNS:PingIn</wsdl-message>
+ <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingIn</wsdl-message>
<wsdl-message-part-name>parameters</wsdl-message-part-name>
<parameter-mode>IN</parameter-mode>
</wsdl-message-mapping>
</method-param-parts-mapping>
<wsdl-return-value-mapping>
<method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/rpclit'>wsdlMsgNS:PingOut</wsdl-message>
+ <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingOut</wsdl-message>
<wsdl-message-part-name>result</wsdl-message-part-name>
</wsdl-return-value-mapping>
</service-endpoint-method-mapping>
@@ -72,7 +149,7 @@
<param-position>0</param-position>
<param-type>java.lang.String</param-type>
<wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/rpclit'>wsdlMsgNS:OctetsIn</wsdl-message>
+ <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:OctetsIn</wsdl-message>
<wsdl-message-part-name>message</wsdl-message-part-name>
<parameter-mode>IN</parameter-mode>
</wsdl-message-mapping>
@@ -81,16 +158,74 @@
<param-position>1</param-position>
<param-type>java.lang.Object</param-type>
<wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/rpclit'>wsdlMsgNS:OctetsIn</wsdl-message>
+ <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:OctetsIn</wsdl-message>
<wsdl-message-part-name>xopContent</wsdl-message-part-name>
<parameter-mode>IN</parameter-mode>
</wsdl-message-mapping>
</method-param-parts-mapping>
<wsdl-return-value-mapping>
<method-return-value>java.lang.Object</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/rpclit'>wsdlMsgNS:OctetsOut</wsdl-message>
+ <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:OctetsOut</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>pingImage</java-method-name>
+ <wsdl-operation>pingImage</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingImageIn</wsdl-message>
+ <wsdl-message-part-name>parameters</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingImageOut</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>pingSource</java-method-name>
+ <wsdl-operation>pingSource</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingSourceIn</wsdl-message>
+ <wsdl-message-part-name>parameters</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingSourceOut</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>pingDataHandler</java-method-name>
+ <wsdl-operation>pingDataHandler</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingDataHandlerIn</wsdl-message>
+ <wsdl-message-part-name>parameters</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingDataHandlerOut</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/xop/rpclit/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml 2006-10-27 11:44:08 UTC (rev 1319)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml 2006-10-27 11:46:30 UTC (rev 1320)
@@ -7,7 +7,7 @@
<servlet>
<servlet-name>TestService</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxrpc.xop.rpclit.TestServiceImpl</servlet-class>
+ <servlet-class>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPingImpl</servlet-class>
</servlet>
<servlet-mapping>
Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml 2006-10-27 11:44:08 UTC (rev 1319)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml 2006-10-27 11:46:30 UTC (rev 1320)
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:impl="http://jboss.org/test/ws/xop/rpclit"
+ xmlns:impl="http://jboss.org/test/ws/xop"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
version="1.1">
<webservice-description>
<webservice-description-name>XOP RPC/Lit without handlers</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file>
+ <wsdl-file>WEB-INF/wsdl/service-rpclit.wsdl</wsdl-file>
<jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
<port-component>
<port-component-name>TestServicePort</port-component-name>
<wsdl-port>impl:TestServicePort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.TestService_PortType</service-endpoint-interface>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface>
<service-impl-bean>
<servlet-link>TestService</servlet-link>
</service-impl-bean>
Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml 2006-10-27 11:44:08 UTC (rev 1319)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml 2006-10-27 11:46:30 UTC (rev 1320)
@@ -13,7 +13,7 @@
<wsdl-file>use overwrite in jboss-client.xml</wsdl-file>
<jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
<port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.TestService_PortType</service-endpoint-interface>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface>
</port-component-ref>
<handler>
<handler-name>XOPInlineHandler</handler-name>
Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml 2006-10-27 11:44:08 UTC (rev 1319)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml 2006-10-27 11:46:30 UTC (rev 1320)
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:impl="http://jboss.org/test/ws/xop/rpclit"
+ xmlns:impl="http://jboss.org/test/ws/xop"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
version="1.1">
<webservice-description>
<webservice-description-name>XOP RPC/Lit with handlers</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file>
+ <wsdl-file>WEB-INF/wsdl/service-rpclit.wsdl</wsdl-file>
<jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
<port-component>
<port-component-name>TestServicePort</port-component-name>
<wsdl-port>impl:TestServicePort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.TestService_PortType</service-endpoint-interface>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface>
<handler>
<handler-name>XOPInlineHandler</handler-name>
<handler-class>org.jboss.test.ws.jaxrpc.xop.rpclit.InlineHandler</handler-class>
18 years, 2 months
- 1
- 0
JBossWS SVN: r1319 - in branches/jbossws-1.0/src/test: java/org/jboss/test/ws/jaxrpc/xop/doclit java/org/jboss/test/ws/jaxrpc/xop/rpclit resources/jaxrpc/xop/doclit/WEB-INF/wsdl resources/jaxrpc/xop/rpclit/WEB-INF/wsdl
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2006-10-27 07:44:08 -0400 (Fri, 27 Oct 2006)
New Revision: 1319
Added:
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPing.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingImpl.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingService.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPing.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingImpl.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingService.java
branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl
branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl
branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/xsd0.xsd
branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl
Removed:
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestServiceImpl.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestService_PortType.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestService_Service.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/TestServiceImpl.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/TestService_PortType.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/TestService_Service.java
branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/TestService.wsdl
branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/TestService.wsdl
Log:
renamed files
Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestServiceImpl.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestServiceImpl.java 2006-10-27 11:43:42 UTC (rev 1318)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestServiceImpl.java 2006-10-27 11:44:08 UTC (rev 1319)
@@ -1,35 +0,0 @@
-package org.jboss.test.ws.jaxrpc.xop.doclit;
-
-import org.jboss.test.ws.jaxrpc.xop.shared.*;
-
-import java.rmi.RemoteException;
-
-/**
- * MTOM test service impl.
- * The 'message' param value determines wether or not the response should be XOP encoded.
- *
- * @author Heiko Braun, <heiko(a)openj.net>
- * @since 11-Apr-2006
- */
-public class TestServiceImpl extends MTOMServiceBase implements TestService_PortType {
-
- public PingMsgResponse ping(PingMsg pingMsg) throws RemoteException {
- toggleXOP(pingMsg.getMessage());
- return new PingMsgResponse(pingMsg.getXopContent());
- }
-
- public PingImageResponse pingImage(PingImage pingImage) throws RemoteException {
- toggleXOP(pingImage.getMessage());
- return new PingImageResponse(pingImage.getXopContent());
- }
-
- public PingSourceResponse pingSource(PingSource pingSource) throws RemoteException {
- toggleXOP(pingSource.getMessage());
- return new PingSourceResponse(pingSource.getXopContent());
- }
-
- public PingDataHandlerResponse pingDataHandler(PingDataHandler pingDataHandler) throws RemoteException {
- toggleXOP(pingDataHandler.getMessage());
- return new PingDataHandlerResponse(pingDataHandler.getXopContent());
- }
-}
Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestService_PortType.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestService_PortType.java 2006-10-27 11:43:42 UTC (rev 1318)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestService_PortType.java 2006-10-27 11:44:08 UTC (rev 1319)
@@ -1,17 +0,0 @@
-/*
- * JBoss, the OpenSource EJB server
- * Distributable under LGPL license. See terms of license at gnu.org.
- */
-//Auto Generated by jbossws - Please do not edit!!!
-
-package org.jboss.test.ws.jaxrpc.xop.doclit;
-
-import org.jboss.test.ws.jaxrpc.xop.shared.*;
-
-public interface TestService_PortType extends java.rmi.Remote
-{
- public PingMsgResponse ping(PingMsg pingMsg) throws java.rmi.RemoteException;
- public PingImageResponse pingImage(PingImage pingImage) throws java.rmi.RemoteException;
- public PingSourceResponse pingSource(PingSource pingSource) throws java.rmi.RemoteException;
- public PingDataHandlerResponse pingDataHandler(PingDataHandler pingDataHandler) throws java.rmi.RemoteException;
-}
Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestService_Service.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestService_Service.java 2006-10-27 11:43:42 UTC (rev 1318)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestService_Service.java 2006-10-27 11:44:08 UTC (rev 1319)
@@ -1,19 +0,0 @@
-/*
-* JBoss, the OpenSource EJB server
-* Distributable under LGPL license. See terms of license at gnu.org.
-*/
-
-//Auto Generated by jbossws - Please do not edit!!!
-
-package org.jboss.test.ws.jaxrpc.xop.doclit;
-
-
-import javax.xml.rpc.ServiceException;
-
-
-public interface TestService_Service extends javax.xml.rpc.Service
-{
-
- public org.jboss.test.ws.jaxrpc.xop.doclit.TestService_PortType getTestServicePort() throws ServiceException;
-
-}
Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPing.java (from rev 1296, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestService_PortType.java)
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestService_PortType.java 2006-10-24 14:06:00 UTC (rev 1296)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPing.java 2006-10-27 11:44:08 UTC (rev 1319)
@@ -0,0 +1,17 @@
+/*
+ * JBoss, the OpenSource EJB server
+ * Distributable under LGPL license. See terms of license at gnu.org.
+ */
+//Auto Generated by jbossws - Please do not edit!!!
+
+package org.jboss.test.ws.jaxrpc.xop.doclit;
+
+import org.jboss.test.ws.jaxrpc.xop.shared.*;
+
+public interface XOPPing extends java.rmi.Remote
+{
+ public PingMsgResponse ping(PingMsg pingMsg) throws java.rmi.RemoteException;
+ public PingImageResponse pingImage(PingImage pingImage) throws java.rmi.RemoteException;
+ public PingSourceResponse pingSource(PingSource pingSource) throws java.rmi.RemoteException;
+ public PingDataHandlerResponse pingDataHandler(PingDataHandler pingDataHandler) throws java.rmi.RemoteException;
+}
Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingImpl.java (from rev 1296, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestServiceImpl.java)
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestServiceImpl.java 2006-10-24 14:06:00 UTC (rev 1296)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingImpl.java 2006-10-27 11:44:08 UTC (rev 1319)
@@ -0,0 +1,36 @@
+package org.jboss.test.ws.jaxrpc.xop.doclit;
+
+import org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing;
+import org.jboss.test.ws.jaxrpc.xop.shared.*;
+
+import java.rmi.RemoteException;
+
+/**
+ * MTOM test service impl.
+ * The 'message' param value determines wether or not the response should be XOP encoded.
+ *
+ * @author Heiko Braun, <heiko(a)openj.net>
+ * @since 11-Apr-2006
+ */
+public class XOPPingImpl extends MTOMServiceBase implements XOPPing {
+
+ public PingMsgResponse ping(PingMsg pingMsg) throws RemoteException {
+ toggleXOP(pingMsg.getMessage());
+ return new PingMsgResponse(pingMsg.getXopContent());
+ }
+
+ public PingImageResponse pingImage(PingImage pingImage) throws RemoteException {
+ toggleXOP(pingImage.getMessage());
+ return new PingImageResponse(pingImage.getXopContent());
+ }
+
+ public PingSourceResponse pingSource(PingSource pingSource) throws RemoteException {
+ toggleXOP(pingSource.getMessage());
+ return new PingSourceResponse(pingSource.getXopContent());
+ }
+
+ public PingDataHandlerResponse pingDataHandler(PingDataHandler pingDataHandler) throws RemoteException {
+ toggleXOP(pingDataHandler.getMessage());
+ return new PingDataHandlerResponse(pingDataHandler.getXopContent());
+ }
+}
Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingService.java (from rev 1296, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestService_Service.java)
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestService_Service.java 2006-10-24 14:06:00 UTC (rev 1296)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingService.java 2006-10-27 11:44:08 UTC (rev 1319)
@@ -0,0 +1,19 @@
+/*
+* JBoss, the OpenSource EJB server
+* Distributable under LGPL license. See terms of license at gnu.org.
+*/
+
+//Auto Generated by jbossws - Please do not edit!!!
+
+package org.jboss.test.ws.jaxrpc.xop.doclit;
+
+
+import javax.xml.rpc.ServiceException;
+
+
+public interface XOPPingService extends javax.xml.rpc.Service
+{
+
+ public org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing getTestServicePort() throws ServiceException;
+
+}
Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/TestServiceImpl.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/TestServiceImpl.java 2006-10-27 11:43:42 UTC (rev 1318)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/TestServiceImpl.java 2006-10-27 11:44:08 UTC (rev 1319)
@@ -1,32 +0,0 @@
-package org.jboss.test.ws.jaxrpc.xop.rpclit;
-
-import org.jboss.ws.soap.MessageContextAssociation;
-import org.jboss.ws.common.CommonMessageContext;
-import org.jboss.ws.jaxrpc.StubExt;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg;
-import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse;
-import org.jboss.test.ws.jaxrpc.xop.shared.MTOMServiceBase;
-
-import java.rmi.RemoteException;
-import java.util.StringTokenizer;
-
-/**
- * @author Heiko Braun, <heiko(a)openj.net>
- * @since 11-Apr-2006
- */
-public class TestServiceImpl extends MTOMServiceBase implements TestService_PortType {
-
- public PingMsgResponse pingComplex(PingMsg pingMsg) throws RemoteException {
-
- String message = pingMsg.getMessage();
- toggleXOP(message);
-
- return new PingMsgResponse(pingMsg.getXopContent());
- }
-
- public byte[] pingSimple(String parameters, byte[] xopContent) throws RemoteException {
- toggleXOP(parameters);
- return xopContent;
- }
-
-}
Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/TestService_PortType.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/TestService_PortType.java 2006-10-27 11:43:42 UTC (rev 1318)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/TestService_PortType.java 2006-10-27 11:44:08 UTC (rev 1319)
@@ -1,12 +0,0 @@
-/*
- * JBoss, the OpenSource EJB server
- * Distributable under LGPL license. See terms of license at gnu.org.
- */
-//Auto Generated by jbossws - Please do not edit!!!
-
-package org.jboss.test.ws.jaxrpc.xop.rpclit;
-public interface TestService_PortType extends java.rmi.Remote
-{
- public org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse pingComplex(org.jboss.test.ws.jaxrpc.xop.shared.PingMsg pingMsg) throws java.rmi.RemoteException;
- public byte[] pingSimple(String parameters, byte[] xopContent) throws java.rmi.RemoteException;
-}
Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/TestService_Service.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/TestService_Service.java 2006-10-27 11:43:42 UTC (rev 1318)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/TestService_Service.java 2006-10-27 11:44:08 UTC (rev 1319)
@@ -1,17 +0,0 @@
-/*
-* JBoss, the OpenSource EJB server
-* Distributable under LGPL license. See terms of license at gnu.org.
-*/
-
-//Auto Generated by jbossws - Please do not edit!!!
-
-package org.jboss.test.ws.jaxrpc.xop.rpclit;
-
-
-import javax.xml.rpc.ServiceException;
-
-
-public interface TestService_Service extends javax.xml.rpc.Service
-{
- public org.jboss.test.ws.jaxrpc.xop.rpclit.TestService_PortType getTestServicePort() throws ServiceException;
-}
Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPing.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPing.java 2006-10-27 11:43:42 UTC (rev 1318)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPing.java 2006-10-27 11:44:08 UTC (rev 1319)
@@ -0,0 +1,18 @@
+/*
+ * JBoss, the OpenSource EJB server
+ * Distributable under LGPL license. See terms of license at gnu.org.
+ */
+//Auto Generated by jbossws - Please do not edit!!!
+
+package org.jboss.test.ws.jaxrpc.xop.rpclit;
+
+import org.jboss.test.ws.jaxrpc.xop.shared.*;
+
+public interface XOPPing extends java.rmi.Remote
+{
+ public org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse ping(org.jboss.test.ws.jaxrpc.xop.shared.PingMsg pingMsg) throws java.rmi.RemoteException;
+ public byte[] pingSimple(String parameters, byte[] xopContent) throws java.rmi.RemoteException;
+ public PingImageResponse pingImage(PingImage pingImage) throws java.rmi.RemoteException;
+ public PingSourceResponse pingSource(PingSource pingSource) throws java.rmi.RemoteException;
+ public PingDataHandlerResponse pingDataHandler(PingDataHandler pingDataHandler) throws java.rmi.RemoteException;
+}
Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPing.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingImpl.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingImpl.java 2006-10-27 11:43:42 UTC (rev 1318)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingImpl.java 2006-10-27 11:44:08 UTC (rev 1319)
@@ -0,0 +1,41 @@
+package org.jboss.test.ws.jaxrpc.xop.rpclit;
+
+import org.jboss.test.ws.jaxrpc.xop.shared.*;
+
+import java.rmi.RemoteException;
+
+/**
+ * @author Heiko Braun, <heiko(a)openj.net>
+ * @since 11-Apr-2006
+ */
+public class XOPPingImpl extends MTOMServiceBase implements XOPPing {
+
+ public PingMsgResponse ping(PingMsg pingMsg) throws RemoteException {
+
+ String message = pingMsg.getMessage();
+ toggleXOP(message);
+
+ return new PingMsgResponse(pingMsg.getXopContent());
+ }
+
+ public byte[] pingSimple(String parameters, byte[] xopContent) throws RemoteException {
+ toggleXOP(parameters);
+ return xopContent;
+ }
+
+ public PingImageResponse pingImage(PingImage pingImage) throws RemoteException {
+ toggleXOP(pingImage.getMessage());
+ return new PingImageResponse(pingImage.getXopContent());
+ }
+
+ public PingSourceResponse pingSource(PingSource pingSource) throws RemoteException {
+ toggleXOP(pingSource.getMessage());
+ return new PingSourceResponse(pingSource.getXopContent());
+ }
+
+ public PingDataHandlerResponse pingDataHandler(PingDataHandler pingDataHandler) throws RemoteException {
+ toggleXOP(pingDataHandler.getMessage());
+ return new PingDataHandlerResponse(pingDataHandler.getXopContent());
+ }
+
+}
Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingService.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingService.java 2006-10-27 11:43:42 UTC (rev 1318)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingService.java 2006-10-27 11:44:08 UTC (rev 1319)
@@ -0,0 +1,17 @@
+/*
+* JBoss, the OpenSource EJB server
+* Distributable under LGPL license. See terms of license at gnu.org.
+*/
+
+//Auto Generated by jbossws - Please do not edit!!!
+
+package org.jboss.test.ws.jaxrpc.xop.rpclit;
+
+
+import javax.xml.rpc.ServiceException;
+
+
+public interface XOPPingService extends javax.xml.rpc.Service
+{
+ public org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing getTestServicePort() throws ServiceException;
+}
Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/TestService.wsdl 2006-10-27 11:43:42 UTC (rev 1318)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/TestService.wsdl 2006-10-27 11:44:08 UTC (rev 1319)
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<definitions
- xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:s="http://www.w3.org/2001/XMLSchema"
- xmlns:s0="http://jboss.org/test/ws/xop/doclit"
- xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
- xmlns:tns="http://jboss.org/test/ws/xop/doclit"
- targetNamespace="http://jboss.org/test/ws/xop/doclit"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
-
- <types>
- <s:schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://jboss.org/test/ws/xop/doclit"
- xmlns:xmime="http://www.w3.org/2005/05/xmlmime" >
-
- <import namespace="http://www.w3.org/2005/05/xmlmime"/>
-
- <!--
- the xmime:expectedContentType is missing.
- this maps to byte[]
- -->
- <s:element name="PingMsg">
- <s:complexType>
- <s:sequence>
- <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" />
- <s:element name="xopContent" minOccurs="0" maxOccurs="1" type="s:base64Binary"/>
- </s:sequence>
- </s:complexType>
- </s:element>
-
- <!--
- a known media type maps to specific java type.
- in this case a byte[] as well
- -->
- <s:element name="PingMsgResponse">
- <s:complexType>
- <s:sequence>
- <s:element name="xopContent" minOccurs="0" maxOccurs="1"
- xmime:expectedContentTypes="application/octet-stream"
- type="xmime:base64Binary"/>
- </s:sequence>
- </s:complexType>
- </s:element>
-
- <!--
- a known media type that maps to java.awt.Image
- -->
- <s:element name="PingImage">
- <s:complexType>
- <s:sequence>
- <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" />
- <s:element name="xopContent" minOccurs="0" maxOccurs="1"
- xmime:expectedContentTypes="image/jpeg"
- type="xmime:base64Binary"/>
- </s:sequence>
- </s:complexType>
- </s:element>
-
- <s:element name="PingImageResponse">
- <s:complexType>
- <s:sequence>
- <s:element name="xopContent" minOccurs="0" maxOccurs="1"
- xmime:expectedContentTypes="image/jpeg"
- type="xmime:base64Binary"/>
- </s:sequence>
- </s:complexType>
- </s:element>
-
- <!--
- a preferred media type specified through xmime:contentType.
- this would map to javax.transform.Source
- -->
- <s:element name="PingSource">
- <s:complexType>
- <s:sequence>
- <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" />
- <s:element name="xopContent" minOccurs="0" maxOccurs="1"
- xmime:expectedContentTypes="image/jpeg,text/xml"
- xmime:contentType="text/xml"
- type="xmime:base64Binary"/>
- </s:sequence>
- </s:complexType>
- </s:element>
-
- <s:element name="PingSourceResponse">
- <s:complexType>
- <s:sequence>
- <s:element name="xopContent" minOccurs="0" maxOccurs="1"
- xmime:expectedContentTypes="text/xml"
- type="xmime:base64Binary"/>
- </s:sequence>
- </s:complexType>
- </s:element>
-
- <!--
- the preferred media type is not declared
- binaries will be mapped to javax.activation.DataHandler
- -->
- <s:element name="PingDataHandler">
- <s:complexType>
- <s:sequence>
- <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" />
- <s:element name="xopContent" minOccurs="0" maxOccurs="1"
- xmime:expectedContentTypes="image/jpeg,text/xml"
- type="xmime:base64Binary"/>
- </s:sequence>
- </s:complexType>
- </s:element>
-
- <s:element name="PingDataHandlerResponse">
- <s:complexType>
- <s:sequence>
- <s:element name="xopContent" minOccurs="0" maxOccurs="1" type="s:base64Binary"/>
- </s:sequence>
- </s:complexType>
- </s:element>
-
- </s:schema>
- </types>
-
- <message name="PingIn">
- <part name="parameters" element="s0:PingMsg" />
- </message>
- <message name="PingOut">
- <part name="parameters" element="s0:PingMsgResponse" />
- </message>
-
- <message name="PingImageIn">
- <part name="parameters" element="s0:PingImage" />
- </message>
- <message name="PingImageOut">
- <part name="parameters" element="s0:PingImageResponse" />
- </message>
-
- <message name="PingSourceIn">
- <part name="parameters" element="s0:PingSource" />
- </message>
- <message name="PingSourceOut">
- <part name="parameters" element="s0:PingSourceResponse" />
- </message>
-
- <message name="PingDataHandlerIn">
- <part name="parameters" element="s0:PingDataHandler" />
- </message>
- <message name="PingDataHandlerOut">
- <part name="parameters" element="s0:PingDataHandlerResponse" />
- </message>
-
- <portType name="TestService">
- <operation name="ping">
- <input message="s0:PingIn" />
- <output message="s0:PingOut" />
- </operation>
- <operation name="pingImage">
- <input message="s0:PingImageIn" />
- <output message="s0:PingImageOut" />
- </operation>
- <operation name="pingSource">
- <input message="s0:PingSourceIn" />
- <output message="s0:PingSourceOut" />
- </operation>
- <operation name="pingDataHandler">
- <input message="s0:PingDataHandlerIn" />
- <output message="s0:PingDataHandlerOut" />
- </operation>
- </portType>
-
- <binding name="TestServiceBinding" type="s0:TestService">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
- <operation name="ping">
- <soap:operation soapAction="http://jboss.org/test/ws/xop/doclit/Ping" style="document" />
- <input>
- <soap:body use="literal" />
- </input>
- <output>
- <soap:body use="literal" />
- </output>
- </operation>
- <operation name="pingImage">
- <soap:operation soapAction="http://jboss.org/test/ws/xop/doclit/PingImage" style="document" />
- <input>
- <soap:body use="literal" />
- </input>
- <output>
- <soap:body use="literal" />
- </output>
- </operation>
- <operation name="pingSource">
- <soap:operation soapAction="http://jboss.org/test/ws/xop/doclit/PingSource" style="document" />
- <input>
- <soap:body use="literal" />
- </input>
- <output>
- <soap:body use="literal" />
- </output>
- </operation>
- <operation name="pingDataHandler">
- <soap:operation soapAction="http://jboss.org/test/ws/xop/doclit/PingDataHandler" style="document" />
- <input>
- <soap:body use="literal" />
- </input>
- <output>
- <soap:body use="literal" />
- </output>
- </operation>
- </binding>
-
- <service name="TestService">
- <port name="TestServicePort" binding="s0:TestServiceBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_URL" />
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl (from rev 1296, branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/TestService.wsdl)
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/TestService.wsdl 2006-10-24 14:06:00 UTC (rev 1296)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl 2006-10-27 11:44:08 UTC (rev 1319)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<wsdl:definitions
+ xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+ xmlns:tns="http://jboss.org/test/ws/xop"
+ targetNamespace="http://jboss.org/test/ws/xop"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+
+ <wsdl:types>
+ <xsd:import schemaLocation="xsd0.xsd"/>
+ </wsdl:types>
+
+ <wsdl:import namespace="http://jboss.org/test/ws/xop" location="wsdl0.wsdl"/>
+
+ <wsdl:binding name="TestServiceBinding" type="tns:TestService">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
+ <wsdl:operation name="ping">
+ <soap:operation soapAction="http://jboss.org/test/ws/xop/Ping" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="pingImage">
+ <soap:operation soapAction="http://jboss.org/test/ws/xop/PingImage" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="pingSource">
+ <soap:operation soapAction="http://jboss.org/test/ws/xop/PingSource" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="pingDataHandler">
+ <soap:operation soapAction="http://jboss.org/test/ws/xop/PingDataHandler" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:service name="TestService">
+ <wsdl:port name="TestServicePort" binding="tns:TestServiceBinding">
+ <soap:address location="REPLACE_WITH_ACTUAL_URL" />
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
\ No newline at end of file
Added: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl 2006-10-27 11:43:42 UTC (rev 1318)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl 2006-10-27 11:44:08 UTC (rev 1319)
@@ -0,0 +1,60 @@
+<?xml version="1.0" ?>
+
+<wsdl:definitions
+ xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+ xmlns:tns="http://jboss.org/test/ws/xop"
+ targetNamespace="http://jboss.org/test/ws/xop"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+
+ <wsdl:message name="PingIn">
+ <wsdl:part name="parameters" element="tns:PingMsg" />
+ </wsdl:message>
+
+ <wsdl:message name="PingOut">
+ <wsdl:part name="parameters" element="tns:PingMsgResponse" />
+ </wsdl:message>
+
+ <wsdl:message name="PingImageIn">
+ <wsdl:part name="parameters" element="tns:PingImage" />
+ </wsdl:message>
+ <wsdl:message name="PingImageOut">
+ <wsdl:part name="parameters" element="tns:PingImageResponse" />
+ </wsdl:message>
+
+ <wsdl:message name="PingSourceIn">
+ <wsdl:part name="parameters" element="tns:PingSource" />
+ </wsdl:message>
+ <wsdl:message name="PingSourceOut">
+ <wsdl:part name="parameters" element="tns:PingSourceResponse" />
+ </wsdl:message>
+
+ <wsdl:message name="PingDataHandlerIn">
+ <wsdl:part name="parameters" element="tns:PingDataHandler" />
+ </wsdl:message>
+ <wsdl:message name="PingDataHandlerOut">
+ <wsdl:part name="parameters" element="tns:PingDataHandlerResponse" />
+ </wsdl:message>
+
+ <wsdl:portType name="TestService">
+ <wsdl:operation name="ping">
+ <wsdl:input message="tns:PingIn" />
+ <wsdl:output message="tns:PingOut" />
+ </wsdl:operation>
+ <wsdl:operation name="pingImage">
+ <wsdl:input message="tns:PingImageIn" />
+ <wsdl:output message="tns:PingImageOut" />
+ </wsdl:operation>
+ <wsdl:operation name="pingSource">
+ <wsdl:input message="tns:PingSourceIn" />
+ <wsdl:output message="tns:PingSourceOut" />
+ </wsdl:operation>
+ <wsdl:operation name="pingDataHandler">
+ <wsdl:input message="tns:PingDataHandlerIn" />
+ <wsdl:output message="tns:PingDataHandlerOut" />
+ </wsdl:operation>
+ </wsdl:portType>
+
+</wsdl:definitions>
\ No newline at end of file
Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/xsd0.xsd
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/xsd0.xsd 2006-10-27 11:43:42 UTC (rev 1318)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/xsd0.xsd 2006-10-27 11:44:08 UTC (rev 1319)
@@ -0,0 +1,108 @@
+<?xml version="1.0" ?>
+<s:schema xmlns:s="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://jboss.org/test/ws/xop"
+ xmlns:xmime="http://www.w3.org/2005/05/xmlmime" >
+
+ <s:import namespace="http://www.w3.org/2005/05/xmlmime"/>
+
+ <!--
+ the xmime:expectedContentType is missing.
+ this maps to byte[]
+ -->
+ <s:element name="PingMsg">
+ <s:complexType>
+ <s:sequence>
+ <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" />
+ <s:element name="xopContent" minOccurs="0" maxOccurs="1" type="s:base64Binary"/>
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+
+ <!--
+ a known media type maps to specific java type.
+ in this case a byte[] as well
+ -->
+ <s:element name="PingMsgResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element name="xopContent" minOccurs="0" maxOccurs="1"
+ xmime:expectedContentTypes="application/octet-stream"
+ type="xmime:base64Binary"/>
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+
+ <!--
+ a known media type that maps to java.awt.Image
+ -->
+ <s:element name="PingImage">
+ <s:complexType>
+ <s:sequence>
+ <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" />
+ <s:element name="xopContent" minOccurs="0" maxOccurs="1"
+ xmime:expectedContentTypes="image/jpeg"
+ type="xmime:base64Binary"/>
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+
+ <s:element name="PingImageResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element name="xopContent" minOccurs="0" maxOccurs="1"
+ xmime:expectedContentTypes="image/jpeg"
+ type="xmime:base64Binary"/>
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+
+ <!--
+ a preferred media type specified through xmime:contentType.
+ this would map to javax.transform.Source
+ -->
+ <s:element name="PingSource">
+ <s:complexType>
+ <s:sequence>
+ <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" />
+ <s:element name="xopContent" minOccurs="0" maxOccurs="1"
+ xmime:expectedContentTypes="image/jpeg,text/xml"
+ xmime:contentType="text/xml"
+ type="xmime:base64Binary"/>
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+
+ <s:element name="PingSourceResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element name="xopContent" minOccurs="0" maxOccurs="1"
+ xmime:expectedContentTypes="text/xml"
+ type="xmime:base64Binary"/>
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+
+ <!--
+ the preferred media type is not declared
+ binaries will be mapped to javax.activation.DataHandler
+ -->
+ <s:element name="PingDataHandler">
+ <s:complexType>
+ <s:sequence>
+ <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" />
+ <s:element name="xopContent" minOccurs="0" maxOccurs="1"
+ xmime:expectedContentTypes="image/jpeg,text/xml"
+ type="xmime:base64Binary"/>
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+
+ <s:element name="PingDataHandlerResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element name="xopContent" minOccurs="0" maxOccurs="1" type="s:base64Binary"/>
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+
+</s:schema>
\ No newline at end of file
Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/xsd0.xsd
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/TestService.wsdl 2006-10-27 11:43:42 UTC (rev 1318)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/TestService.wsdl 2006-10-27 11:44:08 UTC (rev 1319)
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<definitions
- xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:s="http://www.w3.org/2001/XMLSchema"
- xmlns:s0="http://jboss.org/test/ws/xop/rpclit"
- xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
- xmlns:tns="http://jboss.org/test/ws/xop/rpclit"
- targetNamespace="http://jboss.org/test/ws/xop/rpclit"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
-
- <types>
- <s:schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://jboss.org/test/ws/xop/rpclit"
- xmlns:xmime="http://www.w3.org/2005/05/xmlmime" >
-
- <import namespace="http://www.w3.org/2005/05/xmlmime"/>
-
- <s:complexType name="PingInType">
- <s:sequence>
- <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" />
- <s:element name="xopContent" minOccurs="0" maxOccurs="1" xmime:expectedContentTypes="text/plain" type="xmime:base64Binary"/>
- </s:sequence>
- </s:complexType>
-
- <s:complexType name="PingOutType">
- <s:sequence>
- <s:element name="xopContent" minOccurs="0" maxOccurs="1" xmime:expectedContentTypes="text/plain" type="s:base64Binary"/>
- </s:sequence>
- </s:complexType>
-
- </s:schema>
- </types>
-
- <message name="PingIn">
- <part name="parameters" type="tns:PingInType" />
- </message>
- <message name="PingOut">
- <part name="result" type="tns:PingOutType" />
- </message>
-
- <message name="OctetsIn">
- <part name="message" type="s:string" />
- <part name="xopContent" type="s:base64Binary" />
- </message>
- <message name="OctetsOut">
- <part name="result" type="s:base64Binary" />
- </message>
-
- <portType name="TestService">
- <operation name="pingComplex" parameterOrder='parameters'>
- <input message="tns:PingIn" />
- <output message="tns:PingOut" />
- </operation>
-
- <operation name="pingSimple">
- <input message="tns:OctetsIn" />
- <output message="tns:OctetsOut" />
- </operation>
- </portType>
-
- <binding name="TestServiceBinding" type="tns:TestService">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" />
- <operation name="pingComplex">
- <soap:operation soapAction="" style="rpc" />
- <input>
- <soap:body use="literal" />
- </input>
- <output>
- <soap:body use="literal" />
- </output>
- </operation>
- <operation name="pingSimple">
- <soap:operation soapAction="http://jboss.org/test/ws/xop/rpclit/PingSimple" style="rpc" />
- <input>
- <soap:body use="literal" />
- </input>
- <output>
- <soap:body use="literal" />
- </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
Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl (from rev 1296, branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/TestService.wsdl)
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/TestService.wsdl 2006-10-24 14:06:00 UTC (rev 1296)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl 2006-10-27 11:44:08 UTC (rev 1319)
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<wsdl:definitions
+ xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+ xmlns:tns="http://jboss.org/test/ws/xop"
+ targetNamespace="http://jboss.org/test/ws/xop"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+
+ <wsdl:types>
+ <xsd:schema targetNamespace="http://jboss.org/test/ws/xop"
+ xmlns:xmime="http://www.w3.org/2005/05/xmlmime" >
+
+ <xsd:import namespace="http://www.w3.org/2005/05/xmlmime"/>
+
+ <xsd:complexType name="PingInType">
+ <xsd:sequence>
+ <xsd:element name="message" minOccurs="0" maxOccurs="1" type="xsd:string" />
+ <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="PingOutType">
+ <xsd:sequence>
+ <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="PingImageType">
+ <xsd:sequence>
+ <xsd:element name="message" minOccurs="0" maxOccurs="1" type="xsd:string" />
+ <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="PingImageOutType">
+ <xsd:sequence>
+ <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="PingSourceType">
+ <xsd:sequence>
+ <xsd:element name="message" minOccurs="0" maxOccurs="1" type="xsd:string" />
+ <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="PingSourceOutType">
+ <xsd:sequence>
+ <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="PingDataHandlerType">
+ <xsd:sequence>
+ <xsd:element name="message" minOccurs="0" maxOccurs="1" type="xsd:string" />
+ <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="PingDataHandlerOutType">
+ <xsd:sequence>
+ <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:schema>
+
+ </wsdl:types>
+
+ <wsdl:message name="PingIn">
+ <wsdl:part name="parameters" type="tns:PingInType" />
+ </wsdl:message>
+
+ <wsdl:message name="PingOut">
+ <wsdl:part name="result" type="tns:PingOutType" />
+ </wsdl:message>
+
+ <wsdl:message name="OctetsIn">
+ <wsdl:part name="message" type="xsd:string" />
+ <wsdl:part name="xopContent" type="xsd:base64Binary" />
+ </wsdl:message>
+
+ <wsdl:message name="OctetsOut">
+ <wsdl:part name="result" type="xsd:base64Binary" />
+ </wsdl:message>
+
+ <wsdl:message name="PingImageIn">
+ <wsdl:part name="parameters" type="tns:PingImageType" />
+ </wsdl:message>
+ <wsdl:message name="PingImageOut">
+ <wsdl:part name="result" type="tns:PingImageOutType" />
+ </wsdl:message>
+
+ <wsdl:message name="PingSourceIn">
+ <wsdl:part name="parameters" type="tns:PingSourceType" />
+ </wsdl:message>
+ <wsdl:message name="PingSourceOut">
+ <wsdl:part name="result" type="tns:PingSourceOutType" />
+ </wsdl:message>
+
+ <wsdl:message name="PingDataHandlerIn">
+ <wsdl:part name="parameters" type="tns:PingDataHandlerType" />
+ </wsdl:message>
+ <wsdl:message name="PingDataHandlerOut">
+ <wsdl:part name="result" type="tns:PingDataHandlerOutType" />
+ </wsdl:message>
+
+ <wsdl:portType name="TestService">
+ <wsdl:operation name="ping">
+ <wsdl:input message="tns:PingIn" />
+ <wsdl:output message="tns:PingOut" />
+ </wsdl:operation>
+ <wsdl:operation name="pingSimple">
+ <wsdl:input message="tns:OctetsIn" />
+ <wsdl:output message="tns:OctetsOut" />
+ </wsdl:operation>
+ <wsdl:operation name="pingImage">
+ <wsdl:input message="tns:PingImageIn" />
+ <wsdl:output message="tns:PingImageOut" />
+ </wsdl:operation>
+ <wsdl:operation name="pingSource">
+ <wsdl:input message="tns:PingSourceIn" />
+ <wsdl:output message="tns:PingSourceOut" />
+ </wsdl:operation>
+ <wsdl:operation name="pingDataHandler">
+ <wsdl:input message="tns:PingDataHandlerIn" />
+ <wsdl:output message="tns:PingDataHandlerOut" />
+ </wsdl:operation>
+ </wsdl:portType>
+
+
+ <wsdl:binding name="TestServiceBinding" type="tns:TestService">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" />
+ <wsdl:operation name="ping">
+ <soap:operation soapAction="" style="rpc" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="pingSimple">
+ <soap:operation soapAction="http://jboss.org/test/ws/xop/PingSimple" style="rpc" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+
+ <wsdl:operation name="pingImage">
+ <soap:operation soapAction="" style="rpc" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="pingSource">
+ <soap:operation soapAction="" style="rpc" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="pingDataHandler">
+ <soap:operation soapAction="" style="rpc" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+
+ </wsdl:binding>
+
+ <wsdl:service name="TestService">
+ <wsdl:port name="TestServicePort" binding="tns:TestServiceBinding">
+ <soap:address location="REPLACE_WITH_ACTUAL_URL" />
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
\ No newline at end of file
Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years, 2 months
- 1
- 0
JBossWS SVN: r1318 - in branches/jbossws-1.0/src/test/resources/jaxrpc/xop: . shared
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2006-10-27 07:43:42 -0400 (Fri, 27 Oct 2006)
New Revision: 1318
Added:
branches/jbossws-1.0/src/test/resources/jaxrpc/xop/shared/
branches/jbossws-1.0/src/test/resources/jaxrpc/xop/shared/attach.jpeg
branches/jbossws-1.0/src/test/resources/jaxrpc/xop/shared/attach.txt
branches/jbossws-1.0/src/test/resources/jaxrpc/xop/shared/attach.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/xop/shared/disguised_jpeg.xcf
Log:
test resources
Added: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/shared/attach.jpeg
===================================================================
(Binary files differ)
Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/shared/attach.jpeg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/shared/attach.txt
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/shared/attach.txt 2006-10-27 07:43:19 UTC (rev 1317)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/shared/attach.txt 2006-10-27 11:43:42 UTC (rev 1318)
@@ -0,0 +1 @@
+This is a plain text attachment.
Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/shared/attach.txt
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/shared/attach.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/shared/attach.xml 2006-10-27 07:43:19 UTC (rev 1317)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/shared/attach.xml 2006-10-27 11:43:42 UTC (rev 1318)
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<mime-message>This is an xml attachment.</mime-message>
Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/shared/attach.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/shared/disguised_jpeg.xcf
===================================================================
(Binary files differ)
Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/shared/disguised_jpeg.xcf
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
18 years, 2 months
- 1
- 0
JBossWS SVN: r1317 - in trunk/src/test/resources: interop/microsoft/addressing/sep06/wsa10/META-INF interop/microsoft/addressing/sep06/wsa10/WEB-INF interop/microsoft/addressing/wsa10/META-INF interop/microsoft/addressing/wsaTestService/WEB-INF interop/microsoft/mtom/utf8/META-INF interop/microsoft/mtom/utf8/WEB-INF interop/microsoft/mtom/utf8/wsse/META-INF interop/microsoft/mtom/utf8/wsse/WEB-INF interop/microsoft/root/WEB-INF interop/microsoft/security/sep06/wsse10/WEB-INF interop/micros
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-10-27 03:43:19 -0400 (Fri, 27 Oct 2006)
New Revision: 1317
Modified:
trunk/src/test/resources/interop/microsoft/addressing/sep06/wsa10/META-INF/jboss-client.xml
trunk/src/test/resources/interop/microsoft/addressing/sep06/wsa10/WEB-INF/jboss-web.xml
trunk/src/test/resources/interop/microsoft/addressing/wsa10/META-INF/jboss-client.xml
trunk/src/test/resources/interop/microsoft/addressing/wsaTestService/WEB-INF/jboss-web.xml
trunk/src/test/resources/interop/microsoft/mtom/utf8/META-INF/jboss-client.xml
trunk/src/test/resources/interop/microsoft/mtom/utf8/WEB-INF/jboss-web.xml
trunk/src/test/resources/interop/microsoft/mtom/utf8/wsse/META-INF/jboss-client.xml
trunk/src/test/resources/interop/microsoft/mtom/utf8/wsse/WEB-INF/jboss-web.xml
trunk/src/test/resources/interop/microsoft/root/WEB-INF/jboss-web.xml
trunk/src/test/resources/interop/microsoft/security/sep06/wsse10/WEB-INF/jboss-web.xml
trunk/src/test/resources/interop/microsoft/security/sep06/wsse10Encrypt/META-INF/jboss-client.xml
trunk/src/test/resources/interop/microsoft/security/sep06/wsse10Encrypt/WEB-INF/jboss-web.xml
trunk/src/test/resources/interop/microsoft/security/wsse10/META-INF/jboss-client.xml
trunk/src/test/resources/interop/microsoft/security/wsse10/WEB-INF/jboss-web.xml
trunk/src/test/resources/interop/microsoft/security/wsse10Encrypt/META-INF/jboss-client.xml
trunk/src/test/resources/interop/microsoft/security/wsse10Encrypt/WEB-INF/jboss-web.xml
trunk/src/test/resources/interop/microsoft/soapwsdl/BaseDataTypesDocLitB/META-INF/jboss-client.xml
trunk/src/test/resources/interop/microsoft/soapwsdl/BaseDataTypesDocLitB_Service/WEB-INF/jboss-web.xml
trunk/src/test/resources/interop/microsoft/soapwsdl/BaseDataTypesDocLitW/META-INF/jboss-client.xml
trunk/src/test/resources/interop/microsoft/soapwsdl/BaseDataTypesDocLitW_Service/WEB-INF/jboss-web.xml
trunk/src/test/resources/interop/microsoft/soapwsdl/BaseDataTypesRpcLit/META-INF/jboss-client.xml
trunk/src/test/resources/interop/microsoft/soapwsdl/BaseDataTypesRpcLit_Service/WEB-INF/jboss-web.xml
trunk/src/test/resources/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB/META-INF/jboss-client.xml
trunk/src/test/resources/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB_Service/WEB-INF/jboss-web.xml
trunk/src/test/resources/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW/META-INF/jboss-client.xml
trunk/src/test/resources/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW_Service/WEB-INF/jboss-web.xml
trunk/src/test/resources/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit/META-INF/jboss-client.xml
trunk/src/test/resources/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit_Service/WEB-INF/jboss-web.xml
trunk/src/test/resources/jaxrpc/benchmark/doclit/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/benchmark/doclit/WEB-INF/jboss-web.xml
trunk/src/test/resources/jaxrpc/benchmark/rpclit/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/benchmark/rpclit/WEB-INF/jboss-web.xml
trunk/src/test/resources/jaxrpc/encoded/marshalltest/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/encoded/parametermode/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/enventry/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/jbws1010/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/jbws1011/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/jbws1107/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/jbws1121/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/jbws1124/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/jbws1124/WEB-INF/jboss-web.xml
trunk/src/test/resources/jaxrpc/jbws1125/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/jbws1205/Client/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/jboss-web.xml
trunk/src/test/resources/jaxrpc/jbws231/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/jbws434/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/jbws718/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/jbws720/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/jbws732/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/jbws775/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/jbws807/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/jbws812/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/marshall-doclit/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/overloaded/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/samples/docstyle/bare/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/samples/docstyle/wrapped/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/samples/dynamichandler/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/samples/exception/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/samples/handler/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/samples/holder/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/samples/jmstransport/META-INF/jboss.xml
trunk/src/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/samples/message/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/samples/mtom/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/samples/oneway/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/samples/rpcstyle/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss.xml
trunk/src/test/resources/jaxrpc/samples/swa/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/samples/wsbpel/hello/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/samples/wseventing/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/samples/wseventing/WEB-INF/jboss-web.xml
trunk/src/test/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/webserviceref/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/wseventing/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/wseventing/WEB-INF/jboss-web.xml
trunk/src/test/resources/jaxrpc/wsse/account-signup/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/wsse/rpc/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml
trunk/src/test/resources/jaxws/jbws860/WEB-INF/jboss-web.xml
trunk/src/test/resources/jaxws/jbws944/META-INF/jboss-client.xml
trunk/src/test/resources/jaxws/jsr181/webservice/WEB-INF01/jboss-web.xml
trunk/src/test/resources/jaxws/jsr181/webservice/WEB-INF02/jboss-web.xml
trunk/src/test/resources/jaxws/jsr181/webservice/WEB-INF03/jboss-web.xml
trunk/src/test/resources/jaxws/samples/jsr181ejb/META-INF/jboss-client.xml
trunk/src/test/resources/jaxws/samples/jsr181pojo/META-INF/jboss-client.xml
trunk/src/test/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF/jboss-client.xml
trunk/src/test/resources/jaxws/samples/wsaddressing/META-INF/jboss-client.xml
trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-client.xml
trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-web.xml
trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss.xml
trunk/src/test/resources/jaxws/wsaddressing/action/META-INF/jboss-client.xml
trunk/src/test/resources/jaxws/wsaddressing/replyto/Initial-META-INF/jboss-client.xml
trunk/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jboss-client.xml
Log:
fix doctype
Modified: trunk/src/test/resources/interop/microsoft/addressing/sep06/wsa10/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/interop/microsoft/addressing/sep06/wsa10/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/interop/microsoft/addressing/sep06/wsa10/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/interop/microsoft/addressing/sep06/wsa10/WEB-INF/jboss-web.xml
===================================================================
--- trunk/src/test/resources/interop/microsoft/addressing/sep06/wsa10/WEB-INF/jboss-web.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/interop/microsoft/addressing/sep06/wsa10/WEB-INF/jboss-web.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
<jboss-web>
<context-root>/wsa10_sep06</context-root>
</jboss-web>
\ No newline at end of file
Modified: trunk/src/test/resources/interop/microsoft/addressing/wsa10/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/interop/microsoft/addressing/wsa10/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/interop/microsoft/addressing/wsa10/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/interop/microsoft/addressing/wsaTestService/WEB-INF/jboss-web.xml
===================================================================
--- trunk/src/test/resources/interop/microsoft/addressing/wsaTestService/WEB-INF/jboss-web.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/interop/microsoft/addressing/wsaTestService/WEB-INF/jboss-web.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
<jboss-web>
<context-root>/wsa10</context-root>
<depends>jboss.ws:service=WebServiceDeployerJSE</depends>
Modified: trunk/src/test/resources/interop/microsoft/mtom/utf8/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/interop/microsoft/mtom/utf8/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/interop/microsoft/mtom/utf8/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/interop/microsoft/mtom/utf8/WEB-INF/jboss-web.xml
===================================================================
--- trunk/src/test/resources/interop/microsoft/mtom/utf8/WEB-INF/jboss-web.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/interop/microsoft/mtom/utf8/WEB-INF/jboss-web.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
<jboss-web>
<context-root>/mtomUTF8</context-root>
<depends>jboss.ws:service=WebServiceDeployerJSE</depends>
Modified: trunk/src/test/resources/interop/microsoft/mtom/utf8/wsse/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/interop/microsoft/mtom/utf8/wsse/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/interop/microsoft/mtom/utf8/wsse/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/interop/microsoft/mtom/utf8/wsse/WEB-INF/jboss-web.xml
===================================================================
--- trunk/src/test/resources/interop/microsoft/mtom/utf8/wsse/WEB-INF/jboss-web.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/interop/microsoft/mtom/utf8/wsse/WEB-INF/jboss-web.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
<jboss-web>
<context-root>/mtomUTF8_wsse</context-root>
</jboss-web>
\ No newline at end of file
Modified: trunk/src/test/resources/interop/microsoft/root/WEB-INF/jboss-web.xml
===================================================================
--- trunk/src/test/resources/interop/microsoft/root/WEB-INF/jboss-web.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/interop/microsoft/root/WEB-INF/jboss-web.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
<jboss-web>
<context-root>/interop</context-root>
</jboss-web>
\ No newline at end of file
Modified: trunk/src/test/resources/interop/microsoft/security/sep06/wsse10/WEB-INF/jboss-web.xml
===================================================================
--- trunk/src/test/resources/interop/microsoft/security/sep06/wsse10/WEB-INF/jboss-web.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/interop/microsoft/security/sep06/wsse10/WEB-INF/jboss-web.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
<jboss-web>
<context-root>/wsse10Sign_sep06</context-root>
</jboss-web>
\ No newline at end of file
Modified: trunk/src/test/resources/interop/microsoft/security/sep06/wsse10Encrypt/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/interop/microsoft/security/sep06/wsse10Encrypt/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/interop/microsoft/security/sep06/wsse10Encrypt/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,5 +1,7 @@
<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/interop/microsoft/security/sep06/wsse10Encrypt/WEB-INF/jboss-web.xml
===================================================================
--- trunk/src/test/resources/interop/microsoft/security/sep06/wsse10Encrypt/WEB-INF/jboss-web.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/interop/microsoft/security/sep06/wsse10Encrypt/WEB-INF/jboss-web.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
<jboss-web>
<context-root>/wsse10Encrypt_sep06</context-root>
</jboss-web>
\ No newline at end of file
Modified: trunk/src/test/resources/interop/microsoft/security/wsse10/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/interop/microsoft/security/wsse10/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/interop/microsoft/security/wsse10/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,5 +1,7 @@
<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/interop/microsoft/security/wsse10/WEB-INF/jboss-web.xml
===================================================================
--- trunk/src/test/resources/interop/microsoft/security/wsse10/WEB-INF/jboss-web.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/interop/microsoft/security/wsse10/WEB-INF/jboss-web.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
<jboss-web>
<context-root>/wsse10Sign</context-root>
<depends>jboss.ws:service=WebServiceDeployerJSE</depends>
Modified: trunk/src/test/resources/interop/microsoft/security/wsse10Encrypt/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/interop/microsoft/security/wsse10Encrypt/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/interop/microsoft/security/wsse10Encrypt/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,5 +1,7 @@
<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/interop/microsoft/security/wsse10Encrypt/WEB-INF/jboss-web.xml
===================================================================
--- trunk/src/test/resources/interop/microsoft/security/wsse10Encrypt/WEB-INF/jboss-web.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/interop/microsoft/security/wsse10Encrypt/WEB-INF/jboss-web.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
<jboss-web>
<context-root>/wsse10Encrypt</context-root>
<depends>jboss.ws:service=WebServiceDeployerJSE</depends>
Modified: trunk/src/test/resources/interop/microsoft/soapwsdl/BaseDataTypesDocLitB/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/interop/microsoft/soapwsdl/BaseDataTypesDocLitB/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/interop/microsoft/soapwsdl/BaseDataTypesDocLitB/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/interop/microsoft/soapwsdl/BaseDataTypesDocLitB_Service/WEB-INF/jboss-web.xml
===================================================================
--- trunk/src/test/resources/interop/microsoft/soapwsdl/BaseDataTypesDocLitB_Service/WEB-INF/jboss-web.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/interop/microsoft/soapwsdl/BaseDataTypesDocLitB_Service/WEB-INF/jboss-web.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
<jboss-web>
<context-root>/BaseDataTypesDocLitB_Service</context-root>
<depends>jboss.ws:service=WebServiceDeployerJSE</depends>
Modified: trunk/src/test/resources/interop/microsoft/soapwsdl/BaseDataTypesDocLitW/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/interop/microsoft/soapwsdl/BaseDataTypesDocLitW/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/interop/microsoft/soapwsdl/BaseDataTypesDocLitW/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/interop/microsoft/soapwsdl/BaseDataTypesDocLitW_Service/WEB-INF/jboss-web.xml
===================================================================
--- trunk/src/test/resources/interop/microsoft/soapwsdl/BaseDataTypesDocLitW_Service/WEB-INF/jboss-web.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/interop/microsoft/soapwsdl/BaseDataTypesDocLitW_Service/WEB-INF/jboss-web.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
<jboss-web>
<context-root>/BaseDataTypesDocLitW_Service</context-root>
<depends>jboss.ws:service=WebServiceDeployerJSE</depends>
Modified: trunk/src/test/resources/interop/microsoft/soapwsdl/BaseDataTypesRpcLit/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/interop/microsoft/soapwsdl/BaseDataTypesRpcLit/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/interop/microsoft/soapwsdl/BaseDataTypesRpcLit/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/interop/microsoft/soapwsdl/BaseDataTypesRpcLit_Service/WEB-INF/jboss-web.xml
===================================================================
--- trunk/src/test/resources/interop/microsoft/soapwsdl/BaseDataTypesRpcLit_Service/WEB-INF/jboss-web.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/interop/microsoft/soapwsdl/BaseDataTypesRpcLit_Service/WEB-INF/jboss-web.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
<jboss-web>
<context-root>/BaseDataTypesRpcLit_Service</context-root>
<depends>jboss.ws:service=WebServiceDeployerJSE</depends>
Modified: trunk/src/test/resources/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB_Service/WEB-INF/jboss-web.xml
===================================================================
--- trunk/src/test/resources/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB_Service/WEB-INF/jboss-web.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB_Service/WEB-INF/jboss-web.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
<jboss-web>
<context-root>/ComplexDataTypesDocLitB_Service</context-root>
<depends>jboss.ws:service=WebServiceDeployerJSE</depends>
Modified: trunk/src/test/resources/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW_Service/WEB-INF/jboss-web.xml
===================================================================
--- trunk/src/test/resources/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW_Service/WEB-INF/jboss-web.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW_Service/WEB-INF/jboss-web.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
<jboss-web>
<context-root>/ComplexDataTypesDocLitW_Service</context-root>
<depends>jboss.ws:service=WebServiceDeployerJSE</depends>
Modified: trunk/src/test/resources/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit_Service/WEB-INF/jboss-web.xml
===================================================================
--- trunk/src/test/resources/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit_Service/WEB-INF/jboss-web.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit_Service/WEB-INF/jboss-web.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
<jboss-web>
<context-root>/ComplexDataTypesRpcLit_Service</context-root>
<depends>jboss.ws:service=WebServiceDeployerJSE</depends>
Modified: trunk/src/test/resources/jaxrpc/benchmark/doclit/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/benchmark/doclit/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/benchmark/doclit/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>benchmark-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/benchmark/doclit/WEB-INF/jboss-web.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/benchmark/doclit/WEB-INF/jboss-web.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/benchmark/doclit/WEB-INF/jboss-web.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
<jboss-web>
Modified: trunk/src/test/resources/jaxrpc/benchmark/rpclit/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/benchmark/rpclit/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/benchmark/rpclit/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>benchmark-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/benchmark/rpclit/WEB-INF/jboss-web.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/benchmark/rpclit/WEB-INF/jboss-web.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/benchmark/rpclit/WEB-INF/jboss-web.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
<jboss-web>
Modified: trunk/src/test/resources/jaxrpc/encoded/marshalltest/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/encoded/marshalltest/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/encoded/marshalltest/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/encoded/parametermode/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/encoded/parametermode/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/encoded/parametermode/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/enventry/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/enventry/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/enventry/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/jbws1010/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/jbws1010/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/jbws1010/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/jbws1011/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/jbws1011/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/jbws1011/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/jbws1107/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/jbws1107/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/jbws1107/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/jbws1121/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/jbws1121/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/jbws1121/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/jbws1124/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/jbws1124/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/jbws1124/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/jbws1124/WEB-INF/jboss-web.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/jbws1124/WEB-INF/jboss-web.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/jbws1124/WEB-INF/jboss-web.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
<jboss-web>
<class-loading>
Modified: trunk/src/test/resources/jaxrpc/jbws1125/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/jbws1125/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/jbws1125/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/jbws1205/Client/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/jbws1205/Client/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/jbws1205/Client/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/jboss-web.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/jboss-web.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/jboss-web.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,7 +1,7 @@
-<!DOCTYPE jboss-web PUBLIC
- "-//JBoss//DTD Web Application 2.4//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
<jboss-web>
<service-ref>
Modified: trunk/src/test/resources/jaxrpc/jbws231/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/jbws231/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/jbws231/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/jbws434/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/jbws434/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/jbws434/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/jbws718/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/jbws718/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/jbws718/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/jbws720/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/jbws720/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/jbws720/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/jbws732/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/jbws732/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/jbws732/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,7 +1,7 @@
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/jbws775/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/jbws775/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/jbws775/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/jbws807/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/jbws807/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/jbws807/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/jbws812/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/jbws812/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/jbws812/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/marshall-doclit/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/marshall-doclit/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/marshall-doclit/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/overloaded/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/overloaded/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/overloaded/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/samples/docstyle/bare/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples/docstyle/bare/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/samples/docstyle/bare/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/samples/docstyle/wrapped/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples/docstyle/wrapped/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/samples/docstyle/wrapped/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/samples/dynamichandler/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples/dynamichandler/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/samples/dynamichandler/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/samples/exception/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples/exception/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/samples/exception/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/samples/handler/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples/handler/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/samples/handler/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/samples/holder/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples/holder/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/samples/holder/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/samples/jmstransport/META-INF/jboss.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples/jmstransport/META-INF/jboss.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/samples/jmstransport/META-INF/jboss.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
<enterprise-beans>
Modified: trunk/src/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/samples/message/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples/message/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/samples/message/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/samples/mtom/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples/mtom/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/samples/mtom/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/samples/oneway/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples/oneway/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/samples/oneway/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/samples/rpcstyle/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples/rpcstyle/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/samples/rpcstyle/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
Modified: trunk/src/test/resources/jaxrpc/samples/swa/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples/swa/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/samples/swa/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/samples/wsbpel/hello/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples/wsbpel/hello/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/samples/wsbpel/hello/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,6 +1,7 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+
<jboss-client>
<!-- JNDI name of client environment context -->
Modified: trunk/src/test/resources/jaxrpc/samples/wseventing/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples/wseventing/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/samples/wseventing/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/samples/wseventing/WEB-INF/jboss-web.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples/wseventing/WEB-INF/jboss-web.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/samples/wseventing/WEB-INF/jboss-web.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
<jboss-web>
<context-root>/jaxrpc-samples-wseventing</context-root>
</jboss-web>
\ No newline at end of file
Modified: trunk/src/test/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/webserviceref/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/webserviceref/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/webserviceref/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/wseventing/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/wseventing/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/wseventing/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/wseventing/WEB-INF/jboss-web.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/wseventing/WEB-INF/jboss-web.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/wseventing/WEB-INF/jboss-web.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
<jboss-web>
<context-root>/jbossws-test-eventing</context-root>
</jboss-web>
\ No newline at end of file
Modified: trunk/src/test/resources/jaxrpc/wsse/account-signup/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/wsse/account-signup/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/wsse/account-signup/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/wsse/rpc/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/wsse/rpc/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/wsse/rpc/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxws/jbws860/WEB-INF/jboss-web.xml
===================================================================
--- trunk/src/test/resources/jaxws/jbws860/WEB-INF/jboss-web.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxws/jbws860/WEB-INF/jboss-web.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd">
<jboss-web>
<context-root>/test</context-root>
Modified: trunk/src/test/resources/jaxws/jbws944/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxws/jbws944/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxws/jbws944/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxws/jsr181/webservice/WEB-INF01/jboss-web.xml
===================================================================
--- trunk/src/test/resources/jaxws/jsr181/webservice/WEB-INF01/jboss-web.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxws/jsr181/webservice/WEB-INF01/jboss-web.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd">
+
<jboss-web>
<context-root>/jsr181</context-root>
</jboss-web>
Modified: trunk/src/test/resources/jaxws/jsr181/webservice/WEB-INF02/jboss-web.xml
===================================================================
--- trunk/src/test/resources/jaxws/jsr181/webservice/WEB-INF02/jboss-web.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxws/jsr181/webservice/WEB-INF02/jboss-web.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd">
+
<jboss-web>
<context-root>/jsr181</context-root>
</jboss-web>
Modified: trunk/src/test/resources/jaxws/jsr181/webservice/WEB-INF03/jboss-web.xml
===================================================================
--- trunk/src/test/resources/jaxws/jsr181/webservice/WEB-INF03/jboss-web.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxws/jsr181/webservice/WEB-INF03/jboss-web.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd">
+
<jboss-web>
<context-root>/jsr181</context-root>
</jboss-web>
Modified: trunk/src/test/resources/jaxws/samples/jsr181ejb/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxws/samples/jsr181ejb/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxws/samples/jsr181ejb/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxws/samples/jsr181pojo/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxws/samples/jsr181pojo/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxws/samples/jsr181pojo/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxws/samples/wsaddressing/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxws/samples/wsaddressing/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxws/samples/wsaddressing/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
Modified: trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_5_0.dtd">
<jboss-client>
Modified: trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-web.xml
===================================================================
--- trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-web.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-web.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd">
<jboss-web>
Modified: trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss.xml
===================================================================
--- trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd">
<jboss>
Modified: trunk/src/test/resources/jaxws/wsaddressing/action/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxws/wsaddressing/action/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxws/wsaddressing/action/META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_5_0.dtd">
<jboss-client>
<jndi-name>wsarpc-client</jndi-name>
Modified: trunk/src/test/resources/jaxws/wsaddressing/replyto/Initial-META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxws/wsaddressing/replyto/Initial-META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxws/wsaddressing/replyto/Initial-META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_5_0.dtd">
<jboss-client>
<jndi-name>initial-client</jndi-name>
Modified: trunk/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
+++ trunk/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jboss-client.xml 2006-10-27 07:43:19 UTC (rev 1317)
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_5_0.dtd">
<jboss-client>
<jndi-name>replyto-client</jndi-name>
18 years, 2 months
- 1
- 0