JBossWS SVN: r2255 - in branches/jbossws-1.2.0: build/ant-import and 15 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-02 12:33:49 -0500 (Fri, 02 Feb 2007)
New Revision: 2255
Added:
branches/jbossws-1.2.0/integration-tomcat/src/main/resources/tomcat-users.xml
Removed:
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsse/keystore.password
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsse/wsse.keystore
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsse/wsse.truststore
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webservice/WEB-INF01/jboss-web.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webservice/WEB-INF02/jboss-web.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webservice/WEB-INF03/jboss-web.xml
Modified:
branches/jbossws-1.2.0/build/ant-import/build-samples.xml
branches/jbossws-1.2.0/build/ant-import/build-setup.xml
branches/jbossws-1.2.0/build/ant.properties.example
branches/jbossws-1.2.0/integration-tomcat/build.xml
branches/jbossws-1.2.0/integration-tomcat/src/main/resources/log4j.xml
branches/jbossws-1.2.0/jbossws-core/src/main/java/javax/xml/ws/handler/MessageContext.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextJSE.java
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant.properties.example
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml
branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxws.xml
branches/jbossws-1.2.0/jbossws-tests/build.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB21Bean01.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB21Bean02.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceBase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceEJB3TestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceJSETestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt
Log:
WebServiceContextJSE delegates to HTTPServletREquest instead of JBossSX
Deploy-tomcat copies tomcat-users.xml
Remove dependency on jboss-web.xml for jaxws samples
Remove duplicated keystore/truststore
Modified: branches/jbossws-1.2.0/build/ant-import/build-samples.xml
===================================================================
--- branches/jbossws-1.2.0/build/ant-import/build-samples.xml 2007-02-02 14:40:37 UTC (rev 2254)
+++ branches/jbossws-1.2.0/build/ant-import/build-samples.xml 2007-02-02 17:33:49 UTC (rev 2255)
@@ -28,7 +28,7 @@
<include name="build.xml"/>
</fileset>
</copy>
- <copy file="${build.src.samples.dir}/ant.properties.example" tofile="${build.src.samples.dir}/ant.properties"/>
+ <!--copy file="${build.src.samples.dir}/ant.properties.example" tofile="${build.src.samples.dir}/ant.properties"/-->
<copy todir="${build.src.samples.dir}">
<fileset dir="${core.samples.dir}">
@@ -63,10 +63,11 @@
<mkdir dir="${build.src.samples.dir}/lib"/>
<copy todir="${build.src.samples.dir}/lib">
<fileset dir="${core.output.lib.dir}">
+ <include name="jbossws-core.jar"/>
+ <include name="jbossws-client.jar"/>
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
</fileset>
<fileset dir="${jboss50.output.lib.dir}">
<include name="jbossws-jboss50-integration.jar"/>
Modified: branches/jbossws-1.2.0/build/ant-import/build-setup.xml
===================================================================
--- branches/jbossws-1.2.0/build/ant-import/build-setup.xml 2007-02-02 14:40:37 UTC (rev 2254)
+++ branches/jbossws-1.2.0/build/ant-import/build-setup.xml 2007-02-02 17:33:49 UTC (rev 2255)
@@ -57,10 +57,11 @@
<property name="jboss40.server.deploy" value="${jboss40.server}/deploy"/>
<property name="jboss40.thirdparty" value="${jboss40.home}/../../../thirdparty"/>
- <property name="tomcat.webapps.dir" value="${tomcat.home}/webapps"/>
+ <property name="tomcat.conf.dir" value="${tomcat.home}/conf"/>
<property name="tomcat.common.dir" value="${tomcat.home}/common"/>
<property name="tomcat.common.classes" value="${tomcat.home}/common/classes"/>
<property name="tomcat.common.lib" value="${tomcat.home}/common/lib"/>
+ <property name="tomcat.webapps.dir" value="${tomcat.home}/webapps"/>
<available property="jboss50.available" file="${jboss50.client}/jboss-client.jar"/>
<available property="jboss42.available" file="${jboss42.client}/jboss-client.jar"/>
Modified: branches/jbossws-1.2.0/build/ant.properties.example
===================================================================
--- branches/jbossws-1.2.0/build/ant.properties.example 2007-02-02 14:40:37 UTC (rev 2254)
+++ branches/jbossws-1.2.0/build/ant.properties.example 2007-02-02 17:33:49 UTC (rev 2255)
@@ -9,7 +9,7 @@
#jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3
# The JBoss server under test. This can be [jboss50|jboss42|jboss40|tomcat]
-jbossws.integration.target=jboss50
+jbossws.integration.target=jboss42
# The JBoss server instance
jboss.server.instance=default
Modified: branches/jbossws-1.2.0/integration-tomcat/build.xml
===================================================================
--- branches/jbossws-1.2.0/integration-tomcat/build.xml 2007-02-02 14:40:37 UTC (rev 2254)
+++ branches/jbossws-1.2.0/integration-tomcat/build.xml 2007-02-02 17:33:49 UTC (rev 2255)
@@ -99,7 +99,7 @@
<include name="META-INF/standard-jaxws-client-config.xml"/>
<include name="META-INF/standard-jaxws-endpoint-config.xml"/>
</fileset>
- <webinf dir="${tomcat.resources.dir}/jbossws.war/WEB-INF">
+ <webinf dir="${tomcat.resources.dir}">
<include name="log4j.xml"/>
</webinf>
</war>
@@ -110,6 +110,7 @@
<!-- Build jbossws-thirdparty.jar -->
<mkdir dir="${tomcat.output.lib.dir}/build"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/commons-logging.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/concurrent.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jaxb-api.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jaxb-impl.jar"/>
@@ -124,6 +125,7 @@
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-xml-binding.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/javassist.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/log4j.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/stax-api.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/wsdl4j.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/xmlsec.jar"/>
<jar jarfile="${tomcat.output.lib.dir}/jbossws-thirdparty.jar" manifest="${etc.dir}/default.mf">
@@ -145,6 +147,11 @@
<include name="xercesImpl.jar"/>
</fileset>
</copy>
+ <copy todir="${tomcat.conf.dir}" overwrite="true">
+ <fileset dir="${tomcat.resources.dir}">
+ <include name="tomcat-users.xml"/>
+ </fileset>
+ </copy>
<copy todir="${tomcat.common.classes}" overwrite="true">
<fileset dir="${tomcat.resources.dir}">
<include name="log4j.xml"/>
Modified: branches/jbossws-1.2.0/integration-tomcat/src/main/resources/log4j.xml
===================================================================
--- branches/jbossws-1.2.0/integration-tomcat/src/main/resources/log4j.xml 2007-02-02 14:40:37 UTC (rev 2254)
+++ branches/jbossws-1.2.0/integration-tomcat/src/main/resources/log4j.xml 2007-02-02 17:33:49 UTC (rev 2255)
@@ -56,14 +56,27 @@
<priority value="DEBUG"/>
</category>
- <category name="org.jboss.remoting">
+ <category name="org.apache.catalina">
<priority value="INFO"/>
</category>
- <!-- Enable SOAP message tracing -->
+ <category name="org.apache.commons">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="org.apache.jasper">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="org.jboss.remoting">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Enable SOAP message tracing
<category name="jbossws.SOAPMessage">
<priority value="TRACE" class="org.jboss.logging.XLevel"/>
</category>
+ -->
<!-- ======================= -->
<!-- Setup the Root category -->
Added: branches/jbossws-1.2.0/integration-tomcat/src/main/resources/tomcat-users.xml
===================================================================
--- branches/jbossws-1.2.0/integration-tomcat/src/main/resources/tomcat-users.xml (rev 0)
+++ branches/jbossws-1.2.0/integration-tomcat/src/main/resources/tomcat-users.xml 2007-02-02 17:33:49 UTC (rev 2255)
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='utf-8'?>
+<tomcat-users>
+ <!-- Security realm for jbossws sample tests -->
+ <role rolename="friend"/>
+ <user username="kermit" password="thefrog" roles="friend"/>
+
+ <!-- Security realm for jbossws sample deployment -->
+ <role rolename="manager"/>
+ <user username="manager" password="manager" roles="manager"/>
+</tomcat-users>
Property changes on: branches/jbossws-1.2.0/integration-tomcat/src/main/resources/tomcat-users.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/javax/xml/ws/handler/MessageContext.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/javax/xml/ws/handler/MessageContext.java 2007-02-02 14:40:37 UTC (rev 2254)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/javax/xml/ws/handler/MessageContext.java 2007-02-02 17:33:49 UTC (rev 2255)
@@ -37,168 +37,154 @@
*
* @since JAX-WS 2.0
*/
-public interface MessageContext extends Map<String, Object> {
-
- /**
- * Standard property: message direction, <code>true</code> for
- * outbound messages, <code>false</code> for inbound.
- * <p>Type: boolean
- */
- public static final String MESSAGE_OUTBOUND_PROPERTY =
- "javax.xml.ws.handler.message.outbound";
-
- /**
- * Standard property: Map of attachments to a message for the inbound
- * message, key is the MIME Content-ID, value is a DataHandler.
- * <p>Type: java.util.Map<String,DataHandler>
- */
- public static final String INBOUND_MESSAGE_ATTACHMENTS =
- "javax.xml.ws.binding.attachments.inbound";
-
- /**
- * Standard property: Map of attachments to a message for the outbound
- * message, key is the MIME Content-ID, value is a DataHandler.
- * <p>Type: java.util.Map<String,DataHandler>
- */
- public static final String OUTBOUND_MESSAGE_ATTACHMENTS =
- "javax.xml.ws.binding.attachments.outbound";
-
- /**
- * Standard property: input source for WSDL document.
- * <p>Type: org.xml.sax.InputSource
- */
- public static final String WSDL_DESCRIPTION =
- "javax.xml.ws.wsdl.description";
-
- /**
- * Standard property: name of WSDL service.
- * <p>Type: javax.xml.namespace.QName
- */
- public static final String WSDL_SERVICE =
- "javax.xml.ws.wsdl.service";
-
- /**
- * Standard property: name of WSDL port.
- * <p>Type: javax.xml.namespace.QName
- */
- public static final String WSDL_PORT =
- "javax.xml.ws.wsdl.port";
-
- /**
- * Standard property: name of wsdl interface (2.0) or port type (1.1).
- * <p>Type: javax.xml.namespace.QName
- */
- public static final String WSDL_INTERFACE =
- "javax.xml.ws.wsdl.interface";
-
- /**
- * Standard property: name of WSDL operation.
- * <p>Type: javax.xml.namespace.QName
- */
- public static final String WSDL_OPERATION =
- "javax.xml.ws.wsdl.operation";
-
- /**
- * Standard property: HTTP response status code.
- * <p>Type: java.lang.Integer
- */
- public static final String HTTP_RESPONSE_CODE =
- "javax.xml.ws.http.response.code";
-
- /**
- * Standard property: HTTP request headers.
- * <p>Type: java.util.Map<java.lang.String, java.util.List<java.lang.String>>
- */
- public static final String HTTP_REQUEST_HEADERS =
- "javax.xml.ws.http.request.headers";
-
- /**
- * Standard property: HTTP response headers.
- * <p>Type: java.util.Map<java.lang.String, java.util.List<java.lang.String>>
- */
- public static final String HTTP_RESPONSE_HEADERS =
- "javax.xml.ws.http.response.headers";
-
- /**
- * Standard property: HTTP request method.
- * <p>Type: java.lang.String
- */
- public static final String HTTP_REQUEST_METHOD =
- "javax.xml.ws.http.request.method";
-
- /**
- * Standard property: servlet request object.
- * <p>Type: javax.servlet.http.HttpServletRequest
- */
- public static final String SERVLET_REQUEST =
- "javax.xml.ws.servlet.request";
-
- /**
- * Standard property: servlet response object.
- * <p>Type: javax.servlet.http.HttpServletResponse
- */
- public static final String SERVLET_RESPONSE =
- "javax.xml.ws.servlet.response";
-
- /**
- * Standard property: servlet context object.
- * <p>Type: javax.servlet.ServletContext
- */
- public static final String SERVLET_CONTEXT =
- "javax.xml.ws.servlet.context";
-
- /**
- * Standard property: Query string for request.
- * <p>Type: String
- **/
- public static final String QUERY_STRING =
- "javax.xml.ws.http.request.querystring";
-
- /**
- * Standard property: Request Path Info
- * <p>Type: String
- */
- public static final String PATH_INFO =
- "javax.xml.ws.http.request.pathinfo";
-
- /**
- * Standard property: WS Addressing Reference Parameters.
- * The list MUST include all SOAP headers marked with the
- * wsa:IsReferenceParameter="true" attribute.
- * <p>Type: List<Element>
- *
- * @since JAX-WS 2.1
- */
- public static final String REFERENCE_PARAMETERS =
- "javax.xml.ws.reference.parameters";
-
- /**
- * Property scope. Properties scoped as <code>APPLICATION</code> are
- * visible to handlers,
- * client applications and service endpoints; properties scoped as
- * <code>HANDLER</code>
- * are only normally visible to handlers.
- */
- public enum Scope {APPLICATION, HANDLER};
-
- /**
- * Sets the scope of a property.
- *
- * @param name Name of the property associated with the
- * <code>MessageContext</code>
- * @param scope Desired scope of the property
- * @throws java.lang.IllegalArgumentException if an illegal
- * property name is specified
- */
- public void setScope(String name, Scope scope);
-
- /**
- * Gets the scope of a property.
- *
- * @param name Name of the property
- * @return Scope of the property
- * @throws java.lang.IllegalArgumentException if a non-existant
- * property name is specified
- */
- public Scope getScope(String name);
+public interface MessageContext extends Map<String, Object>
+{
+
+ /**
+ * Standard property: message direction, <code>true</code> for
+ * outbound messages, <code>false</code> for inbound.
+ * <p>Type: boolean
+ */
+ public static final String MESSAGE_OUTBOUND_PROPERTY = "javax.xml.ws.handler.message.outbound";
+
+ /**
+ * Standard property: Map of attachments to a message for the inbound
+ * message, key is the MIME Content-ID, value is a DataHandler.
+ * <p>Type: java.util.Map<String,DataHandler>
+ */
+ public static final String INBOUND_MESSAGE_ATTACHMENTS = "javax.xml.ws.binding.attachments.inbound";
+
+ /**
+ * Standard property: Map of attachments to a message for the outbound
+ * message, key is the MIME Content-ID, value is a DataHandler.
+ * <p>Type: java.util.Map<String,DataHandler>
+ */
+ public static final String OUTBOUND_MESSAGE_ATTACHMENTS = "javax.xml.ws.binding.attachments.outbound";
+
+ /**
+ * Standard property: input source for WSDL document.
+ * <p>Type: org.xml.sax.InputSource
+ */
+ public static final String WSDL_DESCRIPTION = "javax.xml.ws.wsdl.description";
+
+ /**
+ * Standard property: name of WSDL service.
+ * <p>Type: javax.xml.namespace.QName
+ */
+ public static final String WSDL_SERVICE = "javax.xml.ws.wsdl.service";
+
+ /**
+ * Standard property: name of WSDL port.
+ * <p>Type: javax.xml.namespace.QName
+ */
+ public static final String WSDL_PORT = "javax.xml.ws.wsdl.port";
+
+ /**
+ * Standard property: name of wsdl interface (2.0) or port type (1.1).
+ * <p>Type: javax.xml.namespace.QName
+ */
+ public static final String WSDL_INTERFACE = "javax.xml.ws.wsdl.interface";
+
+ /**
+ * Standard property: name of WSDL operation.
+ * <p>Type: javax.xml.namespace.QName
+ */
+ public static final String WSDL_OPERATION = "javax.xml.ws.wsdl.operation";
+
+ /**
+ * Standard property: HTTP response status code.
+ * <p>Type: java.lang.Integer
+ */
+ public static final String HTTP_RESPONSE_CODE = "javax.xml.ws.http.response.code";
+
+ /**
+ * Standard property: HTTP request headers.
+ * <p>Type: java.util.Map<java.lang.String, java.util.List<java.lang.String>>
+ */
+ public static final String HTTP_REQUEST_HEADERS = "javax.xml.ws.http.request.headers";
+
+ /**
+ * Standard property: HTTP response headers.
+ * <p>Type: java.util.Map<java.lang.String, java.util.List<java.lang.String>>
+ */
+ public static final String HTTP_RESPONSE_HEADERS = "javax.xml.ws.http.response.headers";
+
+ /**
+ * Standard property: HTTP request method.
+ * <p>Type: java.lang.String
+ */
+ public static final String HTTP_REQUEST_METHOD = "javax.xml.ws.http.request.method";
+
+ /**
+ * Standard property: servlet request object.
+ * <p>Type: javax.servlet.http.HttpServletRequest
+ */
+ public static final String SERVLET_REQUEST = "javax.xml.ws.servlet.request";
+
+ /**
+ * Standard property: servlet response object.
+ * <p>Type: javax.servlet.http.HttpServletResponse
+ */
+ public static final String SERVLET_RESPONSE = "javax.xml.ws.servlet.response";
+
+ /**
+ * Standard property: servlet context object.
+ * <p>Type: javax.servlet.ServletContext
+ */
+ public static final String SERVLET_CONTEXT = "javax.xml.ws.servlet.context";
+
+ /**
+ * Standard property: Query string for request.
+ * <p>Type: String
+ **/
+ public static final String QUERY_STRING = "javax.xml.ws.http.request.querystring";
+
+ /**
+ * Standard property: Request Path Info
+ * <p>Type: String
+ */
+ public static final String PATH_INFO = "javax.xml.ws.http.request.pathinfo";
+
+ /**
+ * Standard property: WS Addressing Reference Parameters.
+ * The list MUST include all SOAP headers marked with the
+ * wsa:IsReferenceParameter="true" attribute.
+ * <p>Type: List<Element>
+ *
+ * @since JAX-WS 2.1
+ */
+ public static final String REFERENCE_PARAMETERS = "javax.xml.ws.reference.parameters";
+
+ /**
+ * Property scope. Properties scoped as <code>APPLICATION</code> are
+ * visible to handlers,
+ * client applications and service endpoints; properties scoped as
+ * <code>HANDLER</code>
+ * are only normally visible to handlers.
+ */
+ public enum Scope
+ {
+ APPLICATION, HANDLER
+ };
+
+ /**
+ * Sets the scope of a property.
+ *
+ * @param name Name of the property associated with the
+ * <code>MessageContext</code>
+ * @param scope Desired scope of the property
+ * @throws java.lang.IllegalArgumentException if an illegal
+ * property name is specified
+ */
+ public void setScope(String name, Scope scope);
+
+ /**
+ * Gets the scope of a property.
+ *
+ * @param name Name of the property
+ * @return Scope of the property
+ * @throws java.lang.IllegalArgumentException if a non-existant
+ * property name is specified
+ */
+ public Scope getScope(String name);
}
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextJSE.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextJSE.java 2007-02-02 14:40:37 UTC (rev 2254)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextJSE.java 2007-02-02 17:33:49 UTC (rev 2255)
@@ -24,20 +24,15 @@
// $Id$
import java.security.Principal;
-import java.util.HashSet;
-import java.util.Set;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
+import javax.servlet.http.HttpServletRequest;
import javax.xml.ws.handler.MessageContext;
import org.jboss.logging.Logger;
-import org.jboss.security.RealmMapping;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SimplePrincipal;
+import org.jboss.ws.core.jaxws.handler.MessageContextJAXWS;
/**
- * A WebServiceContext implementation that delegates to jbosssx.
+ * A WebServiceContext implementation that delegates to the HttpServletRequest.
*
* @author Thomas.Diesler(a)jboss.org
* @since 23-Jan-2007
@@ -47,50 +42,27 @@
// provide logging
private Logger log = Logger.getLogger(WebServiceContextJSE.class);
- private RealmMapping realmMapping;
+ private HttpServletRequest httpRequest;
public WebServiceContextJSE(MessageContext messageContext)
{
super(messageContext);
+ httpRequest = (HttpServletRequest)messageContext.get(MessageContextJAXWS.SERVLET_REQUEST);
+ if (httpRequest == null)
+ throw new IllegalStateException("Cannot obtain HTTPServletRequest from message context");
}
@Override
public Principal getUserPrincipal()
{
- Principal principal = SecurityAssociation.getCallerPrincipal();
+ Principal principal = httpRequest.getUserPrincipal();
return principal;
}
@Override
public boolean isUserInRole(String role)
{
- boolean isUserInRole = false;
- Principal principal = SecurityAssociation.getCallerPrincipal();
- RealmMapping realmMapping = getRealmMapping();
- if (realmMapping != null && principal != null)
- {
- Set<Principal> roles = new HashSet<Principal>();
- roles.add(new SimplePrincipal(role));
- isUserInRole = realmMapping.doesUserHaveRole(principal, roles);
- }
+ boolean isUserInRole = httpRequest.isUserInRole(role);
return isUserInRole;
}
-
- private RealmMapping getRealmMapping()
- {
- if (realmMapping == null)
- {
- String lookupName = "java:comp/env/security/realmMapping";
- try
- {
- InitialContext iniCtx = new InitialContext();
- realmMapping = (RealmMapping)iniCtx.lookup(lookupName);
- }
- catch (NamingException e)
- {
- log.debug("Cannot obtain realm mapping from: " + lookupName);
- }
- }
- return realmMapping;
- }
}
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml 2007-02-02 14:40:37 UTC (rev 2254)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml 2007-02-02 17:33:49 UTC (rev 2255)
@@ -61,22 +61,14 @@
<pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-impl.jar"/>
<pathelement location="${thirdparty.dir}/jboss-common.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/>
<pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/>
<pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-remoting.jar"/>
<pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
<pathelement location="${thirdparty.dir}/jbosssx-client.jar"/>
<pathelement location="${thirdparty.dir}/mail.jar"/>
<pathelement location="${thirdparty.dir}/servlet-api.jar"/>
<pathelement location="${thirdparty.dir}/stax-api.jar"/>
<pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
- <pathelement location="${thirdparty.dir}/wstx.jar"/>
- <pathelement location="${thirdparty.dir}/getopt.jar"/>
- <pathelement location="${thirdparty.dir}/xmlsec.jar"/>
- <pathelement location="${thirdparty.dir}/xercesImpl.jar"/>
- <pathelement location="${thirdparty.dir}/xalan.jar"/>
</path>
</target>
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant.properties.example
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant.properties.example 2007-02-02 14:40:37 UTC (rev 2254)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant.properties.example 2007-02-02 17:33:49 UTC (rev 2255)
@@ -7,7 +7,7 @@
jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3
# The JBoss server under test. This can be [jboss50|jboss42|jboss40|tomcat]
-jbossws.integration.target=jboss50
+jbossws.integration.target=jboss42
# The JBoss server instance
jboss.server.instance=default
@@ -18,8 +18,8 @@
tomcat.manager.password=manager
# JBoss Repository
-jboss.repository=file:/home/tdiesler/cvs/jboss.local.repository
-#jboss.repository=http://repository.jboss.com
+#jboss.repository=file:/home/tdiesler/cvs/jboss.local.repository
+jboss.repository=http://repository.jboss.com
# Force thirdparty HTTP get
#force.thirdparty.get=true
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-02-02 14:40:37 UTC (rev 2254)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-02-02 17:33:49 UTC (rev 2255)
@@ -151,6 +151,7 @@
<!-- The combined compile classpath -->
<path id="jbossws.jars.classpath">
+ <pathelement location="${tests.lib.dir}/jbossws-core.jar"/>
<pathelement location="${tests.lib.dir}/jbossws-client.jar"/>
<pathelement location="${tests.lib.dir}/jboss-jaxrpc.jar"/>
<pathelement location="${tests.lib.dir}/jboss-jaxws.jar"/>
@@ -320,7 +321,10 @@
<!-- generate mapping artifacts -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="core.classpath"/>
- <classpath location="${tests.lib.dir}/jbossws-client.jar"/>
+ <classpath location="${tests.lib.dir}/jbossws-core.jar"/>
+ <classpath location="${tests.lib.dir}/jboss-jaxrpc.jar"/>
+ <classpath location="${tests.lib.dir}/jboss-jaxws.jar"/>
+ <classpath location="${tests.lib.dir}/jboss-saaj.jar"/>
<classpath location="${thirdparty.dir}/concurrent.jar"/>
<classpath location="${tests.output.dir}/classes"/>
<classpath location="${tests.output.dir}"/>
@@ -405,8 +409,8 @@
<sysproperty key="tomcat.home" value="${tomcat.home}"/>
<sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/>
<sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/>
- <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.keystore"/>
- <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.truststore"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.keystore"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.truststore"/>
<sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/>
<sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/>
<sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/>
@@ -446,8 +450,8 @@
<sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/>
<!--
http://jira.jboss.com/jira/browse/JBWS-917
- <sysproperty key="javax.net.ssl.keyStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.keystore"/>
- <sysproperty key="javax.net.ssl.trustStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.truststore"/>
+ <sysproperty key="javax.net.ssl.keyStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.keystore"/>
+ <sysproperty key="javax.net.ssl.trustStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.truststore"/>
<sysproperty key="javax.net.ssl.keyStorePassword" value="jbossws"/>
<sysproperty key="javax.net.ssl.trustStorePassword" value="jbossws"/>
<sysproperty key="javax.net.ssl.keyStoreType" value="jks"/>
@@ -455,8 +459,8 @@
-->
<!-- HTTPS hostname wrong: should be <localhost> -->
<sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/>
- <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.keystore"/>
- <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.truststore"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.keystore"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.truststore"/>
<sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/>
<sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/>
<sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/>
Modified: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxws.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-02-02 14:40:37 UTC (rev 2254)
+++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-02-02 17:33:49 UTC (rev 2255)
@@ -256,16 +256,12 @@
<classes dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean01.class"/>
</classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF01">
- <include name="jboss-web.xml"/>
- </webinf>
</war>
<war warfile="${tests.output.dir}/libs/jaxws-samples-webservice02-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02/web.xml">
<classes dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean02.class"/>
</classes>
<webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02">
- <include name="jboss-web.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
@@ -274,9 +270,6 @@
<include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean03.class"/>
<include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/>
</classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF03">
- <include name="jboss-web.xml"/>
- </webinf>
</war>
<jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice01-ejb3.jar">
<fileset dir="${tests.output.dir}/classes">
Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-02 14:40:37 UTC (rev 2254)
+++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-02 17:33:49 UTC (rev 2255)
@@ -435,8 +435,8 @@
<sysproperty key="tomcat.home" value="${tomcat.home}"/>
<sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/>
<sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/>
- <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.keystore"/>
- <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.truststore"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.keystore"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.truststore"/>
<sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/>
<sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/>
<sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/>
@@ -476,8 +476,8 @@
<sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/>
<!--
http://jira.jboss.com/jira/browse/JBWS-917
- <sysproperty key="javax.net.ssl.keyStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.keystore"/>
- <sysproperty key="javax.net.ssl.trustStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.truststore"/>
+ <sysproperty key="javax.net.ssl.keyStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.keystore"/>
+ <sysproperty key="javax.net.ssl.trustStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.truststore"/>
<sysproperty key="javax.net.ssl.keyStorePassword" value="jbossws"/>
<sysproperty key="javax.net.ssl.trustStorePassword" value="jbossws"/>
<sysproperty key="javax.net.ssl.keyStoreType" value="jks"/>
@@ -485,8 +485,8 @@
-->
<!-- HTTPS hostname wrong: should be <localhost> -->
<sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/>
- <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.keystore"/>
- <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.truststore"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.keystore"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.truststore"/>
<sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/>
<sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/>
<sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/>
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB21Bean01.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB21Bean01.java 2007-02-02 14:40:37 UTC (rev 2254)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB21Bean01.java 2007-02-02 17:33:49 UTC (rev 2255)
@@ -40,7 +40,7 @@
*/
@WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService")
@SOAPBinding(style = SOAPBinding.Style.RPC)
-@WebContext(contextRoot="/jsr181", urlPattern="/*")
+@WebContext(urlPattern="/*")
public class EJB21Bean01 implements SessionBean
{
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB21Bean02.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB21Bean02.java 2007-02-02 14:40:37 UTC (rev 2254)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB21Bean02.java 2007-02-02 17:33:49 UTC (rev 2255)
@@ -42,7 +42,7 @@
*/
@WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService", wsdlLocation = "META-INF/wsdl/TestService.wsdl")
@SOAPBinding(style = SOAPBinding.Style.RPC)
-@WebContext(contextRoot="/jsr181", urlPattern="/*")
+@WebContext(urlPattern="/*")
public class EJB21Bean02 implements SessionBean
{
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.java 2007-02-02 14:40:37 UTC (rev 2254)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.java 2007-02-02 17:33:49 UTC (rev 2255)
@@ -37,7 +37,7 @@
* @since 29-Apr-2005
*/
@WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService")
-@WebContext(contextRoot="/jsr181", urlPattern="/*")
+@WebContext(urlPattern="/*")
@SOAPBinding(style = SOAPBinding.Style.RPC)
@Remote(EJB3RemoteInterface.class)
@RemoteBinding(jndiBinding = "/ejb3/EJB3EndpointInterface")
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.java 2007-02-02 14:40:37 UTC (rev 2254)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.java 2007-02-02 17:33:49 UTC (rev 2255)
@@ -41,7 +41,7 @@
* @since 29-Apr-2005
*/
@WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService", wsdlLocation = "META-INF/wsdl/TestService.wsdl")
-@WebContext(contextRoot="/jsr181", urlPattern="/*")
+@WebContext(urlPattern="/*")
@SOAPBinding(style = SOAPBinding.Style.RPC)
@Remote(EJB3RemoteInterface.class)
@RemoteBinding(jndiBinding = "/ejb3/EJB3EndpointInterface")
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.java 2007-02-02 14:40:37 UTC (rev 2254)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.java 2007-02-02 17:33:49 UTC (rev 2255)
@@ -36,7 +36,7 @@
* @since 29-Apr-2005
*/
@WebService(targetNamespace = "http://foo")
-@WebContext(contextRoot="/jsr181", urlPattern="/*")
+@WebContext(urlPattern="/*")
@SOAPBinding(style = SOAPBinding.Style.RPC)
public interface EndpointInterface03 extends Remote
{
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceBase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceBase.java 2007-02-02 14:40:37 UTC (rev 2254)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceBase.java 2007-02-02 17:33:49 UTC (rev 2255)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.ws.jaxws.samples.webservice;
+//$Id$
+
import java.net.MalformedURLException;
import java.net.URL;
import java.rmi.RemoteException;
@@ -29,69 +31,54 @@
import javax.xml.ws.Service;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
-import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
-// $Id$
-
/**
- * Base testing class for @WebService
+ * Base testing class for @WebService
*
* @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a>
- * @version $Revision$
*/
public class JSR181WebServiceBase extends JBossWSTest
{
- private EndpointInterface getPort() throws MalformedURLException
+ private EndpointInterface getPort(String context) throws MalformedURLException
{
QName serviceName = new QName("http://www.openuri.org/2004/04/HelloWorld", "TestService");
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jsr181?wsdl");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + context + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
return service.getPort(EndpointInterface.class);
}
- private EndpointInterface03 getPort03() throws MalformedURLException
+ private EndpointInterface03 getPort03(String context) throws MalformedURLException
{
QName serviceName = new QName("http://foo", "TestService");
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jsr181?wsdl");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + context + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
return service.getPort(EndpointInterface03.class);
}
- private void sayHello() throws RemoteException, MalformedURLException
+ private void sayHello(String context) throws RemoteException, MalformedURLException
{
- assertWSDLAccess();
String helloWorld = "Hello world!";
- Object retObj = getPort().echo(helloWorld);
+ Object retObj = getPort(context).echo(helloWorld);
assertEquals(helloWorld, retObj);
}
- public void webServiceTest() throws Exception
+ public void webServiceTest(String context) throws Exception
{
- sayHello();
+ sayHello(context);
}
- public void webServiceWsdlLocationTest() throws Exception
+ public void webServiceWsdlLocationTest(String context) throws Exception
{
- sayHello();
+ sayHello(context);
}
- public void webServiceEndpointInterfaceTest() throws Exception
+ public void webServiceEndpointInterfaceTest(String context) throws Exception
{
- assertWSDLAccess();
String helloWorld = "Hello Interface!";
- Object retObj = getPort03().echo(helloWorld);
+ Object retObj = getPort03(context).echo(helloWorld);
assertEquals(helloWorld, retObj);
}
-
- private void assertWSDLAccess() throws MalformedURLException
- {
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jsr181?wsdl");
- WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
- WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL);
- assertNotNull(wsdlDefinitions);
- }
}
\ No newline at end of file
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceEJB3TestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceEJB3TestCase.java 2007-02-02 14:40:37 UTC (rev 2254)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceEJB3TestCase.java 2007-02-02 17:33:49 UTC (rev 2255)
@@ -64,7 +64,7 @@
deploy("jaxws-samples-webservice01-ejb3.jar");
try
{
- webServiceTest();
+ webServiceTest("jaxws-samples-webservice01-ejb3");
}
finally
{
@@ -77,7 +77,7 @@
deploy("jaxws-samples-webservice02-ejb3.jar");
try
{
- webServiceWsdlLocationTest();
+ webServiceWsdlLocationTest("jaxws-samples-webservice02-ejb3");
}
finally
{
@@ -90,7 +90,7 @@
deploy("jaxws-samples-webservice03-ejb3.jar");
try
{
- webServiceEndpointInterfaceTest();
+ webServiceEndpointInterfaceTest("jaxws-samples-webservice03-ejb3");
}
finally
{
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceJSETestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceJSETestCase.java 2007-02-02 14:40:37 UTC (rev 2254)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceJSETestCase.java 2007-02-02 17:33:49 UTC (rev 2255)
@@ -44,7 +44,7 @@
deploy("jaxws-samples-webservice01-jse.war");
try
{
- webServiceTest();
+ webServiceTest("jaxws-samples-webservice01-jse");
}
finally
{
@@ -57,7 +57,7 @@
deploy("jaxws-samples-webservice02-jse.war");
try
{
- webServiceWsdlLocationTest();
+ webServiceWsdlLocationTest("jaxws-samples-webservice02-jse");
}
finally
{
@@ -70,7 +70,7 @@
deploy("jaxws-samples-webservice03-jse.war");
try
{
- webServiceEndpointInterfaceTest();
+ webServiceEndpointInterfaceTest("jaxws-samples-webservice03-jse");
}
finally
{
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsse/keystore.password
===================================================================
(Binary files differ)
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml 2007-02-02 14:40:37 UTC (rev 2254)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml 2007-02-02 17:33:49 UTC (rev 2255)
@@ -2,10 +2,10 @@
<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
<key-store-file>WEB-INF/wsse.keystore</key-store-file>
<!--Note ${buildpath} will be replaced with the actual build directory path -->
- <key-store-password>{EXT}java -cp ${buildpath}/classes org.jboss.test.ws.jaxrpc.wsse.PasswordUtil ${buildpath}/resources/jaxrpc/wsse/keystore.password</key-store-password>
+ <key-store-password>{EXT}java -cp ${buildpath}/classes org.jboss.test.ws.jaxrpc.wsse.PasswordUtil ${buildpath}/resources/jaxrpc/samples/wssecurity/keystore.password</key-store-password>
<trust-store-file>WEB-INF/wsse.truststore</trust-store-file>
<!--Note ${buildpath} will be replaced with the actual build directory path -->
- <trust-store-password>{CLASS}org.jboss.security.plugins.FilePassword:${buildpath}/resources/jaxrpc/wsse/keystore.password</trust-store-password>
+ <trust-store-password>{CLASS}org.jboss.security.plugins.FilePassword:${buildpath}/resources/jaxrpc/samples/wssecurity/keystore.password</trust-store-password>
<config>
<sign type="x509v3" alias="wsse"/>
<encrypt type="x509v3" alias="wsse"/>
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsse/wsse.keystore
===================================================================
(Binary files differ)
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsse/wsse.truststore
===================================================================
(Binary files differ)
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webservice/WEB-INF01/jboss-web.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webservice/WEB-INF01/jboss-web.xml 2007-02-02 14:40:37 UTC (rev 2254)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webservice/WEB-INF01/jboss-web.xml 2007-02-02 17:33:49 UTC (rev 2255)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<jboss-web>
- <context-root>/jsr181</context-root>
-</jboss-web>
-
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webservice/WEB-INF02/jboss-web.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webservice/WEB-INF02/jboss-web.xml 2007-02-02 14:40:37 UTC (rev 2254)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webservice/WEB-INF02/jboss-web.xml 2007-02-02 17:33:49 UTC (rev 2255)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<jboss-web>
- <context-root>/jsr181</context-root>
-</jboss-web>
-
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webservice/WEB-INF03/jboss-web.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webservice/WEB-INF03/jboss-web.xml 2007-02-02 14:40:37 UTC (rev 2254)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webservice/WEB-INF03/jboss-web.xml 2007-02-02 17:33:49 UTC (rev 2255)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<jboss-web>
- <context-root>/jsr181</context-root>
-</jboss-web>
-
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-02-02 14:40:37 UTC (rev 2254)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-02-02 17:33:49 UTC (rev 2255)
@@ -11,6 +11,7 @@
org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase.*
org/jboss/test/ws/jaxws/samples/jsr181ejb/**
org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceEJB3TestCase.*
org/jboss/test/ws/jaxws/samples/webserviceref/**
# JBoss excludes
@@ -23,3 +24,7 @@
# [JBWS-1471] - Remove unwanted tomcat excludes
org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.*
org/jboss/test/ws/jaxws/samples/wseventing/**
+
+# [JBWS-1503] - Support XOP samples in tomcat
+org/jboss/test/ws/jaxrpc/samples/xop/**
+org/jboss/test/ws/jaxws/samples/xop/**
17 years, 3 months
- 1
- 0
JBossWS SVN: r2254 - in branches/jbossws-1.2.0/build: hudson/apache-tomcat/conf and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-02 09:40:37 -0500 (Fri, 02 Feb 2007)
New Revision: 2254
Modified:
branches/jbossws-1.2.0/build/hudson/apache-tomcat/conf/server.xml
branches/jbossws-1.2.0/build/version.properties
Log:
Resolve dependencies on snapshots
Hudson management port 8105
Modified: branches/jbossws-1.2.0/build/hudson/apache-tomcat/conf/server.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/apache-tomcat/conf/server.xml 2007-02-02 14:21:44 UTC (rev 2253)
+++ branches/jbossws-1.2.0/build/hudson/apache-tomcat/conf/server.xml 2007-02-02 14:40:37 UTC (rev 2254)
@@ -1,5 +1,5 @@
-<Server port="8005" shutdown="SHUTDOWN">
+<Server port="8105" shutdown="SHUTDOWN">
<!-- Comment these entries out to disable JMX MBeans support used for the
administration web application -->
Modified: branches/jbossws-1.2.0/build/version.properties
===================================================================
--- branches/jbossws-1.2.0/build/version.properties 2007-02-02 14:21:44 UTC (rev 2253)
+++ branches/jbossws-1.2.0/build/version.properties 2007-02-02 14:40:37 UTC (rev 2254)
@@ -3,7 +3,7 @@
specification.title=JBossWS
specification.vendor=JBoss (http://www.jboss.org)
-specification.version=jbossws-2.0
+specification.version=jbossws-1.2
version.id=1.2.0.GA
repository.id=1.2.0.GA
@@ -38,9 +38,9 @@
jboss-common-logging-log4j=2.0.2.GA
jboss-common-logging-spi=2.0.2.GA
jboss-ejb3=1.0.0.CR9-jboss4.0.5
-jboss-jbossretro=snapshot
+jboss-jbossretro=1.0.4.GA
jboss-security=4.0.5.GA
-jboss-vfs=2.0.0.snapshot
+jboss-vfs=2.0.0.Beta2
jbossas-core-libs=4.0.5.GA
jbpm-bpel=1.1.Beta3
junit=3.8.1
17 years, 3 months
- 1
- 0
JBossWS SVN: r2253 - in trunk: jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc and 11 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-02-02 09:21:44 -0500 (Fri, 02 Feb 2007)
New Revision: 2253
Added:
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointDTO.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonContextServlet.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/EncodedTypeMapping.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/LiteralTypeMapping.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointManager.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointMetrics.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementWriter.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/DOMWriter.java
trunk/jbossws-core/src/main/resources/jbossws.war/index.html
trunk/jbossws-core/src/main/resources/jbossws.war/styles.css
trunk/jbossws-tests/build.xml
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java
trunk/jbossws-tests/src/main/resources/benchmark/jmeter/JBossWS_Benchmark.jmx
Log:
Resolved HotSpots: DOMWriter.normalize() and TypeMappingImpl.getKeyPairs(). SOAPContentElement invalidates object and dom states when xmlFragement is marshalled. JBossWS webapp facelifting: Includes endpoint stats
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonContextServlet.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonContextServlet.java 2007-02-02 13:52:01 UTC (rev 2252)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonContextServlet.java 2007-02-02 14:21:44 UTC (rev 2253)
@@ -26,6 +26,7 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.net.URL;
+import java.util.List;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
@@ -35,6 +36,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.core.server.ServiceEndpointManager;
+import org.jboss.ws.core.server.ServiceEndpointDTO;
/**
* The servlet that that is associated with context /jbossws
@@ -67,9 +69,90 @@
writer.print("<html>");
setupHTMLResponseHeader(writer);
+ URL requestURL = new URL(req.getRequestURL().toString());
+
writer.print("<body>");
- //writer.print(epManager.showServiceEndpointTable());
- writer.print(epManager.showServiceEndpointTable(new URL(req.getRequestURL().toString())));
+
+ writer.print("<div class='pageHeader'>JBossWS/Services</div>");
+ writer.print("<div class='pageSection'>");
+ writer.print("<fieldset>");
+ writer.print("<legend><b>Registered Service Endpoints</b></legend>");
+ writer.print("<table>");
+
+ // begin iteration
+ List<ServiceEndpointDTO> endpoints = epManager.getRegisteredEndpoints(requestURL);
+
+ if(endpoints.isEmpty())
+ {
+ writer.print("<tr>");
+ writer.print(" <td><h3>There currently no endpoints deployed</h3></td>");
+ writer.print("</tr>");
+ }
+
+ for(ServiceEndpointDTO ep : endpoints)
+ {
+ writer.print("<tr>");
+ writer.print(" <td>ServiceEndpointID</td>");
+ writer.print(" <td>"+ep.getSepID()+"</td>");
+ writer.print("</tr>");
+ writer.print("<tr>");
+ writer.print(" <td>ServiceEndpointAddress</td>");
+ writer.print(" <td><a href='"+ep.getAddress()+"?wsdl'>"+ep.getAddress()+"?wsdl</a></td>");
+ writer.print("</tr>");
+ writer.print("<tr>");
+ writer.print(" <td colspan=2>");
+ writer.print(" ");
+ writer.print("");
+ writer.print("<table class='metrics'>");
+ writer.print("<tr>");
+ writer.print(" <td>StartTime</td>");
+ writer.print(" <td>StopTime</td>");
+ writer.print(" <td></td>");
+ writer.print("</tr>");
+ writer.print("<tr>");
+ writer.print(" <td>"+ep.getSeMetrics().getStartTime()+"</td>");
+
+ String stopTime = ep.getSeMetrics().getStopTime() != null ? ep.getSeMetrics().getStopTime().toString() : "";
+ writer.print(" <td>"+stopTime+"</td>");
+ writer.print(" <td></td>");
+ writer.print("</tr>");
+ writer.print("<tr>");
+
+ writer.print(" <td>RequestCount</td>");
+ writer.print(" <td>ResponseCount</td>");
+ writer.print(" <td>FaultCount</td>");
+ writer.print("</tr>");
+ writer.print("<tr>");
+ writer.print(" <td>"+ep.getSeMetrics().getRequestCount()+"</td>");
+ writer.print(" <td>"+ep.getSeMetrics().getResponseCount()+"</td>");
+ writer.print(" <td>"+ep.getSeMetrics().getFaultCount()+"</td>");
+ writer.print("</tr>");
+ writer.print("<tr>");
+ writer.print(" <td>MinProcessingTime</td>");
+ writer.print(" <td>MaxProcessingTime</td>");
+ writer.print(" <td>AvgProcessingTime</td>");
+ writer.print("</tr>");
+ writer.print("<tr>");
+ writer.print(" <td>"+ep.getSeMetrics().getMinProcessingTime()+"</td>");
+ writer.print(" <td>"+ep.getSeMetrics().getMaxProcessingTime()+"</td>");
+ writer.print(" <td>"+ep.getSeMetrics().getAverageProcessingTime()+"</td>");
+ writer.print("</tr>");
+ writer.print("");
+ writer.print("");
+ writer.print("</table>");
+ writer.print("");
+ writer.print(" </td>");
+ writer.print("</tr>");
+
+ writer.print("<tr><td colspan='3'> </td></tr>");
+ }
+ // end iteration
+ writer.print("</table>");
+ writer.print("");
+ writer.print("</fieldset>");
+ writer.print("</div>");
+
+
writer.print("</body>");
writer.print("</html>");
writer.close();
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/EncodedTypeMapping.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/EncodedTypeMapping.java 2007-02-02 13:52:01 UTC (rev 2252)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/EncodedTypeMapping.java 2007-02-02 14:21:44 UTC (rev 2253)
@@ -79,82 +79,82 @@
registerStandardSOAP11EncodedTypes();
// register mapping for xsd:anyType
- registerInternal(SOAPElement.class, Constants.TYPE_SOAP11_ANYTYPE, new SOAPElementSerializerFactory(), new SOAPElementDeserializerFactory());
- registerInternal(Element.class, Constants.TYPE_SOAP11_ANYTYPE, new ElementSerializerFactory(), new ElementDeserializerFactory());
+ register(SOAPElement.class, Constants.TYPE_SOAP11_ANYTYPE, new SOAPElementSerializerFactory(), new SOAPElementDeserializerFactory());
+ register(Element.class, Constants.TYPE_SOAP11_ANYTYPE, new ElementSerializerFactory(), new ElementDeserializerFactory());
}
private void registerStandardSOAP11EncodedTypes()
{
- registerInternal(BigDecimal.class, Constants.TYPE_SOAP11_DECIMAL, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(BigDecimal.class, Constants.TYPE_SOAP11_DECIMAL, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(BigInteger.class, Constants.TYPE_SOAP11_POSITIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(BigInteger.class, Constants.TYPE_SOAP11_NEGATIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(BigInteger.class, Constants.TYPE_SOAP11_NONPOSITIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(BigInteger.class, Constants.TYPE_SOAP11_NONNEGATIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(BigInteger.class, Constants.TYPE_SOAP11_UNSIGNEDLONG, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(BigInteger.class, Constants.TYPE_SOAP11_INTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(BigInteger.class, Constants.TYPE_SOAP11_POSITIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(BigInteger.class, Constants.TYPE_SOAP11_NEGATIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(BigInteger.class, Constants.TYPE_SOAP11_NONPOSITIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(BigInteger.class, Constants.TYPE_SOAP11_NONNEGATIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(BigInteger.class, Constants.TYPE_SOAP11_UNSIGNEDLONG, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(BigInteger.class, Constants.TYPE_SOAP11_INTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(Date.class, Constants.TYPE_SOAP11_DATETIME, new DateSerializerFactory(), new DateDeserializerFactory());
+ register(Date.class, Constants.TYPE_SOAP11_DATETIME, new DateSerializerFactory(), new DateDeserializerFactory());
- registerInternal(Calendar.class, Constants.TYPE_SOAP11_DATE, new CalendarSerializerFactory(), new CalendarDeserializerFactory());
- registerInternal(Calendar.class, Constants.TYPE_SOAP11_TIME, new CalendarSerializerFactory(), new CalendarDeserializerFactory());
- registerInternal(Calendar.class, Constants.TYPE_SOAP11_DATETIME, new CalendarSerializerFactory(), new CalendarDeserializerFactory());
+ register(Calendar.class, Constants.TYPE_SOAP11_DATE, new CalendarSerializerFactory(), new CalendarDeserializerFactory());
+ register(Calendar.class, Constants.TYPE_SOAP11_TIME, new CalendarSerializerFactory(), new CalendarDeserializerFactory());
+ register(Calendar.class, Constants.TYPE_SOAP11_DATETIME, new CalendarSerializerFactory(), new CalendarDeserializerFactory());
- registerInternal(QName.class, Constants.TYPE_SOAP11_QNAME, new QNameSerializerFactory(), new QNameDeserializerFactory());
+ register(QName.class, Constants.TYPE_SOAP11_QNAME, new QNameSerializerFactory(), new QNameDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_SOAP11_ANYSIMPLETYPE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_SOAP11_DURATION, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_SOAP11_GDAY, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_SOAP11_GMONTH, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_SOAP11_GMONTHDAY, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_SOAP11_GYEAR, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_SOAP11_GYEARMONTH, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_SOAP11_ID, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_SOAP11_LANGUAGE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_SOAP11_NAME, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_SOAP11_NCNAME, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_SOAP11_NMTOKEN, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_SOAP11_NORMALIZEDSTRING, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_SOAP11_TOKEN, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_SOAP11_STRING, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_SOAP11_ANYSIMPLETYPE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_SOAP11_DURATION, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_SOAP11_GDAY, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_SOAP11_GMONTH, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_SOAP11_GMONTHDAY, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_SOAP11_GYEAR, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_SOAP11_GYEARMONTH, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_SOAP11_ID, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_SOAP11_LANGUAGE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_SOAP11_NAME, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_SOAP11_NCNAME, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_SOAP11_NMTOKEN, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_SOAP11_NORMALIZEDSTRING, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_SOAP11_TOKEN, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_SOAP11_STRING, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String[].class, Constants.TYPE_SOAP11_NMTOKENS, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String[].class, Constants.TYPE_SOAP11_NMTOKENS, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(URI.class, Constants.TYPE_SOAP11_ANYURI, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(URI.class, Constants.TYPE_SOAP11_ANYURI, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(boolean.class, Constants.TYPE_SOAP11_BOOLEAN, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(Boolean.class, Constants.TYPE_SOAP11_BOOLEAN, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(boolean.class, Constants.TYPE_SOAP11_BOOLEAN, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Boolean.class, Constants.TYPE_SOAP11_BOOLEAN, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(byte.class, Constants.TYPE_SOAP11_BYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(Byte.class, Constants.TYPE_SOAP11_BYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(byte.class, Constants.TYPE_SOAP11_BYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Byte.class, Constants.TYPE_SOAP11_BYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(byte[].class, Constants.TYPE_SOAP11_HEXBINARY, new HexSerializerFactory(), new HexDeserializerFactory());
- registerInternal(Byte[].class, Constants.TYPE_SOAP11_HEXBINARY, new HexSerializerFactory(), new HexDeserializerFactory());
- registerInternal(byte[].class, Constants.TYPE_SOAP11_BASE64BINARY, new Base64SerializerFactory(), new Base64DeserializerFactory());
- registerInternal(Byte[].class, Constants.TYPE_SOAP11_BASE64BINARY, new Base64SerializerFactory(), new Base64DeserializerFactory());
- registerInternal(byte[].class, Constants.TYPE_SOAP11_BASE64, new Base64SerializerFactory(), new Base64DeserializerFactory());
- registerInternal(Byte[].class, Constants.TYPE_SOAP11_BASE64, new Base64SerializerFactory(), new Base64DeserializerFactory());
+ register(byte[].class, Constants.TYPE_SOAP11_HEXBINARY, new HexSerializerFactory(), new HexDeserializerFactory());
+ register(Byte[].class, Constants.TYPE_SOAP11_HEXBINARY, new HexSerializerFactory(), new HexDeserializerFactory());
+ register(byte[].class, Constants.TYPE_SOAP11_BASE64BINARY, new Base64SerializerFactory(), new Base64DeserializerFactory());
+ register(Byte[].class, Constants.TYPE_SOAP11_BASE64BINARY, new Base64SerializerFactory(), new Base64DeserializerFactory());
+ register(byte[].class, Constants.TYPE_SOAP11_BASE64, new Base64SerializerFactory(), new Base64DeserializerFactory());
+ register(Byte[].class, Constants.TYPE_SOAP11_BASE64, new Base64SerializerFactory(), new Base64DeserializerFactory());
- registerInternal(double.class, Constants.TYPE_SOAP11_DOUBLE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(Double.class, Constants.TYPE_SOAP11_DOUBLE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(double.class, Constants.TYPE_SOAP11_DOUBLE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Double.class, Constants.TYPE_SOAP11_DOUBLE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(float.class, Constants.TYPE_SOAP11_FLOAT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(Float.class, Constants.TYPE_SOAP11_FLOAT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(float.class, Constants.TYPE_SOAP11_FLOAT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Float.class, Constants.TYPE_SOAP11_FLOAT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(int.class, Constants.TYPE_SOAP11_UNSIGNEDSHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(Integer.class, Constants.TYPE_SOAP11_UNSIGNEDSHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(int.class, Constants.TYPE_SOAP11_INT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(Integer.class, Constants.TYPE_SOAP11_INT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(int.class, Constants.TYPE_SOAP11_UNSIGNEDSHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Integer.class, Constants.TYPE_SOAP11_UNSIGNEDSHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(int.class, Constants.TYPE_SOAP11_INT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Integer.class, Constants.TYPE_SOAP11_INT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(long.class, Constants.TYPE_SOAP11_UNSIGNEDINT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(Long.class, Constants.TYPE_SOAP11_UNSIGNEDINT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(long.class, Constants.TYPE_SOAP11_LONG, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(Long.class, Constants.TYPE_SOAP11_LONG, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(long.class, Constants.TYPE_SOAP11_UNSIGNEDINT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Long.class, Constants.TYPE_SOAP11_UNSIGNEDINT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(long.class, Constants.TYPE_SOAP11_LONG, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Long.class, Constants.TYPE_SOAP11_LONG, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(short.class, Constants.TYPE_SOAP11_UNSIGNEDBYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(Short.class, Constants.TYPE_SOAP11_UNSIGNEDBYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(short.class, Constants.TYPE_SOAP11_SHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(Short.class, Constants.TYPE_SOAP11_SHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(short.class, Constants.TYPE_SOAP11_UNSIGNEDBYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Short.class, Constants.TYPE_SOAP11_UNSIGNEDBYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(short.class, Constants.TYPE_SOAP11_SHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Short.class, Constants.TYPE_SOAP11_SHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
}
/**
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/LiteralTypeMapping.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/LiteralTypeMapping.java 2007-02-02 13:52:01 UTC (rev 2252)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/LiteralTypeMapping.java 2007-02-02 14:21:44 UTC (rev 2253)
@@ -67,30 +67,30 @@
JBossXBSerializerFactory jbxbSF = new JBossXBSerializerFactory();
JBossXBDeserializerFactory jbxbDF = new JBossXBDeserializerFactory();
- registerInternal(DataHandler.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF);
- registerInternal(DataHandler.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF);
- registerInternal(DataHandler.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF);
- registerInternal(DataHandler.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF);
- registerInternal(DataHandler.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF);
+ register(DataHandler.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF);
+ register(DataHandler.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF);
+ register(DataHandler.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF);
+ register(DataHandler.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF);
+ register(DataHandler.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF);
- registerInternal(String.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF);
- registerInternal(Image.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF);
- registerInternal(Source.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF);
- registerInternal(MimeMultipart.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF);
+ register(String.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF);
+ register(Image.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF);
+ register(Source.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF);
+ register(MimeMultipart.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF);
registerStandardLiteralTypes();
// register default mime mappings
- registerInternal(DataHandler.class, Constants.TYPE_MIME_APPLICATION_XML, null, null);
- registerInternal(DataHandler.class, Constants.TYPE_MIME_IMAGE_GIF, null, null);
- registerInternal(DataHandler.class, Constants.TYPE_MIME_IMAGE_JPEG, null, null);
- registerInternal(DataHandler.class, Constants.TYPE_MIME_TEXT_PLAIN, null, null);
- registerInternal(DataHandler.class, Constants.TYPE_MIME_TEXT_XML, null, null);
- registerInternal(MimeMultipart.class, Constants.TYPE_MIME_MULTIPART_MIXED, null, null);
+ register(DataHandler.class, Constants.TYPE_MIME_APPLICATION_XML, null, null);
+ register(DataHandler.class, Constants.TYPE_MIME_IMAGE_GIF, null, null);
+ register(DataHandler.class, Constants.TYPE_MIME_IMAGE_JPEG, null, null);
+ register(DataHandler.class, Constants.TYPE_MIME_TEXT_PLAIN, null, null);
+ register(DataHandler.class, Constants.TYPE_MIME_TEXT_XML, null, null);
+ register(MimeMultipart.class, Constants.TYPE_MIME_MULTIPART_MIXED, null, null);
// register mapping for xsd:anyType
- registerInternal(SOAPElement.class, Constants.TYPE_LITERAL_ANYTYPE, new SOAPElementSerializerFactory(), new SOAPElementDeserializerFactory());
- registerInternal(Element.class, Constants.TYPE_LITERAL_ANYTYPE, new ElementSerializerFactory(), new ElementDeserializerFactory());
+ register(SOAPElement.class, Constants.TYPE_LITERAL_ANYTYPE, new SOAPElementSerializerFactory(), new SOAPElementDeserializerFactory());
+ register(Element.class, Constants.TYPE_LITERAL_ANYTYPE, new ElementSerializerFactory(), new ElementDeserializerFactory());
}
/**
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingImpl.java 2007-02-02 13:52:01 UTC (rev 2252)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingImpl.java 2007-02-02 14:21:44 UTC (rev 2253)
@@ -23,37 +23,22 @@
// $Id$
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import org.jboss.logging.Logger;
+import org.jboss.ws.Constants;
+import org.jboss.ws.core.jaxrpc.binding.*;
+import org.jboss.ws.core.utils.JavaUtils;
+import org.jboss.ws.core.utils.HashCodeUtil;
import javax.xml.namespace.QName;
import javax.xml.rpc.encoding.DeserializerFactory;
import javax.xml.rpc.encoding.SerializerFactory;
import javax.xml.rpc.encoding.TypeMapping;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.URI;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
-import org.jboss.logging.Logger;
-import org.jboss.ws.Constants;
-import org.jboss.ws.core.jaxrpc.binding.Base64DeserializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.Base64SerializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.CalendarDeserializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.CalendarSerializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.DateDeserializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.DateSerializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.HexDeserializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.HexSerializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.QNameDeserializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.QNameSerializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.SimpleDeserializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.SimpleSerializerFactory;
-import org.jboss.ws.core.utils.JavaUtils;
-
/**
* This is the representation of a type mapping.
* This TypeMapping implementation supports the literal encoding style.
@@ -72,6 +57,8 @@
// Map<KeyPair,FactoryPair>
private Map<KeyPair, FactoryPair> tupleMap = new LinkedHashMap<KeyPair, FactoryPair>();
+ private Map<Integer, List<KeyPair>> keyPairCache = new ConcurrentHashMap<Integer, List<KeyPair>>();
+
/**
* Gets the DeserializerFactory registered for the specified pair of Java type and XML data type.
* @param javaType Class of the Java type
@@ -80,7 +67,7 @@
*/
public DeserializerFactory getDeserializer(Class javaType, QName xmlType)
{
- FactoryPair fPair = getFactoryPair(xmlType, javaType);
+ FactoryPair fPair = getFactoryPair(new IQName(xmlType), javaType);
return (fPair != null ? fPair.getDeserializerFactory() : null);
}
@@ -92,7 +79,7 @@
*/
public SerializerFactory getSerializer(Class javaType, QName xmlType)
{
- FactoryPair fPair = getFactoryPair(xmlType, javaType);
+ FactoryPair fPair = getFactoryPair(new IQName(xmlType), javaType);
return (fPair != null ? fPair.getSerializerFactory() : null);
}
@@ -121,7 +108,7 @@
*/
public boolean isRegistered(Class javaType, QName xmlType)
{
- return getFactoryPair(xmlType, javaType) != null;
+ return getFactoryPair(new IQName(xmlType), javaType) != null;
}
/**
@@ -136,10 +123,11 @@
public void register(Class javaType, QName xmlType, SerializerFactory sf, DeserializerFactory df)
{
log.debug("register: TypeMappingImpl@" + hashCode() + " [xmlType=" + xmlType + ",javaType=" + javaType.getName() + ",sf=" + sf + ",df=" + df + "]");
- registerInternal(javaType, xmlType, sf, df);
+ registerInternal(javaType, new IQName(xmlType), sf, df);
+ keyPairCache.clear();
}
- void registerInternal(Class javaType, QName xmlType, SerializerFactory sf, DeserializerFactory df)
+ private void registerInternal(Class javaType, IQName xmlType, SerializerFactory sf, DeserializerFactory df)
{
if (javaType == null)
throw new IllegalArgumentException("javaType cannot be null for: " + xmlType);
@@ -159,7 +147,7 @@
*/
public void removeDeserializer(Class javaType, QName xmlType)
{
- FactoryPair fPair = getFactoryPair(xmlType, javaType);
+ FactoryPair fPair = getFactoryPair(new IQName(xmlType), javaType);
if (fPair != null)
fPair.setDeserializerFactory(null);
}
@@ -172,7 +160,7 @@
*/
public void removeSerializer(Class javaType, QName xmlType)
{
- FactoryPair fPair = getFactoryPair(xmlType, javaType);
+ FactoryPair fPair = getFactoryPair(new IQName(xmlType), javaType);
if (fPair != null)
fPair.setSerializerFactory(null);
}
@@ -183,7 +171,7 @@
List<QName> types = new ArrayList<QName>();
for (KeyPair keyPair : getKeyPairs(null, null))
{
- types.add(keyPair.getXmlType());
+ types.add(keyPair.getXmlType().toQName());
}
return types;
}
@@ -204,7 +192,7 @@
{
Class javaType = null;
- List keyPairList = getKeyPairs(xmlType, null);
+ List keyPairList = getKeyPairs(new IQName(xmlType), null);
int size = keyPairList.size();
if (size > 0)
{
@@ -220,17 +208,17 @@
*/
public List<Class> getJavaTypes(QName xmlType)
{
- List<KeyPair> keyPairList = getKeyPairs(xmlType, null);
+ List<KeyPair> keyPairList = getKeyPairs( new IQName(xmlType), null);
List<Class> classes = new ArrayList<Class>(keyPairList.size());
-
+
for (KeyPair current : keyPairList)
{
classes.add(current.getJavaType());
}
-
+
return classes;
}
-
+
/**
* Get the Class that was registered last for this xmlType
* If there are two Java Types registered for the xmlType
@@ -242,7 +230,7 @@
//Lets get the primitive type if available
Class javaType = null;
- List keyPairList = getKeyPairs(xmlType, null);
+ List keyPairList = getKeyPairs(new IQName(xmlType), null);
int size = keyPairList.size();
if (size == 2 && getPrimitive)
{
@@ -253,10 +241,10 @@
if(javaType2.isPrimitive() && !javaType1.isPrimitive())
javaType = javaType2;
else
- if(javaType1.isPrimitive() && !javaType2.isPrimitive())
- javaType = javaType1;
+ if(javaType1.isPrimitive() && !javaType2.isPrimitive())
+ javaType = javaType1;
else
- javaType = javaType2; //Fallback on the most latest
+ javaType = javaType2; //Fallback on the most latest
}
else
return getJavaType(xmlType);
@@ -281,7 +269,7 @@
if (size > 0)
{
KeyPair kPair = (KeyPair)keyPairList.get(size - 1);
- xmlType = kPair.getXmlType();
+ xmlType = kPair.getXmlType().toQName();
}
return xmlType;
@@ -305,7 +293,7 @@
if (size > 0)
{
KeyPair kPair = (KeyPair)keyPairList.get(size - 1);
- xmlType = kPair.getXmlType();
+ xmlType = kPair.getXmlType().toQName();
}
return xmlType;
@@ -315,9 +303,34 @@
* Get the serializer/deserializer factory pair for the given xmlType, javaType
* Both xmlType, javaType may be null. In that case, this implementation still
* returns a FactoryPair if there is only one possible match.
+ *
+ * @param xmlType can be null
+ * @param javaType can be null
*/
- List<KeyPair> getKeyPairs(QName xmlType, Class javaType)
+ private List<KeyPair> getKeyPairs(IQName xmlType, Class javaType)
{
+ Integer cacheId = cacheIdFor(javaType, xmlType);
+
+ List<KeyPair> keyPairList = keyPairCache.get(cacheId);
+ if(null == keyPairList)
+ {
+ keyPairList = getKeyPairsInternal(xmlType, javaType);
+ keyPairCache.put(cacheId, keyPairList);
+ }
+
+ return keyPairList;
+ }
+
+ private Integer cacheIdFor(Class javaType, IQName xmlType) {
+ int result = HashCodeUtil.SEED;
+ int nullHash = HashCodeUtil.hash(result, "null");
+ result = javaType!= null ? HashCodeUtil.hash(result, javaType.getName()) : HashCodeUtil.hash(result, nullHash);
+ result = xmlType!= null ? HashCodeUtil.hash(result, xmlType.hashCode()): HashCodeUtil.hash(result, nullHash);
+ return new Integer(result);
+ }
+
+ private List<KeyPair> getKeyPairsInternal(IQName xmlType, Class javaType)
+ {
List<KeyPair> keyPairList = new ArrayList<KeyPair>();
// Getting the exact matching pair
@@ -387,6 +400,20 @@
return keyPairList;
}
+ private List<KeyPair> getKeyPairs(IQName xmlType, Class javaType, boolean tryAssignable)
+ {
+ Integer cacheId = cacheIdFor(javaType, xmlType);
+
+ List<KeyPair> keyPairList = keyPairCache.get(cacheId);
+ if(null == keyPairList)
+ {
+ keyPairList = getKeyPairsInternal(xmlType, javaType, tryAssignable);
+ keyPairCache.put(cacheId, keyPairList);
+ }
+
+ return keyPairList;
+ }
+
/**
* Get the serializer/deserializer factory pair for the given xmlType, javaType
* Both xmlType, javaType may be null. In that case, this implementation still
@@ -394,9 +421,9 @@
* <br>Note: This method does not try for the base class, if no keypair exists for the
* javaType in question.
*/
- List<KeyPair> getKeyPairs(QName xmlType, Class javaType, boolean tryAssignable)
+ private List<KeyPair> getKeyPairsInternal(IQName xmlType, Class javaType, boolean tryAssignable)
{
- if(tryAssignable) return getKeyPairs( xmlType, javaType);
+ if(tryAssignable) return getKeyPairs( xmlType, javaType );
List<KeyPair> keyPairList = new ArrayList<KeyPair>();
@@ -450,7 +477,7 @@
* Both xmlType, javaType may be null. In that case, this implementation still
* returns a FactoryPair that was last registered
*/
- FactoryPair getFactoryPair(QName xmlType, Class javaType)
+ private FactoryPair getFactoryPair(IQName xmlType, Class javaType)
{
FactoryPair fPair = null;
@@ -467,85 +494,85 @@
protected void registerStandardLiteralTypes()
{
- registerInternal(BigDecimal.class, Constants.TYPE_LITERAL_DECIMAL, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(BigDecimal.class, Constants.TYPE_LITERAL_DECIMAL, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(BigInteger.class, Constants.TYPE_LITERAL_POSITIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(BigInteger.class, Constants.TYPE_LITERAL_NEGATIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(BigInteger.class, Constants.TYPE_LITERAL_NONPOSITIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(BigInteger.class, Constants.TYPE_LITERAL_NONNEGATIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(BigInteger.class, Constants.TYPE_LITERAL_UNSIGNEDLONG, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(BigInteger.class, Constants.TYPE_LITERAL_INTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(BigInteger.class, Constants.TYPE_LITERAL_POSITIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(BigInteger.class, Constants.TYPE_LITERAL_NEGATIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(BigInteger.class, Constants.TYPE_LITERAL_NONPOSITIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(BigInteger.class, Constants.TYPE_LITERAL_NONNEGATIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(BigInteger.class, Constants.TYPE_LITERAL_UNSIGNEDLONG, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(BigInteger.class, Constants.TYPE_LITERAL_INTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(Date.class, Constants.TYPE_LITERAL_DATETIME, new DateSerializerFactory(), new DateDeserializerFactory());
+ register(Date.class, Constants.TYPE_LITERAL_DATETIME, new DateSerializerFactory(), new DateDeserializerFactory());
- registerInternal(Calendar.class, Constants.TYPE_LITERAL_DATE, new CalendarSerializerFactory(), new CalendarDeserializerFactory());
- registerInternal(Calendar.class, Constants.TYPE_LITERAL_TIME, new CalendarSerializerFactory(), new CalendarDeserializerFactory());
- registerInternal(Calendar.class, Constants.TYPE_LITERAL_DATETIME, new CalendarSerializerFactory(), new CalendarDeserializerFactory());
+ register(Calendar.class, Constants.TYPE_LITERAL_DATE, new CalendarSerializerFactory(), new CalendarDeserializerFactory());
+ register(Calendar.class, Constants.TYPE_LITERAL_TIME, new CalendarSerializerFactory(), new CalendarDeserializerFactory());
+ register(Calendar.class, Constants.TYPE_LITERAL_DATETIME, new CalendarSerializerFactory(), new CalendarDeserializerFactory());
- registerInternal(QName.class, Constants.TYPE_LITERAL_QNAME, new QNameSerializerFactory(), new QNameDeserializerFactory());
+ register(QName.class, Constants.TYPE_LITERAL_QNAME, new QNameSerializerFactory(), new QNameDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_LITERAL_ANYSIMPLETYPE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_LITERAL_DURATION, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_LITERAL_GDAY, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_LITERAL_GMONTH, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_LITERAL_GMONTHDAY, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_LITERAL_GYEAR, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_LITERAL_GYEARMONTH, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_LITERAL_ID, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_LITERAL_LANGUAGE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_LITERAL_NAME, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_LITERAL_NCNAME, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_LITERAL_NMTOKEN, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_LITERAL_NORMALIZEDSTRING, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_LITERAL_TOKEN, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String.class, Constants.TYPE_LITERAL_STRING, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_LITERAL_ANYSIMPLETYPE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_LITERAL_DURATION, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_LITERAL_GDAY, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_LITERAL_GMONTH, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_LITERAL_GMONTHDAY, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_LITERAL_GYEAR, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_LITERAL_GYEARMONTH, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_LITERAL_ID, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_LITERAL_LANGUAGE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_LITERAL_NAME, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_LITERAL_NCNAME, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_LITERAL_NMTOKEN, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_LITERAL_NORMALIZEDSTRING, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_LITERAL_TOKEN, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_LITERAL_STRING, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(String[].class, Constants.TYPE_LITERAL_NMTOKENS, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String[].class, Constants.TYPE_LITERAL_NMTOKENS, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(URI.class, Constants.TYPE_LITERAL_ANYURI, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(URI.class, Constants.TYPE_LITERAL_ANYURI, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(boolean.class, Constants.TYPE_LITERAL_BOOLEAN, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(Boolean.class, Constants.TYPE_LITERAL_BOOLEAN, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(boolean.class, Constants.TYPE_LITERAL_BOOLEAN, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Boolean.class, Constants.TYPE_LITERAL_BOOLEAN, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(byte.class, Constants.TYPE_LITERAL_BYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(Byte.class, Constants.TYPE_LITERAL_BYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(byte.class, Constants.TYPE_LITERAL_BYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Byte.class, Constants.TYPE_LITERAL_BYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(Byte[].class, Constants.TYPE_LITERAL_HEXBINARY, new HexSerializerFactory(), new HexDeserializerFactory());
- registerInternal(byte[].class, Constants.TYPE_LITERAL_HEXBINARY, new HexSerializerFactory(), new HexDeserializerFactory());
+ register(Byte[].class, Constants.TYPE_LITERAL_HEXBINARY, new HexSerializerFactory(), new HexDeserializerFactory());
+ register(byte[].class, Constants.TYPE_LITERAL_HEXBINARY, new HexSerializerFactory(), new HexDeserializerFactory());
- registerInternal(Byte[].class, Constants.TYPE_LITERAL_BASE64BINARY, new Base64SerializerFactory(), new Base64DeserializerFactory());
- registerInternal(byte[].class, Constants.TYPE_LITERAL_BASE64BINARY, new Base64SerializerFactory(), new Base64DeserializerFactory());
+ register(Byte[].class, Constants.TYPE_LITERAL_BASE64BINARY, new Base64SerializerFactory(), new Base64DeserializerFactory());
+ register(byte[].class, Constants.TYPE_LITERAL_BASE64BINARY, new Base64SerializerFactory(), new Base64DeserializerFactory());
- registerInternal(double.class, Constants.TYPE_LITERAL_DOUBLE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(Double.class, Constants.TYPE_LITERAL_DOUBLE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(double.class, Constants.TYPE_LITERAL_DOUBLE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Double.class, Constants.TYPE_LITERAL_DOUBLE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(float.class, Constants.TYPE_LITERAL_FLOAT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(Float.class, Constants.TYPE_LITERAL_FLOAT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(float.class, Constants.TYPE_LITERAL_FLOAT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Float.class, Constants.TYPE_LITERAL_FLOAT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(int.class, Constants.TYPE_LITERAL_UNSIGNEDSHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(Integer.class, Constants.TYPE_LITERAL_UNSIGNEDSHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(int.class, Constants.TYPE_LITERAL_INT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(Integer.class, Constants.TYPE_LITERAL_INT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(int.class, Constants.TYPE_LITERAL_UNSIGNEDSHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Integer.class, Constants.TYPE_LITERAL_UNSIGNEDSHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(int.class, Constants.TYPE_LITERAL_INT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Integer.class, Constants.TYPE_LITERAL_INT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(long.class, Constants.TYPE_LITERAL_UNSIGNEDINT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(Long.class, Constants.TYPE_LITERAL_UNSIGNEDINT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(long.class, Constants.TYPE_LITERAL_LONG, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(Long.class, Constants.TYPE_LITERAL_LONG, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(long.class, Constants.TYPE_LITERAL_UNSIGNEDINT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Long.class, Constants.TYPE_LITERAL_UNSIGNEDINT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(long.class, Constants.TYPE_LITERAL_LONG, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Long.class, Constants.TYPE_LITERAL_LONG, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(short.class, Constants.TYPE_LITERAL_UNSIGNEDBYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(Short.class, Constants.TYPE_LITERAL_UNSIGNEDBYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(short.class, Constants.TYPE_LITERAL_SHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- registerInternal(Short.class, Constants.TYPE_LITERAL_SHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(short.class, Constants.TYPE_LITERAL_UNSIGNEDBYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Short.class, Constants.TYPE_LITERAL_UNSIGNEDBYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(short.class, Constants.TYPE_LITERAL_SHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Short.class, Constants.TYPE_LITERAL_SHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
}
/** A tuple of the type {XML typeQName, Java Class, SerializerFactory, DeserializerFactory}.
*/
- public static class KeyPair
+ private static class KeyPair
{
- private QName xmlType;
+ private IQName xmlType;
private Class javaType;
- public KeyPair(QName xmlType, Class javaType)
+ public KeyPair(IQName xmlType, Class javaType)
{
this.javaType = javaType;
this.xmlType = xmlType;
@@ -556,7 +583,7 @@
return javaType;
}
- public QName getXmlType()
+ public IQName getXmlType()
{
return xmlType;
}
@@ -621,4 +648,66 @@
this.serializerFactory = sf;
}
}
+
+ /**
+ * A duck typed QName that relies on internalized Strings.<p>
+ * Taken from the {@link javax.xml.namespace.QName} docs:<br>
+ * The value of a QName contains a Namespace URI, local part and prefix.
+ * The prefix is included in QName to retain lexical information when present in an XML input source.
+ * The prefix is NOT used in QName.equals(Object) or to compute the QName.hashCode().
+ * Equality and the hash code are defined using only the Namespace URI and local part.
+ * If not specified, the Namespace URI is set to "" (the empty string).
+ * If not specified, the prefix is set to "" (the empty string).
+ */
+ private final class IQName
+ {
+ public String namespace;
+ public String localPart;
+ public String prefix;
+ public int hash;
+
+ public IQName(QName name)
+ {
+ namespace = name.getNamespaceURI() != null ? name.getNamespaceURI().intern() : "".intern();
+ localPart = name.getLocalPart() != null ? name.getLocalPart().intern() : "".intern();
+ prefix = name.getPrefix() != null ? name.getPrefix().intern() : "".intern();
+ hash = name.hashCode();
+ }
+
+ public boolean equals(Object object) {
+ if(!(object instanceof IQName))
+ throw new IllegalArgumentException("Cannot compare IQName to " + object);
+
+ IQName iqn = (IQName)object;
+ return (iqn.namespace == this.namespace && iqn.localPart == this.localPart);
+ }
+
+ public QName toQName()
+ {
+ QName qname;
+
+ if(null == namespace)
+ qname = new QName(localPart);
+ else if(null == prefix)
+ qname = new QName(namespace, localPart);
+ else
+ qname = new QName(namespace, localPart, prefix);
+
+ return qname;
+ }
+
+ /**
+ * This implementation currently represents a QName as: "{" + Namespace URI + "}" + local part.
+ * If the Namespace URI .equals(""), only the local part is returned.
+ */
+ public String toString() {
+ String ns = "".equals(namespace) ? namespace : "{"+namespace+"}";
+ return ns+localPart;
+ }
+
+ public int hashCode()
+ {
+ return this.hash;
+ }
+ }
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java 2007-02-02 13:52:01 UTC (rev 2252)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java 2007-02-02 14:21:44 UTC (rev 2253)
@@ -30,6 +30,7 @@
import javax.xml.bind.JAXBException;
import org.jboss.ws.core.CommonMessageContext;
+import org.jboss.ws.core.utils.HashCodeUtil;
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
@@ -107,11 +108,11 @@
private static Integer buildId(Class[] classes)
{
- int sum = 0;
+ int sum = HashCodeUtil.SEED;
for (Class cls : classes)
{
- sum += cls.hashCode();
- }
+ sum = HashCodeUtil.hash(sum, cls.getName());
+ }
return new Integer(sum);
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-02-02 13:52:01 UTC (rev 2252)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-02-02 14:21:44 UTC (rev 2253)
@@ -64,30 +64,10 @@
String xmlFragment = null;
try
{
- TypeMappingImpl typeMapping = serContext.getTypeMapping();
+ // It needs to be a valid JAXB type
+ // Therefore we don't need to look into our TypeMapping
+ Class javaType = value.getClass();
- Class javaType = null;
- List<Class> possibleJavaTypes = typeMapping.getJavaTypes(xmlType);
- if(possibleJavaTypes.size()>1)
- {
- // resolve java type by assignability
- for(Class type : possibleJavaTypes)
- {
- if(JavaUtils.isAssignableFrom(type, value.getClass()))
- {
- javaType = type;
- break;
- }
- }
- }
- else
- {
- javaType = typeMapping.getJavaType(xmlType);
- }
-
- if(null == javaType)
- throw new Exception("Unable to resolve target java type");
-
JAXBContextCache contextCache = JAXBContextCache.getContextCache();
JAXBContext jaxbContext = contextCache.getInstance(javaType);
Added: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointDTO.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointDTO.java (rev 0)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointDTO.java 2007-02-02 14:21:44 UTC (rev 2253)
@@ -0,0 +1,70 @@
+/*
+ * 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.ws.core.server;
+
+import javax.management.ObjectName;
+
+/**
+ * @author Heiko.Braun(a)jboss.org
+ * @version $Id:$
+ * @since 02.02.2007
+ */
+public class ServiceEndpointDTO {
+
+ private ServiceEndpointMetrics seMetrics;
+ private ServiceEndpoint.State state;
+ private ObjectName sepID;
+ private String address;
+
+ public ServiceEndpointMetrics getSeMetrics() {
+ return seMetrics;
+ }
+
+ public void setSeMetrics(ServiceEndpointMetrics seMetrics) {
+ this.seMetrics = seMetrics;
+ }
+
+ public ServiceEndpoint.State getState() {
+ return state;
+ }
+
+ public void setState(ServiceEndpoint.State state) {
+ this.state = state;
+ }
+
+ public ObjectName getSepID() {
+ return sepID;
+ }
+
+ public void setSepID(ObjectName sepID) {
+ this.sepID = sepID;
+ }
+
+ public String getAddress() {
+ return address;
+ }
+
+ public void setAddress(String address) {
+ this.address = address;
+ }
+
+}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointManager.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointManager.java 2007-02-02 13:52:01 UTC (rev 2252)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointManager.java 2007-02-02 14:21:44 UTC (rev 2253)
@@ -34,6 +34,7 @@
import java.net.InetAddress;
import java.net.URL;
import java.net.UnknownHostException;
+import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -285,15 +286,7 @@
ObjectName sepID = (ObjectName)entry.getKey();
ServiceEndpoint wsEndpoint = (ServiceEndpoint)entry.getValue();
ServiceEndpointInfo seInfo = wsEndpoint.getServiceEndpointInfo();
- String endpointAddress = seInfo.getServerEndpointMetaData().getEndpointAddress();
- //pw.println("<tr><td>" + sepID.getCanonicalName() + "</td><td><a href='" + endpointAddress + "?wsdl'>" + endpointAddress + "?wsdl</a></td></tr>");
- URL displayURL = new URL(endpointAddress);
- String endPointPath = displayURL.getPath();
- if (this.getWebServiceHost().equals(ServiceEndpointManager.UNDEFINED_HOSTNAME) == true)
- {
- displayURL = requestURL;
- }
- String displayAddress = displayURL.getProtocol() + "://" + displayURL.getHost() + ":" + displayURL.getPort() + endPointPath;
+ String displayAddress = getDisplayAddress(seInfo, requestURL);
pw.println("<tr><td>" + sepID.getCanonicalName() + "</td><td><a href='" + displayAddress + "?wsdl'>" + displayAddress + "?wsdl</a></td></tr>");
}
pw.println("</table>");
@@ -302,6 +295,43 @@
return sw.toString();
}
+ public List<ServiceEndpointDTO> getRegisteredEndpoints(URL requestURL) throws java.net.MalformedURLException
+ {
+ List<ServiceEndpointDTO> registered = new ArrayList<ServiceEndpointDTO>();
+ Iterator it = registry.entrySet().iterator();
+ while (it.hasNext())
+ {
+ Map.Entry entry = (Map.Entry)it.next();
+ ObjectName sepID = (ObjectName)entry.getKey();
+ ServiceEndpoint wsEndpoint = (ServiceEndpoint)entry.getValue();
+ ServiceEndpointInfo seInfo = wsEndpoint.getServiceEndpointInfo();
+ String displayAddress = getDisplayAddress(seInfo, requestURL);
+
+ try {
+ ServiceEndpointDTO dto = new ServiceEndpointDTO();
+ dto.setSepID(sepID);
+ dto.setAddress(displayAddress);
+ dto.setSeMetrics((ServiceEndpointMetrics)wsEndpoint.getServiceEndpointMetrics().clone());
+ dto.setState(wsEndpoint.getState());
+ registered.add(dto);
+ } catch (CloneNotSupportedException e) { }
+ }
+
+ return registered;
+ }
+
+ private String getDisplayAddress(ServiceEndpointInfo seInfo, URL requestURL) throws MalformedURLException {
+ String endpointAddress = seInfo.getServerEndpointMetaData().getEndpointAddress();
+ URL displayURL = new URL(endpointAddress);
+ String endPointPath = displayURL.getPath();
+ if (this.getWebServiceHost().equals(ServiceEndpointManager.UNDEFINED_HOSTNAME) == true)
+ {
+ displayURL = requestURL;
+ }
+ String displayAddress = displayURL.getProtocol() + "://" + displayURL.getHost() + ":" + displayURL.getPort() + endPointPath;
+ return displayAddress;
+ }
+
/** Get the endpoint metrics
*/
public ServiceEndpointMetrics getServiceEndpointMetrics(ObjectName sepID)
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointMetrics.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointMetrics.java 2007-02-02 13:52:01 UTC (rev 2252)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointMetrics.java 2007-02-02 14:21:44 UTC (rev 2253)
@@ -34,7 +34,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 14-Dec-2005
*/
-public class ServiceEndpointMetrics implements Serializable
+public class ServiceEndpointMetrics implements Serializable, Cloneable
{
private static final long serialVersionUID = -7730514070812711512L;
@@ -172,4 +172,22 @@
buffer.append("\n totalProcessingTime=" + totalProcessingTime);
return buffer.toString();
}
+
+ protected Object clone() throws CloneNotSupportedException {
+ ServiceEndpointMetrics sem = new ServiceEndpointMetrics(this.endpointID);
+
+ sem.avgProcessingTime = this.avgProcessingTime;
+ sem.maxProcessingTime = this.maxProcessingTime;
+ sem.minProcessingTime = this.minProcessingTime;
+
+ sem.faultCount = this.faultCount;
+ sem.requestCount = this.requestCount;
+ sem.responseCount = this.responseCount;
+
+ sem.startTime = this.startTime;
+ sem.stopTime = this.stopTime;
+ sem.totalProcessingTime = this.totalProcessingTime;
+
+ return sem;
+ }
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-02-02 13:52:01 UTC (rev 2252)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-02-02 14:21:44 UTC (rev 2253)
@@ -140,7 +140,7 @@
completeHost = reqProtocol + "://" + hostAndPort;
}
- String newLocation = completeHost + reqPath + "?wsdl&resource=" + newResourcePath;
+ String newLocation = completeHost + reqPath + "?wsdl&resource=" + newResourcePath;
locationAttr.setNodeValue(newLocation);
log.trace("Mapping import from '" + orgLocation + "' to '" + newLocation + "'");
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-02-02 13:52:01 UTC (rev 2252)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-02-02 14:21:44 UTC (rev 2253)
@@ -68,6 +68,7 @@
Element domEnv = null;
try
{
+ // TODO: The parser unescapes special characters, which we need to escape later on again
domEnv = DOMUtils.parse(ins);
}
catch (IOException ex)
@@ -107,7 +108,7 @@
{
Element srcElement = (Element)it.next();
//registerNamespacesLocally(srcElement);
- String xmlFragment = DOMWriter.printNode(srcElement, false);
+ String xmlFragment = DOMWriter.printNode(srcElement, false, true);
Name name = new NameImpl(srcElement.getLocalName(), srcElement.getPrefix(), srcElement.getNamespaceURI());
SOAPContentElement destElement = new SOAPHeaderElementImpl(name);
@@ -201,7 +202,7 @@
DOMUtils.copyAttributes(destElement, srcElement);
- String xmlFragment = DOMWriter.printNode(srcElement, false);
+ String xmlFragment = DOMWriter.printNode(srcElement, false, true);
destElement.setXMLFragment(xmlFragment);
}
}
@@ -214,7 +215,7 @@
DOMUtils.copyAttributes(destElement, srcElement);
- String xmlFragment = DOMWriter.printNode(srcElement, false);
+ String xmlFragment = DOMWriter.printNode(srcElement, false, true);
destElement.setXMLFragment(xmlFragment);
}
else if (style == null)
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2007-02-02 13:52:01 UTC (rev 2252)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2007-02-02 14:21:44 UTC (rev 2253)
@@ -186,6 +186,9 @@
throw new WSException("javax.xml.soap.Text should take care of this");
org.w3c.dom.Node child = (org.w3c.dom.Node)getFirstChild();
+
+ value = DOMWriter.normalize(value, false);
+
if (child instanceof org.w3c.dom.Text)
((org.w3c.dom.Text)child).setNodeValue(value);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java 2007-02-02 13:52:01 UTC (rev 2252)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java 2007-02-02 14:21:44 UTC (rev 2253)
@@ -207,6 +207,8 @@
QName xmlType = getXmlType();
Class javaType = getJavaType();
+ QName xmlName = getElementQName();
+
log.debug("getXMLFragment from Object [xmlType=" + xmlType + ",javaType=" + javaType + "]");
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
@@ -218,7 +220,6 @@
TypeMappingImpl typeMapping = serContext.getTypeMapping();
- QName xmlName = getElementQName();
try
{
SerializerSupport ser;
@@ -232,9 +233,10 @@
ser = new NullValueSerializer();
}
- xmlFragment = ser.serialize(xmlName, xmlType, getObjectValue(), serContext, null);
- log.debug("xmlFragment: " + xmlFragment);
- invalidateObjectContent();
+ String tmpFragment = ser.serialize(xmlName, xmlType, getObjectValue(), serContext, null);
+ log.debug("xmlFragment: " + tmpFragment);
+
+ setXMLFragment(tmpFragment);
}
catch (BindingException e)
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementWriter.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementWriter.java 2007-02-02 13:52:01 UTC (rev 2252)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementWriter.java 2007-02-02 14:21:44 UTC (rev 2253)
@@ -112,6 +112,8 @@
// This is expensive. Make sure it only happens for debugging
try
{
+ // TODO: this unescapes sepcial chars, which might be quiet confusing
+ // but they are actually send escaped.
xmlStr = DOMWriter.printNode(DOMUtils.parse(xmlStr), true);
}
catch (IOException ex)
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/DOMWriter.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/DOMWriter.java 2007-02-02 13:52:01 UTC (rev 2252)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/DOMWriter.java 2007-02-02 14:21:44 UTC (rev 2253)
@@ -57,23 +57,14 @@
// $Id$
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
+import org.jboss.logging.Logger;
+import org.w3c.dom.*;
+
+import java.io.*;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.jboss.logging.Logger;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
/**
* Traverse a DOM tree in order to print a document that is parsed.
*
@@ -103,6 +94,8 @@
// True if we want namespace completion
private boolean completeNamespaces = true;
+ private boolean escapeCharacters = false;
+
public DOMWriter(Writer w)
{
this.out = new PrintWriter(w);
@@ -144,7 +137,7 @@
/**
* Print a node with explicit prettyprinting.
* The defaults for all other DOMWriter properties apply.
- *
+ * Special characters will not be escaped.
*/
public static String printNode(Node node, boolean prettyprint)
{
@@ -153,6 +146,19 @@
return strw.toString();
}
+ /**
+ * Print a node with explicit prettyprinting.
+ * Special characters can be escaped. This is idiot proof
+ * but can be very expensive.
+ *
+ */
+ public static String printNode(Node node, boolean prettyprint, boolean escape)
+ {
+ StringWriter strw = new StringWriter();
+ new DOMWriter(strw).setPrettyprint(prettyprint).setEscapeCharacters(escape).print(node);
+ return strw.toString();
+ }
+
public boolean isCanonical()
{
return canonical;
@@ -168,6 +174,11 @@
return this;
}
+ public DOMWriter setEscapeCharacters(boolean b)
+ {
+ this.escapeCharacters = b;
+ return this;
+ }
/**
* Set wheter subelements should have their namespaces completed.
* Setting this to false may lead to invalid XML fragments.
@@ -287,7 +298,7 @@
Attr attr = attrs[i];
String atPrefix = attr.getPrefix();
String atName = attr.getNodeName();
- String atValue = normalize(attr.getNodeValue(), canonical);
+ String atValue = escapeCharacters ? normalize(attr.getNodeValue(), canonical) : attr.getNodeValue();
if (atPrefix != null && !atPrefix.equals("xmlns") && !atPrefix.equals("xml"))
{
@@ -394,7 +405,7 @@
// print text
case Node.TEXT_NODE:
{
- String text = normalize(node.getNodeValue(), canonical);
+ String text = escapeCharacters ? normalize(node.getNodeValue(), canonical) : node.getNodeValue();
if (prettyprint == false || text.trim().length() > 0)
out.print(text);
break;
Added: trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java (rev 0)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java 2007-02-02 14:21:44 UTC (rev 2253)
@@ -0,0 +1,134 @@
+/*
+ * 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.ws.core.utils;
+
+import java.lang.reflect.Array;
+
+/**
+* Collected methods which allow easy implementation of <code>hashCode</code>.
+*
+* Example use case:
+* <pre>
+* public int hashCode(){
+* int result = HashCodeUtil.SEED;
+* //collect the contributions of various fields
+* result = HashCodeUtil.hash(result, fPrimitive);
+* result = HashCodeUtil.hash(result, fObject);
+* result = HashCodeUtil.hash(result, fArray);
+* return result;
+* }
+* </pre>
+*/
+public final class HashCodeUtil {
+
+ /**
+ * An initial value for a <code>hashCode</code>, to which is added contributions
+ * from fields. Using a non-zero value decreases collisons of <code>hashCode</code>
+ * values.
+ */
+ public static final int SEED = 23;
+
+ /**
+ * booleans.
+ */
+ public static int hash( int aSeed, boolean aBoolean ) {
+ return firstTerm( aSeed ) + ( aBoolean ? 1 : 0 );
+ }
+
+ /**
+ * chars.
+ */
+ public static int hash( int aSeed, char aChar ) {
+ return firstTerm( aSeed ) + (int)aChar;
+ }
+
+ /**
+ * ints.
+ */
+ public static int hash( int aSeed , int aInt ) {
+ /*
+ * Implementation Note
+ * Note that byte and short are handled by this method, through
+ * implicit conversion.
+ */
+ return firstTerm( aSeed ) + aInt;
+ }
+
+ /**
+ * longs.
+ */
+ public static int hash( int aSeed , long aLong ) {
+ return firstTerm(aSeed) + (int)( aLong ^ (aLong >>> 32) );
+ }
+
+ /**
+ * floats.
+ */
+ public static int hash( int aSeed , float aFloat ) {
+ return hash( aSeed, Float.floatToIntBits(aFloat) );
+ }
+
+ /**
+ * doubles.
+ */
+ public static int hash( int aSeed , double aDouble ) {
+ return hash( aSeed, Double.doubleToLongBits(aDouble) );
+ }
+
+ /**
+ * <code>aObject</code> is a possibly-null object field, and possibly an array.
+ *
+ * If <code>aObject</code> is an array, then each element may be a primitive
+ * or a possibly-null object.
+ */
+ public static int hash( int aSeed , Object aObject ) {
+ int result = aSeed;
+ if ( aObject == null) {
+ result = hash(result, 0);
+ }
+ else if ( ! isArray(aObject) ) {
+ result = hash(result, aObject.hashCode());
+ }
+ else {
+ int length = Array.getLength(aObject);
+ for ( int idx = 0; idx < length; ++idx ) {
+ Object item = Array.get(aObject, idx);
+ //recursive call!
+ result = hash(result, item);
+ }
+ }
+ return result;
+ }
+
+
+ /// PRIVATE ///
+ private static final int fODD_PRIME_NUMBER = 37;
+
+ private static int firstTerm( int aSeed ){
+ return fODD_PRIME_NUMBER * aSeed;
+ }
+
+ private static boolean isArray(Object aObject){
+ return aObject.getClass().isArray();
+ }
+}
+
Modified: trunk/jbossws-core/src/main/resources/jbossws.war/index.html
===================================================================
--- trunk/jbossws-core/src/main/resources/jbossws.war/index.html 2007-02-02 13:52:01 UTC (rev 2252)
+++ trunk/jbossws-core/src/main/resources/jbossws.war/index.html 2007-02-02 14:21:44 UTC (rev 2253)
@@ -1,19 +1,63 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>JBossWS</title>
-<link rel="stylesheet" href="./styles.css">
+<html><head>
+<meta http-equiv='Content-Type content='text/html; charset=iso-8859-1'>
+<title>JBossWS / jbossws-2.0.0.CR3 (date=200702012001)</title>
+<link rel='stylesheet' href='./styles.css'>
</head>
<body>
-<h3>Welcome to JBoss Web Services</h3>
+<div class='pageHeader'>Welcome to JBoss Web Services</div>
-J2EE compatible webservices.
-<p/>
+<div class="pageSection">
+<h2>J2EE compatible web services</h2>
+After JBoss J2EE-1.4 certification in Jun/2004 we have decided to develop our own JAX-RPC 1.1 / JAX-WS compliant SOAP stack that fits better in the overall JBoss architecture and is generally more suiteable for the specific J2EE requirements for web services.
+</div>
+<div class="pageSection">
+<h3>Administration</h3>
+
+<fieldset>
+ <legend><b>Runtime information</b></legend>
<ul>
- <li> <a href="services">View</a> the list of deployed Web Services </li>
+ <li><a href="services">View a list of deployed services</a></li>
+ <!--li><a href="depends">View installed dependencies</a></li-->
+ <li><a href="/jmx-console/">Access JMX console</a></li>
</ul>
+</fieldset>
+</div>
+<div class="pageSection">
+<h3>Project information</h3>
+
+<fieldset>
+ <legend><b>Documentation</b></legend>
+
+<ul>
+ <li><a href="http://labs.jboss.com/portal/jbossws/downloads">Latest download and samples</a></li>
+ <li><a href="http://www.jboss.org/wiki/Wiki.jsp?page=JBWSFAQ">FAQ</a></li>
+ <li><a href="http://labs.jboss.com/jbossws/user-guide/en/html/index.html">User guide</a></li>
+ <li><a href="http://www.jboss.org/wiki/Wiki.jsp?page=JBossWS">JBossWS WIKI</a></li>
+</ul>
+</fieldset>
+
+</br>
+<fieldset>
+ <legend><b>Community</b></legend>
+<ul>
+ <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=200">User forum</a></li>
+ <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=174">Design forum</a></li>
+ <li><a href="https://lists.jboss.org/mailman/listinfo/jbossws-users">Mailing list</a></li>
+</ul>
+</fieldset>
+
+</br>
+<fieldset>
+ <legend><b>Source repository</b></legend>
+<ul>
+ <li><a href="http://wiki.jboss.org/wiki/Wiki.jsp?page=JBWSFAQSourceRepository">Subversion repository</a></li>
+ <li><a href="http://fisheye.jboss.com/viewrep/JBossWS">Browse sources online</a></li>
+</ul>
+</fieldset>
+</div>
+
</body>
-</html>
+</html>
\ No newline at end of file
Modified: trunk/jbossws-core/src/main/resources/jbossws.war/styles.css
===================================================================
--- trunk/jbossws-core/src/main/resources/jbossws.war/styles.css 2007-02-02 13:52:01 UTC (rev 2252)
+++ trunk/jbossws-core/src/main/resources/jbossws.war/styles.css 2007-02-02 14:21:44 UTC (rev 2253)
@@ -7,9 +7,37 @@
.table_form {
}
+.pageHeader {
+ font-size: 14pt;
+ font-weight: BOLD;
+ color: #ffffff;
+ border-bottom-width:1px;
+ border-bottom-style:solid;
+ border-color:#000066;
+ margin-bottom:15px;
+ padding-left:15px;
+ padding-top:5px;
+ padding-bottom:5px;
+ background-color: #aaaadd;
+ max-width: 900px;
+}
+
+.pageSection {
+ padding-left:15px;
+ margin-bottom: 5px;
+ max-width: 900px;
+}
+
+.metrics
+{
+ font-size: 6pt;
+ background-color: #dddddd;
+ width: 100%;
+}
+
/* table row header */
.list_tr_head {
- font-family: Verdana;
+ font-family: Verdana, sans-serif;
font-size: 8pt;
font-weight: 600;
text-align: center;
@@ -18,7 +46,7 @@
/* table row list view */
.list_tr {
- font-family: Verdana;
+ font-family: Verdana, sans-serif;
font-size: 8pt;
color: #000066;
vertical-align: top;
@@ -27,7 +55,7 @@
/* table row list view odd lines */
.list_tr_even {
- font-family: Verdana;
+ font-family: Verdana, sans-serif;
font-size: 8pt;
color: #000066;
vertical-align: top;
@@ -36,7 +64,7 @@
/* table row list view even lines */
.list_tr_odd {
- font-family: Verdana;
+ font-family: Verdana, sans-serif;
font-size: 8pt;
color: #000066;
vertical-align: top;
@@ -45,7 +73,7 @@
/* form label */
.form_label {
- font-family: Verdana;
+ font-family: Verdana, sans-serif;
font-weight: 500;
font-size: 8pt;
color: #000066;
@@ -57,7 +85,7 @@
/* form value */
.form_value {
- font-family: Verdana;
+ font-family: Verdana, sans-serif;
font-size: 8pt;
color: #000066;
vertical-align: baseline;
@@ -65,7 +93,7 @@
/* tiny writing */
.tiny {
- font-family: Verdana;
+ font-family: Verdana, sans-serif;
font-size: 8pt;
color: #666666;
}
@@ -92,7 +120,7 @@
}
body {
- font-family: Verdana;
+ font-family: Verdana,, sans-serif;
font-size: 8pt;
color: #000066;
background-color: #ffffff;
@@ -100,28 +128,28 @@
/* title style */
h1 {
- font-family: Verdana;
+ font-family: Verdana, sans-serif;
font-size: 14pt;
font-weight: 600;
color: #000066;
}
h2 {
- font-family: Verdana;
+ font-family: Verdana, sans-serif;
font-size: 12pt;
font-weight: 600;
color: #000066;
}
h3 {
- font-family: Verdana;
+ font-family: Verdana, sans-serif;
font-size: 10pt;
font-weight: 600;
color: #000066;
}
h4 {
- font-family: Verdana;
+ font-family: Verdana, sans-serif;
font-size: 10pt;
font-weight: 500;
color: #000066;
@@ -129,26 +157,26 @@
/* table desk */
td {
- font-family: Verdana;
+ font-family: Verdana, sans-serif;
font-size: 8pt;
padding-left: 5px;
padding-right: 5px;
}
input, textarea, select, option {
- font-family: Verdana;
+ font-family: Verdana, sans-serif;
font-size: 8pt;
color: #000066;
}
a {
- font-family: Verdana;
+ font-family: Verdana, sans-serif;
color: #0000dd;
text-decoration: none;
}
a:hover{
- font-family: Verdana;
+ font-family: Verdana, sans-serif;
color: #cc0000;
text-decoration: none;
}
Modified: trunk/jbossws-tests/build.xml
===================================================================
--- trunk/jbossws-tests/build.xml 2007-02-02 13:52:01 UTC (rev 2252)
+++ trunk/jbossws-tests/build.xml 2007-02-02 14:21:44 UTC (rev 2253)
@@ -9,7 +9,7 @@
<!-- $Id$ -->
<project default="main" basedir="../jbossws-tests" name="JBossWS-Tests">
-
+
<import file="${basedir}/../build/ant-import/build-thirdparty.xml"/>
<import file="${basedir}/../build/ant-import/build-setup.xml"/>
<import file="${basedir}/../integration-jboss50/build.xml"/>
@@ -19,21 +19,21 @@
<import file="${basedir}/../jbossws-core/build.xml"/>
<import file="${basedir}/../jbossws-tests/ant-import/build-benchmark.xml"/>
<import file="${basedir}/../jbossws-tests/ant-import/jaxws-tools-delegate.xml"/>
-
+
<property name="core.output.dir" value="${core.dir}/output"/>
<property name="core.output.classes.dir" value="${core.output.dir}/classes"/>
<property name="core.output.classes14.dir" value="${core.output.dir}/classes14"/>
<property name="core.output.lib.dir" value="${core.output.dir}/lib"/>
-
+
<property name="tests.etc.dir" value="${tests.dir}/src/main/etc"/>
<property name="tests.java.dir" value="${tests.dir}/src/main/java"/>
<property name="tests.resources.dir" value="${tests.dir}/src/main/resources"/>
<property name="tests.output.dir" value="${tests.dir}/output"/>
-
+
<!-- ================================================================== -->
<!-- Setup -->
<!-- ================================================================== -->
-
+
<!-- Use -Ddebug=true for remote debugging -->
<condition property="remote.debug.line" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006">
<isset property="debug"/>
@@ -43,10 +43,10 @@
<isset property="debug"/>
</not>
</condition>
-
+
<!-- Available integration target -->
<property name="integration.target.${jbossws.integration.target}" value="true"/>
-
+
<!-- Define jboss.home -->
<condition property="jboss.home" value="${jboss50.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
@@ -57,7 +57,7 @@
<condition property="jboss.home" value="${jboss40.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss40"/>
</condition>
-
+
<!-- Integration Target Server -->
<condition property="jbossws.integration.target.jboss">
<isset property="jboss.home"/>
@@ -65,13 +65,13 @@
<condition property="jbossws.integration.target.tomcat">
<equals arg1="${jbossws.integration.target}" arg2="tomcat"/>
</condition>
-
+
<property name="jboss.client" value="${jboss.home}/client"/>
<property name="jboss.lib" value="${jboss.home}/lib"/>
<property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/>
<property name="jboss.server.lib" value="${jboss.server}/lib"/>
<property name="jboss.server.deploy" value="${jboss.server}/deploy"/>
-
+
<!-- Java Endorsed -->
<condition property="endorsed.dirs" value="${jboss.home}/lib/endorsed">
<isset property="jbossws.integration.target.jboss"/>
@@ -79,7 +79,7 @@
<condition property="endorsed.dirs" value="${tomcat.home}/common/endorsed">
<isset property="jbossws.integration.target.tomcat"/>
</condition>
-
+
<!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME
otherwise and initialize the node0/node1 cluster hostnames to localhost
and ${hostname} by default. If you cannot route multicast traffic between
@@ -96,26 +96,26 @@
<os family="windows"/>
</not>
</condition>
-
+
<!-- node0 defaults -->
<property name="node0" value="localhost"/>
<property name="node0.http.url" value="http://${node0}:8080"/>
<property name="node0.jndi.url" value="jnp://${node0}:1099"/>
<property name="node0.hajndi.url" value="jnp://${node0}:1100"/>
-
+
<!-- ================================================================== -->
<!-- Initialization -->
<!-- ================================================================== -->
-
+
<target name="prepare">
-
+
<mkdir dir="${tests.output.dir}/log"/>
<touch file="${tests.output.dir}/log/test.log"/>
-
+
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
</tstamp>
-
+
<!-- Define the jbossws.core.jar -->
<condition property="jbossws.core.jar" value="${core.output.lib.dir}/jbossws-core.jar">
<isset property="HAVE_JDK_1.5"/>
@@ -137,7 +137,7 @@
</condition>
<property name="excludes-short-name" value="tests-${jbossws.integration.target}-noejb3-excludes.txt"/>
<property name="excludesfile" value="${tests.resources.dir}/${excludes-short-name}"/>
-
+
<echo/>
<echo message="-----------------------------------------------"/>
<echo message="jboss.home = ${jboss.home}"/>
@@ -146,16 +146,16 @@
<echo message="endorsed = ${endorsed.dirs}"/>
<echo message="excludesfile = ${excludes-short-name}"/>
<echo message="-----------------------------------------------"/>
-
+
</target>
-
+
<!--
Init the various classpaths
-->
<target name="init" depends="prepare,jboss-classpath,tomcat-classpath"/>
-
+
<target name="common-classpath" depends="prepare,thirdparty">
-
+
<!-- The combined compile classpath -->
<path id="jbossws.jars.classpath">
<pathelement location="${jbossws.core.jar}"/>
@@ -163,12 +163,12 @@
<pathelement location="${core.output.lib.dir}/jboss-jaxrpc.jar"/>
<pathelement location="${core.output.lib.dir}/jboss-jaxws.jar"/>
<pathelement location="${core.output.lib.dir}/jboss-saaj.jar"/>
- <pathelement location="${jboss50.output.lib.dir}/jbossws-jboss50-integration.jar"/>
- <pathelement location="${jboss42.output.lib.dir}/jbossws-jboss42-integration.jar"/>
- <pathelement location="${jboss40.output.lib.dir}/jbossws-jboss40-integration.jar"/>
- <pathelement location="${tomcat.output.lib.dir}/jbossws-tomcat-integration.jar"/>
+ <pathelement location="${jboss50.output.lib.dir}/jbossws-jboss50-integration.jar"/>
+ <pathelement location="${jboss42.output.lib.dir}/jbossws-jboss42-integration.jar"/>
+ <pathelement location="${jboss40.output.lib.dir}/jbossws-jboss40-integration.jar"/>
+ <pathelement location="${tomcat.output.lib.dir}/jbossws-tomcat-integration.jar"/>
</path>
-
+
<!-- The combined compile classpath -->
<path id="javac.classpath">
<path refid="core.classpath"/>
@@ -185,9 +185,9 @@
<pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
</path>
</target>
-
+
<target name="jboss-classpath" depends="common-classpath" if="jbossws.integration.target.jboss">
-
+
<!-- The test client classpath -->
<path id="test.client.classpath">
<path refid="jbossws.jars.classpath"/>
@@ -199,14 +199,14 @@
<pathelement location="${jboss.client}/jbossretro-rt.jar"/>
<pathelement location="${jboss.client}/log4j.jar"/>
<pathelement location="${jboss.client}/jbossall-client.jar"/>
- <pathelement location="${jboss.lib}/jboss-vfs.jar"/>
+ <pathelement location="${jboss.lib}/jboss-vfs.jar"/>
<pathelement location="${jboss.server.lib}/hibernate3.jar"/>
- <pathelement location="${jboss.server.lib}/jboss.jar"/>
- <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
- <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
+ <pathelement location="${jboss.server.lib}/jboss.jar"/>
+ <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
+ <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
<path refid="javac.classpath"/>
</path>
-
+
<!-- The jBPM BPEL classpath -->
<path id="jbpm.bpel.classpath">
<path refid="jbossws.jars.classpath"/>
@@ -226,23 +226,23 @@
-->
</path>
</target>
-
+
<target name="tomcat-classpath" depends="common-classpath" if="jbossws.integration.target.tomcat">
<!-- The test client classpath -->
<path id="test.client.classpath">
<path refid="jbossws.jars.classpath"/>
- <pathelement location="${tomcat.common.lib}/jbossws-thirdparty.jar"/>
+ <pathelement location="${tomcat.common.lib}/jbossws-thirdparty.jar"/>
<path refid="javac.classpath"/>
</path>
</target>
-
-
+
+
<!-- ================================================================== -->
<!-- Compiling -->
<!-- ================================================================== -->
-
+
<target name="compile" depends="wsdl-java,compile14,compile15" description="Compile sources"/>
-
+
<target name="compile14" depends="init" unless="HAVE_JDK_1.5">
<mkdir dir="${tests.output.dir}/classes"/>
<javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
@@ -253,7 +253,7 @@
<classpath refid="javac.classpath"/>
</javac>
</target>
-
+
<target name="compile15" depends="init" if="HAVE_JDK_1.5">
<mkdir dir="${tests.output.dir}/classes"/>
<javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
@@ -262,7 +262,7 @@
<classpath refid="javac.classpath"/>
</javac>
</target>
-
+
<target name="post-compile" depends="init" description="Compile generated sources">
<mkdir dir="${tests.output.dir}/classes"/>
<javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
@@ -271,7 +271,7 @@
<classpath refid="javac.classpath"/>
</javac>
</target>
-
+
<target name="copy-resources" depends="init" description="Copy the deployment resources.">
<copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/jndi.properties"/>
<copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/log4j.xml"/>
@@ -295,18 +295,18 @@
</fileset>
</copy>
</target>
-
+
<!-- ================================================================== -->
<!-- Building -->
<!-- ================================================================== -->
-
+
<target name="main" depends="compile,copy-resources,java-wsdl,post-compile,copy-generated" description="Build the deployments.">
<ant antfile="${basedir}/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc" inheritall="true"/>
<ant antfile="${basedir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/>
<ant antfile="${basedir}/ant-import/build-jars-jaxrpc.xml" target="build-jars-jaxrpc" inheritall="true"/>
<ant antfile="${basedir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
</target>
-
+
<!--
Create artifacts that need to be compiled with the test cases
-->
@@ -314,23 +314,23 @@
<!-- interop -->
<callWsimport wsdlLocation="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" sourceDir="${tests.output.dir}/wstools/java"
destDir="${tests.output.dir}/classes" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" verbose="true"/>
-
+
<callWsimport wsdlLocation="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" sourceDir="${tests.output.dir}/wstools/java"
destDir="${tests.output.dir}/classes" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" verbose="true"/>
-
+
<callWsimport wsdlLocation="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" sourceDir="${tests.output.dir}/wstools/java"
destDir="${tests.output.dir}/classes" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" verbose="true"/>
-
+
<!-- benchmark -->
<callWsimport wsdlLocation="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" sourceDir="${tests.output.dir}/wstools/java"
destDir="${tests.output.dir}/classes" package="org.jboss.test.ws.benchmark.jaxws.doclit" verbose="true"/>
</target>
-
+
<!--
Create artifacts that depend on pre-compiled sources
-->
<target name="java-wsdl" depends="compile" description="Generate the deployment resources.">
-
+
<!-- create jbpm process archives -->
<mkdir dir="${tests.output.dir}/libs"/>
<zip destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip">
@@ -346,7 +346,7 @@
<servicegen processfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"
outputdir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl"
bindingfile="hello-binding-.wsdl" servicefile="hello-service.wsdl" />
-
+
<!-- generate mapping artifacts -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="core.classpath"/>
@@ -359,8 +359,8 @@
<classpath location="${thirdparty.dir}/concurrent.jar"/>
<classpath location="${tests.output.dir}/classes"/>
<classpath location="${tests.output.dir}"/>
- </taskdef>
-
+ </taskdef>
+
<mkdir dir="${tests.output.dir}/libs"/>
<mkdir dir="${tests.output.dir}/wstools/java"/>
<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/>
@@ -384,7 +384,7 @@
<fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/>
</move>
</target>
-
+
<target name="copy-generated" depends="init" description="Copy the deployment resources.">
<!-- Copy generated resources -->
<copy todir="${tests.output.dir}/resources">
@@ -401,11 +401,11 @@
</filterset>
</copy>
</target>
-
+
<!-- ================================================================== -->
<!-- Testing -->
<!-- ================================================================== -->
-
+
<!-- Run all unit tests and generate a report -->
<target name="tests" depends="main" description="Run all unit tests and generate a report">
<antcall target="tests-main">
@@ -413,7 +413,7 @@
</antcall>
<antcall target="tests-report"/>
</target>
-
+
<!-- Run samples test cases -->
<target name="tests-samples" depends="init" description="Run samples unit tests">
<antcall target="tests-main">
@@ -421,7 +421,7 @@
</antcall>
<antcall target="tests-report"/>
</target>
-
+
<!-- Run tools test cases -->
<target name="tests-tools" depends="init" description="Run tools unit tests">
<antcall target="tests-main">
@@ -429,7 +429,7 @@
</antcall>
<antcall target="tests-report"/>
</target>
-
+
<!--
Run a collection of unit tests.
ant -Dtest=tools test
@@ -439,7 +439,7 @@
<param name="include.wildcard" value="org/jboss/test/ws/${test}/**/*TestCase.class"/>
</antcall>
</target>
-
+
<!-- Common test target -->
<target name="tests-main" depends="init">
<mkdir dir="${tests.output.dir}/reports"/>
@@ -475,7 +475,7 @@
</batchtest>
</junit>
</target>
-
+
<!--
Run a single unit test.
ant -Dtest=org.jboss.test.ws.jaxrpc.samples.jsr109pojo.RpcJSETestCase one-test
@@ -524,11 +524,11 @@
<test todir="${tests.output.dir}/reports" name="${test}" fork="true"/>
</junit>
</target>
-
+
<!-- ================================================================== -->
<!-- Reporting -->
<!-- ================================================================== -->
-
+
<!-- Build the tests report -->
<target name="tests-report" depends="init" description="Build the tests report">
<junitreport todir="${tests.output.dir}/reports">
@@ -541,13 +541,13 @@
<fileset dir="${tests.output.dir}" includes="reports/**"/>
</zip>
</target>
-
+
<!-- ================================================================== -->
<!-- Cleaning -->
<!-- ================================================================== -->
-
+
<target name="clean" description="Delete all generated test files.">
<delete dir="${tests.output.dir}"/>
</target>
-
+
</project>
\ No newline at end of file
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java 2007-02-02 13:52:01 UTC (rev 2252)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java 2007-02-02 14:21:44 UTC (rev 2253)
@@ -29,6 +29,7 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.xml.rpc.Service;
+import javax.xml.rpc.Stub;
import java.util.Properties;
/**
@@ -54,7 +55,8 @@
{
InitialContext iniCtx = getInitialContext("benchmark-client");
Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkJSE");
- endpoint = (BenchmarkService)service.getPort(BenchmarkService.class);
+ endpoint = (BenchmarkService)service.getPort(BenchmarkService.class);
+
}
}
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java 2007-02-02 13:52:01 UTC (rev 2252)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java 2007-02-02 14:21:44 UTC (rev 2253)
@@ -62,7 +62,7 @@
endpoint = service.getPort(BenchmarkService.class);
((BindingProvider)endpoint).getRequestContext().put(
BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
- "http://"+getServerHost()+":8080/jaxws-benchmark-doc"
+ "http://"+getServerHost()+":8080/jaxws-benchmark-doc"
);
}
}
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java 2007-02-02 13:52:01 UTC (rev 2252)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java 2007-02-02 14:21:44 UTC (rev 2253)
@@ -189,7 +189,7 @@
Element domEl = DOMUtils.parse(expStr);
- String wasStr = DOMWriter.printNode(domEl, false);
+ String wasStr = DOMWriter.printNode(domEl, false, true);
assertEquals(expStr, wasStr);
}
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java 2007-02-02 13:52:01 UTC (rev 2252)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java 2007-02-02 14:21:44 UTC (rev 2253)
@@ -28,6 +28,7 @@
import javax.naming.InitialContext;
import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
+import javax.xml.rpc.Stub;
import junit.framework.Test;
@@ -59,7 +60,7 @@
{
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/StandardTypes");
- port = (StandardTypes)service.getPort(StandardTypes.class);
+ port = (StandardTypes)service.getPort(StandardTypes.class);
}
}
Modified: trunk/jbossws-tests/src/main/resources/benchmark/jmeter/JBossWS_Benchmark.jmx
===================================================================
--- trunk/jbossws-tests/src/main/resources/benchmark/jmeter/JBossWS_Benchmark.jmx 2007-02-02 13:52:01 UTC (rev 2252)
+++ trunk/jbossws-tests/src/main/resources/benchmark/jmeter/JBossWS_Benchmark.jmx 2007-02-02 14:21:44 UTC (rev 2253)
@@ -6,7 +6,7 @@
</elementProp>
<stringProp name="TestPlan.user_define_classpath"></stringProp>
<boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
- <boolProp name="TestPlan.functional_mode">true</boolProp>
+ <boolProp name="TestPlan.functional_mode">false</boolProp>
<stringProp name="TestPlan.comments"></stringProp>
</TestPlan>
<hashTree>
@@ -14,7 +14,7 @@
<longProp name="ThreadGroup.start_time">1144146988000</longProp>
<stringProp name="ThreadGroup.delay"></stringProp>
<stringProp name="ThreadGroup.duration"></stringProp>
- <stringProp name="ThreadGroup.num_threads">8</stringProp>
+ <stringProp name="ThreadGroup.num_threads">10</stringProp>
<boolProp name="ThreadGroup.scheduler">false</boolProp>
<elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
<intProp name="LoopController.loops">-1</intProp>
@@ -71,8 +71,8 @@
</SoapSampler>
<hashTree/>
<GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true">
- <stringProp name="ConstantTimer.delay">500</stringProp>
- <stringProp name="RandomTimer.range">100</stringProp>
+ <stringProp name="ConstantTimer.delay">100</stringProp>
+ <stringProp name="RandomTimer.range">50</stringProp>
</GaussianRandomTimer>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true">
@@ -129,7 +129,7 @@
<longProp name="ThreadGroup.start_time">1144146988000</longProp>
<stringProp name="ThreadGroup.delay"></stringProp>
<stringProp name="ThreadGroup.duration"></stringProp>
- <stringProp name="ThreadGroup.num_threads">8</stringProp>
+ <stringProp name="ThreadGroup.num_threads">10</stringProp>
<boolProp name="ThreadGroup.scheduler">false</boolProp>
<elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
<intProp name="LoopController.loops">-1</intProp>
@@ -185,8 +185,8 @@
</SoapSampler>
<hashTree/>
<GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true">
- <stringProp name="ConstantTimer.delay">1000</stringProp>
- <stringProp name="RandomTimer.range">200</stringProp>
+ <stringProp name="ConstantTimer.delay">100</stringProp>
+ <stringProp name="RandomTimer.range">50</stringProp>
</GaussianRandomTimer>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true">
@@ -243,7 +243,7 @@
<longProp name="ThreadGroup.start_time">1144146988000</longProp>
<stringProp name="ThreadGroup.delay"></stringProp>
<stringProp name="ThreadGroup.duration"></stringProp>
- <stringProp name="ThreadGroup.num_threads">8</stringProp>
+ <stringProp name="ThreadGroup.num_threads">10</stringProp>
<boolProp name="ThreadGroup.scheduler">false</boolProp>
<elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
<intProp name="LoopController.loops">-1</intProp>
@@ -299,8 +299,8 @@
</SoapSampler>
<hashTree/>
<GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true">
- <stringProp name="ConstantTimer.delay">500</stringProp>
- <stringProp name="RandomTimer.range">100</stringProp>
+ <stringProp name="ConstantTimer.delay">100</stringProp>
+ <stringProp name="RandomTimer.range">50</stringProp>
</GaussianRandomTimer>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true">
@@ -357,7 +357,7 @@
<longProp name="ThreadGroup.start_time">1144146988000</longProp>
<stringProp name="ThreadGroup.delay"></stringProp>
<stringProp name="ThreadGroup.duration"></stringProp>
- <stringProp name="ThreadGroup.num_threads">8</stringProp>
+ <stringProp name="ThreadGroup.num_threads">10</stringProp>
<boolProp name="ThreadGroup.scheduler">false</boolProp>
<elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
<intProp name="LoopController.loops">-1</intProp>
@@ -419,8 +419,8 @@
</SoapSampler>
<hashTree/>
<GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true">
- <stringProp name="ConstantTimer.delay">500</stringProp>
- <stringProp name="RandomTimer.range">100</stringProp>
+ <stringProp name="ConstantTimer.delay">100</stringProp>
+ <stringProp name="RandomTimer.range">50</stringProp>
</GaussianRandomTimer>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true">
@@ -477,7 +477,7 @@
<longProp name="ThreadGroup.start_time">1144146988000</longProp>
<stringProp name="ThreadGroup.delay"></stringProp>
<stringProp name="ThreadGroup.duration"></stringProp>
- <stringProp name="ThreadGroup.num_threads">8</stringProp>
+ <stringProp name="ThreadGroup.num_threads">10</stringProp>
<boolProp name="ThreadGroup.scheduler">false</boolProp>
<elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
<intProp name="LoopController.loops">-1</intProp>
@@ -534,8 +534,8 @@
</SoapSampler>
<hashTree/>
<GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true">
- <stringProp name="ConstantTimer.delay">500</stringProp>
- <stringProp name="RandomTimer.range">100</stringProp>
+ <stringProp name="ConstantTimer.delay">100</stringProp>
+ <stringProp name="RandomTimer.range">50</stringProp>
</GaussianRandomTimer>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true">
@@ -592,7 +592,7 @@
<longProp name="ThreadGroup.start_time">1144146988000</longProp>
<stringProp name="ThreadGroup.delay"></stringProp>
<stringProp name="ThreadGroup.duration"></stringProp>
- <stringProp name="ThreadGroup.num_threads">8</stringProp>
+ <stringProp name="ThreadGroup.num_threads">10</stringProp>
<boolProp name="ThreadGroup.scheduler">false</boolProp>
<elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
<intProp name="LoopController.loops">-1</intProp>
@@ -648,8 +648,8 @@
</SoapSampler>
<hashTree/>
<GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true">
- <stringProp name="ConstantTimer.delay">1000</stringProp>
- <stringProp name="RandomTimer.range">200</stringProp>
+ <stringProp name="ConstantTimer.delay">100</stringProp>
+ <stringProp name="RandomTimer.range">50</stringProp>
</GaussianRandomTimer>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true">
@@ -684,7 +684,7 @@
<longProp name="ThreadGroup.start_time">1144146988000</longProp>
<stringProp name="ThreadGroup.delay"></stringProp>
<stringProp name="ThreadGroup.duration"></stringProp>
- <stringProp name="ThreadGroup.num_threads">8</stringProp>
+ <stringProp name="ThreadGroup.num_threads">10</stringProp>
<boolProp name="ThreadGroup.scheduler">false</boolProp>
<elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
<intProp name="LoopController.loops">-1</intProp>
@@ -740,8 +740,8 @@
</SoapSampler>
<hashTree/>
<GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true">
- <stringProp name="ConstantTimer.delay">500</stringProp>
- <stringProp name="RandomTimer.range">100</stringProp>
+ <stringProp name="ConstantTimer.delay">100</stringProp>
+ <stringProp name="RandomTimer.range">50</stringProp>
</GaussianRandomTimer>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true">
@@ -798,7 +798,7 @@
<longProp name="ThreadGroup.start_time">1144146988000</longProp>
<stringProp name="ThreadGroup.delay"></stringProp>
<stringProp name="ThreadGroup.duration"></stringProp>
- <stringProp name="ThreadGroup.num_threads">8</stringProp>
+ <stringProp name="ThreadGroup.num_threads">10</stringProp>
<boolProp name="ThreadGroup.scheduler">false</boolProp>
<elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
<intProp name="LoopController.loops">-1</intProp>
@@ -860,8 +860,8 @@
</SoapSampler>
<hashTree/>
<GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true">
- <stringProp name="ConstantTimer.delay">500</stringProp>
- <stringProp name="RandomTimer.range">100</stringProp>
+ <stringProp name="ConstantTimer.delay">100</stringProp>
+ <stringProp name="RandomTimer.range">50</stringProp>
</GaussianRandomTimer>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true">
17 years, 3 months
- 1
- 0
JBossWS SVN: r2252 - in trunk/jbossws-tests/src/main: resources/benchmark/jaxrpc/doclit/META-INF and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-02 08:52:01 -0500 (Fri, 02 Feb 2007)
New Revision: 2252
Modified:
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java
trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/jboss-client.xml
trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/jboss.xml
trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/META-INF/jboss-client.xml
trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/META-INF/jboss.xml
Log:
Fix benchmark context name
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java 2007-02-02 13:25:09 UTC (rev 2251)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java 2007-02-02 13:52:01 UTC (rev 2252)
@@ -46,25 +46,13 @@
return JBossWSTestSetup.newTestSetup(BenchmarkDocEJBTestCase.class, "jaxrpc-benchmark-doclit.jar, jaxrpc-benchmark-doclit-client.jar");
}
- /** Get the client's env context
- */
- protected InitialContext getInitialContext() throws NamingException
- {
- Properties env = new Properties();
- env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
- env.setProperty(Context.URL_PKG_PREFIXES, "org.jboss.naming.client");
- env.setProperty(Context.PROVIDER_URL, "jnp://localhost:1099");
- env.setProperty("j2ee.clientName", "benchmark-client");
- return new InitialContext(env);
- }
-
protected void setUp() throws Exception
{
super.setUp();
if (endpoint == null)
{
- InitialContext iniCtx = getInitialContext();
+ InitialContext iniCtx = getInitialContext("benchmark-client");
Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkEJB");
endpoint = (BenchmarkService)service.getPort(BenchmarkService.class);
}
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java 2007-02-02 13:25:09 UTC (rev 2251)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java 2007-02-02 13:52:01 UTC (rev 2252)
@@ -46,25 +46,13 @@
return JBossWSTestSetup.newTestSetup(BenchmarkDocJSETestCase.class, "jaxrpc-benchmark-doclit.war, jaxrpc-benchmark-doclit-client.jar");
}
- /** Get the client's env context
- */
- protected InitialContext getInitialContext() throws NamingException
- {
- Properties env = new Properties();
- env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
- env.setProperty(Context.URL_PKG_PREFIXES, "org.jboss.naming.client");
- env.setProperty(Context.PROVIDER_URL, "jnp://localhost:1099");
- env.setProperty("j2ee.clientName", "benchmark-client");
- return new InitialContext(env);
- }
-
protected void setUp() throws Exception
{
super.setUp();
if (endpoint == null)
{
- InitialContext iniCtx = getInitialContext();
+ InitialContext iniCtx = getInitialContext("benchmark-client");
Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkJSE");
endpoint = (BenchmarkService)service.getPort(BenchmarkService.class);
}
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java 2007-02-02 13:25:09 UTC (rev 2251)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java 2007-02-02 13:52:01 UTC (rev 2252)
@@ -46,25 +46,13 @@
return JBossWSTestSetup.newTestSetup(BenchmarkRpcEJBTestCase.class, "jaxrpc-benchmark-rpclit.jar, jaxrpc-benchmark-rpclit-client.jar");
}
- /** Get the client's env context
- */
- protected InitialContext getInitialContext() throws NamingException
- {
- Properties env = new Properties();
- env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
- env.setProperty(Context.URL_PKG_PREFIXES, "org.jboss.naming.client");
- env.setProperty(Context.PROVIDER_URL, "jnp://localhost:1099");
- env.setProperty("j2ee.clientName", "benchmark-client");
- return new InitialContext(env);
- }
-
protected void setUp() throws Exception
{
super.setUp();
if (endpoint == null)
{
- InitialContext iniCtx = getInitialContext();
+ InitialContext iniCtx = getInitialContext("benchmark-client");
Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkEJB");
endpoint = (BenchmarkService)service.getPort(BenchmarkService.class);
}
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java 2007-02-02 13:25:09 UTC (rev 2251)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java 2007-02-02 13:52:01 UTC (rev 2252)
@@ -46,25 +46,13 @@
return JBossWSTestSetup.newTestSetup(BenchmarkRpcJSETestCase.class, "jaxrpc-benchmark-rpclit.war, jaxrpc-benchmark-rpclit-client.jar");
}
- /** Get the client's env context
- */
- protected InitialContext getInitialContext() throws NamingException
- {
- Properties env = new Properties();
- env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
- env.setProperty(Context.URL_PKG_PREFIXES, "org.jboss.naming.client");
- env.setProperty(Context.PROVIDER_URL, "jnp://localhost:1099");
- env.setProperty("j2ee.clientName", "benchmark-client");
- return new InitialContext(env);
- }
-
protected void setUp() throws Exception
{
super.setUp();
if (endpoint == null)
{
- InitialContext iniCtx = getInitialContext();
+ InitialContext iniCtx = getInitialContext("benchmark-client");
Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkJSE");
endpoint = (BenchmarkService)service.getPort(BenchmarkService.class);
}
Modified: trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/jboss-client.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/jboss-client.xml 2007-02-02 13:25:09 UTC (rev 2251)
+++ trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/jboss-client.xml 2007-02-02 13:52:01 UTC (rev 2252)
@@ -7,11 +7,11 @@
<service-ref>
<service-ref-name>service/BenchmarkJSE</service-ref-name>
- <wsdl-override>http://localhost:8080/benchmark-doc?wsdl</wsdl-override>
+ <wsdl-override>http://localhost:8080/jaxrpc-benchmark-doc?wsdl</wsdl-override>
</service-ref>
<service-ref>
<service-ref-name>service/BenchmarkEJB</service-ref-name>
- <wsdl-override>http://localhost:8080/benchmark-doc-ejb?wsdl</wsdl-override>
+ <wsdl-override>http://localhost:8080/jaxrpc-benchmark-doc-ejb?wsdl</wsdl-override>
</service-ref>
</jboss-client>
Modified: trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/jboss.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/jboss.xml 2007-02-02 13:25:09 UTC (rev 2251)
+++ trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/jboss.xml 2007-02-02 13:52:01 UTC (rev 2252)
@@ -8,7 +8,7 @@
<ejb-name>BenchmarkDocLit</ejb-name>
<port-component>
<port-component-name>BenchmarkDocLitEJBWS</port-component-name>
- <port-component-uri>/benchmark-doc-ejb/*</port-component-uri>
+ <port-component-uri>/jaxrpc-benchmark-doc-ejb/*</port-component-uri>
</port-component>
</session>
</enterprise-beans>
Modified: trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/META-INF/jboss-client.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/META-INF/jboss-client.xml 2007-02-02 13:25:09 UTC (rev 2251)
+++ trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/META-INF/jboss-client.xml 2007-02-02 13:52:01 UTC (rev 2252)
@@ -7,11 +7,11 @@
<service-ref>
<service-ref-name>service/BenchmarkJSE</service-ref-name>
- <wsdl-override>http://localhost:8080/benchmark-rpc?wsdl</wsdl-override>
+ <wsdl-override>http://localhost:8080/jaxrpc-benchmark-rpc?wsdl</wsdl-override>
</service-ref>
<service-ref>
<service-ref-name>service/BenchmarkEJB</service-ref-name>
- <wsdl-override>http://localhost:8080/benchmark-rpc-ejb?wsdl</wsdl-override>
+ <wsdl-override>http://localhost:8080/jaxrpc-benchmark-rpc-ejb?wsdl</wsdl-override>
</service-ref>
</jboss-client>
Modified: trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/META-INF/jboss.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/META-INF/jboss.xml 2007-02-02 13:25:09 UTC (rev 2251)
+++ trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/META-INF/jboss.xml 2007-02-02 13:52:01 UTC (rev 2252)
@@ -8,7 +8,7 @@
<ejb-name>BenchmarkRpcLit</ejb-name>
<port-component>
<port-component-name>BenchmarkRpcLitEJBWS</port-component-name>
- <port-component-uri>/benchmark-rpc-ejb/*</port-component-uri>
+ <port-component-uri>/jaxrpc-benchmark-rpc-ejb/*</port-component-uri>
</port-component>
</session>
</enterprise-beans>
17 years, 3 months
- 1
- 0
JBossWS SVN: r2251 - branches/jbossws-1.2.0.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-02 08:25:09 -0500 (Fri, 02 Feb 2007)
New Revision: 2251
Modified:
branches/jbossws-1.2.0/merge-info.txt
Log:
Merged to trunk -r2250
Modified: branches/jbossws-1.2.0/merge-info.txt
===================================================================
--- branches/jbossws-1.2.0/merge-info.txt 2007-02-02 13:13:28 UTC (rev 2250)
+++ branches/jbossws-1.2.0/merge-info.txt 2007-02-02 13:25:09 UTC (rev 2251)
@@ -1,3 +1,10 @@
+# $Id$
+
+02-Feb-2007 13:21 UTC
+svn merge -r2211:2217 https://svn.jboss.org/repos/jbossws/branches/jbossws-1.2.0
+svn merge -r2227:2229 https://svn.jboss.org/repos/jbossws/branches/jbossws-1.2.0
+svn merge -r2231:2249 https://svn.jboss.org/repos/jbossws/branches/jbossws-1.2.0
+
31-Jan-2007 09:36 UTC
svn merge -r2154:2177 https://svn.jboss.org/repos/jbossws/branches/jbossws-1.2.0
svn merge -r2180:2181 https://svn.jboss.org/repos/jbossws/branches/jbossws-1.2.0
17 years, 3 months
- 1
- 0
JBossWS SVN: r2250 - in trunk: build/ant-import and 89 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-02 08:13:28 -0500 (Fri, 02 Feb 2007)
New Revision: 2250
Added:
trunk/build/hudson/hudson-home/jobs/AS-4.0.5-jdk14/
trunk/build/hudson/hudson-home/jobs/AS-4.0.5-jdk14/config.xml
trunk/build/hudson/hudson-home/jobs/AS-4.0.5/
trunk/build/hudson/hudson-home/jobs/AS-4.0.5/config.xml
trunk/build/hudson/hudson-home/jobs/AS-4.0.5/lastSuccessful
trunk/integration-tomcat/src/main/resources/log4j.xml
trunk/jbossws-core/src/main/resources/samples/ant-import/
trunk/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml
trunk/jbossws-tests/ant-import/build-benchmark.xml
trunk/jbossws-tests/ant-import/build-samples-jaxrpc.xml
trunk/jbossws-tests/ant-import/build-samples-jaxws.xml
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/TestDeployer.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/TestDeployerJBoss.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/TestDeployerTomcat.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/XOPTestSupport.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/InlineHandler.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPBase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPHandlerTestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPing.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPingImpl.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPingService.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPTestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/InlineHandler.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPBase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPHandlerTestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPing.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPingImpl.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPingService.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPTestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/MTOMServiceBase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingDataHandler.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingDataHandlerResponse.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingImage.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingImageResponse.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingMsg.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingMsgResponse.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingSource.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingSourceResponse.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpoint.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpointImpl.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/circular.xsd
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF/application-client.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF/jboss-client.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/jaxrpc-mapping.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/web.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/webservices.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl/xsd0.xsd
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/attach.jpeg
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF/application-client.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF/jboss-client.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/WEB-INF/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/WEB-INF/webservices.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF/application-client.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF/jboss-client.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/jaxrpc-mapping.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/web.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/webservices.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/wsdl/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF/application-client.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF/jboss-client.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/WEB-INF/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/WEB-INF/webservices.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/schema.xsd
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/attach.jpeg
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/attach.txt
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/attach.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/disguised_jpeg.xcf
trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/
trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/META-INF/
trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/META-INF/application-client.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/META-INF/jboss-client.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/
trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/jaxrpc-mapping.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/jboss-web.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/web.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/webservices.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/
trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/
trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/TestServicePortType.wsdl
trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/bar/
trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/bar/TestService.wsdl
trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/wstools-config.xml
Removed:
trunk/build/hudson/hudson-home/jobs/AS-4.0.5-jdk14/config.xml
trunk/build/hudson/hudson-home/jobs/AS-4.0.5/config.xml
trunk/build/hudson/hudson-home/jobs/AS-4.0.5/lastSuccessful
trunk/integration-tomcat/src/main/resources/jbossws.war/WEB-INF/log4j.xml
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/XercesXSMarshallerImpl.java
trunk/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml
trunk/jbossws-core/src/main/resources/samples/common/
trunk/jbossws-core/src/main/resources/samples/jaxrpc/
trunk/jbossws-core/src/main/resources/samples/jaxws/
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossTestDeployer.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestDeployer.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/TomcatTestDeployer.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/InlineHandler.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPBase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPHandlerTestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPing.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPingImpl.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPingService.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPTestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/InlineHandler.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPBase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPHandlerTestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPing.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPingImpl.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPingService.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPTestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/MTOMServiceBase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingDataHandler.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingDataHandlerResponse.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingImage.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingImageResponse.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingMsg.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingMsgResponse.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingSource.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingSourceResponse.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpoint.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpointImpl.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/circular.xsd
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF/application-client.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF/jboss-client.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/jaxrpc-mapping.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/web.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/webservices.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl/xsd0.xsd
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/attach.jpeg
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF/application-client.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF/jboss-client.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/WEB-INF/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/WEB-INF/webservices.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF/application-client.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF/jboss-client.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/jaxrpc-mapping.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/web.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/webservices.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/wsdl/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF/application-client.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF/jboss-client.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/WEB-INF/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/WEB-INF/webservices.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/schema.xsd
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/attach.jpeg
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/attach.txt
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/attach.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/disguised_jpeg.xcf
trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/META-INF/
trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/META-INF/application-client.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/META-INF/jboss-client.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/
trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/jaxrpc-mapping.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/jboss-web.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/web.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/webservices.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/
trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/
trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/TestServicePortType.wsdl
trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/bar/
trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/bar/TestService.wsdl
trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/wstools-config.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/xop/
Modified:
trunk/build/ant-import/build-samples.xml
trunk/build/ant-import/build-setup.xml
trunk/build/ant-import/build-thirdparty.xml
trunk/build/hudson/hudson-home/config.xml
trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
trunk/build/version.properties
trunk/integration-jboss40/.classpath
trunk/integration-jboss40/build.xml
trunk/integration-jboss42/.classpath
trunk/integration-jboss42/build.xml
trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBossServiceEndpointServlet.java
trunk/integration-jboss50/.classpath
trunk/integration-jboss50/build.xml
trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java
trunk/integration-tomcat/.classpath
trunk/integration-tomcat/build.xml
trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/ServerConfigImpl.java
trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java
trunk/jbossws-core/.classpath
trunk/jbossws-core/build.xml
trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/SchemaBindingBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCDeployment.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/Configurable.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/ConfigurationProvider.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedPortComponentRefMetaData.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Config.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Encrypt.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Operation.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Port.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Requires.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Sign.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfiguration.java
trunk/jbossws-core/src/main/resources/samples/ant.properties.example
trunk/jbossws-core/src/main/resources/samples/build.xml
trunk/jbossws-core/src/main/resources/samples/version.properties
trunk/jbossws-docs/user-guide/project/en/modules/secureejb/secure-ejb.xml
trunk/jbossws-tests/.classpath
trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml
trunk/jbossws-tests/ant-import/build-jars-jaxws.xml
trunk/jbossws-tests/ant-import/jaxws-tools-delegate.xml
trunk/jbossws-tests/build.xml
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestSetup.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws424/META-INF/application-client.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/wsbpel/hello/wstools-config.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/wsse/username/META-INF/jboss-client.xml
trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt
trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt
Log:
Remove javax classes from jbossws-client.jar
Simplify Configurable, ConfigurationProvider
Fix tomcat deployment, add target container AS-4.0.5
Fix tomcat deployment, add target container AS-4.0.5
Include XOP in jaxrpc samples
Fix CTS regression wsdl-publish-location
Support <service-ref> call properties for jaxrpc
Enable EJB-2.1 deployments for jboss50
Remove XercesXSMarshaller hack for exception handling
Modified: trunk/build/ant-import/build-samples.xml
===================================================================
--- trunk/build/ant-import/build-samples.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/build/ant-import/build-samples.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -23,17 +23,43 @@
<copy todir="${build.src.samples.dir}">
<fileset dir="${core.samples.dir}">
- <include name="common/imported-build.xml"/>
- <include name="common/build-thirdparty.xml"/>
+ <include name="ant-import/build-thirdparty.xml"/>
<include name="ant.properties.example"/>
+ <include name="build.xml"/>
+ </fileset>
+ </copy>
+ <copy file="${build.src.samples.dir}/ant.properties.example" tofile="${build.src.samples.dir}/ant.properties"/>
+
+ <copy todir="${build.src.samples.dir}">
+ <fileset dir="${core.samples.dir}">
<include name="version.properties"/>
- <include name="**/build.xml"/>
</fileset>
<filterset>
<filtersfile file="${build.dir}/version.properties"/>
</filterset>
</copy>
+ <copy todir="${build.src.samples.dir}">
+ <fileset dir="${tests.dir}">
+ <include name="ant-import/build-samples-jaxrpc.xml"/>
+ <include name="ant-import/build-samples-jaxws.xml"/>
+ <include name="src/main/etc/*"/>
+ <include name="src/main/java/org/jboss/test/ws/jaxrpc/samples/**"/>
+ <include name="src/main/java/org/jboss/test/ws/jaxws/samples/**"/>
+ <include name="src/main/java/org/jboss/test/ws/*"/>
+ <include name="src/main/resources/jaxrpc/samples/**"/>
+ <include name="src/main/resources/jaxrpc/samples-override/**"/>
+ <include name="src/main/resources/jaxws/samples/**"/>
+ <include name="src/main/resources/*excludes.txt"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${build.src.samples.dir}/src/main">
+ <fileset dir="${core.samples.dir}">
+ <include name="etc/*"/>
+ </fileset>
+ </copy>
+
<mkdir dir="${build.src.samples.dir}/lib"/>
<copy todir="${build.src.samples.dir}/lib">
<fileset dir="${core.output.lib.dir}">
@@ -56,291 +82,6 @@
</fileset>
</copy>
- <!-- samples/common -->
- <mkdir dir="${build.src.samples.dir}/common/java"/>
- <mkdir dir="${build.src.samples.dir}/common/resources/overrides/jaxrpc/samples"/>
-
- <copy todir="${build.src.samples.dir}/common/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/*.java"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/common/resources">
- <fileset dir="${core.samples.dir}/common">
- <include name="tests-*-excludes.txt"/>
- <include name="jndi.properties"/>
- <include name="log4j.xml"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/common/resources/overrides/jaxrpc/samples">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples-override"/>
- </copy>
-
- <!-- samples/docstyle -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/docstyle/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/docstyle/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/docstyle/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/docstyle/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/docstyle"/>
- </copy>
-
- <!-- samples/dynamichandler -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/dynamichandler/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/dynamichandler/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/dynamichandler/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/dynamichandler/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/dynamichandler"/>
- </copy>
-
- <!-- samples/exception -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/exception/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/exception/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/exception/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/exception/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/exception/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/exception"/>
- </copy>
-
- <!-- samples/handler -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/handler/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/handler/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/handler/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/handler/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/handler/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/handler"/>
- </copy>
-
- <!-- samples/holder -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/holder/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/holder/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/holder/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/holder/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/holder/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/holder"/>
- </copy>
-
- <!-- samples/jmstransport -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/jmstransport/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/jmstransport/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/jmstransport/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/jmstransport/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/jmstransport"/>
- </copy>
-
- <!-- samples/jsr109ejb -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/jsr109ejb/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/jsr109ejb/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/jsr109ejb/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/jsr109ejb/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/jsr109ejb"/>
- </copy>
-
- <!-- samples/jsr109pojo -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/jsr109pojo/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/jsr109pojo/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/jsr109pojo/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/**/*"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/jsr109pojo/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/jsr109pojo"/>
- </copy>
-
- <!-- samples/message -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/message/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/message/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/message/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/message/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/message/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/message"/>
- </copy>
-
- <!-- samples/mtom -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/mtom/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/mtom/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/mtom/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/mtom/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/mtom/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/mtom"/>
- </copy>
-
- <!-- samples/oneway -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/oneway/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/oneway/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/oneway/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/oneway/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/oneway/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/oneway"/>
- </copy>
-
- <!-- samples/rpcstyle -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/rpcstyle/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/rpcstyle/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/rpcstyle/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/rpcstyle/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/rpcstyle"/>
- </copy>
-
- <!-- samples/secureejb -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/secureejb/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/secureejb/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/secureejb/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/secureejb/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/secureejb"/>
- </copy>
-
- <!-- samples/swa -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/swa/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/swa/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/swa/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/swa/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/swa/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/swa"/>
- </copy>
-
- <!-- samples/wsbpel -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/wsbpel/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/wsbpel/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/wsbpel/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/wsbpel/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel" />
- </copy>
-
- <!-- samples/wssecurity -->
- <mkdir dir="${build.src.samples.dir}/jaxrpc/wssecurity/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxrpc/wssecurity/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxrpc/wssecurity/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/**"/>
- <exclude name="org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxrpc/wssecurity/resources">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/wssecurity">
- <exclude name="store-pass-encrypt/**"/>
- </fileset>
- </copy>
-
- <!-- JAXWS samples - - - - - - - - - - - - - - - - - - - - - - -->
-
- <!-- samples/jsr181ejb -->
- <mkdir dir="${build.src.samples.dir}/jaxws/jsr181ejb/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxws/jsr181ejb/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxws/jsr181ejb/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxws/jsr181ejb/resources">
- <fileset dir="${tests.resources.dir}/jaxws/samples/jsr181ejb"/>
- </copy>
-
- <!-- samples/jsr181pojo -->
- <mkdir dir="${build.src.samples.dir}/jaxws/jsr181pojo/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxws/jsr181pojo/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxws/jsr181pojo/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxws/jsr181pojo/resources">
- <fileset dir="${tests.resources.dir}/jaxws/samples/jsr181pojo"/>
- </copy>
-
- <!-- samples/retail -->
- <mkdir dir="${build.src.samples.dir}/jaxws/retail/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxws/retail/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxws/retail/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxws/samples/retail/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxws/retail/resources">
- <fileset dir="${tests.resources.dir}/jaxws/samples/retail"/>
- </copy>
-
- <!-- samples/wsaddressing -->
- <mkdir dir="${build.src.samples.dir}/jaxws/wsaddressing/java"/>
- <mkdir dir="${build.src.samples.dir}/jaxws/wsaddressing/resources"/>
-
- <copy todir="${build.src.samples.dir}/jaxws/wsaddressing/java">
- <fileset dir="${tests.java.dir}">
- <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jaxws/wsaddressing/resources">
- <fileset dir="${tests.resources.dir}/jaxws/samples/wsaddressing"/>
- </copy>
-
<!-- Build the samples zip -->
<zip destfile="${build.output.dir}/${samples.target}.zip">
<fileset dir="${build.output.dir}">
Modified: trunk/build/ant-import/build-setup.xml
===================================================================
--- trunk/build/ant-import/build-setup.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/build/ant-import/build-setup.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -59,6 +59,7 @@
<property name="tomcat.webapps.dir" value="${tomcat.home}/webapps"/>
<property name="tomcat.common.dir" value="${tomcat.home}/common"/>
+ <property name="tomcat.common.classes" value="${tomcat.home}/common/classes"/>
<property name="tomcat.common.lib" value="${tomcat.home}/common/lib"/>
<available property="jboss50.available" file="${jboss50.client}/jboss-client.jar"/>
Modified: trunk/build/ant-import/build-thirdparty.xml
===================================================================
--- trunk/build/ant-import/build-thirdparty.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/build/ant-import/build-thirdparty.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -40,8 +40,8 @@
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/backport-concurrent/${jboss-backport-concurrent}/lib/jboss-backport-concurrent.jar" dest="${thirdparty.dir}/jboss-backport-concurrent.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/common/${jboss-common}/lib/jboss-common.jar" dest="${thirdparty.dir}/jboss-common.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/common/${jboss-common}/lib/jboss-common-sources.jar" dest="${thirdparty.dir}/jboss-common-sources.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/ejb3/${jboss-ejb3}/bin/ejb3.deployer" dest="${thirdparty.dir}/ejb3.deployer.zip" usetimestamp="true" verbose="true"/>
@@ -88,7 +88,7 @@
<pathelement location="${thirdparty.dir}/javassist.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-common.jar"/>
<pathelement location="${thirdparty.dir}/jboss-dependency.jar"/>
<pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/>
<pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/>
Modified: trunk/build/hudson/hudson-home/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/config.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/build/hudson/hudson-home/config.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -138,10 +138,12 @@
<owner reference="../../.."/>
<jobNames class="tree-set">
<no-comparator/>
+ <string>AS-5.0</string>
+ <string>AS-4.2</string>
<string>AS-4.0</string>
<string>AS-4.0-jdk14</string>
- <string>AS-4.2</string>
- <string>AS-5.0</string>
+ <string>AS-4.0.5</string>
+ <string>AS-4.0.5-jdk14</string>
<string>TC-5.5</string>
</jobNames>
<name>Target Container</name>
Copied: trunk/build/hudson/hudson-home/jobs/AS-4.0.5 (from rev 2249, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0.5)
Deleted: trunk/build/hudson/hudson-home/jobs/AS-4.0.5/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0.5/config.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/build/hudson/hudson-home/jobs/AS-4.0.5/config.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,53 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=AS-4.0.5
-SVNBASE=JBoss_4_0_5_GA
-
-#
-# checkout with an explicit version
-#
-if [ -d "$SVNBASE" ]; then
- svn up $SVNBASE
-else
- svn co https://svn.jboss.org/repos/jbossas/tags/JBoss_4_0_5_GA
-fi
-
-#
-# build jboss
-#
-cd $SVNBASE
-rm -f thirdparty/libraries.ent
-./build/build.sh clean main
-
-#
-# build the testsuite
-#
-cd testsuite
-./build.sh clean main
- </command>
- </hudson.tasks.Shell>
- </builders>
- <publishers class="vector">
- <!--hudson.tasks.Mailer>
- <recipients>@hudson.mail.recipients@</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>false</sendToIndividuals>
- <hudson.tasks.Mailer-->
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.NullSCM"/>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
- <description>Build AS-4.0.5</description>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/AS-4.0.5/config.xml (from rev 2249, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0.5/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-4.0.5/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/AS-4.0.5/config.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,53 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=AS-4.0.5
+SVNBASE=JBoss_4_0_5_GA
+
+#
+# checkout with an explicit version
+#
+if [ -d "$SVNBASE" ]; then
+ svn up $SVNBASE
+else
+ svn co https://svn.jboss.org/repos/jbossas/tags/JBoss_4_0_5_GA
+fi
+
+#
+# build jboss
+#
+cd $SVNBASE
+rm -f thirdparty/libraries.ent
+./build/build.sh clean main
+
+#
+# build the testsuite
+#
+cd testsuite
+./build.sh clean main
+ </command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <!--hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ <hudson.tasks.Mailer-->
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.NullSCM"/>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Build AS-4.0.5</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Deleted: trunk/build/hudson/hudson-home/jobs/AS-4.0.5/lastSuccessful
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0.5/lastSuccessful 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/build/hudson/hudson-home/jobs/AS-4.0.5/lastSuccessful 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1 +0,0 @@
-link builds/2007-01-22_17-40-33
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/AS-4.0.5/lastSuccessful (from rev 2249, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0.5/lastSuccessful)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-4.0.5/lastSuccessful (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/AS-4.0.5/lastSuccessful 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1 @@
+link builds/2007-01-22_17-40-33
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/AS-4.0.5-jdk14 (from rev 2249, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0.5-jdk14)
Deleted: trunk/build/hudson/hudson-home/jobs/AS-4.0.5-jdk14/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0.5-jdk14/config.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/build/hudson/hudson-home/jobs/AS-4.0.5-jdk14/config.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,55 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=AS-4.0.5-jdk14
-SVNBASE=JBoss_4_0_5_GA
-
-#
-# checkout with an explicit version
-#
-if [ -d "$SVNBASE" ]; then
- svn up $SVNBASE
-else
- svn co https://svn.jboss.org/repos/jbossas/tags/JBoss_4_0_5_GA
-fi
-
-export JAVA_HOME=(a)hudson.jdk14@
-
-#
-# build jboss
-#
-cd $SVNBASE
-rm -f thirdparty/libraries.ent
-./build/build.sh clean main
-
-#
-# build the testsuite
-#
-cd testsuite
-./build.sh clean main
- </command>
- </hudson.tasks.Shell>
- </builders>
- <publishers class="vector">
- <!--hudson.tasks.Mailer>
- <recipients>@hudson.mail.recipients@</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>false</sendToIndividuals>
- <hudson.tasks.Mailer-->
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.NullSCM"/>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
- <description>Build AS-4.0.5-jdk14</description>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/AS-4.0.5-jdk14/config.xml (from rev 2249, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0.5-jdk14/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-4.0.5-jdk14/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/AS-4.0.5-jdk14/config.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=AS-4.0.5-jdk14
+SVNBASE=JBoss_4_0_5_GA
+
+#
+# checkout with an explicit version
+#
+if [ -d "$SVNBASE" ]; then
+ svn up $SVNBASE
+else
+ svn co https://svn.jboss.org/repos/jbossas/tags/JBoss_4_0_5_GA
+fi
+
+export JAVA_HOME=(a)hudson.jdk14@
+
+#
+# build jboss
+#
+cd $SVNBASE
+rm -f thirdparty/libraries.ent
+./build/build.sh clean main
+
+#
+# build the testsuite
+#
+cd testsuite
+./build.sh clean main
+ </command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <!--hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ <hudson.tasks.Mailer-->
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.NullSCM"/>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Build AS-4.0.5-jdk14</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Modified: trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -3,9 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>
- AS-5.0, AS-4.2, AS-4.0, AS-4.0-jdk14, TC-5.5
- </childProjects>
+ <childProjects>AS-5.0, AS-4.2, AS-4.0, AS-4.0-jdk14, AS-4.0.5, AS-4.0.5-jdk14, TC-5.5</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -3,11 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>
- JBWS-Tests-AS-5.0, JBWS-Tests-AS-4.2, JBWS-Tests-AS-4.0, JBWS-Tests-AS-4.0-jdk14, JBWS-Tests-TC-5.5,
- JBAS-Tests-AS-5.0, JBAS-Tests-AS-4.2, JBAS-Tests-AS-4.0, JBAS-Tests-AS-4.0-jdk14,
- JBWS-Samples-AS-5.0, JBWS-Samples-AS-4.2, JBWS-Samples-AS-4.0, JBWS-Samples-TC-5.5
- </childProjects>
+ <childProjects>JBWS-Tests-AS-5.0, JBWS-Tests-AS-4.2, JBWS-Tests-AS-4.0, JBWS-Tests-AS-4.0-jdk14, JBWS-Tests-TC-5.5, JBAS-Tests-AS-5.0, JBAS-Tests-AS-4.2, JBAS-Tests-AS-4.0, JBAS-Tests-AS-4.0-jdk14, JBWS-Samples-AS-5.0, JBWS-Samples-AS-4.2, JBWS-Samples-AS-4.0, JBWS-Samples-TC-5.5</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: trunk/build/version.properties
===================================================================
--- trunk/build/version.properties 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/build/version.properties 2007-02-02 13:13:28 UTC (rev 2250)
@@ -34,7 +34,7 @@
gnu-getopt=1.0.10
hibernate=3.2.1.GA
jboss-backport-concurrent=2.1.0.GA
-jboss-common-core=2.0.4.Alpha
+jboss-common=1.0.3.GA
jboss-common-logging-log4j=2.0.2.GA
jboss-common-logging-spi=2.0.2.GA
jboss-ejb3=1.0.0.CR9-jboss4.0.5
@@ -43,7 +43,7 @@
jboss-vfs=2.0.0.snapshot
jbossas-core-libs=4.0.5.GA
jbossws-sun-wsimport=2.0.0
-jbpm-bpel=1.1.Beta2
+jbpm-bpel=1.1.Beta3
junit=3.8.1
oswego-concurrent=1.3.4
qdox=1.4
Modified: trunk/integration-jboss40/.classpath
===================================================================
--- trunk/integration-jboss40/.classpath 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/integration-jboss40/.classpath 2007-02-02 13:13:28 UTC (rev 2250)
@@ -11,7 +11,6 @@
<classpathentry kind="lib" path="/build/thirdparty/javassist.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-impl.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-container.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-j2ee.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/>
@@ -30,5 +29,6 @@
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-common.jar" sourcepath="/build/thirdparty/jboss-common-sources.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: trunk/integration-jboss40/build.xml
===================================================================
--- trunk/integration-jboss40/build.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/integration-jboss40/build.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -319,8 +319,6 @@
<delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss40.output.lib.dir}/jbossws40.sar"/>
- <!-- Deploy the BPEL sar -->
- <copy file="${thirdparty.dir}/jbpm-bpel.sar" todir="${jboss40.home}/server/${jboss.server.instance}/deploy"/>
<!-- The JBossAS testsuite references jbosswsfrom thirdparty -->
<copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true">
<fileset dir="${core.output.lib.dir}">
@@ -362,8 +360,6 @@
<delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/>
<mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/>
<unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar" src="${jboss40.output.lib.dir}/jbossws40-jdk14.sar"/>
- <!-- Deploy the BPEL sar -->
- <copy file="${thirdparty.dir}/jbpm-bpel.sar" todir="${jboss40.home}/server/${jboss.server.instance}/deploy"/>
<!-- The JBossAS testsuite references jbosswsfrom thirdparty -->
<copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true">
<fileset dir="${jboss40.output.lib.dir}">
Modified: trunk/integration-jboss42/.classpath
===================================================================
--- trunk/integration-jboss42/.classpath 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/integration-jboss42/.classpath 2007-02-02 13:13:28 UTC (rev 2250)
@@ -11,7 +11,6 @@
<classpathentry kind="lib" path="/build/thirdparty/javassist.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-impl.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-container.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-j2ee.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/>
@@ -29,5 +28,6 @@
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jbosssx-client.jar" sourcepath="/build/thirdparty/jbosssx-src.zip"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-common.jar" sourcepath="/build/thirdparty/jboss-common-sources.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: trunk/integration-jboss42/build.xml
===================================================================
--- trunk/integration-jboss42/build.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/integration-jboss42/build.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -153,8 +153,6 @@
<delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss42.output.lib.dir}/jbossws42.sar"/>
- <!-- Deploy the BPEL sar -->
- <copy file="${thirdparty.dir}/jbpm-bpel.sar" todir="${jboss42.home}/server/${jboss.server.instance}/deploy"/>
<!-- The JBossAS testsuite references jbosswsfrom thirdparty -->
<copy todir="${jboss42.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true">
<fileset dir="${core.output.lib.dir}">
Modified: trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBossServiceEndpointServlet.java
===================================================================
--- trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBossServiceEndpointServlet.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBossServiceEndpointServlet.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -29,7 +29,6 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.server.AbstractServiceEndpointServlet;
import org.jboss.ws.core.server.ServiceEndpoint;
-import org.jboss.ws.metadata.config.ConfigurationProvider;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
/**
@@ -61,13 +60,8 @@
{
log.debug("Updating service endpoint config\n config-name: " + configName + "\n config-file: " + configFile);
ServerEndpointMetaData sepMetaData = wsEndpoint.getServiceEndpointInfo().getServerEndpointMetaData();
+ sepMetaData.setConfigName(configName, configFile);
- ConfigurationProvider configProvider = (ConfigurationProvider)sepMetaData;
- configProvider.setConfigName(configName, configFile);
-
- // configure handler chain
- configProvider.configure(sepMetaData);
-
log.debug("Updated server meta data" + sepMetaData);
}
}
Modified: trunk/integration-jboss50/.classpath
===================================================================
--- trunk/integration-jboss50/.classpath 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/integration-jboss50/.classpath 2007-02-02 13:13:28 UTC (rev 2250)
@@ -11,7 +11,6 @@
<classpathentry kind="lib" path="/build/thirdparty/javassist.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-impl.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-container.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-j2ee.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/>
@@ -30,5 +29,6 @@
<classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jbosssx-client.jar" sourcepath="/build/thirdparty/jbosssx-src.zip"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-common.jar" sourcepath="/build/thirdparty/jboss-common-sources.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: trunk/integration-jboss50/build.xml
===================================================================
--- trunk/integration-jboss50/build.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/integration-jboss50/build.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -162,8 +162,6 @@
<delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss50.output.lib.dir}/jbossws50.sar"/>
- <!-- deploy the BPEL sar -->
- <copy file="${thirdparty.dir}/jbpm-bpel.sar" todir="${jboss50.home}/server/${jboss.server.instance}/deploy"/>
<!-- The JBossAS testsuite references jbosswsfrom thirdparty -->
<copy todir="${jboss50.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true">
<fileset dir="${core.output.lib.dir}">
Modified: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java
===================================================================
--- trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -62,12 +62,8 @@
log.debug("Updating service endpoint config\n config-name: " + configName + "\n config-file: " + configFile);
ServerEndpointMetaData sepMetaData = wsEndpoint.getServiceEndpointInfo().getServerEndpointMetaData();
- ConfigurationProvider configProvider = (ConfigurationProvider)sepMetaData;
- configProvider.setConfigName(configName, configFile);
+ sepMetaData.setConfigName(configName, configFile);
- // configure handler chain
- configProvider.configure(sepMetaData);
-
log.debug("Updated server meta data" + sepMetaData);
}
}
Modified: trunk/integration-tomcat/.classpath
===================================================================
--- trunk/integration-tomcat/.classpath 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/integration-tomcat/.classpath 2007-02-02 13:13:28 UTC (rev 2250)
@@ -10,7 +10,6 @@
<classpathentry kind="lib" path="/build/thirdparty/javassist.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-impl.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-container.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-j2ee.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/>
@@ -29,5 +28,6 @@
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-common.jar" sourcepath="/build/thirdparty/jboss-common-sources.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: trunk/integration-tomcat/build.xml
===================================================================
--- trunk/integration-tomcat/build.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/integration-tomcat/build.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -99,9 +99,9 @@
<include name="META-INF/standard-jaxws-client-config.xml"/>
<include name="META-INF/standard-jaxws-endpoint-config.xml"/>
</fileset>
- <classes dir="${tomcat.resources.dir}/jbossws.war/WEB-INF">
+ <webinf dir="${tomcat.resources.dir}/jbossws.war/WEB-INF">
<include name="log4j.xml"/>
- </classes>
+ </webinf>
</war>
</target>
@@ -110,9 +110,10 @@
<!-- Build jbossws-thirdparty.jar -->
<mkdir dir="${tomcat.output.lib.dir}/build"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/concurrent.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jaxb-api.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jaxb-impl.jar"/>
- <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-common-core.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-common.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-j2ee.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-container.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-dependency.jar"/>
@@ -122,7 +123,7 @@
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-remoting.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-xml-binding.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/javassist.jar"/>
- <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/concurrent.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/log4j.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/wsdl4j.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/xmlsec.jar"/>
<jar jarfile="${tomcat.output.lib.dir}/jbossws-thirdparty.jar" manifest="${etc.dir}/default.mf">
@@ -144,6 +145,11 @@
<include name="xercesImpl.jar"/>
</fileset>
</copy>
+ <copy todir="${tomcat.common.classes}" overwrite="true">
+ <fileset dir="${tomcat.resources.dir}">
+ <include name="log4j.xml"/>
+ </fileset>
+ </copy>
<copy todir="${tomcat.common.lib}" overwrite="true">
<fileset dir="${core.output.lib.dir}">
<include name="jbossws-core.jar"/>
Modified: trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/ServerConfigImpl.java
===================================================================
--- trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/ServerConfigImpl.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/ServerConfigImpl.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -40,7 +40,9 @@
{
try
{
- File tmpdir = File.createTempFile("jbossws", null).getParentFile();
+ File tmpFile = File.createTempFile("jbossws", null);
+ File tmpdir = tmpFile.getParentFile();
+ tmpFile.delete();
return tmpdir;
}
catch (IOException e)
@@ -53,7 +55,9 @@
{
try
{
- File tmpdir = File.createTempFile("jbossws", null).getParentFile();
+ File tmpFile = File.createTempFile("jbossws", null);
+ File tmpdir = tmpFile.getParentFile();
+ tmpFile.delete();
return tmpdir;
}
catch (IOException e)
Modified: trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java
===================================================================
--- trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -25,7 +25,6 @@
import java.io.File;
import java.io.IOException;
-import java.net.URL;
import java.net.URLClassLoader;
import javax.servlet.ServletConfig;
@@ -73,7 +72,7 @@
{
String message = "Failed to initialze service endpoint";
log.error(message, ex);
- throw new WSException(message, ex);
+ WSException.rethrow(message, ex);
}
finally
{
@@ -179,9 +178,17 @@
protected UnifiedVirtualFile getWebservicesFile(URLClassLoader ctxLoader)
{
- URL url = ctxLoader.findResource("WEB-INF/webservices.xml");
- return url != null ? new ResourceLoaderAdapter(ctxLoader) : null;
+ UnifiedVirtualFile vfsRoot = new ResourceLoaderAdapter(ctxLoader);
+ try
+ {
+ return vfsRoot.findChild("WEB-INF/webservices.xml");
+ }
+ catch (IOException e)
+ {
+ return null;
+ }
}
+
private void undeployServiceEndpoints(ServletContext servletContext)
{
Deleted: trunk/integration-tomcat/src/main/resources/jbossws.war/WEB-INF/log4j.xml
===================================================================
--- trunk/integration-tomcat/src/main/resources/jbossws.war/WEB-INF/log4j.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/integration-tomcat/src/main/resources/jbossws.war/WEB-INF/log4j.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Log4j Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- $Id:log4j.xml 1492 2006-11-21 19:49:34Z thomas.diesler(a)jboss.com $ -->
-
-<!--
-| For more configuration infromation and examples see the Jakarta Log4j
-| owebsite: http://jakarta.apache.org/log4j
--->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <!-- ================================= -->
- <!-- Preserve messages in a local file -->
- <!-- ================================= -->
-
- <!-- A time/date based rolling appender -->
- <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
- <param name="File" value="../logs/jbossws.log"/>
- <param name="Append" value="false"/>
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c:%L] %m%n"/>
- </layout>
- </appender>
-
- <!-- ============================== -->
- <!-- Append messages to the console -->
- <!-- ============================== -->
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <param name="Threshold" value="INFO"/>
- <param name="Target" value="System.out"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
- </layout>
- </appender>
-
- <!-- ================ -->
- <!-- Limit categories -->
- <!-- ================ -->
-
- <category name="org.jboss.ws">
- <priority value="DEBUG"/>
- </category>
-
- <category name="org.jboss.remoting">
- <priority value="INFO"/>
- </category>
-
- <category name="jbossws.SOAPMessage">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category>
-
- <!--
- <category name="org.jboss.xb">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category>
- -->
-
- <!-- ======================= -->
- <!-- Setup the Root category -->
- <!-- ======================= -->
-
- <root>
-<!--
- <appender-ref ref="CONSOLE"/>
--->
- <appender-ref ref="FILE"/>
- </root>
-
-</log4j:configuration>
Copied: trunk/integration-tomcat/src/main/resources/log4j.xml (from rev 2249, branches/jbossws-1.2.0/integration-tomcat/src/main/resources/log4j.xml)
===================================================================
--- trunk/integration-tomcat/src/main/resources/log4j.xml (rev 0)
+++ trunk/integration-tomcat/src/main/resources/log4j.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id:log4j.xml 1492 2006-11-21 19:49:34Z thomas.diesler(a)jboss.com $ -->
+
+<!--
+| For more configuration infromation and examples see the Jakarta Log4j
+| owebsite: http://jakarta.apache.org/log4j
+-->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <!-- A time/date based rolling appender -->
+ <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <param name="File" value="${catalina.home}/logs/jbossws.log"/>
+ <param name="Append" value="false"/>
+
+ <!-- Rollover at midnight each day -->
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c:%L] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Threshold" value="INFO"/>
+ <param name="Target" value="System.out"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <category name="org.jboss.ws">
+ <priority value="DEBUG"/>
+ </category>
+
+ <category name="org.jboss.remoting">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Enable SOAP message tracing -->
+ <category name="jbossws.SOAPMessage">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ </category>
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
Modified: trunk/jbossws-core/.classpath
===================================================================
--- trunk/jbossws-core/.classpath 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/.classpath 2007-02-02 13:13:28 UTC (rev 2250)
@@ -9,7 +9,6 @@
<classpathentry kind="lib" path="/build/thirdparty/javassist.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-impl.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar" sourcepath="/build/thirdparty/jboss-common-core-sources.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-container.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-j2ee.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/>
@@ -31,5 +30,6 @@
<classpathentry kind="lib" path="/build/thirdparty/jbosssx-client.jar" sourcepath="/build/thirdparty/jbosssx-src.zip"/>
<classpathentry kind="lib" path="/build/thirdparty/wstx.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/getopt.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-common.jar" sourcepath="/build/thirdparty/jboss-common-sources.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: trunk/jbossws-core/build.xml
===================================================================
--- trunk/jbossws-core/build.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/build.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -125,7 +125,6 @@
<include name="javax/annotation/**"/>
<include name="javax/jws/**"/>
<include name="javax/xml/ws/**"/>
- <include name="org/jboss/ws/jaxws/injection/**"/>
</fileset>
<metainf dir="${core.resources.dir}/jboss-jaxws.jar/META-INF"/>
</jar>
@@ -136,7 +135,6 @@
<fileset dir="${core.output.classes.dir}">
<include name="org/jboss/annotation/**"/>
<include name="org/jboss/ws/**"/>
- <exclude name="org/jboss/ws/integration/**"/>
</fileset>
<fileset dir="${core.resources.dir}">
<include name="schema/**"/>
@@ -146,14 +144,9 @@
<!-- Build jbossws-client.jar -->
<jar jarfile="${core.output.lib.dir}/jbossws-client.jar" manifest="${etc.dir}/default.mf">
- <fileset dir="${core.output.classes14.dir}">
- <include name="javax/xml/rpc/**"/>
- <include name="javax/xml/soap/**"/>
- </fileset>
<fileset dir="${core.output.classes.dir}">
- <include name="javax/xml/ws/**"/>
- <include name="javax/jws/**"/>
<include name="org/jboss/ws/**"/>
+ <exclude name="org/jboss/ws/core/server/**"/>
</fileset>
<fileset dir="${core.resources.dir}/jbossws.sar">
<include name="META-INF/standard-jaxrpc-client-config.xml"/>
@@ -174,7 +167,6 @@
<include name="wsimport.sh"/>
<include name="wstools.sh"/>
</zipfileset>
- <metainf dir="${core.resources.dir}/jboss-saaj.jar/META-INF"/>
</jar>
</target>
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -65,22 +65,19 @@
private void configure()
{
// process MTOM config elements
- if(epMetaData!=null)
+ if (epMetaData != null)
{
- ConfigurationProvider configProvider = (ConfigurationProvider)epMetaData;
- configProvider.configure(this);
+ epMetaData.configure(this);
}
}
protected void initBinding(String bindingId, Type type)
{
- if (CommonSOAPBinding.SOAP11HTTP_BINDING.equals(bindingId)
- || CommonSOAPBinding.SOAP11HTTP_MTOM_BINDING.equals(bindingId))
+ if (CommonSOAPBinding.SOAP11HTTP_BINDING.equals(bindingId) || CommonSOAPBinding.SOAP11HTTP_MTOM_BINDING.equals(bindingId))
{
binding = (type == Type.JAXWS ? new SOAP11BindingJAXWS() : new SOAP11BindingJAXRPC());
}
- else if (CommonSOAPBinding.SOAP12HTTP_BINDING.equals(bindingId)
- || CommonSOAPBinding.SOAP12HTTP_MTOM_BINDING.equals(bindingId))
+ else if (CommonSOAPBinding.SOAP12HTTP_BINDING.equals(bindingId) || CommonSOAPBinding.SOAP12HTTP_MTOM_BINDING.equals(bindingId))
{
binding = (type == Type.JAXWS ? new SOAP12BindingJAXWS() : new SOAP12BindingJAXRPC());
}
@@ -88,7 +85,7 @@
{
throw new WSException("Unsupported binding: " + bindingId);
}
-
+
}
public CommonBinding getCommonBinding()
@@ -96,7 +93,8 @@
return binding;
}
- public void update(Observable observable, Object object) {
+ public void update(Observable observable, Object object)
+ {
log.debug("Update config: " + object);
configure();
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializer.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializer.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -33,7 +33,6 @@
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBMarshaller;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBMarshallerImpl;
-import org.jboss.ws.core.jaxrpc.binding.jbossxb.XercesXSMarshallerImpl;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.w3c.dom.NamedNodeMap;
@@ -90,13 +89,6 @@
// schemabinding marshaller is the default delegate
JBossXBMarshaller delegate = marshaller;
- if(value instanceof Exception)
- {
- // todo: CTS workaround for custom exceptions, clarify when Alexey is back
- // causes NPE in MarshallerImpl:458
- delegate = new XercesXSMarshallerImpl();
- }
-
// marshalling context
delegate.setProperty(JBossXBConstants.JBXB_XS_MODEL, model);
delegate.setProperty(JBossXBConstants.JBXB_TYPE_QNAME, xmlType);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/SchemaBindingBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/SchemaBindingBuilder.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/SchemaBindingBuilder.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -116,6 +116,11 @@
processPackageMapping(schemaBinding, packageMapping);
}
+ for (ExceptionMapping exceptionMapping : wsdlMapping.getExceptionMappings())
+ {
+ processExceptionMapping(schemaBinding, exceptionMapping);
+ }
+
for (JavaXmlTypeMapping typeMapping : wsdlMapping.getJavaXmlTypeMappings())
{
processJavaXmlTypeMapping(schemaBinding, typeMapping);
@@ -150,6 +155,24 @@
}
}
+ private void processExceptionMapping(SchemaBinding schemaBinding, ExceptionMapping exceptionMapping)
+ {
+ QName xmlType = exceptionMapping.getWsdlMessage();
+ String javaType = exceptionMapping.getExceptionType();
+ log.trace("processExceptionMapping: [xmlType=" + xmlType + ",javaType=" + javaType + "]");
+
+ if (schemaBinding.getType(xmlType) == null)
+ {
+ TypeBinding typeBinding = new TypeBinding(xmlType);
+ ClassMetaData cmd = new ClassMetaData();
+ cmd.setUseNoArgCtor(Boolean.FALSE);
+ cmd.setImpl(javaType);
+ typeBinding.setClassMetaData(cmd);
+ typeBinding.setSimple(false);
+ schemaBinding.addType(typeBinding);
+ }
+ }
+
private void processArrayType(SchemaBinding schemaBinding, JavaXmlTypeMapping typeMapping)
{
QName xmlType = getXmlType(typeMapping);
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/XercesXSMarshallerImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/XercesXSMarshallerImpl.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/XercesXSMarshallerImpl.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,251 +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.ws.core.jaxrpc.binding.jbossxb;
-
-// $Id$
-
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.HashMap;
-
-import javax.xml.namespace.QName;
-
-import org.apache.xerces.xs.XSModel;
-import org.jboss.logging.Logger;
-import org.jboss.util.NotImplementedException;
-import org.jboss.ws.WSException;
-import org.jboss.ws.core.utils.JavaUtils;
-import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
-import org.jboss.ws.metadata.jaxrpcmapping.JavaXmlTypeMapping;
-import org.jboss.ws.metadata.jaxrpcmapping.VariableMapping;
-import org.jboss.xb.binding.Constants;
-import org.jboss.xb.binding.MappingObjectModelProvider;
-import org.jboss.xb.binding.XercesXsMarshaller;
-import org.w3c.dom.Node;
-import org.xml.sax.ContentHandler;
-
-/**
- * An implementation of a JAXB Marshaller that user XercesXSMarshaller impl.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 18-Oct-2004
- */
-public class XercesXSMarshallerImpl implements JBossXBMarshaller
-{
-
- // provide logging
- private static final Logger log = Logger.getLogger(XercesXSMarshallerImpl.class);
-
- // The marshaller properties
- private HashMap properties = new HashMap();
-
- private XercesXsMarshaller delegate;
-
- public XercesXSMarshallerImpl()
- {
- delegate = new XercesXsMarshaller();
- delegate.setProperty(XercesXsMarshaller.PROP_OUTPUT_XML_VERSION, "false");
- delegate.setProperty(XercesXsMarshaller.PROP_OUTPUT_INDENTATION, "false");
- delegate.declareNamespace("xsi", Constants.NS_XML_SCHEMA_INSTANCE);
- delegate.setSupportNil(true);
- delegate.setSimpleContentProperty("_value");
- }
-
- /**
- * Marshal the content tree rooted at obj into a Writer.
- */
- public void marshal(Object obj, Writer writer) throws MarshalException
- {
- assertRequiredProperties();
-
- try
- {
- QName xmlName = (QName)getProperty(JBossXBConstants.JBXB_ROOT_QNAME);
- delegate.addRootElement(xmlName);
-
- QName xmlType = (QName)getProperty(JBossXBConstants.JBXB_TYPE_QNAME);
- if (xmlType != null)
- {
- delegate.setRootTypeQName(xmlType);
- }
-
- if (xmlName.getNamespaceURI().length() > 0)
- {
- String prefix = xmlName.getPrefix();
- String nsURI = xmlName.getNamespaceURI();
- delegate.declareNamespace(prefix, nsURI);
- }
-
- MappingObjectModelProvider provider = new MappingObjectModelProvider();
- provider.setIgnoreLowLine(false);
- provider.setIgnoreNotFoundField(false);
-
- // todo complete wsdl mapping merge
- JavaWsdlMapping wsdlMapping = (JavaWsdlMapping)getProperty(JBossXBConstants.JBXB_JAVA_MAPPING);
- if (wsdlMapping != null)
- {
- JavaXmlTypeMapping[] javaXmlMappings = wsdlMapping.getJavaXmlTypeMappings();
- if (javaXmlMappings != null)
- {
- for (int i = 0; i < javaXmlMappings.length; ++i)
- {
- JavaXmlTypeMapping javaXmlMapping = javaXmlMappings[i];
- VariableMapping[] variableMappings = javaXmlMapping.getVariableMappings();
- if (variableMappings != null)
- {
- String clsName = javaXmlMapping.getJavaType();
- Class cls = JavaUtils.loadJavaType(clsName, Thread.currentThread().getContextClassLoader());
- QName clsQName = javaXmlMapping.getRootTypeQName();
-
- if (clsQName != null)
- {
- if ("element".equals(javaXmlMapping.getQnameScope()))
- {
- delegate.mapClassToGlobalElement(cls, clsQName.getLocalPart(), clsQName.getNamespaceURI(), null, provider);
- }
- else
- {
- delegate.mapClassToGlobalType(cls, clsQName.getLocalPart(), clsQName.getNamespaceURI(), null, provider);
- delegate.mapClassToXsiType(cls, clsQName.getNamespaceURI(), clsQName.getLocalPart());
- }
- }
-
- for (int j = 0; j < variableMappings.length; ++j)
- {
- VariableMapping variableMapping = variableMappings[j];
- String javaName = variableMapping.getJavaVariableName();
- if (variableMapping.getXmlElementName() != null)
- {
- String xmlElementName = variableMapping.getXmlElementName();
- provider.mapFieldToElement(cls, javaName, "", xmlElementName, null);
- }
- else if (variableMapping.getXmlAttributeName() != null)
- {
- log.trace("Unmapped attribute: " + javaName);
- }
- else if (variableMapping.getXmlWildcard())
- {
- delegate.mapFieldToWildcard(cls, "_any", JBossXBSupport.getWildcardMarshaller());
- }
- else
- {
- log.warn("Unmapped variable: " + javaName);
- }
- }
- }
- }
- }
- }
-
- if (getProperty(JBossXBConstants.JBXB_XS_MODEL) != null)
- {
- XSModel model = (XSModel)getProperty(JBossXBConstants.JBXB_XS_MODEL);
- delegate.marshal(model, provider, obj, writer);
- }
- }
- catch (RuntimeException e)
- {
- throw e;
- }
- catch (Exception e)
- {
- throw new MarshalException(e);
- }
- }
-
- /**
- * Marshal the content tree rooted at obj into SAX2 events.
- */
- public void marshal(Object obj, ContentHandler handler)
- {
- throw new NotImplementedException();
- }
-
- /**
- * Marshal the content tree rooted at obj into a DOM tree.
- */
- public void marshal(Object obj, Node node)
- {
- throw new NotImplementedException();
- }
-
- /**
- * Marshal the content tree rooted at obj into an output stream.
- */
- public void marshal(Object obj, OutputStream os) throws MarshalException
- {
- marshal(obj, new OutputStreamWriter(os));
- }
-
- /**
- * Get the particular property in the underlying implementation of
- * Marshaller.
- */
- public Object getProperty(String name)
- {
- if (name == null)
- throw new IllegalArgumentException("name parameter is null");
-
- return properties.get(name);
- }
-
- /**
- * Set the particular property in the underlying implementation of
- * Marshaller.
- *
- */
- public void setProperty(String name, Object value)
- {
- if (name == null)
- throw new IllegalArgumentException("name parameter is null");
-
- properties.put(name, value);
- }
-
- /**
- * Get a DOM tree view of the content tree(Optional).
- */
- public Node getNode(Object contentTree)
- {
- throw new NotImplementedException();
- }
-
- /**
- * Assert the required properties
- */
- private void assertRequiredProperties()
- {
- if (getProperty(JBossXBConstants.JBXB_SCHEMA_READER) == null && getProperty(JBossXBConstants.JBXB_XS_MODEL) == null)
- throw new WSException("Cannot find required property: " + JBossXBConstants.JBXB_XS_MODEL);
-
- if (getProperty(JBossXBConstants.JBXB_JAVA_MAPPING) == null)
- throw new WSException("Cannot find required property: " + JBossXBConstants.JBXB_JAVA_MAPPING);
-
- QName xmlName = (QName)getProperty(JBossXBConstants.JBXB_ROOT_QNAME);
- if (xmlName == null)
- throw new WSException("Cannot find required property: " + JBossXBConstants.JBXB_ROOT_QNAME);
-
- if (xmlName.getNamespaceURI().length() > 0 && xmlName.getPrefix().length() == 0)
- throw new IllegalArgumentException("The given root element name must be prefix qualified: " + xmlName);
- }
-}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -447,10 +447,12 @@
{
if (null == name)
throw new JAXRPCException("Unsupported property: " + name);
+
// CTS: com/sun/ts/tests/jaxrpc/api/javax_xml_rpc/Call/Client.java#SetGetPropertyTest2
if (name.startsWith("javax.xml.rpc") && standardProperties.contains(name) == false)
throw new JAXRPCException("Unsupported property: " + name);
+ log.debug("setProperty: [name=" + name + ",value=" + value + "]");
properties.put(name, value);
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -27,10 +27,12 @@
import java.net.URL;
import java.rmi.Remote;
import java.util.ArrayList;
+import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Properties;
import java.util.Set;
import javax.xml.namespace.QName;
@@ -45,6 +47,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.core.StubExt;
import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCClientMetaDataBuilder;
+import org.jboss.ws.metadata.j2ee.UnifiedPortComponentRefMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
@@ -77,9 +80,10 @@
// The service meta data that is associated with this JAXRPC Service
private ServiceMetaData serviceMetaData;
-
// The optional WSDL location
private URL wsdlLocation;
+ // The <service-ref> meta data
+ private UnifiedServiceRefMetaData usrMetaData;
// The handler registry
private HandlerRegistryImpl handlerRegistry;
@@ -111,14 +115,15 @@
/**
* Construct a Service that has access to some WSDL meta data
*/
- ServiceImpl(QName serviceName, URL wsdlURL, JavaWsdlMapping mappingURL, WSSecurityConfiguration securityConfig, UnifiedServiceRefMetaData serviceRefMetaData)
+ ServiceImpl(QName serviceName, URL wsdlURL, JavaWsdlMapping mappingURL, WSSecurityConfiguration securityConfig, UnifiedServiceRefMetaData usrMetaData)
{
this.wsdlLocation = wsdlURL;
+ this.usrMetaData = usrMetaData;
+
JAXRPCClientMetaDataBuilder builder = new JAXRPCClientMetaDataBuilder();
-
ClassLoader ctxClassLoader = Thread.currentThread().getContextClassLoader();
-
- serviceMetaData = builder.buildMetaData(serviceName, wsdlURL, mappingURL, securityConfig, serviceRefMetaData, ctxClassLoader);
+
+ serviceMetaData = builder.buildMetaData(serviceName, wsdlURL, mappingURL, securityConfig, usrMetaData, ctxClassLoader);
handlerRegistry = new HandlerRegistryImpl(serviceMetaData);
}
@@ -160,7 +165,9 @@
{
String nsURI = portName.getNamespaceURI();
serviceMetaData.assertTargetNamespace(nsURI);
- return new CallImpl(this, portName, null);
+ CallImpl call = new CallImpl(this, portName, null);
+ initCallProperties(call, null);
+ return call;
}
/**
@@ -180,7 +187,9 @@
String nsURI = portName.getNamespaceURI();
serviceMetaData.assertTargetNamespace(nsURI);
QName opName = new QName(nsURI, operationName);
- return new CallImpl(this, portName, opName);
+ CallImpl call = new CallImpl(this, portName, opName);
+ initCallProperties(call, null);
+ return call;
}
/**
@@ -199,7 +208,9 @@
{
serviceMetaData.assertTargetNamespace(portName.getNamespaceURI());
serviceMetaData.assertTargetNamespace(opName.getNamespaceURI());
- return new CallImpl(this, portName, opName);
+ CallImpl call = new CallImpl(this, portName, opName);
+ initCallProperties(call, null);
+ return call;
}
/**
@@ -213,7 +224,9 @@
*/
public Call createCall() throws ServiceException
{
- return new CallImpl(this);
+ CallImpl call = new CallImpl(this);
+ initCallProperties(call, null);
+ return call;
}
/**
@@ -392,6 +405,7 @@
private Remote createProxy(Class seiClass, EndpointMetaData epMetaData) throws Exception
{
CallImpl call = new CallImpl(this, epMetaData);
+ initCallProperties(call, seiClass.getName());
PortProxy handler = new PortProxy(call);
ClassLoader cl = epMetaData.getClassLoader();
@@ -400,6 +414,47 @@
return proxy;
}
+ private void initCallProperties(CallImpl call, String seiName)
+ {
+ // nothing to do
+ if (usrMetaData == null)
+ return;
+
+ // General properties
+ Properties callProps = usrMetaData.getCallProperties();
+ if (callProps != null)
+ {
+ Enumeration<?> names = callProps.propertyNames();
+ while (names.hasMoreElements())
+ {
+ String name = (String)names.nextElement();
+ String value = callProps.getProperty(name);
+ call.setProperty(name, value);
+ }
+ }
+
+ if (seiName != null)
+ {
+ for (UnifiedPortComponentRefMetaData upcRef : usrMetaData.getPortComponentRefs())
+ {
+ if (seiName.equals(upcRef.getServiceEndpointInterface()))
+ {
+ callProps = upcRef.getCallProperties();
+ if (callProps != null)
+ {
+ Enumeration<?> names = callProps.propertyNames();
+ while (names.hasMoreElements())
+ {
+ String name = (String)names.nextElement();
+ String value = callProps.getProperty(name);
+ call.setProperty(name, value);
+ }
+ }
+ }
+ }
+ }
+ }
+
/**
* Get the handler chain for the given endpoint name, maybe null.
*/
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -102,13 +102,13 @@
Reference ref = (Reference)obj;
// Unmarshall the ServiceRefMetaData
- UnifiedServiceRefMetaData serviceRefMetaData = null;
+ UnifiedServiceRefMetaData usrMetaData = null;
RefAddr metaRefAddr = ref.get(ServiceReferenceable.SERVICE_REF_META_DATA);
ByteArrayInputStream bais = new ByteArrayInputStream((byte[])metaRefAddr.getContent());
try
{
ObjectInputStream ois = new ObjectInputStream(bais);
- serviceRefMetaData = (UnifiedServiceRefMetaData)ois.readObject();
+ usrMetaData = (UnifiedServiceRefMetaData)ois.readObject();
ois.close();
}
catch (IOException ex)
@@ -137,15 +137,15 @@
}
ServiceImpl jaxrpcService = null;
- URL wsdlLocation = serviceRefMetaData.getWsdlLocation();
+ URL wsdlLocation = usrMetaData.getWsdlLocation();
if (wsdlLocation != null)
{
log.debug("Create jaxrpc service from wsdl");
// Create the actual service object
- QName serviceName = serviceRefMetaData.getServiceQName();
- JavaWsdlMapping javaWsdlMapping = (JavaWsdlMapping)serviceRefMetaData.getJavaWsdlMapping();
- jaxrpcService = new ServiceImpl(serviceName, wsdlLocation, javaWsdlMapping, securityConfig, serviceRefMetaData);
+ QName serviceName = usrMetaData.getServiceQName();
+ JavaWsdlMapping javaWsdlMapping = (JavaWsdlMapping)usrMetaData.getJavaWsdlMapping();
+ jaxrpcService = new ServiceImpl(serviceName, wsdlLocation, javaWsdlMapping, securityConfig, usrMetaData);
}
else
{
@@ -155,7 +155,7 @@
// Set any service level properties
ServiceMetaData serviceMetaData = jaxrpcService.getServiceMetaData();
- serviceMetaData.setProperties(serviceRefMetaData.getCallProperties());
+ serviceMetaData.setProperties(usrMetaData.getCallProperties());
// The web service client using a port-component-link, the contet is the URL to
// the PortComponentLinkServlet that will return the actual endpoint address
@@ -211,12 +211,12 @@
// load the service interface class
ClassLoader contextCL = Thread.currentThread().getContextClassLoader();
- Class siClass = contextCL.loadClass(serviceRefMetaData.getServiceInterface());
+ Class siClass = contextCL.loadClass(usrMetaData.getServiceInterface());
if (Service.class.isAssignableFrom(siClass) == false)
throw new JAXRPCException("The service interface does not implement javax.xml.rpc.Service: " + siClass.getName());
// load all service endpoint interface classes
- UnifiedPortComponentRefMetaData[] pcrArray = serviceRefMetaData.getPortComponentRefs();
+ UnifiedPortComponentRefMetaData[] pcrArray = usrMetaData.getPortComponentRefs();
for (int i = 0; i < pcrArray.length; i++)
{
UnifiedPortComponentRefMetaData pcr = pcrArray[i];
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -21,6 +21,8 @@
*/
package org.jboss.ws.core.jaxws;
+// $Id: $
+
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -35,18 +37,19 @@
* Cache JAXBContext's.
*
* @author Heiko.Braun(a)jboss.org
- * @version $Id:$
* @since 26.01.2007
*/
-public class JAXBContextCache {
-
+public class JAXBContextCache
+{
private Map<Integer, JAXBContext> cache = new ConcurrentHashMap<Integer, JAXBContext>();
- private JAXBContext get(Integer id) {
+ private JAXBContext get(Integer id)
+ {
return cache.get(id);
}
- private void add(Integer id, JAXBContext context) {
+ private void add(Integer id, JAXBContext context)
+ {
cache.put(id, context);
}
@@ -61,7 +64,7 @@
{
Integer id = buildId(classes);
JAXBContext ctx = get(id);
- if(null==ctx)
+ if (null == ctx)
{
ctx = JAXBContext.newInstance(classes);
add(id, ctx);
@@ -81,7 +84,7 @@
{
Integer id = buildId(clazz);
JAXBContext ctx = get(id);
- if(null==ctx)
+ if (null == ctx)
{
ctx = JAXBContext.newInstance(clazz);
add(id, ctx);
@@ -105,7 +108,7 @@
private static Integer buildId(Class[] classes)
{
int sum = 0;
- for(Class cls : classes)
+ for (Class cls : classes)
{
sum += cls.hashCode();
}
@@ -114,6 +117,6 @@
private static Integer buildId(Class clazz)
{
- return buildId(new Class[] {clazz});
+ return buildId(new Class[] { clazz });
}
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -127,9 +127,6 @@
{
log.debug("Configuration change event received. Reconfigure handler chain: " + object);
- // reconfigure endpoint meta data handler information from config
- ((ConfigurationProvider)epMetaData).configure(epMetaData);
-
// re-populate the binding handler chain
resetCreateBindingHandlerChain();
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -42,6 +42,7 @@
import org.jboss.util.NotImplementedException;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
+import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType;
import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.IOUtils;
import org.jboss.ws.core.utils.ResourceURL;
@@ -71,12 +72,9 @@
{
this.udi = udi;
- String archiveName = udi.simpleName;
- if (archiveName.endsWith(".jar") || archiveName.endsWith(".ejb3"))
- expLocation = "META-INF/wsdl/";
- else if (archiveName.endsWith(".war"))
+ if (udi.type == DeploymentType.JAXRPC_JSE || udi.type == DeploymentType.JAXWS_JSE)
expLocation = "WEB-INF/wsdl/";
- else throw new WSException("Can only publish wsdl from WAR or JAR deployment");
+ else expLocation = "META-INF/wsdl/";
}
/** Publish the deployed wsdl file to the data directory
@@ -88,59 +86,45 @@
// For each service
for (ServiceMetaData serviceMetaData : wsMetaData.getServices())
{
- String wsdlPath = serviceMetaData.getWsdlLocation().toExternalForm();
- log.debug("Publish WSDL file: " + wsdlPath);
+ File wsdlFile = getPublishLocation(deploymentName, serviceMetaData);
+ wsdlFile.getParentFile().mkdirs();
- if (wsdlPath != null)
+ // Get the wsdl definition and write it to the wsdl publish location
+ try
{
- File targetFile = getPublishLocation(deploymentName, serviceMetaData);
- targetFile.getParentFile().mkdirs();
+ Writer fWriter = IOUtils.getCharsetFileWriter(wsdlFile, Constants.DEFAULT_XML_CHARSET);
+ WSDLDefinitions wsdlDefinitions = serviceMetaData.getWsdlDefinitions();
+ new WSDLWriter(wsdlDefinitions).write(fWriter, Constants.DEFAULT_XML_CHARSET);
- // Get the wsdl definition and write it to the wsdl publish location
- try
+ URL wsdlPublishURL = wsdlFile.toURL();
+ log.info("WSDL published to: " + wsdlPublishURL);
+
+ // udpate the wsdl file location
+ serviceMetaData.setWsdlLocation(wsdlFile.toURL());
+
+ // Process the wsdl imports
+ Definition wsdl11Definition = wsdlDefinitions.getWsdlOneOneDefinition();
+ if (wsdl11Definition != null)
{
- Writer fWriter = IOUtils.getCharsetFileWriter(targetFile, Constants.DEFAULT_XML_CHARSET);
- WSDLDefinitions wsdlDefinitions = serviceMetaData.getWsdlDefinitions();
- new WSDLWriter(wsdlDefinitions).write(fWriter, Constants.DEFAULT_XML_CHARSET);
+ publishWsdlImports(wsdlFile.toURL(), wsdl11Definition);
- URL wsdlPublishURL = targetFile.toURL();
- log.info("WSDL published to: " + wsdlPublishURL);
-
- // delete wsdl temp file
- ServerConfigFactory factory = ServerConfigFactory.getInstance();
- ServerConfig config = factory.getServerConfig();
- if (wsdlPath.startsWith(config.getServerTempDir().toURL().toExternalForm()))
- {
- new File(wsdlPath).delete();
- }
-
- // udpate the wsdl file location
- serviceMetaData.setWsdlLocation(wsdlPublishURL);
-
- // Process the wsdl imports
- Definition wsdl11Definition = wsdlDefinitions.getWsdlOneOneDefinition();
- if (wsdl11Definition != null)
- {
- publishWsdlImports(targetFile.toURL(), wsdl11Definition);
-
- // Publish XMLSchema imports
- Document document = wsdlDefinitions.getWsdlDocument();
- publishSchemaImports(targetFile.toURL(), document.getDocumentElement());
- }
- else
- {
- throw new NotImplementedException("WSDL-2.0 imports");
- }
+ // Publish XMLSchema imports
+ Document document = wsdlDefinitions.getWsdlDocument();
+ publishSchemaImports(wsdlFile.toURL(), document.getDocumentElement());
}
- catch (RuntimeException rte)
+ else
{
- throw rte;
+ throw new NotImplementedException("WSDL-2.0 imports");
}
- catch (Exception e)
- {
- throw new WSException("Cannot publish wsdl to: " + targetFile, e);
- }
}
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ catch (Exception e)
+ {
+ throw new WSException("Cannot publish wsdl to: " + wsdlFile, e);
+ }
}
}
@@ -281,6 +265,17 @@
*/
private File getPublishLocation(String archiveName, ServiceMetaData serviceMetaData) throws IOException
{
+ String wsdlLocation = null;
+ if (serviceMetaData.getWsdlLocation() != null)
+ wsdlLocation = serviceMetaData.getWsdlLocation().toExternalForm();
+ else if (serviceMetaData.getWsdlFile() != null)
+ wsdlLocation = serviceMetaData.getWsdlFile();
+
+ if (wsdlLocation == null)
+ throw new IllegalStateException("Cannot obtain wsdl location for: " + serviceMetaData.getServiceName());
+
+ log.debug("Publish WSDL file: " + wsdlLocation);
+
// Only file URLs are supported in <wsdl-publish-location>
String publishLocation = serviceMetaData.getWsdlPublishLocation();
boolean predefinedLocation = publishLocation != null && publishLocation.startsWith("file:");
@@ -304,10 +299,9 @@
}
File wsdlFile;
- String wsdlLocation = serviceMetaData.getWsdlLocation().toExternalForm();
- if (wsdlLocation.startsWith(expLocation))
+ if (wsdlLocation.indexOf(expLocation) >= 0)
{
- wsdlLocation = wsdlLocation.substring(expLocation.length());
+ wsdlLocation = wsdlLocation.substring(wsdlLocation.indexOf(expLocation) + expLocation.length());
wsdlFile = new File(locationFile + "/" + wsdlLocation);
}
else if (wsdlLocation.startsWith("vfsfile:") || wsdlLocation.startsWith("file:") || wsdlLocation.startsWith("jar:"))
@@ -319,7 +313,7 @@
{
throw new WSException("Invalid wsdlFile '" + wsdlLocation + "', expected in: " + expLocation);
}
-
+
return wsdlFile;
}
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -280,12 +280,12 @@
private boolean isSoapContent(ContentType type)
{
String baseType = type.getBaseType();
- return MimeConstants.TYPE_SOAP11.equals(baseType) || MimeConstants.TYPE_SOAP12.equals(baseType);
+ return MimeConstants.TYPE_SOAP11.equalsIgnoreCase(baseType) || MimeConstants.TYPE_SOAP12.equalsIgnoreCase(baseType);
}
private boolean isMultipartRelatedContent(ContentType type)
{
String baseType = type.getBaseType();
- return MimeConstants.TYPE_MULTIPART_RELATED.equals(baseType);
+ return MimeConstants.TYPE_MULTIPART_RELATED.equalsIgnoreCase(baseType);
}
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -63,6 +63,10 @@
String prefix = getPrefix();
String namespaceURI = getNamespaceURI();
+ String localName = getLocalName();
+
+ if ("Envelope".equals(localName) == false)
+ throw new IllegalArgumentException("Cannot create SOAP envelope from: " + element.getElementQName());
assertEnvelopeNamespace(namespaceURI);
addNamespaceDeclaration(prefix, namespaceURI);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -67,7 +67,7 @@
public MultipartRelatedDecoder(ContentType contentType) throws IOException, MessagingException
{
this.contentType = contentType;
- if (!contentType.getBaseType().equals(MimeConstants.TYPE_MULTIPART_RELATED))
+ if (MimeConstants.TYPE_MULTIPART_RELATED.equalsIgnoreCase(contentType.getBaseType()) == false)
throw new IllegalArgumentException("Multipart related decoder called with a non-multipart/related type");
rootType = contentType.getParameter("type");
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -33,8 +33,6 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.core.UnifiedVirtualFile;
-import org.jboss.ws.metadata.config.JBossWSConfigFactory;
-import org.jboss.ws.metadata.config.jaxrpc.ClientConfigJAXRPC;
import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
@@ -100,7 +98,7 @@
/** Build from WSDL and jaxrpc-mapping.xml
*/
public ServiceMetaData buildMetaData(QName serviceQName, URL wsdlURL, JavaWsdlMapping javaWsdlMapping, WSSecurityConfiguration securityConfig,
- UnifiedServiceRefMetaData serviceRefMetaData, ClassLoader loader)
+ UnifiedServiceRefMetaData usrMetaData, ClassLoader loader)
{
log.debug("START buildMetaData: [service=" + serviceQName + "]");
try
@@ -119,9 +117,9 @@
if (javaWsdlMapping != null)
{
URL mappingURL = new URL(Constants.NS_JBOSSWS_URI + "/dummy-mapping-file");
- if (serviceRefMetaData != null && serviceRefMetaData.getMappingLocation() != null)
+ if (usrMetaData != null && usrMetaData.getMappingLocation() != null)
{
- mappingURL = serviceRefMetaData.getMappingLocation();
+ mappingURL = usrMetaData.getMappingLocation();
}
wsMetaData.addMappingDefinition(mappingURL.toExternalForm(), javaWsdlMapping);
serviceMetaData.setMappingLocation(mappingURL);
@@ -133,7 +131,7 @@
setupSecurity(securityConfig, wsMetaData.getRootFile());
}
- buildMetaDataInternal(serviceMetaData, wsdlDefinitions, javaWsdlMapping, serviceRefMetaData);
+ buildMetaDataInternal(serviceMetaData, wsdlDefinitions, javaWsdlMapping, usrMetaData);
// eagerly initialize
wsMetaData.eagerInitialize();
@@ -223,14 +221,6 @@
private void setupHandlers(UnifiedServiceRefMetaData serviceRefMetaData, QName portName, EndpointMetaData epMetaData)
{
- // Add pre handlers
- UnifiedVirtualFile vfsRoot = epMetaData.getRootFile();
- String configName = epMetaData.getConfigName();
- String configFile = epMetaData.getConfigFile();
- JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance();
- ClientConfigJAXRPC jaxrpcConfig = (ClientConfigJAXRPC)factory.getConfig(vfsRoot, configName, configFile);
- epMetaData.addHandlers(jaxrpcConfig.getHandlers(epMetaData, HandlerType.PRE));
-
// Setup the endpoint handlers
if (serviceRefMetaData != null)
{
@@ -243,9 +233,6 @@
}
}
}
-
- // Add post handlers
- epMetaData.addHandlers(jaxrpcConfig.getHandlers(epMetaData, HandlerType.POST));
}
private void setupSecurity(WSSecurityConfiguration securityConfig, UnifiedVirtualFile vfsRoot)
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCDeployment.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCDeployment.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCDeployment.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -24,6 +24,7 @@
import java.io.InputStream;
import java.net.URL;
+import org.jboss.ws.WSException;
import org.jboss.ws.core.UnifiedVirtualFile;
import org.jboss.ws.core.server.UnifiedDeploymentInfo;
import org.jboss.ws.metadata.webservices.WebservicesFactory;
@@ -66,7 +67,7 @@
}
catch (Exception ex)
{
- throw new RuntimeException(ex);
+ WSException.rethrow(ex);
}
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -22,7 +22,6 @@
// $Id$
package org.jboss.ws.metadata.builder.jaxrpc;
-import java.net.URL;
import java.util.Set;
import javax.management.ObjectName;
@@ -30,9 +29,6 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.UnifiedVirtualFile;
-import org.jboss.ws.metadata.config.JBossWSConfigFactory;
-import org.jboss.ws.metadata.config.jaxrpc.EndpointConfigJAXRPC;
import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData;
@@ -85,12 +81,11 @@
serviceMetaData.setWebserviceDescriptionName(wsdMetaData.getWebserviceDescriptionName());
wsMetaData.addService(serviceMetaData);
- // Set wsdl location
+ // Set wsdl file
String wsdlFile = wsdMetaData.getWsdlFile();
- URL wsdlLocation = udi.getMetaDataFileURL(wsdlFile);
+ serviceMetaData.setWsdlFile(wsdlFile);
// Unmarshall the WSDL
- serviceMetaData.setWsdlLocation(wsdlLocation);
WSDLDefinitions wsdlDefinitions = serviceMetaData.getWsdlDefinitions();
// Unmarshall the jaxrpc-mapping.xml
@@ -221,14 +216,6 @@
// Setup the endpoint operations
setupOperationsFromWSDL(sepMetaData, wsdlEndpoint, seiMapping);
- // Add pre handlers
- UnifiedVirtualFile vfsRoot = sepMetaData.getRootFile();
- String configName = sepMetaData.getConfigName();
- String configFile = sepMetaData.getConfigFile();
- JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance();
- EndpointConfigJAXRPC jaxrpcConfig = (EndpointConfigJAXRPC)factory.getConfig(vfsRoot, configName, configFile);
- sepMetaData.addHandlers(jaxrpcConfig.getHandlers(sepMetaData, HandlerType.PRE));
-
// Setup the endpoint handlers
for (UnifiedHandlerMetaData uhmd : pcMetaData.getHandlers())
{
@@ -238,9 +225,6 @@
sepMetaData.addHandler(uhmd.getHandlerMetaDataJAXRPC(sepMetaData, HandlerType.ENDPOINT));
}
}
-
- // Add post handlers
- sepMetaData.addHandlers(jaxrpcConfig.getHandlers(sepMetaData, HandlerType.POST));
}
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -196,7 +196,7 @@
processSOAPBinding(epMetaData, wsClass);
// process config, this will as well setup the handler
- epMetaData.configure(epMetaData);
+ epMetaData.initEndpointConfig();
// Process an optional @HandlerChain annotation
processHandlerChain(epMetaData, wsClass);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -146,7 +146,7 @@
processWebContext(udi, sepClass, linkName, sepMetaData);
// setup handler chain from config
- sepMetaData.configure(sepMetaData);
+ sepMetaData.initEndpointConfig();
// Process an optional @HandlerChain annotation
if (sepClass.isAnnotationPresent(HandlerChain.class))
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/Configurable.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/Configurable.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/Configurable.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,3 +1,24 @@
+/*
+ * 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.ws.metadata.config;
import java.util.Observer;
@@ -8,8 +29,8 @@
* to get notified then the configuration changes.
*
* @author Heiko.Braun(a)jboss.org
- * @version $Id$
* @since 15.12.2006
*/
-public interface Configurable extends Observer {
+public interface Configurable extends Observer
+{
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/ConfigurationProvider.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/ConfigurationProvider.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/ConfigurationProvider.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -31,15 +31,16 @@
*
* @see org.jboss.ws.metadata.umdm.EndpointMetaData
*/
-public interface ConfigurationProvider {
+public interface ConfigurationProvider
+{
- static final String DEFAULT_JAXRPC_ENDPOINT_CONFIG_FILE = "META-INF/standard-jaxrpc-endpoint-config.xml";
- static final String DEFAULT_JAXWS_ENDPOINT_CONFIG_FILE = "META-INF/standard-jaxws-endpoint-config.xml";
- static final String DEFAULT_ENDPOINT_CONFIG_NAME = "Standard Endpoint";
+ static final String DEFAULT_JAXRPC_ENDPOINT_CONFIG_FILE = "META-INF/standard-jaxrpc-endpoint-config.xml";
+ static final String DEFAULT_JAXWS_ENDPOINT_CONFIG_FILE = "META-INF/standard-jaxws-endpoint-config.xml";
+ static final String DEFAULT_ENDPOINT_CONFIG_NAME = "Standard Endpoint";
- static final String DEFAULT_JAXRPC_CLIENT_CONFIG_FILE = "META-INF/standard-jaxrpc-client-config.xml";
- static final String DEFAULT_JAXWS_CLIENT_CONFIG_FILE = "META-INF/standard-jaxws-client-config.xml";
- static final String DEFAULT_CLIENT_CONFIG_NAME = "Standard Client";
+ static final String DEFAULT_JAXRPC_CLIENT_CONFIG_FILE = "META-INF/standard-jaxrpc-client-config.xml";
+ static final String DEFAULT_JAXWS_CLIENT_CONFIG_FILE = "META-INF/standard-jaxws-client-config.xml";
+ static final String DEFAULT_CLIENT_CONFIG_NAME = "Standard Client";
/**
* Callback for components that require configuration through jbossws-dd
@@ -55,6 +56,6 @@
String getConfigName();
void setConfigName(String configName);
-
+
void setConfigName(String configName, String configFile);
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedPortComponentRefMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedPortComponentRefMetaData.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedPortComponentRefMetaData.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -40,8 +40,7 @@
private String serviceEndpointInterface;
// The optional <port-component-link> element
private String portComponentLink;
-
- /** Arbitrary proxy properties given by <call-property> */
+ // Arbitrary proxy properties given by <call-property>
private Properties callProperties;
public String getPortComponentLink()
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -68,7 +68,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 12-May-2005
*/
-public abstract class EndpointMetaData extends ExtensibleMetaData implements ConfigurationProvider, Configurable
+public abstract class EndpointMetaData extends ExtensibleMetaData implements ConfigurationProvider
{
// provide logging
private static Logger log = Logger.getLogger(EndpointMetaData.class);
@@ -127,7 +127,7 @@
private ConfigObservable configObservable = new ConfigObservable();
- private JAXBContextCache jaxbCache;
+ private JAXBContextCache jaxbCache = new JAXBContextCache();
public EndpointMetaData(ServiceMetaData service, QName portName, QName portTypeName, Type type)
{
@@ -579,8 +579,6 @@
}
public JAXBContextCache getJaxbCache() {
- if(null == jaxbCache)
- jaxbCache = new JAXBContextCache();
return jaxbCache;
}
@@ -589,26 +587,13 @@
/**
* Callback for components that require configuration through jbossws-dd
- *
- * @param configurable
*/
public void configure(Configurable configurable)
{
-
- // emit notificatins when the config changes
- registerConfigObserver(configurable);
-
- if (null == config)
- {
- log.trace("Create new config: " + getConfigFile() + ":" + getConfigName());
- JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance();
- config = factory.getConfig(getRootFile(), getConfigName(), getConfigFile());
- }
- else
- {
- log.trace("Reusing cached config. Current should be: " + getConfigFile() + ":" + getConfigName());
- }
-
+ // Make sure we have a configuration
+ if (config == null)
+ initEndpointConfig();
+
// SOAPBinding configuration
if (configurable instanceof CommonBindingProvider)
{
@@ -621,30 +606,6 @@
log.debug("Enable MTOM on endpoint " + this.getPortName());
}
}
-
- // Configure EndpointMetaData
- else if (configurable instanceof EndpointMetaData)
- {
-
- log.debug("Configure EndpointMetaData");
-
- // It's not necessarily the same instance
- EndpointMetaData epmd = (EndpointMetaData)configurable;
-
- // TODO: Why should we keep them?
- List<HandlerMetaData> sepHandlers = epmd.getHandlerMetaData(HandlerType.ENDPOINT);
- epmd.clearHandlers();
-
- List<HandlerMetaData> preHandlers = config.getHandlers(this, HandlerType.PRE);
- List<HandlerMetaData> postHandlers = config.getHandlers(this, HandlerType.POST);
-
- epmd.addHandlers(preHandlers);
- epmd.addHandlers(sepHandlers);
- epmd.addHandlers(postHandlers);
-
- log.debug("Added " + preHandlers.size() + " PRE handlers");
- log.debug("Added " + postHandlers.size() + " POST handlers");
- }
}
public UnifiedVirtualFile getRootFile()
@@ -688,27 +649,48 @@
if (configName.equals(this.configName) == false)
{
this.configName = configName;
- this.config = null;
-
- // notify observers
+
log.debug("Reconfiguration forced, new config is '" + configName + "'");
- this.configObservable.doNotify(configName);
+ initEndpointConfig();
+ configObservable.doNotify(configName);
}
}
+
+ public void initEndpointConfig()
+ {
+ log.debug("Create new config [name=" + getConfigName() + ",file=" + getConfigFile() + "]");
+ JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance();
+ config = factory.getConfig(getRootFile(), getConfigName(), getConfigFile());
+
+ reconfigHandlerMetaData();
+ }
- public List<Class> getRegisteredTypes()
+ private void reconfigHandlerMetaData()
{
- return Collections.unmodifiableList(registeredTypes);
+ log.debug("Configure EndpointMetaData");
+
+ List<HandlerMetaData> sepHandlers = getHandlerMetaData(HandlerType.ENDPOINT);
+ clearHandlers();
+
+ List<HandlerMetaData> preHandlers = config.getHandlers(this, HandlerType.PRE);
+ List<HandlerMetaData> postHandlers = config.getHandlers(this, HandlerType.POST);
+
+ addHandlers(preHandlers);
+ addHandlers(sepHandlers);
+ addHandlers(postHandlers);
+
+ log.debug("Added " + preHandlers.size() + " PRE handlers");
+ log.debug("Added " + sepHandlers.size() + " ENDPOINT handlers");
+ log.debug("Added " + postHandlers.size() + " POST handlers");
}
- public void update(Observable observable, Object object)
+ public List<Class> getRegisteredTypes()
{
- log.trace("Ingore configuration change notification");
+ return Collections.unmodifiableList(registeredTypes);
}
class ConfigObservable extends Observable
{
-
public void doNotify(Object object)
{
setChanged();
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -24,6 +24,7 @@
// $Id$
import java.io.IOException;
+import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.LinkedHashMap;
@@ -36,6 +37,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
+import org.jboss.ws.core.UnifiedVirtualFile;
import org.jboss.ws.core.jaxrpc.TypeMappingImpl;
import org.jboss.ws.core.jaxrpc.TypeMappingRegistryImpl;
import org.jboss.ws.core.jaxrpc.Use;
@@ -72,6 +74,7 @@
private String serviceRefName;
private String wsdName;
private URL wsdlLocation;
+ private String wsdlFile;
private URL mappingLocation;
private String handlerChain;
private String wsdlPublishLocation;
@@ -83,13 +86,16 @@
// Arbitrary properties given by <call-property>
private Properties properties;
-
+
// derived cached encoding style
private Use encStyle;
-
+
// The security configuration
- private WSSecurityConfiguration securityConfiguration;
-
+ private WSSecurityConfiguration securityConfig;
+
+ // The key to the wsdl cache
+ private String wsdlCacheKey;
+
public ServiceMetaData(UnifiedMetaData wsMetaData, QName serviceName)
{
this.wsMetaData = wsMetaData;
@@ -132,6 +138,16 @@
this.wsdName = wsdName;
}
+ public String getWsdlFile()
+ {
+ return wsdlFile;
+ }
+
+ public void setWsdlFile(String wsdlFile)
+ {
+ this.wsdlFile = wsdlFile;
+ }
+
public URL getWsdlLocation()
{
return wsdlLocation;
@@ -255,15 +271,47 @@
*/
public WSDLDefinitions getWsdlDefinitions()
{
+ URL wsdlURL = wsdlLocation;
+ if (wsdlURL == null && wsdlFile != null)
+ {
+ // Try wsdlFile as URL
+ try
+ {
+ wsdlURL = new URL(wsdlFile);
+ }
+ catch (MalformedURLException e)
+ {
+ // ignore
+ }
+
+ // Try wsdlFile as child from root
+ if (wsdlURL == null)
+ {
+ try
+ {
+ UnifiedVirtualFile vfsRoot = getUnifiedMetaData().getRootFile();
+ wsdlURL = vfsRoot.findChild(wsdlFile).toURL();
+ }
+ catch (IOException ex)
+ {
+ throw new IllegalStateException("Cannot find wsdl: " + wsdlFile);
+ }
+ }
+ }
+
WSDLDefinitions wsdlDefinitions = null;
- if (wsdlLocation != null)
+ if (wsdlURL != null)
{
- wsdlDefinitions = (WSDLDefinitions)wsMetaData.getWSDLDefinition(wsdlLocation.toExternalForm());
+ // The key should not after it is assigned
+ if (wsdlCacheKey == null)
+ wsdlCacheKey = "#" + (wsdlLocation != null ? wsdlLocation : wsdlFile);
+
+ wsdlDefinitions = (WSDLDefinitions)wsMetaData.getWsdlDefinition(wsdlCacheKey);
if (wsdlDefinitions == null)
{
WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
- wsdlDefinitions = factory.parse(wsdlLocation);
- wsMetaData.addWSDLDefinition(wsdlLocation.toExternalForm(), wsdlDefinitions);
+ wsdlDefinitions = factory.parse(wsdlURL);
+ wsMetaData.addWsdlDefinition(wsdlCacheKey, wsdlDefinitions);
}
}
return wsdlDefinitions;
@@ -281,12 +329,12 @@
public WSSecurityConfiguration getSecurityConfiguration()
{
- return securityConfiguration;
+ return securityConfig;
}
public void setSecurityConfiguration(WSSecurityConfiguration securityConfiguration)
{
- this.securityConfiguration = securityConfiguration;
+ this.securityConfig = securityConfiguration;
}
public Use getEncodingStyle()
@@ -331,7 +379,7 @@
{
// Validate that there is at least one handler configured
// if we have a security configuration
- if (securityConfiguration != null)
+ if (securityConfig != null)
{
int handlerCount = 0;
for (EndpointMetaData epMetaData : endpoints.values())
@@ -389,10 +437,12 @@
buffer.append("\n qname=" + serviceName);
buffer.append("\n refName=" + serviceRefName);
buffer.append("\n wsdName=" + wsdName);
+ buffer.append("\n wsdlFile=" + wsdlFile);
buffer.append("\n wsdlLocation=" + wsdlLocation);
buffer.append("\n jaxrpcMapping=" + mappingLocation);
buffer.append("\n handlerChain=" + handlerChain);
buffer.append("\n publishLocation=" + wsdlPublishLocation);
+ buffer.append("\n securityConfig=" + (securityConfig != null ? "found" : null));
buffer.append("\n properties=" + properties);
buffer.append("\n" + types);
buffer.append("\n");
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -140,12 +140,12 @@
services.add(serviceMetaData);
}
- public void addWSDLDefinition(String wsdlFile, WSDLDefinitions wsdlDefinitions)
+ public void addWsdlDefinition(String wsdlFile, WSDLDefinitions wsdlDefinitions)
{
wsdlMap.put(wsdlFile, wsdlDefinitions);
}
- public WSDLDefinitions getWSDLDefinition(String wsdlFile)
+ public WSDLDefinitions getWsdlDefinition(String wsdlFile)
{
return wsdlMap.get(wsdlFile);
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Config.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Config.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Config.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -34,13 +34,9 @@
private static final long serialVersionUID = 4219543242657899910L;
private Timestamp timestamp;
-
private Username username;
-
private Sign sign;
-
private Encrypt encrypt;
-
private Requires requires;
public Encrypt getEncrypt()
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Encrypt.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Encrypt.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Encrypt.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -35,9 +35,7 @@
private static final long serialVersionUID = -2802677183149218760L;
private String type;
-
private String alias;
-
private String algorithm;
public Encrypt(String type, String alias, String algorithm)
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Operation.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Operation.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Operation.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -35,7 +35,6 @@
private static final long serialVersionUID = 4223295703633326725L;
private Config config;
-
private String name;
public Operation(String name)
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Port.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Port.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Port.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -36,9 +36,7 @@
private static final long serialVersionUID = 8294850341855208663L;
private String name;
-
private Config defaultConfig;
-
private HashMap<String, Operation> operations = new HashMap<String, Operation>();
public Port(String name)
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Requires.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Requires.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Requires.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -34,9 +34,7 @@
private static final long serialVersionUID = 6899913633295989845L;
private RequireTimestamp requireTimestamp;
-
private RequireSignature requireSignature;
-
private RequireEncryption requireEncryption;
public RequireEncryption getRequireEncryption()
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Sign.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Sign.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Sign.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -33,9 +33,7 @@
private static final long serialVersionUID = -2645745357707804441L;
private String type;
-
private String alias;
-
private boolean includeTimestamp;
public Sign(String type, String alias, boolean includeTimestamp)
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -21,21 +21,23 @@
*/
package org.jboss.ws.metadata.wsse;
+// $Id: $
+
import java.io.IOException;
-import java.io.InputStream;
import java.net.URL;
+import org.jboss.logging.Logger;
import org.jboss.ws.core.UnifiedVirtualFile;
+import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCServerMetaDataBuilder;
/**
- * Created by IntelliJ IDEA.
- * User: hbraun
- * Date: 14.12.2006
- * Time: 16:17:02
- * To change this template use File | Settings | File Templates.
+ * @author hbraun
+ * @author Thomas.Diesler(a)jboss.com
*/
public class WSSecurityConfigFactory
{
+ // provide logging
+ final Logger log = Logger.getLogger(JAXRPCServerMetaDataBuilder.class);
public static WSSecurityConfigFactory newInstance()
{
@@ -52,6 +54,7 @@
if (location != null)
{
+ log.debug("createConfiguration from: " + location);
config = WSSecurityOMFactory.newInstance().parse(location);
// Get and set deployment path to the keystore file
@@ -59,39 +62,32 @@
{
location = getResource(vfsRoot, config.getKeyStoreFile());
if (location != null)
+ {
+ log.debug("Add keystore: " + location);
config.setKeyStoreURL(location);
+ }
}
if (config.getTrustStoreFile() != null)
{
location = getResource(vfsRoot, config.getTrustStoreFile());
if (location != null)
+ {
+ log.debug("Add truststore: " + location);
config.setTrustStoreURL(location);
+ }
}
}
return config;
}
- /**
- *
- * @param vfsRoot
- * @param resource
- * @return null, when the resource cannot be found
- */
private URL getResource(UnifiedVirtualFile vfsRoot, String resource)
{
try
{
UnifiedVirtualFile child = vfsRoot.findChild(resource);
- URL url = child.toURL();
- if (url != null)
- {
- InputStream inputStream = url.openStream();
- inputStream.close();
- }
-
- return url;
+ return child.toURL();
}
catch (Exception e)
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfiguration.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfiguration.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfiguration.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -36,25 +36,20 @@
private static final long serialVersionUID = 1022564645797303076L;
private Config defaultConfig;
-
private HashMap<String, Port> ports = new HashMap<String, Port>();
-
private String keyStoreFile;
-
private URL keyStoreURL;
-
private String keyStoreType;
-
private String keyStorePassword;
-
private String trustStoreFile;
-
private URL trustStoreURL;
-
private String trustStoreType;
-
private String trustStorePassword;
+ public WSSecurityConfiguration()
+ {
+ }
+
public Config getDefaultConfig()
{
return defaultConfig;
Copied: trunk/jbossws-core/src/main/resources/samples/ant-import (from rev 2249, branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import)
Deleted: trunk/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id:build-thirdparty.xml 1125 2006-10-03 15:45:31Z thomas.diesler(a)jboss.com $ -->
-
-<project name="JBossWS-Thirdparty">
-
- <!-- ========= -->
- <!-- Libraries -->
- <!-- ========= -->
-
- <target name="thirdparty" depends="thirdparty-get,thirdparty-classpath">
- </target>
-
- <target name="thirdparty-get" depends="prepare" if="force.thirdparty.get"
- description="Gets the thirdparty libraries">
-
- <mkdir dir="${thirdparty.dir}"/>
- <get src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar" dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/apache-logging/${apache-logging}/lib/commons-logging.jar" dest="${thirdparty.dir}/commons-logging.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/common/${jboss-common}/lib/jboss-common.jar" dest="${thirdparty.dir}/jboss-common.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/ejb3/${jboss-ejb3}/bin/ejb3.deployer" dest="${thirdparty.dir}/ejb3.deployer.zip" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-client.jar" dest="${thirdparty.dir}/jbosssx-client.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jbossas/core-libs/${jbossas-core-libs}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" />
- <get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mail.jar" dest="${thirdparty.dir}/mail.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
-
- <mkdir dir="${thirdparty.dir}/jbpm-bpel"/>
- <unzip dest="${thirdparty.dir}/jbpm-bpel" src="${thirdparty.dir}/jbpm-bpel.sar"/>
- <unzip dest="${thirdparty.dir}" src="${thirdparty.dir}/ejb3.deployer.zip"/>
- </target>
-
- <target name="thirdparty-classpath">
-
- <!-- The compile classpath for jbossws core -->
- <path id="core.classpath">
- <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
- <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/>
- <pathelement location="${thirdparty.dir}/javassist.jar"/>
- <pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
- <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-common.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-remoting.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
- <pathelement location="${thirdparty.dir}/jbosssx-client.jar"/>
- <pathelement location="${thirdparty.dir}/mail.jar"/>
- <pathelement location="${thirdparty.dir}/servlet-api.jar"/>
- <pathelement location="${thirdparty.dir}/stax-api.jar"/>
- <pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
- <pathelement location="${thirdparty.dir}/wstx.jar"/>
- <pathelement location="${thirdparty.dir}/getopt.jar"/>
- <pathelement location="${thirdparty.dir}/xmlsec.jar"/>
- <pathelement location="${thirdparty.dir}/xercesImpl.jar"/>
- <pathelement location="${thirdparty.dir}/xalan.jar"/>
- </path>
-
- </target>
-
-</project>
Copied: trunk/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml (from rev 2249, branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml)
===================================================================
--- trunk/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml (rev 0)
+++ trunk/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id:build-thirdparty.xml 1125 2006-10-03 15:45:31Z thomas.diesler(a)jboss.com $ -->
+
+<project name="JBossWS-Thirdparty">
+
+ <!-- ========= -->
+ <!-- Libraries -->
+ <!-- ========= -->
+
+ <target name="thirdparty" depends="thirdparty-get,thirdparty-classpath">
+ </target>
+
+ <target name="thirdparty-get" depends="prepare" if="force.thirdparty.get"
+ description="Gets the thirdparty libraries">
+
+ <mkdir dir="${thirdparty.dir}"/>
+ <get src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar" dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/apache-logging/${apache-logging}/lib/commons-logging.jar" dest="${thirdparty.dir}/commons-logging.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/common/${jboss-common}/lib/jboss-common.jar" dest="${thirdparty.dir}/jboss-common.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/ejb3/${jboss-ejb3}/bin/ejb3.deployer" dest="${thirdparty.dir}/ejb3.deployer.zip" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-client.jar" dest="${thirdparty.dir}/jbosssx-client.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jbossas/core-libs/${jbossas-core-libs}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" />
+ <get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mail.jar" dest="${thirdparty.dir}/mail.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
+
+ <mkdir dir="${thirdparty.dir}/jbpm-bpel"/>
+ <unzip dest="${thirdparty.dir}/jbpm-bpel" src="${thirdparty.dir}/jbpm-bpel.sar"/>
+ <unzip dest="${thirdparty.dir}" src="${thirdparty.dir}/ejb3.deployer.zip"/>
+ </target>
+
+ <target name="thirdparty-classpath">
+
+ <!-- The compile classpath for jbossws core -->
+ <path id="core.classpath">
+ <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
+ <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/>
+ <pathelement location="${thirdparty.dir}/javassist.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-common.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-remoting.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
+ <pathelement location="${thirdparty.dir}/jbosssx-client.jar"/>
+ <pathelement location="${thirdparty.dir}/mail.jar"/>
+ <pathelement location="${thirdparty.dir}/servlet-api.jar"/>
+ <pathelement location="${thirdparty.dir}/stax-api.jar"/>
+ <pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
+ <pathelement location="${thirdparty.dir}/wstx.jar"/>
+ <pathelement location="${thirdparty.dir}/getopt.jar"/>
+ <pathelement location="${thirdparty.dir}/xmlsec.jar"/>
+ <pathelement location="${thirdparty.dir}/xercesImpl.jar"/>
+ <pathelement location="${thirdparty.dir}/xalan.jar"/>
+ </path>
+
+ </target>
+
+</project>
Modified: trunk/jbossws-core/src/main/resources/samples/ant.properties.example
===================================================================
--- trunk/jbossws-core/src/main/resources/samples/ant.properties.example 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/resources/samples/ant.properties.example 2007-02-02 13:13:28 UTC (rev 2250)
@@ -7,7 +7,7 @@
jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3
# The JBoss server under test. This can be [jboss50|jboss42|jboss40|tomcat]
-jbossws.integration.target=jboss42
+jbossws.integration.target=jboss50
# The JBoss server instance
jboss.server.instance=default
@@ -17,9 +17,15 @@
tomcat.manager.username=manager
tomcat.manager.password=manager
+# JBoss Repository
+jboss.repository=file:/home/tdiesler/cvs/jboss.local.repository
+#jboss.repository=http://repository.jboss.com
+
# Force thirdparty HTTP get
#force.thirdparty.get=true
-# JBoss Repository
-#jboss.repository=file:/home/tdiesler/cvs/jboss.local.repository
-jboss.repository=http://repository.jboss.com
+# Java Compiler options
+javac.debug=yes
+javac.deprecation=yes
+javac.fail.onerror=yes
+javac.verbose=no
Modified: trunk/jbossws-core/src/main/resources/samples/build.xml
===================================================================
--- trunk/jbossws-core/src/main/resources/samples/build.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/resources/samples/build.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,66 +1,499 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ============================================================ -->
+
<!-- $Id$ -->
-<project default="main" name="JBossWS Examples">
+<project default="main" basedir="." name="JBossWS-Tests">
+
+ <import file="${basedir}/ant-import/build-thirdparty.xml"/>
+
+ <property file="${basedir}/ant.properties"/>
+ <property file="${basedir}/version.properties"/>
+
+ <property name="tests.dir" value="${basedir}"/>
+ <property name="tests.etc.dir" value="${tests.dir}/src/main/etc"/>
+ <property name="tests.lib.dir" value="${tests.dir}/lib"/>
+ <property name="tests.java.dir" value="${tests.dir}/src/main/java"/>
+ <property name="tests.resources.dir" value="${tests.dir}/src/main/resources"/>
+ <property name="tests.output.dir" value="${tests.dir}/output"/>
+
+ <property name="thirdparty.dir" value="${basedir}/thirdparty"/>
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <!-- JDK Detection -->
+ <available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/>
+ <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
- <import file="${basedir}/common/imported-build.xml"/>
-
+ <!-- Force thirdparty get -->
+ <condition property="force.thirdparty.get">
+ <not>
+ <available file="${thirdparty.dir}" type="dir"/>
+ </not>
+ </condition>
+
+ <!-- Use -Ddebug=true for remote debugging -->
+ <condition property="remote.debug.line" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006">
+ <isset property="debug"/>
+ </condition>
+ <condition property="remote.debug.line" value="">
+ <not>
+ <isset property="debug"/>
+ </not>
+ </condition>
+
+ <!-- Available integration target -->
+ <property name="integration.target.${jbossws.integration.target}" value="true"/>
+
+ <!-- Define jboss.home -->
+ <condition property="jboss.home" value="${jboss50.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
+ </condition>
+ <condition property="jboss.home" value="${jboss42.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
+ </condition>
+ <condition property="jboss.home" value="${jboss40.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss40"/>
+ </condition>
+
+ <!-- Integration Target Server -->
+ <condition property="jbossws.integration.target.jboss">
+ <isset property="jboss.home"/>
+ </condition>
+ <condition property="jbossws.integration.target.tomcat">
+ <equals arg1="${jbossws.integration.target}" arg2="tomcat"/>
+ </condition>
+
+ <property name="jboss.client" value="${jboss.home}/client"/>
+ <property name="jboss.lib" value="${jboss.home}/lib"/>
+ <property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/>
+ <property name="jboss.server.lib" value="${jboss.server}/lib"/>
+ <property name="jboss.server.deploy" value="${jboss.server}/deploy"/>
+
+ <!-- Java Endorsed -->
+ <condition property="endorsed.dirs" value="${jboss.home}/lib/endorsed">
+ <isset property="jbossws.integration.target.jboss"/>
+ </condition>
+ <condition property="endorsed.dirs" value="${tomcat.home}/common/endorsed">
+ <isset property="jbossws.integration.target.tomcat"/>
+ </condition>
+
+ <!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME
+ otherwise and initialize the node0/node1 cluster hostnames to localhost
+ and ${hostname} by default. If you cannot route multicast traffic between
+ localhost and hostname, then you need to specify node0 and node1 binding
+ in the local.properties that can in order to be able to run the clustering
+ tests.
+ -->
+ <property environment="env"/>
+ <condition property="hostname" value="${env.COMPUTERNAME}">
+ <os family="windows"/>
+ </condition>
+ <condition property="hostname" value="${env.HOSTNAME}">
+ <not>
+ <os family="windows"/>
+ </not>
+ </condition>
+
+ <!-- node0 defaults -->
+ <property name="node0" value="localhost"/>
+ <property name="node0.http.url" value="http://${node0}:8080"/>
+ <property name="node0.jndi.url" value="jnp://${node0}:1099"/>
+ <property name="node0.hajndi.url" value="jnp://${node0}:1100"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="prepare">
+
+ <mkdir dir="${tests.output.dir}/log"/>
+ <touch file="${tests.output.dir}/log/test.log"/>
+
+ <tstamp>
+ <format property="build.id" pattern="yyyyMMddHHmm"/>
+ </tstamp>
+
+ <!-- Define excluded tests -->
+ <condition property="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt">
+ <or>
+ <available file="${jboss.client}/jboss-ejb3-client.jar"/>
+ <isset property="integration.target.tomcat"/>
+ </or>
+ </condition>
+ <property name="excludes-short-name" value="tests-${jbossws.integration.target}-noejb3-excludes.txt"/>
+ <property name="excludesfile" value="${tests.resources.dir}/${excludes-short-name}"/>
+
+ <echo/>
+ <echo message="-----------------------------------------------"/>
+ <echo message="jboss.home = ${jboss.home}"/>
+ <echo message="tomcat.home = ${tomcat.home}"/>
+ <echo message="java.home = ${java.home}"/>
+ <echo message="endorsed = ${endorsed.dirs}"/>
+ <echo message="excludesfile = ${excludes-short-name}"/>
+ <echo message="-----------------------------------------------"/>
+
+ </target>
+
<!--
- Build the test deployments
+ Init the various classpaths
-->
- <target name="jars" description="build the deployments">
-
- <ant antfile="${basedir}/jaxrpc/docstyle/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxrpc/dynamichandler/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxrpc/exception/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxrpc/handler/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxrpc/holder/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxrpc/jmstransport/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxrpc/jsr109ejb/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxrpc/jsr109pojo/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxrpc/message/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxrpc/mtom/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxrpc/oneway/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxrpc/rpcstyle/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxrpc/secureejb/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxrpc/swa/build.xml" target="jars"/>
- <!--ant antfile="${basedir}/jaxrpc/wsbpel/build.xml" target="jars"/-->
- <ant antfile="${basedir}/jaxrpc/wssecurity/build.xml" target="jars"/>
-
- <ant antfile="${basedir}/jaxws/jsr181ejb/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxws/jsr181pojo/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxws/wsaddressing/build.xml" target="jars"/>
+ <target name="init" depends="prepare,jboss-classpath,tomcat-classpath"/>
+
+ <target name="common-classpath" depends="prepare,thirdparty">
+
+ <!-- The combined compile classpath -->
+ <path id="jbossws.jars.classpath">
+ <pathelement location="${tests.lib.dir}/jbossws-client.jar"/>
+ <pathelement location="${tests.lib.dir}/jboss-jaxrpc.jar"/>
+ <pathelement location="${tests.lib.dir}/jboss-jaxws.jar"/>
+ <pathelement location="${tests.lib.dir}/jboss-saaj.jar"/>
+ <pathelement location="${tests.lib.dir}/jbossws-jboss50-integration.jar"/>
+ <pathelement location="${tests.lib.dir}/jbossws-jboss42-integration.jar"/>
+ <pathelement location="${tests.lib.dir}/jbossws-jboss40-integration.jar"/>
+ <pathelement location="${tests.lib.dir}/jbossws-tomcat-integration.jar"/>
+ </path>
+
+ <!-- The combined compile classpath -->
+ <path id="javac.classpath">
+ <path refid="core.classpath"/>
+ <path refid="jbossws.jars.classpath"/>
+ <pathelement location="${thirdparty.dir}/activation.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-vfs.jar"/>
+ <pathelement location="${thirdparty.dir}/junit.jar"/>
+ <pathelement location="${thirdparty.dir}/mail.jar"/>
+ <pathelement location="${thirdparty.dir}/qdox.jar"/>
+ <pathelement location="${thirdparty.dir}/policy.jar"/>
+ <pathelement location="${thirdparty.dir}/servlet-api.jar"/>
+ <pathelement location="${thirdparty.dir}/stax-api.jar"/>
+ <pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
+ </path>
</target>
-
+
+ <target name="jboss-classpath" depends="common-classpath" if="jbossws.integration.target.jboss">
+
+ <!-- The test client classpath -->
+ <path id="test.client.classpath">
+ <path refid="jbossws.jars.classpath"/>
+ <pathelement location="${jboss.client}/commons-logging.jar"/>
+ <pathelement location="${jboss.client}/jboss-backport-concurrent.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-aspect-jdk50-client.jar"/>
+ <pathelement location="${jboss.client}/jbossretro-rt.jar"/>
+ <pathelement location="${jboss.client}/log4j.jar"/>
+ <pathelement location="${jboss.client}/jbossall-client.jar"/>
+ <pathelement location="${jboss.lib}/jboss-vfs.jar"/>
+ <pathelement location="${jboss.server.lib}/hibernate3.jar"/>
+ <pathelement location="${jboss.server.lib}/jboss.jar"/>
+ <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
+ <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
+ <path refid="javac.classpath"/>
+ </path>
+
+ <!-- The jBPM BPEL classpath -->
+ <path id="jbpm.bpel.classpath">
+ <path refid="jbossws.jars.classpath"/>
+ <pathelement location="${thirdparty.dir}/jbpm-bpel"/> <!-- jbpm.cfg.xml -->
+ <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar" />
+ <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar" />
+ <pathelement location="${thirdparty.dir}/jbpm-bpel/commons-lang.jar" />
+ <pathelement location="${thirdparty.dir}/jbpm-bpel/jaxen.jar" />
+ <pathelement location="${thirdparty.dir}/commons-collections.jar"/>
+ <pathelement location="${thirdparty.dir}/commons-logging.jar"/>
+ <pathelement location="${thirdparty.dir}/dom4j.jar"/>
+ <pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-logging-log4j.jar"/>
+ <!--
+ <pathelement location="${thirdparty.dir}/log4j.jar"/>
+ <pathelement location="${tests.etc.dir}"/>
+ -->
+ </path>
+ </target>
+
+ <target name="tomcat-classpath" depends="common-classpath" if="jbossws.integration.target.tomcat">
+ <!-- The test client classpath -->
+ <path id="test.client.classpath">
+ <path refid="jbossws.jars.classpath"/>
+ <pathelement location="${tomcat.common.lib}/jbossws-thirdparty.jar"/>
+ <path refid="javac.classpath"/>
+ </path>
+ </target>
+
+
+ <!-- ================================================================== -->
+ <!-- Compiling -->
+ <!-- ================================================================== -->
+
+ <target name="compile" depends="compile14,compile15" description="Compile sources"/>
+
+ <target name="compile14" depends="init" unless="HAVE_JDK_1.5">
+ <mkdir dir="${tests.output.dir}/classes"/>
+ <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
+ failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}">
+ <src path="${tests.java.dir}"/>
+ <exclude name="org/jboss/test/ws/jaxws/**"/>
+ <exclude name="org/jboss/test/ws/tools/jsr181/**"/>
+ <classpath refid="javac.classpath"/>
+ </javac>
+ </target>
+
+ <target name="compile15" depends="init" if="HAVE_JDK_1.5">
+ <mkdir dir="${tests.output.dir}/classes"/>
+ <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
+ failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}">
+ <src path="${tests.java.dir}"/>
+ <classpath refid="javac.classpath"/>
+ </javac>
+ </target>
+
+ <target name="compile-generated" depends="init" description="Compile generated sources">
+ <mkdir dir="${tests.output.dir}/classes"/>
+ <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ <src path="${tests.output.dir}/wstools/java"/>
+ <exclude name="org/jboss/test/ws/interop/**"/>
+ <classpath refid="javac.classpath"/>
+ </javac>
+ </target>
+
+ <target name="copy-resources" depends="init" description="Copy the deployment resources.">
+ <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/jndi.properties"/>
+ <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/log4j.xml"/>
+ <!-- Copy resources -->
+ <copy todir="${tests.output.dir}/resources">
+ <fileset dir="${tests.resources.dir}">
+ <include name="**/*.wsdl"/>
+ <include name="**/*.xml"/>
+ <exclude name="jaxrpc/samples-override/**"/>
+ </fileset>
+ <filterset>
+ <filter token="jbosstest.host.name" value="${node0}"/>
+ <filter token="wsdl-publish-location" value="${tests.output.dir}/wsdl-publish"/>
+ </filterset>
+ </copy>
+ <!-- Copy binary files -->
+ <copy todir="${tests.output.dir}/resources">
+ <fileset dir="${tests.resources.dir}">
+ <exclude name="**/*.wsdl"/>
+ <exclude name="**/*.xml"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <target name="main" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="Build the deployments.">
+ <ant antfile="${basedir}/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc" inheritall="true"/>
+ <ant antfile="${basedir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/>
+ </target>
+
<!--
- Run the testsuite
+ Generate samples sources
-->
- <target name="tests" depends="init" description="run the testsuite">
+ <target name="generate-sources" depends="compile" description="Generate the deployment resources.">
+ <!-- create jbpm process archives -->
+ <mkdir dir="${tests.output.dir}/libs"/>
+ <zip destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip">
+ <fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/bpel" />
+ </zip>
+ <!-- Copy the BPEL sar -->
+ <copy file="${thirdparty.dir}/jbpm-bpel.sar" todir="${tests.output.dir}/libs"/>
- <ant antfile="${basedir}/jaxrpc/docstyle/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxrpc/dynamichandler/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxrpc/exception/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxrpc/handler/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxrpc/holder/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxrpc/jmstransport/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxrpc/jsr109ejb/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxrpc/jsr109pojo/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxrpc/message/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxrpc/mtom/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxrpc/oneway/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxrpc/rpcstyle/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxrpc/secureejb/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxrpc/swa/build.xml" target="tests"/>
- <!--ant antfile="${basedir}/jaxrpc/wsbpel/build.xml" target="tests"/-->
- <ant antfile="${basedir}/jaxrpc/wssecurity/build.xml" target="tests"/>
-
- <ant antfile="${basedir}/jaxws/jsr181ejb/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxws/jsr181pojo/build.xml" target="tests"/>
- <ant antfile="${basedir}/jaxws/wsaddressing/build.xml" target="tests"/>
-
+ <!-- generate wsdl binding and service definitions for bpel processes -->
+ <taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask">
+ <classpath refid="jbpm.bpel.classpath"/>
+ </taskdef>
+ <servicegen processfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"
+ outputdir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl"
+ bindingfile="hello-binding-.wsdl" servicefile="hello-service.wsdl" />
+
+ <!-- generate mapping artifacts -->
+ <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
+ <classpath refid="core.classpath"/>
+ <classpath location="${tests.lib.dir}/jbossws-client.jar"/>
+ <classpath location="${thirdparty.dir}/concurrent.jar"/>
+ <classpath location="${tests.output.dir}/classes"/>
+ <classpath location="${tests.output.dir}"/>
+ </taskdef>
+ <mkdir dir="${tests.output.dir}/libs"/>
+ <mkdir dir="${tests.output.dir}/wstools/java"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/exception/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/handler/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/holder/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jmstransport/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/doclit/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/rpclit/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/message/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${tests.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml" />
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/>
+ <move todir="${tests.output.dir}/wstools/java">
+ <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/>
+ </move>
+ </target>
+
+ <target name="copy-generated" depends="init" description="Copy the deployment resources.">
+ <!-- Copy generated resources -->
+ <copy todir="${tests.output.dir}/resources">
+ <fileset dir="${tests.output.dir}/wstools/resources">
+ <include name="**/*.wsdl"/>
+ <include name="**/*.xml"/>
+ </fileset>
+ </copy>
+ <!-- Copy resources that cannot (yet) be generated -->
+ <copy todir="${tests.output.dir}/resources/jaxrpc/samples" overwrite="true">
+ <fileset dir="${tests.resources.dir}/jaxrpc/samples-override"/>
+ <filterset>
+ <filter token="jbosstest.host.name" value="${node0}"/>
+ </filterset>
+ </copy>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Testing -->
+ <!-- ================================================================== -->
+
+ <!-- Run all unit tests and generate a report -->
+ <target name="tests" depends="main" description="Run all unit tests and generate a report">
+ <antcall target="tests-main">
+ <param name="include.wildcard" value="org/jboss/test/ws/**/*TestCase.class"/>
+ </antcall>
<antcall target="tests-report"/>
-
</target>
-
-</project>
\ No newline at end of file
+
+ <!--
+ Run a collection of unit tests.
+ ant -Dtest=tools test
+ -->
+ <target name="test" depends="init" if="test" description="Run all unit tests in a given directory">
+ <antcall target="tests-main">
+ <param name="include.wildcard" value="org/jboss/test/ws/${test}/**/*TestCase.class"/>
+ </antcall>
+ </target>
+
+ <!-- Common test target -->
+ <target name="tests-main" depends="init">
+ <mkdir dir="${tests.output.dir}/reports"/>
+ <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}">
+ <jvmarg value="-Djava.security.manager"/>
+ <sysproperty key="build.testlog" value="${tests.output.dir}/log"/>
+ <sysproperty key="client.scenario" value="${client.scenario}"/>
+ <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/>
+ <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
+ <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/>
+ <sysproperty key="java.security.policy" value="${tests.etc.dir}/tst.policy"/>
+ <sysproperty key="jboss.home" value="${jboss.home}"/>
+ <sysproperty key="jbosstest.host.name" value="${node0}"/>
+ <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/>
+ <sysproperty key="tomcat.home" value="${tomcat.home}"/>
+ <sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/>
+ <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.keystore"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.truststore"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/>
+ <classpath>
+ <path refid="test.client.classpath"/>
+ <pathelement location="${tests.output.dir}/classes"/>
+ </classpath>
+ <formatter type="plain" usefile="true"/>
+ <formatter type="xml" usefile="true"/>
+ <batchtest todir="${tests.output.dir}/reports" fork="true">
+ <fileset dir="${tests.output.dir}/classes" includes="${include.wildcard}" excludesfile="${excludesfile}"/>
+ </batchtest>
+ </junit>
+ </target>
+
+ <!--
+ Run a single unit test.
+ ant -Dtest=org.jboss.test.ws.jaxrpc.samples.jsr109pojo.RpcJSETestCase one-test
+ -->
+ <target name="one-test" depends="init" if="test" description="Run a single unit test">
+ <mkdir dir="${tests.output.dir}/reports"/>
+ <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}">
+ <jvmarg line="${remote.debug.line}"/>
+ <jvmarg value="-Djava.security.manager"/>
+ <sysproperty key="build.testlog" value="${tests.output.dir}/log"/>
+ <sysproperty key="client.scenario" value="${client.scenario}"/>
+ <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/>
+ <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
+ <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/>
+ <sysproperty key="java.security.policy" value="${tests.etc.dir}/tst.policy"/>
+ <sysproperty key="jboss.home" value="${jboss.home}"/>
+ <sysproperty key="jbosstest.host.name" value="${node0}"/>
+ <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/>
+ <sysproperty key="tomcat.home" value="${tomcat.home}"/>
+ <sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/>
+ <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/>
+ <!--
+ http://jira.jboss.com/jira/browse/JBWS-917
+ <sysproperty key="javax.net.ssl.keyStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.keystore"/>
+ <sysproperty key="javax.net.ssl.trustStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.truststore"/>
+ <sysproperty key="javax.net.ssl.keyStorePassword" value="jbossws"/>
+ <sysproperty key="javax.net.ssl.trustStorePassword" value="jbossws"/>
+ <sysproperty key="javax.net.ssl.keyStoreType" value="jks"/>
+ <sysproperty key="javax.net.ssl.trustStoreType" value="jks"/>
+ -->
+ <!-- HTTPS hostname wrong: should be <localhost> -->
+ <sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.keystore"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.truststore"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/>
+ <classpath>
+ <path refid="test.client.classpath"/>
+ <pathelement location="${tests.output.dir}/classes"/>
+ </classpath>
+ <formatter type="plain" usefile="true"/>
+ <formatter type="xml" usefile="true"/>
+ <test todir="${tests.output.dir}/reports" name="${test}" fork="true"/>
+ </junit>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Reporting -->
+ <!-- ================================================================== -->
+
+ <!-- Build the tests report -->
+ <target name="tests-report" depends="init" description="Build the tests report">
+ <junitreport todir="${tests.output.dir}/reports">
+ <fileset dir="${tests.output.dir}/reports">
+ <include name="TEST-*.xml"/>
+ </fileset>
+ <report format="frames" todir="${tests.output.dir}/reports/html"/>
+ </junitreport>
+ <zip destfile="${tests.output.dir}/test-report-${build.id}.zip">
+ <fileset dir="${tests.output.dir}" includes="reports/**"/>
+ </zip>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Cleaning -->
+ <!-- ================================================================== -->
+
+ <target name="clean" description="Delete all generated test files.">
+ <delete dir="${tests.output.dir}"/>
+ </target>
+
+</project>
Modified: trunk/jbossws-core/src/main/resources/samples/version.properties
===================================================================
--- trunk/jbossws-core/src/main/resources/samples/version.properties 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-core/src/main/resources/samples/version.properties 2007-02-02 13:13:28 UTC (rev 2250)
@@ -2,18 +2,22 @@
# $Id: version.properties 1420 2006-11-14 12:44:10Z thomas.diesler(a)jboss.com $
# thirdparty library versions
+apache-collections=@apache-collections@
apache-log4j=@apache-log4j@
apache-logging=@apache-logging@
+dom4j=@dom4j@
ibm-wsdl4j=@ibm-wsdl4j@
javassist=@javassist@
jbpm-bpel=@jbpm-bpel@
-jboss-common-core=@jboss-common-core@
+jboss-common=@jboss-common@
jboss-common-logging-log4j=@jboss-common-logging-log4j@
jboss-common-logging-spi=@jboss-common-logging-spi@
jboss-ejb3=@jboss-ejb3@
jboss-jbossxb=@jboss-jbossxb@
+jboss-security=@jboss-security@
jbossas-core-libs=@jbossas-core-libs@
oswego-concurrent=@oswego-concurrent@
+stax-api=@stax-api@
sun-jaf=@sun-jaf@
sun-jaxb=@sun-jaxb@
sun-javamail=@sun-javamail@
Modified: trunk/jbossws-docs/user-guide/project/en/modules/secureejb/secure-ejb.xml
===================================================================
--- trunk/jbossws-docs/user-guide/project/en/modules/secureejb/secure-ejb.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-docs/user-guide/project/en/modules/secureejb/secure-ejb.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -76,7 +76,7 @@
<jndi-name>ejb/RoleSecuredSLSB</jndi-name>
<port-component>
<port-component-name>RoleSecured</port-component-name>
- <port-component-uri>/ws4ee-samples-ejb/RoleSecured</port-component-uri>
+ <port-component-uri>/jaxrpc-samples-ejb/RoleSecured</port-component-uri>
</port-component>
</session>
<session>
@@ -84,7 +84,7 @@
<jndi-name>ejb/BasicSecuredSLSB</jndi-name>
<port-component>
<port-component-name>BasicSecured</port-component-name>
- <port-component-uri>/ws4ee-samples-ejb/BasicSecured</port-component-uri>
+ <port-component-uri>/jaxrpc-samples-ejb/BasicSecured</port-component-uri>
</port-component>
</session>
</enterprise-beans>
Modified: trunk/jbossws-tests/.classpath
===================================================================
--- trunk/jbossws-tests/.classpath 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/.classpath 2007-02-02 13:13:28 UTC (rev 2250)
@@ -19,7 +19,6 @@
<classpathentry kind="lib" path="/build/thirdparty/javassist.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-impl.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-container.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-j2ee.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/>
@@ -39,5 +38,6 @@
<classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jbosssx-client.jar" sourcepath="/build/thirdparty/jbosssx-src.zip"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-common.jar" sourcepath="/build/thirdparty/jboss-common-sources.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Copied: trunk/jbossws-tests/ant-import/build-benchmark.xml (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/ant-import/build-benchmark.xml)
===================================================================
--- trunk/jbossws-tests/ant-import/build-benchmark.xml (rev 0)
+++ trunk/jbossws-tests/ant-import/build-benchmark.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ============================================================ -->
+
+<!-- $Id$ -->
+
+<project name="JBossWS Benchamrks">
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <target name="build-benchmark" depends="main">
+ <ant antfile="src/test/ant/build-benchmark-jars.xml" target="build-benchmark-jars" inheritall="true"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Testing -->
+ <!-- ================================================================== -->
+
+ <!-- Run benchmark test cases -->
+ <target name="tests-benchmark" depends="init" description="Run benchmark unit tests">
+ <antcall target="tests-main">
+ <param name="include.wildcard" value="org/jboss/test/ws/benchmark/**/*TestCase.class"/>
+ </antcall>
+ <antcall target="tests-report"/>
+ </target>
+
+</project>
Modified: trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml
===================================================================
--- trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -16,7 +16,7 @@
<!-- Building -->
<!-- ================================================================== -->
- <target name="build-jars" description="Build the jaxrpc deployments">
+ <target name="build-jars-jaxrpc" description="Build the jaxrpc deployments">
<mkdir dir="${tests.output.dir}/libs"/>
@@ -2485,615 +2485,6 @@
</metainf>
</jar>
- <!-- jaxrpc-samples-docstyle-bare -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-bare.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialEndpointJSE.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialService.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrder.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrderResponse.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-bare-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialService.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrder.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrderResponse.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-docstyle-wrapped -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-wrapped.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialEndpointJSE.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*ResponseStruct.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-wrapped-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*ResponseStruct.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-dynamichandler -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-dynamichandler.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*ServiceBean.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Handler.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-dynamichandler-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Handler.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-exception -->
- <war destfile="${tests.output.dir}/libs/jaxrpc-samples-exception.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/exception/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/exception/ServerHandler.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionBeanImpl.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/exception/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-exception-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/exception/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/exception/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-handler -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-handler.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/handler/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/handler/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/handler/*ServiceBean.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/handler/ServerSideHandler.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/handler/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-handler-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/handler/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/handler/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/handler/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-holder -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-holder.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/holder/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/holder/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/holder/*ServiceBean.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/holder/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-holder-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/holder/*Service.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/holder/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/holder/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-jmstransport -->
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jmstransport.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/Organization.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jmstransport/META-INF">
- <include name="ejb-jar.xml"/>
- <include name="jboss.xml"/>
- <include name="webservices.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jmstransport.sar">
- <fileset dir="${tests.output.dir}/libs">
- <include name="jaxrpc-samples-jmstransport.jar"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jmstransport/META-INF">
- <include name="jboss-service.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-jsr109ejb-rpc -->
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-rpc.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*EJBEndpoint.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
- <include name="ejb-jar.xml"/>
- <include name="jboss.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-rpc-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-jsr109ejb-doc -->
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-doc.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Struct.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*EJBEndpoint.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
- <include name="ejb-jar.xml"/>
- <include name="jboss.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-doc-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Struct.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-jsr109pojo-rpc -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-rpc.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*JSEEndpoint.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="jboss-web.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-rpc-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-jsr109pojo-doc -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-doc.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Struct.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*JSEEndpoint.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-doc-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Struct.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-message -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-message.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/message/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/message/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/message/*ServiceBean.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/message/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-message-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/message/*Service.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/message/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/message/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-mtom -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-mtom.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/mtom/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/mtom/**"/>
- <exclude name="org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-mtom-client.jar">
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/mtom/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-oneway -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-oneway.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/oneway/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*ServiceBean.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/oneway/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-oneway-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*Service.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/oneway/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/oneway/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-rpcstyle -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-rpcstyle.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialEndpointJSE.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialService.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-rpcstyle-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialService.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-secureejb -->
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-secureejb.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationImpl.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/secureejb/META-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="ejb-jar.xml"/>
- <include name="jboss.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-secureejb-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/secureejb/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-swa -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-swa.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/swa/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/swa/AttachmentImpl.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/swa/Attachment.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/swa/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-swa-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/swa/Attachment.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/swa/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/swa/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-store-pass-encrypt.war -->
- <replace file="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml" token="${buildpath}" value="${tests.output.dir}"/>
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-store-pass-encrypt.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/PasswordUtil.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt">
- <include name="jboss-wsse-server.xml"/>
- </webinf>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity">
- <include name="wsse.keystore"/>
- <include name="wsse.truststore"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-store-pass-encrypt-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jboss-wsse-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
- <include name="wsdl/**"/>
- <include name="jaxrpc-mapping.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-wsbpel -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello.war"
- webxml="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class" />
- <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class" />
- <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter_Impl.class" />
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
- <include name="webservices.xml" />
- <include name="classes/bpel-application.xml" />
- </webinf>
- <webinf dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
- <include name="jaxrpc-mapping.xml" />
- <include name="wsdl/**" />
- </webinf>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class" />
- <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class" />
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/META-INF">
- <include name="application-client.xml" />
- <include name="jboss-client.xml" />
- </metainf>
- <metainf dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
- <include name="jaxrpc-mapping.xml" />
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-wssecurity-sign -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-sign.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-sign">
- <include name="jboss-wsse-server.xml"/>
- </webinf>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity">
- <include name="wsse.keystore"/>
- <include name="wsse.truststore"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-sign-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jboss-wsse-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-wssecurity-encrypt -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-encrypt.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
- <include name="webservices.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt">
- <include name="jboss-wsse-server.xml"/>
- </webinf>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity">
- <include name="wsse.keystore"/>
- <include name="wsse.truststore"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-encrypt-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jboss-wsse-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
<!-- jaxrpc-utf16 -->
<war warfile="${tests.output.dir}/libs/jaxrpc-utf16.war" webxml="${tests.output.dir}/resources/jaxrpc/utf16/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
@@ -3173,6 +2564,20 @@
</metainf>
</jar>
+ <!-- jaxrpc-wsdlpublish -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-wsdlpublish.war" webxml="${tests.output.dir}/resources/jaxrpc/wsdlpublish/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpointImpl.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/wsdlpublish/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="jboss-web.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+
<!-- jaxrpc-wsse-account-signup.war -->
<war warfile="${tests.output.dir}/libs/jaxrpc-wsse-account-signup.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
@@ -3536,130 +2941,8 @@
</metainf>
</jar>
- <!-- jaxrpc-xop-doclit without handlers -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/>
- <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
- <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF">
- <include name="webservices.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxrpc-xop-doclit-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/>
- <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
- <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF">
- <include name="wsdl/**"/>
- <include name="jaxrpc-mapping.xml"/>
- </metainf>
- </jar>
- <!-- jaxrpc-xop-doclit with handlers -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-xop-doclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/>
- <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
- <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF">
- <include name="webservices.xml"/>
- </webinf>
- </war>
-
- <jar destfile="${tests.output.dir}/libs/jaxrpc-xop-doclit_handler-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/>
- <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
- <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/handlerconfig/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF">
- <include name="wsdl/**"/>
- <include name="jaxrpc-mapping.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-xop-rpclit without handlers -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/>
- <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
- <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF">
- <include name="webservices.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
-
- <jar destfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/>
- <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
- <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF">
- <include name="wsdl/**"/>
- <include name="jaxrpc-mapping.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-xop-rpclit with handlers -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/>
- <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
- <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF">
- <include name="webservices.xml"/>
- </webinf>
- </war>
-
- <jar destfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit_handler-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/>
- <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
- <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF">
- <include name="wsdl/**"/>
- <include name="jaxrpc-mapping.xml"/>
- </metainf>
- </jar>
+ <!-- Please add alphabetically -->
- <!-- Please add alphabetically -->
-
</target>
</project>
Modified: trunk/jbossws-tests/ant-import/build-jars-jaxws.xml
===================================================================
--- trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -9,805 +9,521 @@
<!-- $Id$ -->
<project name="JBossWS">
-
- <description>JBossWS test archive builder</description>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <target name="build-jars" description="Build the deployments.">
-
- <mkdir dir="${tests.output.dir}/libs"/>
-
- <!-- benchmark -->
- <war warfile="${tests.output.dir}/libs/jaxws-benchmark-doclit.war"
- webxml="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/benchmark/jaxws/**/*.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF">
- <include name="wsdl/**"/>
- </webinf>
- <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
-
- <!-- jaxws-anonymous -->
- <war warfile="${tests.output.dir}/libs/jaxws-anonymous.war" webxml="${tests.output.dir}/resources/jaxws/anonymous/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/anonymous/Anonymous.class"/>
- <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.class"/>
- <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.class"/>
- <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.class"/>
- </classes>
- </war>
-
- <!-- jaxws-binding -->
- <war warfile="${tests.output.dir}/libs/jaxws-binding.war" webxml="${tests.output.dir}/resources/jaxws/binding/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.class"/>
- <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpoint.class"/>
- </classes>
- </war>
-
- <!-- jaxws-eardeployment -->
- <war warfile="${tests.output.dir}/libs/jaxws-eardeployment.war" webxml="${tests.output.dir}/resources/jaxws/eardeployment/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/eardeployment/JSEBean.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/eardeployment/WEB-INF">
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxws-eardeployment.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/eardeployment/EJB3Bean.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/eardeployment/WEB-INF">
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-eardeployment.ear">
- <fileset dir="${tests.output.dir}/libs">
- <include name="jaxws-eardeployment.jar"/>
- <include name="jaxws-eardeployment.war"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/eardeployment/META-INF">
- <include name="jboss-app.xml"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-eardeployment42.ear">
- <fileset dir="${tests.output.dir}/libs">
- <include name="jaxws-eardeployment.jar"/>
- <include name="jaxws-eardeployment.war"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/eardeployment/META-INF">
- <include name="application.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxws-endpoint-servlet -->
- <war warfile="${tests.output.dir}/libs/jaxws-endpoint-servlet.war" webxml="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/endpoint/EndpointServlet.class"/>
- <include name="org/jboss/test/ws/jaxws/endpoint/EndpointBean.class"/>
- <include name="org/jboss/test/ws/jaxws/endpoint/EndpointInterface.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF">
- <include name="wsdl/**"/>
- </webinf>
- </war>
-
- <!-- jaxws-handlerscope -->
- <war warfile="${tests.output.dir}/libs/jaxws-handlerscope.war" webxml="${tests.output.dir}/resources/jaxws/handlerscope/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.class"/>
- <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/handlerscope/WEB-INF">
- <include name="jaxws-server-handlers.xml"/>
- </webinf>
- </war>
-
- <!-- jaxws-jbws860 -->
- <war warfile="${tests.output.dir}/libs/jaxws-jbws860.war" webxml="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws860/*.class"/>
- <exclude name="org/jboss/test/ws/jaxws/jbws860/*TestCase.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
-
- <!-- jaxws-jbws871 -->
- <war warfile="${tests.output.dir}/libs/jaxws-jbws871-rpc.war" webxml="${tests.output.dir}/resources/jaxws/jbws871/WEB-INF-rpc/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointImpl.class"/>
- </classes>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxws-jbws871-rpc-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws871/IntegerArray.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointService.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/jbws871/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxws-jbws944 -->
- <jar jarfile="${tests.output.dir}/libs/jaxws-jbws944.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.class"/>
- </fileset>
- </jar>
-
- <!-- jaxws-jbws981 -->
- <jar destfile="${tests.output.dir}/libs/jaxws-jbws981.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws981/EJB3Bean.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws981/EndpointInterface.class"/>
- </fileset>
- </jar>
-
- <!-- jaxws-jbws1178 -->
- <war destfile="${tests.output.dir}/libs/jaxws-jbws1178.war" webxml="${tests.output.dir}/resources/jaxws/jbws1178/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws1178/TestEndpoint.class"/>
- </classes>
- </war>
-
- <!-- jaxws-jbws1190 -->
- <war destfile="${tests.output.dir}/libs/jaxws-jbws1190.war" webxml="${tests.output.dir}/resources/jaxws/jbws1190/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl*.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.class"/>
- </classes>
- </war>
-
- <!-- jaxws-jbws1357 -->
- <war warfile="${tests.output.dir}/libs/jaxws-jbws1357.war" webxml="${tests.output.dir}/resources/jaxws/jbws1357/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.class"/>
- </classes>
- <fileset dir="${tests.output.dir}/resources/jaxws/jbws1357">
- <include name="hello.jsp"/>
- </fileset>
- </war>
-
- <!-- jaxws-jsr181-complex -->
- <war warfile="${tests.output.dir}/libs/jaxws-jsr181-complex.war" webxml="${tests.output.dir}/resources/jaxws/jsr181/complex/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jsr181/complex/*.class"/>
- <include name="org/jboss/test/ws/jaxws/jsr181/complex/extra/*.class"/>
- </classes>
- </war>
-
- <!-- jaxws metadata -->
- <war warfile="${tests.output.dir}/libs/jaxws-metadata.war" webxml="${tests.output.dir}/resources/jaxws/metadata/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/metadata/*.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/metadata/WEB-INF">
- <include name="jboss-web.xml"/>
- <include name="wsdl/*"/>
- </webinf>
- </war>
-
- <!-- jaxws-samples-asynchronous -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-asynchronous.war" webxml="${tests.output.dir}/resources/jaxws/samples/asynchronous/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.class"/>
- </classes>
- </war>
-
- <!-- jaxws-samples-context -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-context.war" webxml="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/context/EndpointJSE.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-context.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/context/EndpointEJB.class"/>
- </fileset>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-context-jboss4x.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/context/EndpointNoInjectEJB.class"/>
- </fileset>
- </jar>
-
- <!-- jaxws-samples-exception -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-exception.war" webxml="${tests.output.dir}/resources/jaxws/samples/exception/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpointImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/exception/UserException.class"/>
- </classes>
- </war>
-
- <!-- jaxws-samples-handlerchain -->
- <copy todir="${tests.output.dir}/classes/org/jboss/test/ws/jaxws/samples/handlerchain"
- file="${tests.output.dir}/resources/jaxws/samples/handlerchain/jaxws-handlers.xml"/>
- <war warfile="${tests.output.dir}/libs/jaxws-samples-handlerchain.war" webxml="${tests.output.dir}/resources/jaxws/samples/handlerchain/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/handlerchain/EndpointImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/handlerchain/*Handler.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers.xml"/>
- </classes>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxws-samples-handlerchain-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/handlerchain/*Handler.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClient.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers.xml"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/handlerchain/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <manifest>
- <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.handlerchain.HandlerChainClient"/>
- </manifest>
- </jar>
-
- <!-- jaxws-samples-jsr181ejb -->
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181ejb.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3RemoteInterface.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181ejb/META-INF">
- <include name="jboss-wsse-server.xml"/>
- <include name="wsse.*"/>
- </metainf>
- </jar>
-
- <!-- jaxws-samples-jsr181pojo -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo.war" webxml="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/JSEBean01.class"/>
- </classes>
- </war>
-
- <!-- jaxws-samples-jsr181pojo-docwrapped -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-docwrapped.war"
- webxml="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/JSEBean01.class"/>
- </classes>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-docwrapped-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/EndpointInterface.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/Concat.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/ConcatResponse.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxws-samples-logicalhandler -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-source.war"
- webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-source.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSource.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF">
- <include name="jaxws-server-source-handlers.xml"/>
- </webinf>
- </war>
- <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-jaxb.war"
- webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-jaxb.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ObjectFactory.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF">
- <include name="jaxws-server-jaxb-handlers.xml"/>
- </webinf>
- </war>
-
- <!-- jaxws-samples-oneway -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-oneway.war" webxml="${tests.output.dir}/resources/jaxws/samples/oneway/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/oneway/PingEndpointImpl.class"/>
- </classes>
- </war>
-
- <!-- jaxws-samples-provider -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/jaxb/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/provider/WebServiceEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/provider/UserType.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared">
- <include name="wsdl/Provider.wsdl"/>
- </webinf>
- </war>
- <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-message.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/message/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanMessage.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared">
- <include name="wsdl/Provider.wsdl"/>
- </webinf>
- </war>
- <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/payload/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared">
- <include name="wsdl/Provider.wsdl"/>
- </webinf>
- </war>
-
- <!-- jaxws-samples-retail -->
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF">
- <include name="wsdl/*"/>
- <include name="jaxws-handler.xml"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/>
- <exclude name="org/jboss/test/ws/jaxws/samples/retail/**/*Bean.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxws-samples-soapbinding -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-soapbinding.war" webxml="${tests.output.dir}/resources/jaxws/samples/soapbinding/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrapped.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleSEI.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocBareServiceImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrappedServiceImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleServiceImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareRequest.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareResponse.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrder.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrderAck.class"/>
- </classes>
- </war>
-
- <!-- jaxws-samples-webmethod -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-webmethod.war" webxml="${tests.output.dir}/resources/jaxws/samples/webmethod/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpointImpl.class"/>
- </classes>
- </war>
-
- <!-- jaxws-samples-webparam -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-webparam.war" webxml="${tests.output.dir}/resources/jaxws/samples/webparam/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webparam/PingServiceImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webparam/PingDocument.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webparam/SecurityHeader.class"/>
- </classes>
- </war>
-
- <!-- jaxws-samples-webresult -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-webresult.war" webxml="${tests.output.dir}/resources/jaxws/samples/webresult/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerServiceImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerRecord.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webresult/USAddress.class"/>
- </classes>
- </war>
-
- <!-- jaxws-samples-webservice -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice01-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF01/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean01.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF01">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
- <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice02-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean02.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02">
- <include name="jboss-web.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice03-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF03/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean03.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF03">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice01-ejb3.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/>
- </fileset>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice02-ejb3.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/webservice/META-INF02">
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice03-ejb3.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/>
- </fileset>
- </jar>
-
- <!-- jaxws-webserviceref -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointImpl.class"/>
- </classes>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <manifest>
- <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne"/>
- </manifest>
- </jar>
- <war destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-servlet-client.war"
- webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF">
- <include name="jboss-web.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-ejb3-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Remote.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF">
- <include name="jboss.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointImpl.class"/>
- </fileset>
- </jar>
- <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointClient.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointService.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpoint.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF-secure">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <manifest>
- <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpointClient"/>
- </manifest>
- </jar>
- <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-override-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientTwo.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF-override">
- <include name="jbossws-client-config.xml"/>
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF">
- <include name="wsdl/**"/>
- </metainf>
- <manifest>
- <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientTwo"/>
- </manifest>
- </jar>
-
- <!-- jaxws-samples-wsaddressing -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-wsaddressing.war" webxml="${tests.output.dir}/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/wsaddressing/WEB-INF">
- <include name="jaxws-handlers.xml"/>
- </webinf>
- </war>
-
- <!-- jaxws-samples-wseventing.war -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-wseventing.war" webxml="${tests.output.dir}/resources/jaxws/samples/wseventing/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/wseventing/*.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/wseventing/WEB-INF">
- <include name="wsdl/jboss-web.xml"/>
- <include name="wsdl/sysmon.wsdl"/>
- <include name="wsdl/ws-eventing.wsdl"/>
- <include name="wsdl/ws-eventing.xsd"/>
- <include name="wsdl/ws-addr.xsd"/>
- </webinf>
- </war>
-
- <!-- jaxws-samples-xop-doclit -->
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/**/*.class"/>
- </fileset>
- </jar>
-
- <!-- jaxws-wrapped-accessor -->
- <war warfile="${tests.output.dir}/libs/jaxws-wrapped-accessor.war" webxml="${tests.output.dir}/resources/jaxws/wrapped/accessor/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.class"/>
- <include name="org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/*"/>
- </classes>
- </war>
-
- <!-- jaxws-wsaddressing-action -->
- <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-action-rpc.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/action/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/wsaddressing/action/META-INF">
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-action-rpc-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/action/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jbossws-client-config.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxws-wsaddressing-replyto -->
- <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-initial.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/Initial-WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class"/>
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class"/>
- </classes>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-initial-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class"/>
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/Initial-META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxws-jbossws-client-config.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- </metainf>
- </jar>
- <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-replyto.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpointImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class"/>
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class"/>
- </classes>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-replyto-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class"/>
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jbossws-client-config.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- </metainf>
- </jar>
- <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-faultto.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.class"/>
- <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class"/>
- </classes>
- </war>
-
- <!-- jaxws-wseventing -->
- <war warfile="${tests.output.dir}/libs/jaxws-wseventing.war" webxml="${tests.output.dir}/resources/jaxws/wseventing/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/ws/eventing/*.class"/>
- <include name="org/jboss/test/ws/jaxws/wseventing/*.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/wseventing/WEB-INF">
- <include name="wsdl/**"/>
- </webinf>
- </war>
-
- <!-- interop -->
-
- <!-- jbossws-interop-wsa10-service -->
- <war warfile="${tests.output.dir}/libs/jbossws-interop-wsa10-service.war" webxml="${tests.output.dir}/resources/interop/wsa/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/interop/wsa/**/*.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/interop/wsa/WEB-INF">
- <include name="wsdl/**"/>
- <include name="jboss-web.xml"/>
- </webinf>
- <fileset dir="${tests.output.dir}/resources/interop/wsa">
- <include name="*.*"/>
- </fileset>
- </war>
-
- <!-- wsse -->
- <!-- jbossws-interop-wsse10Sign -->
- <war warfile="${tests.output.dir}/libs/jbossws-interop-wsse10Sign.war" webxml="${tests.output.dir}/resources/interop/wsse/sign/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/interop/wsse/**/*.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/WEB-INF">
- <include name="wsdl/**"/>
- </webinf>
- <webinf dir="${tests.output.dir}/resources/interop/wsse/sign/WEB-INF">
- <include name="jboss-web.xml"/>
- <include name="jboss-wsse-server.xml"/>
- </webinf>
- <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/META-INF">
- <include name="alice.jks"/>
- <include name="wsse10.truststore"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jbossws-interop-wsse10Sign-client.jar">
- <metainf dir="${tests.output.dir}/resources/interop/wsse/sign/META-INF">
- <include name="jboss-wsse-client.xml"/>
- </metainf>
- </jar>
-
- <!-- jbossws-interop-wsse10Encrypt -->
- <war warfile="${tests.output.dir}/libs/jbossws-interop-wsse10Encrypt.war" webxml="${tests.output.dir}/resources/interop/wsse/encrypt/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/interop/wsse/**/*.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/WEB-INF">
- <include name="wsdl/**"/>
- </webinf>
- <webinf dir="${tests.output.dir}/resources/interop/wsse/encrypt/WEB-INF">
- <include name="jboss-web.xml"/>
- <include name="jboss-wsse-server.xml"/>
- </webinf>
- <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/META-INF">
- <include name="alice.jks"/>
- <include name="wsse10.truststore"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jbossws-interop-wsse10Encrypt-client.jar">
- <metainf dir="${tests.output.dir}/resources/interop/wsse/encrypt/META-INF">
- <include name="jboss-wsse-client.xml"/>
- </metainf>
- </jar>
-
- <!-- base data types -->
- <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitB.war"
- webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/interop/soapwsdl/basedoclitb/**/*.class"/>
- <include name="org/jboss/test/ws/interop/soapwsdl/*.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF">
- <include name="wsdl/**"/>
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
-
- <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitW.war"
- webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/interop/soapwsdl/basedoclitw/**/*.class"/>
- <include name="org/jboss/test/ws/interop/soapwsdl/*.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF">
- <include name="wsdl/**"/>
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
-
- <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesRpcLit.war"
- webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/interop/soapwsdl/baserpclit/**/*.class"/>
- <include name="org/jboss/test/ws/interop/soapwsdl/*.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF">
- <include name="wsdl/**"/>
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
- <!-- end interop -->
-
- <!-- Please add alphabetically -->
-
- </target>
-
+
+ <description>JBossWS test archive builder</description>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <target name="build-jars-jaxws" description="Build the deployments.">
+
+ <mkdir dir="${tests.output.dir}/libs"/>
+
+ <!-- jaxws-anonymous -->
+ <war warfile="${tests.output.dir}/libs/jaxws-anonymous.war" webxml="${tests.output.dir}/resources/jaxws/anonymous/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/anonymous/Anonymous.class"/>
+ <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.class"/>
+ <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.class"/>
+ <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-benchmark-doclit -->
+ <war warfile="${tests.output.dir}/libs/jaxws-benchmark-doclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/benchmark/jaxws/**/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF">
+ <include name="wsdl/**"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-binding -->
+ <war warfile="${tests.output.dir}/libs/jaxws-binding.war" webxml="${tests.output.dir}/resources/jaxws/binding/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.class"/>
+ <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpoint.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-eardeployment -->
+ <war warfile="${tests.output.dir}/libs/jaxws-eardeployment.war" webxml="${tests.output.dir}/resources/jaxws/eardeployment/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/eardeployment/JSEBean.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/eardeployment/WEB-INF">
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-eardeployment.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/eardeployment/EJB3Bean.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/eardeployment/WEB-INF">
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-eardeployment.ear">
+ <fileset dir="${tests.output.dir}/libs">
+ <include name="jaxws-eardeployment.jar"/>
+ <include name="jaxws-eardeployment.war"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/eardeployment/META-INF">
+ <include name="jboss-app.xml"/>
+ </metainf>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-eardeployment42.ear">
+ <fileset dir="${tests.output.dir}/libs">
+ <include name="jaxws-eardeployment.jar"/>
+ <include name="jaxws-eardeployment.war"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/eardeployment/META-INF">
+ <include name="application.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-endpoint-servlet -->
+ <war warfile="${tests.output.dir}/libs/jaxws-endpoint-servlet.war" webxml="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/endpoint/EndpointServlet.class"/>
+ <include name="org/jboss/test/ws/jaxws/endpoint/EndpointBean.class"/>
+ <include name="org/jboss/test/ws/jaxws/endpoint/EndpointInterface.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF">
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-handlerscope -->
+ <war warfile="${tests.output.dir}/libs/jaxws-handlerscope.war" webxml="${tests.output.dir}/resources/jaxws/handlerscope/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.class"/>
+ <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/handlerscope/WEB-INF">
+ <include name="jaxws-server-handlers.xml"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-jbws860 -->
+ <war warfile="${tests.output.dir}/libs/jaxws-jbws860.war" webxml="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws860/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws860/*TestCase.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-jbws871 -->
+ <war warfile="${tests.output.dir}/libs/jaxws-jbws871-rpc.war" webxml="${tests.output.dir}/resources/jaxws/jbws871/WEB-INF-rpc/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointImpl.class"/>
+ </classes>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxws-jbws871-rpc-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws871/IntegerArray.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointService.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/jbws871/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-jbws944 -->
+ <jar jarfile="${tests.output.dir}/libs/jaxws-jbws944.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.class"/>
+ </fileset>
+ </jar>
+
+ <!-- jaxws-jbws981 -->
+ <jar destfile="${tests.output.dir}/libs/jaxws-jbws981.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws981/EJB3Bean.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws981/EndpointInterface.class"/>
+ </fileset>
+ </jar>
+
+ <!-- jaxws-jbws1178 -->
+ <war destfile="${tests.output.dir}/libs/jaxws-jbws1178.war" webxml="${tests.output.dir}/resources/jaxws/jbws1178/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1178/TestEndpoint.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-jbws1190 -->
+ <war destfile="${tests.output.dir}/libs/jaxws-jbws1190.war" webxml="${tests.output.dir}/resources/jaxws/jbws1190/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl*.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-jbws1357 -->
+ <war warfile="${tests.output.dir}/libs/jaxws-jbws1357.war" webxml="${tests.output.dir}/resources/jaxws/jbws1357/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.class"/>
+ </classes>
+ <fileset dir="${tests.output.dir}/resources/jaxws/jbws1357">
+ <include name="hello.jsp"/>
+ </fileset>
+ </war>
+
+ <!-- jaxws-jsr181-complex -->
+ <war warfile="${tests.output.dir}/libs/jaxws-jsr181-complex.war" webxml="${tests.output.dir}/resources/jaxws/jsr181/complex/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jsr181/complex/*.class"/>
+ <include name="org/jboss/test/ws/jaxws/jsr181/complex/extra/*.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws metadata -->
+ <war warfile="${tests.output.dir}/libs/jaxws-metadata.war" webxml="${tests.output.dir}/resources/jaxws/metadata/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/metadata/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/metadata/WEB-INF">
+ <include name="jboss-web.xml"/>
+ <include name="wsdl/*"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-webserviceref -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointImpl.class"/>
+ </classes>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ <manifest>
+ <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne"/>
+ </manifest>
+ </jar>
+ <war destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-servlet-client.war"
+ webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF">
+ <include name="jboss-web.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-ejb3-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Remote.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF">
+ <include name="jboss.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+ <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointImpl.class"/>
+ </fileset>
+ </jar>
+ <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointClient.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF-secure">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <manifest>
+ <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpointClient"/>
+ </manifest>
+ </jar>
+ <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-override-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientTwo.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF-override">
+ <include name="jbossws-client-config.xml"/>
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF">
+ <include name="wsdl/**"/>
+ </metainf>
+ <manifest>
+ <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientTwo"/>
+ </manifest>
+ </jar>
+
+ <!-- jaxws-samples-wsaddressing -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-wsaddressing.war" webxml="${tests.output.dir}/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/wsaddressing/WEB-INF">
+ <include name="jaxws-handlers.xml"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-samples-wseventing.war -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-wseventing.war" webxml="${tests.output.dir}/resources/jaxws/samples/wseventing/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wseventing/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/wseventing/WEB-INF">
+ <include name="wsdl/jboss-web.xml"/>
+ <include name="wsdl/sysmon.wsdl"/>
+ <include name="wsdl/ws-eventing.wsdl"/>
+ <include name="wsdl/ws-eventing.xsd"/>
+ <include name="wsdl/ws-addr.xsd"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-samples-xop-doclit -->
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/**/*.class"/>
+ </fileset>
+ </jar>
+
+ <!-- jaxws-wrapped-accessor -->
+ <war warfile="${tests.output.dir}/libs/jaxws-wrapped-accessor.war" webxml="${tests.output.dir}/resources/jaxws/wrapped/accessor/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.class"/>
+ <include name="org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/*"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-wsaddressing-action -->
+ <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-action-rpc.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/action/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/wsaddressing/action/META-INF">
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-action-rpc-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/action/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jbossws-client-config.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-wsaddressing-replyto -->
+ <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-initial.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/Initial-WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class"/>
+ </classes>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-initial-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/Initial-META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jaxws-jbossws-client-config.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ </metainf>
+ </jar>
+ <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-replyto.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class"/>
+ </classes>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-replyto-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jbossws-client-config.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ </metainf>
+ </jar>
+ <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-faultto.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-wseventing -->
+ <war warfile="${tests.output.dir}/libs/jaxws-wseventing.war" webxml="${tests.output.dir}/resources/jaxws/wseventing/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/ws/eventing/*.class"/>
+ <include name="org/jboss/test/ws/jaxws/wseventing/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/wseventing/WEB-INF">
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+
+ <!-- interop -->
+
+ <!-- jbossws-interop-wsa10-service -->
+ <war warfile="${tests.output.dir}/libs/jbossws-interop-wsa10-service.war" webxml="${tests.output.dir}/resources/interop/wsa/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/interop/wsa/**/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/interop/wsa/WEB-INF">
+ <include name="wsdl/**"/>
+ <include name="jboss-web.xml"/>
+ </webinf>
+ <fileset dir="${tests.output.dir}/resources/interop/wsa">
+ <include name="*.*"/>
+ </fileset>
+ </war>
+
+ <!-- wsse -->
+ <!-- jbossws-interop-wsse10Sign -->
+ <war warfile="${tests.output.dir}/libs/jbossws-interop-wsse10Sign.war" webxml="${tests.output.dir}/resources/interop/wsse/sign/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/interop/wsse/**/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/WEB-INF">
+ <include name="wsdl/**"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/interop/wsse/sign/WEB-INF">
+ <include name="jboss-web.xml"/>
+ <include name="jboss-wsse-server.xml"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/META-INF">
+ <include name="alice.jks"/>
+ <include name="wsse10.truststore"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jbossws-interop-wsse10Sign-client.jar">
+ <metainf dir="${tests.output.dir}/resources/interop/wsse/sign/META-INF">
+ <include name="jboss-wsse-client.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jbossws-interop-wsse10Encrypt -->
+ <war warfile="${tests.output.dir}/libs/jbossws-interop-wsse10Encrypt.war" webxml="${tests.output.dir}/resources/interop/wsse/encrypt/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/interop/wsse/**/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/WEB-INF">
+ <include name="wsdl/**"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/interop/wsse/encrypt/WEB-INF">
+ <include name="jboss-web.xml"/>
+ <include name="jboss-wsse-server.xml"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/META-INF">
+ <include name="alice.jks"/>
+ <include name="wsse10.truststore"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jbossws-interop-wsse10Encrypt-client.jar">
+ <metainf dir="${tests.output.dir}/resources/interop/wsse/encrypt/META-INF">
+ <include name="jboss-wsse-client.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- base data types -->
+ <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitB.war"
+ webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/interop/soapwsdl/basedoclitb/**/*.class"/>
+ <include name="org/jboss/test/ws/interop/soapwsdl/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF">
+ <include name="wsdl/**"/>
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+
+ <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitW.war"
+ webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/interop/soapwsdl/basedoclitw/**/*.class"/>
+ <include name="org/jboss/test/ws/interop/soapwsdl/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF">
+ <include name="wsdl/**"/>
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+
+ <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesRpcLit.war"
+ webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/interop/soapwsdl/baserpclit/**/*.class"/>
+ <include name="org/jboss/test/ws/interop/soapwsdl/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF">
+ <include name="wsdl/**"/>
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+ <!-- end interop -->
+
+ <!-- Please add alphabetically -->
+
+ </target>
+
</project>
\ No newline at end of file
Copied: trunk/jbossws-tests/ant-import/build-samples-jaxrpc.xml (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxrpc.xml)
===================================================================
--- trunk/jbossws-tests/ant-import/build-samples-jaxrpc.xml (rev 0)
+++ trunk/jbossws-tests/ant-import/build-samples-jaxrpc.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,754 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ============================================================ -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <target name="build-samples-jaxrpc" description="Build the jaxrpc samples deployments">
+
+ <mkdir dir="${tests.output.dir}/libs"/>
+
+ <!-- jaxrpc-samples-docstyle-bare -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-bare.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialEndpointJSE.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialService.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrder.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrderResponse.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-bare-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialService.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrder.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrderResponse.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-docstyle-wrapped -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-wrapped.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialEndpointJSE.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*ResponseStruct.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-wrapped-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*ResponseStruct.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-dynamichandler -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-dynamichandler.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Service.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*ServiceBean.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Handler.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-dynamichandler-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Service.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Handler.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-exception -->
+ <war destfile="${tests.output.dir}/libs/jaxrpc-samples-exception.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/exception/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/exception/ServerHandler.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionBeanImpl.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/exception/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-exception-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/exception/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/exception/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-handler -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-handler.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/handler/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/handler/*Service.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/handler/*ServiceBean.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/handler/ServerSideHandler.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/handler/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-handler-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/handler/*Service.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/handler/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/handler/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-holder -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-holder.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/holder/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/holder/*Service.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/holder/*ServiceBean.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/holder/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-holder-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/holder/*Service.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/holder/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/holder/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-jmstransport -->
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jmstransport.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/Organization.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jmstransport/META-INF">
+ <include name="ejb-jar.xml"/>
+ <include name="jboss.xml"/>
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jmstransport.sar">
+ <fileset dir="${tests.output.dir}/libs">
+ <include name="jaxrpc-samples-jmstransport.jar"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jmstransport/META-INF">
+ <include name="jboss-service.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-jsr109ejb-rpc -->
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-rpc.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*EJBEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
+ <include name="ejb-jar.xml"/>
+ <include name="jboss.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-rpc-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-jsr109ejb-doc -->
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-doc.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Struct.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*EJBEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
+ <include name="ejb-jar.xml"/>
+ <include name="jboss.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-doc-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Struct.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-jsr109pojo-rpc -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-rpc.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*JSEEndpoint.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="jboss-web.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-rpc-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-jsr109pojo-doc -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-doc.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Struct.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*JSEEndpoint.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-doc-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Struct.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-message -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-message.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/message/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/message/*Service.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/message/*ServiceBean.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/message/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-message-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/message/*Service.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/message/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/message/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-mtom -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-mtom.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/mtom/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/mtom/**"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-mtom-client.jar">
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/mtom/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-oneway -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-oneway.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/oneway/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*Service.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*ServiceBean.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/oneway/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-oneway-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*Service.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/oneway/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/oneway/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-rpcstyle -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-rpcstyle.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialEndpointJSE.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialService.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-rpcstyle-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialService.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-secureejb -->
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-secureejb.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationImpl.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/secureejb/META-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="ejb-jar.xml"/>
+ <include name="jboss.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-secureejb-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/secureejb/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-swa -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-swa.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/swa/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/swa/AttachmentImpl.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/swa/Attachment.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/swa/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-swa-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/swa/Attachment.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/swa/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/swa/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-store-pass-encrypt.war -->
+ <replace file="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml" token="${buildpath}" value="${tests.output.dir}"/>
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-store-pass-encrypt.war"
+ webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/PasswordUtil.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt">
+ <include name="jboss-wsse-server.xml"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity">
+ <include name="wsse.keystore"/>
+ <include name="wsse.truststore"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-store-pass-encrypt-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jboss-wsse-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <include name="wsdl/**"/>
+ <include name="jaxrpc-mapping.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-wsbpel -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter_Impl.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="classes/bpel-application.xml"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-wssecurity-sign -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-sign.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-sign">
+ <include name="jboss-wsse-server.xml"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity">
+ <include name="wsse.keystore"/>
+ <include name="wsse.truststore"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-sign-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jboss-wsse-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-wssecurity-encrypt -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-encrypt.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt">
+ <include name="jboss-wsse-server.xml"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity">
+ <include name="wsse.keystore"/>
+ <include name="wsse.truststore"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-encrypt-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jboss-wsse-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-xop-doclit without handlers -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*TestCase.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*TestCase.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF">
+ <include name="wsdl/**"/>
+ <include name="jaxrpc-mapping.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-xop-doclit with handlers -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*TestCase.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/handlerconfig/WEB-INF">
+ <include name="webservices.xml"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit_handler-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*TestCase.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF">
+ <include name="wsdl/**"/>
+ <include name="jaxrpc-mapping.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-xop-rpclit without handlers -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*TestCase.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*TestCase.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF">
+ <include name="wsdl/**"/>
+ <include name="jaxrpc-mapping.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxrpc-samples-xop-rpclit with handlers -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*TestCase.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/handlerconfig/WEB-INF">
+ <include name="webservices.xml"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit_handler-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*TestCase.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF">
+ <include name="wsdl/**"/>
+ <include name="jaxrpc-mapping.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- Please add alphabetically -->
+
+ </target>
+
+</project>
Copied: trunk/jbossws-tests/ant-import/build-samples-jaxws.xml (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxws.xml)
===================================================================
--- trunk/jbossws-tests/ant-import/build-samples-jaxws.xml (rev 0)
+++ trunk/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,428 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ============================================================ -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <target name="build-samples-jaxws" description="Build the jaxws sample deployments.">
+
+ <mkdir dir="${tests.output.dir}/libs"/>
+
+ <!-- jaxws-samples-asynchronous -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-asynchronous.war" webxml="${tests.output.dir}/resources/jaxws/samples/asynchronous/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-samples-context -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-context.war" webxml="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/context/EndpointJSE.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-context.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/context/EndpointEJB.class"/>
+ </fileset>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-context-jboss4x.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/context/EndpointNoInjectEJB.class"/>
+ </fileset>
+ </jar>
+
+ <!-- jaxws-samples-exception -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-exception.war" webxml="${tests.output.dir}/resources/jaxws/samples/exception/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/exception/UserException.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-samples-handlerchain -->
+ <copy todir="${tests.output.dir}/classes/org/jboss/test/ws/jaxws/samples/handlerchain"
+ file="${tests.output.dir}/resources/jaxws/samples/handlerchain/jaxws-handlers.xml"/>
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-handlerchain.war" webxml="${tests.output.dir}/resources/jaxws/samples/handlerchain/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/handlerchain/EndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/handlerchain/*Handler.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers.xml"/>
+ </classes>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxws-samples-handlerchain-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/handlerchain/*Handler.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClient.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers.xml"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/handlerchain/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <manifest>
+ <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.handlerchain.HandlerChainClient"/>
+ </manifest>
+ </jar>
+
+ <!-- jaxws-samples-jsr181ejb -->
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181ejb.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3RemoteInterface.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181ejb/META-INF">
+ <include name="jboss-wsse-server.xml"/>
+ <include name="wsse.*"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-samples-jsr181pojo -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo.war" webxml="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/JSEBean01.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-samples-jsr181pojo-docwrapped -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-docwrapped.war"
+ webxml="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/JSEBean01.class"/>
+ </classes>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-docwrapped-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/EndpointInterface.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/Concat.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/ConcatResponse.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-samples-logicalhandler -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-source.war"
+ webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-source.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSource.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF">
+ <include name="jaxws-server-source-handlers.xml"/>
+ </webinf>
+ </war>
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-jaxb.war"
+ webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-jaxb.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ObjectFactory.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF">
+ <include name="jaxws-server-jaxb-handlers.xml"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-samples-oneway -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-oneway.war" webxml="${tests.output.dir}/resources/jaxws/samples/oneway/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/oneway/PingEndpointImpl.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-samples-provider -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/jaxb/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/provider/WebServiceEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/provider/UserType.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared">
+ <include name="wsdl/Provider.wsdl"/>
+ </webinf>
+ </war>
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-message.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/message/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanMessage.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared">
+ <include name="wsdl/Provider.wsdl"/>
+ </webinf>
+ </war>
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/payload/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared">
+ <include name="wsdl/Provider.wsdl"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-samples-retail -->
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF">
+ <include name="wsdl/*"/>
+ <include name="jaxws-handler.xml"/>
+ </metainf>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/samples/retail/**/*Bean.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-samples-soapbinding -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-soapbinding.war" webxml="${tests.output.dir}/resources/jaxws/samples/soapbinding/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrapped.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleSEI.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocBareServiceImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrappedServiceImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleServiceImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareRequest.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareResponse.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrder.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrderAck.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-samples-webmethod -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-webmethod.war" webxml="${tests.output.dir}/resources/jaxws/samples/webmethod/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpointImpl.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-samples-webparam -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-webparam.war" webxml="${tests.output.dir}/resources/jaxws/samples/webparam/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webparam/PingServiceImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webparam/PingDocument.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webparam/SecurityHeader.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-samples-webresult -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-webresult.war" webxml="${tests.output.dir}/resources/jaxws/samples/webresult/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerServiceImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerRecord.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webresult/USAddress.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-samples-webservice -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice01-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF01/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean01.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF01">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice02-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean02.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02">
+ <include name="jboss-web.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice03-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF03/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean03.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF03">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice01-ejb3.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/>
+ </fileset>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice02-ejb3.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/webservice/META-INF02">
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice03-ejb3.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/>
+ </fileset>
+ </jar>
+
+ <!-- jaxws-webserviceref -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointImpl.class"/>
+ </classes>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ <manifest>
+ <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne"/>
+ </manifest>
+ </jar>
+ <war destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-servlet-client.war"
+ webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF">
+ <include name="jboss-web.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-ejb3-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Remote.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF">
+ <include name="jboss.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+ <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointImpl.class"/>
+ </fileset>
+ </jar>
+ <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointClient.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF-secure">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <manifest>
+ <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpointClient"/>
+ </manifest>
+ </jar>
+ <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-override-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientTwo.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF-override">
+ <include name="jbossws-client-config.xml"/>
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF">
+ <include name="wsdl/**"/>
+ </metainf>
+ <manifest>
+ <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientTwo"/>
+ </manifest>
+ </jar>
+
+ <!-- jaxws-samples-wsaddressing -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-wsaddressing.war" webxml="${tests.output.dir}/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/wsaddressing/WEB-INF">
+ <include name="jaxws-handlers.xml"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-samples-wseventing.war -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-wseventing.war" webxml="${tests.output.dir}/resources/jaxws/samples/wseventing/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wseventing/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/wseventing/WEB-INF">
+ <include name="wsdl/jboss-web.xml"/>
+ <include name="wsdl/sysmon.wsdl"/>
+ <include name="wsdl/ws-eventing.wsdl"/>
+ <include name="wsdl/ws-eventing.xsd"/>
+ <include name="wsdl/ws-addr.xsd"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-samples-xop-doclit -->
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/**/*.class"/>
+ </fileset>
+ </jar>
+
+ <!-- Please add alphabetically -->
+
+ </target>
+
+</project>
\ No newline at end of file
Modified: trunk/jbossws-tests/ant-import/jaxws-tools-delegate.xml
===================================================================
--- trunk/jbossws-tests/ant-import/jaxws-tools-delegate.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/ant-import/jaxws-tools-delegate.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -45,9 +45,6 @@
<echo>-----------------------------------------------</echo>
<echo>Invoking wsimport </echo>
-<!--
- <echo>Using RI Home: ${ri.home}</echo>
--->
<echo>sourceDir: @{sourceDir}</echo>
<echo>wsdlLocation: @{wsdlLocation}</echo>
<echo>-----------------------------------------------</echo>
@@ -58,6 +55,8 @@
<taskdef name="wsimport" classname="org.jboss.ws.tools.jaxws.ant.WSImport">
<classpath>
<pathelement location="${core.output.dir}/lib/jbossws-client.jar"/>
+ <pathelement location="${core.output.dir}/lib/jboss-jaxws.jar"/>
+ <pathelement location="${core.output.dir}/lib/jboss-saaj.jar"/>
<pathelement location="${thirdparty.dir}/jbossws-sun-wsimport.jar"/>
<pathelement location="${thirdparty.dir}/wstx.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/>
Modified: trunk/jbossws-tests/build.xml
===================================================================
--- trunk/jbossws-tests/build.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/build.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -9,555 +9,545 @@
<!-- $Id$ -->
<project default="main" basedir="../jbossws-tests" name="JBossWS-Tests">
-
- <import file="${basedir}/../build/ant-import/build-thirdparty.xml"/>
- <import file="${basedir}/../build/ant-import/build-setup.xml"/>
- <import file="${basedir}/../integration-jboss50/build.xml"/>
- <import file="${basedir}/../integration-jboss42/build.xml"/>
- <import file="${basedir}/../integration-jboss40/build.xml"/>
- <import file="${basedir}/../integration-tomcat/build.xml"/>
- <import file="${basedir}/../jbossws-core/build.xml"/>
- <import file="${basedir}/../jbossws-tests/ant-import/jaxws-tools-delegate.xml"/>
-
- <property name="core.output.dir" value="${core.dir}/output"/>
- <property name="core.output.classes.dir" value="${core.output.dir}/classes"/>
- <property name="core.output.classes14.dir" value="${core.output.dir}/classes14"/>
- <property name="core.output.lib.dir" value="${core.output.dir}/lib"/>
-
- <property name="tests.etc.dir" value="${tests.dir}/src/main/etc"/>
- <property name="tests.java.dir" value="${tests.dir}/src/main/java"/>
- <property name="tests.resources.dir" value="${tests.dir}/src/main/resources"/>
- <property name="tests.output.dir" value="${tests.dir}/output"/>
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <!-- Use -Ddebug=true for remote debugging -->
- <condition property="remote.debug.line" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006">
+
+ <import file="${basedir}/../build/ant-import/build-thirdparty.xml"/>
+ <import file="${basedir}/../build/ant-import/build-setup.xml"/>
+ <import file="${basedir}/../integration-jboss50/build.xml"/>
+ <import file="${basedir}/../integration-jboss42/build.xml"/>
+ <import file="${basedir}/../integration-jboss40/build.xml"/>
+ <import file="${basedir}/../integration-tomcat/build.xml"/>
+ <import file="${basedir}/../jbossws-core/build.xml"/>
+ <import file="${basedir}/../jbossws-tests/ant-import/build-benchmark.xml"/>
+ <import file="${basedir}/../jbossws-tests/ant-import/jaxws-tools-delegate.xml"/>
+
+ <property name="core.output.dir" value="${core.dir}/output"/>
+ <property name="core.output.classes.dir" value="${core.output.dir}/classes"/>
+ <property name="core.output.classes14.dir" value="${core.output.dir}/classes14"/>
+ <property name="core.output.lib.dir" value="${core.output.dir}/lib"/>
+
+ <property name="tests.etc.dir" value="${tests.dir}/src/main/etc"/>
+ <property name="tests.java.dir" value="${tests.dir}/src/main/java"/>
+ <property name="tests.resources.dir" value="${tests.dir}/src/main/resources"/>
+ <property name="tests.output.dir" value="${tests.dir}/output"/>
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <!-- Use -Ddebug=true for remote debugging -->
+ <condition property="remote.debug.line" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006">
+ <isset property="debug"/>
+ </condition>
+ <condition property="remote.debug.line" value="">
+ <not>
<isset property="debug"/>
- </condition>
- <condition property="remote.debug.line" value="">
- <not>
- <isset property="debug"/>
- </not>
- </condition>
-
- <!-- Available integration target -->
- <property name="integration.target.${jbossws.integration.target}" value="true"/>
-
- <!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss50.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
- </condition>
- <condition property="jboss.home" value="${jboss42.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
- </condition>
- <condition property="jboss.home" value="${jboss40.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss40"/>
- </condition>
-
- <!-- Integration Target Server -->
- <condition property="jbossws.integration.target.jboss">
- <isset property="jboss.home"/>
- </condition>
- <condition property="jbossws.integration.target.tomcat">
- <equals arg1="${jbossws.integration.target}" arg2="tomcat"/>
- </condition>
-
- <property name="jboss.client" value="${jboss.home}/client"/>
- <property name="jboss.lib" value="${jboss.home}/lib"/>
- <property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/>
- <property name="jboss.server.lib" value="${jboss.server}/lib"/>
- <property name="jboss.server.deploy" value="${jboss.server}/deploy"/>
-
- <!-- Java Endorsed -->
- <condition property="endorsed.dirs" value="${jboss.home}/lib/endorsed">
- <isset property="jbossws.integration.target.jboss"/>
- </condition>
- <condition property="endorsed.dirs" value="${tomcat.home}/common/endorsed">
- <isset property="jbossws.integration.target.tomcat"/>
- </condition>
-
- <!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME
- otherwise and initialize the node0/node1 cluster hostnames to localhost
- and ${hostname} by default. If you cannot route multicast traffic between
- localhost and hostname, then you need to specify node0 and node1 binding
- in the local.properties that can in order to be able to run the clustering
- tests.
- -->
- <property environment="env"/>
- <condition property="hostname" value="${env.COMPUTERNAME}">
+ </not>
+ </condition>
+
+ <!-- Available integration target -->
+ <property name="integration.target.${jbossws.integration.target}" value="true"/>
+
+ <!-- Define jboss.home -->
+ <condition property="jboss.home" value="${jboss50.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
+ </condition>
+ <condition property="jboss.home" value="${jboss42.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
+ </condition>
+ <condition property="jboss.home" value="${jboss40.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss40"/>
+ </condition>
+
+ <!-- Integration Target Server -->
+ <condition property="jbossws.integration.target.jboss">
+ <isset property="jboss.home"/>
+ </condition>
+ <condition property="jbossws.integration.target.tomcat">
+ <equals arg1="${jbossws.integration.target}" arg2="tomcat"/>
+ </condition>
+
+ <property name="jboss.client" value="${jboss.home}/client"/>
+ <property name="jboss.lib" value="${jboss.home}/lib"/>
+ <property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/>
+ <property name="jboss.server.lib" value="${jboss.server}/lib"/>
+ <property name="jboss.server.deploy" value="${jboss.server}/deploy"/>
+
+ <!-- Java Endorsed -->
+ <condition property="endorsed.dirs" value="${jboss.home}/lib/endorsed">
+ <isset property="jbossws.integration.target.jboss"/>
+ </condition>
+ <condition property="endorsed.dirs" value="${tomcat.home}/common/endorsed">
+ <isset property="jbossws.integration.target.tomcat"/>
+ </condition>
+
+ <!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME
+ otherwise and initialize the node0/node1 cluster hostnames to localhost
+ and ${hostname} by default. If you cannot route multicast traffic between
+ localhost and hostname, then you need to specify node0 and node1 binding
+ in the local.properties that can in order to be able to run the clustering
+ tests.
+ -->
+ <property environment="env"/>
+ <condition property="hostname" value="${env.COMPUTERNAME}">
+ <os family="windows"/>
+ </condition>
+ <condition property="hostname" value="${env.HOSTNAME}">
+ <not>
<os family="windows"/>
- </condition>
- <condition property="hostname" value="${env.HOSTNAME}">
- <not>
- <os family="windows"/>
- </not>
- </condition>
+ </not>
+ </condition>
+
+ <!-- node0 defaults -->
+ <property name="node0" value="localhost"/>
+ <property name="node0.http.url" value="http://${node0}:8080"/>
+ <property name="node0.jndi.url" value="jnp://${node0}:1099"/>
+ <property name="node0.hajndi.url" value="jnp://${node0}:1100"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="prepare">
+
+ <mkdir dir="${tests.output.dir}/log"/>
+ <touch file="${tests.output.dir}/log/test.log"/>
+
+ <tstamp>
+ <format property="build.id" pattern="yyyyMMddHHmm"/>
+ </tstamp>
+
+ <!-- Define the jbossws.core.jar -->
+ <condition property="jbossws.core.jar" value="${core.output.lib.dir}/jbossws-core.jar">
+ <isset property="HAVE_JDK_1.5"/>
+ </condition>
+ <property name="jbossws.core.jar" value="${jboss40.output.lib.dir}/jbossws14-core.jar"/>
- <!-- node0 defaults -->
- <property name="node0" value="localhost"/>
- <property name="node0.http.url" value="http://${node0}:8080"/>
- <property name="node0.jndi.url" value="jnp://${node0}:1099"/>
- <property name="node0.hajndi.url" value="jnp://${node0}:1100"/>
+ <!-- Define the jbossws.client.jar -->
+ <condition property="jbossws.client.jar" value="${core.output.lib.dir}/jbossws-client.jar">
+ <isset property="HAVE_JDK_1.5"/>
+ </condition>
+ <property name="jbossws.client.jar" value="${jboss40.output.lib.dir}/jbossws14-client.jar"/>
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
+ <!-- Define excluded tests -->
+ <condition property="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt">
+ <or>
+ <available file="${jboss.client}/jboss-ejb3-client.jar"/>
+ <isset property="integration.target.tomcat"/>
+ </or>
+ </condition>
+ <property name="excludes-short-name" value="tests-${jbossws.integration.target}-noejb3-excludes.txt"/>
+ <property name="excludesfile" value="${tests.resources.dir}/${excludes-short-name}"/>
+
+ <echo/>
+ <echo message="-----------------------------------------------"/>
+ <echo message="jboss.home = ${jboss.home}"/>
+ <echo message="tomcat.home = ${tomcat.home}"/>
+ <echo message="java.home = ${java.home}"/>
+ <echo message="endorsed = ${endorsed.dirs}"/>
+ <echo message="excludesfile = ${excludes-short-name}"/>
+ <echo message="-----------------------------------------------"/>
+
+ </target>
+
+ <!--
+ Init the various classpaths
+ -->
+ <target name="init" depends="prepare,jboss-classpath,tomcat-classpath"/>
+
+ <target name="common-classpath" depends="prepare,thirdparty">
+
+ <!-- The combined compile classpath -->
+ <path id="jbossws.jars.classpath">
+ <pathelement location="${jbossws.core.jar}"/>
+ <pathelement location="${jbossws.client.jar}"/>
+ <pathelement location="${core.output.lib.dir}/jboss-jaxrpc.jar"/>
+ <pathelement location="${core.output.lib.dir}/jboss-jaxws.jar"/>
+ <pathelement location="${core.output.lib.dir}/jboss-saaj.jar"/>
+ <pathelement location="${jboss50.output.lib.dir}/jbossws-jboss50-integration.jar"/>
+ <pathelement location="${jboss42.output.lib.dir}/jbossws-jboss42-integration.jar"/>
+ <pathelement location="${jboss40.output.lib.dir}/jbossws-jboss40-integration.jar"/>
+ <pathelement location="${tomcat.output.lib.dir}/jbossws-tomcat-integration.jar"/>
+ </path>
+
+ <!-- The combined compile classpath -->
+ <path id="javac.classpath">
+ <path refid="core.classpath"/>
+ <path refid="jbossws.jars.classpath"/>
+ <pathelement location="${thirdparty.dir}/activation.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-vfs.jar"/>
+ <pathelement location="${thirdparty.dir}/junit.jar"/>
+ <pathelement location="${thirdparty.dir}/mail.jar"/>
+ <pathelement location="${thirdparty.dir}/qdox.jar"/>
+ <pathelement location="${thirdparty.dir}/policy.jar"/>
+ <pathelement location="${thirdparty.dir}/servlet-api.jar"/>
+ <pathelement location="${thirdparty.dir}/stax-api.jar"/>
+ <pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
+ </path>
+ </target>
+
+ <target name="jboss-classpath" depends="common-classpath" if="jbossws.integration.target.jboss">
+
+ <!-- The test client classpath -->
+ <path id="test.client.classpath">
+ <path refid="jbossws.jars.classpath"/>
+ <pathelement location="${jboss.client}/commons-logging.jar"/>
+ <pathelement location="${jboss.client}/jboss-backport-concurrent.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-aspect-jdk50-client.jar"/>
+ <pathelement location="${jboss.client}/jbossretro-rt.jar"/>
+ <pathelement location="${jboss.client}/log4j.jar"/>
+ <pathelement location="${jboss.client}/jbossall-client.jar"/>
+ <pathelement location="${jboss.lib}/jboss-vfs.jar"/>
+ <pathelement location="${jboss.server.lib}/hibernate3.jar"/>
+ <pathelement location="${jboss.server.lib}/jboss.jar"/>
+ <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
+ <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
+ <path refid="javac.classpath"/>
+ </path>
+
+ <!-- The jBPM BPEL classpath -->
+ <path id="jbpm.bpel.classpath">
+ <path refid="jbossws.jars.classpath"/>
+ <pathelement location="${thirdparty.dir}/jbpm-bpel"/> <!-- jbpm.cfg.xml -->
+ <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar" />
+ <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar" />
+ <pathelement location="${thirdparty.dir}/jbpm-bpel/commons-lang.jar" />
+ <pathelement location="${thirdparty.dir}/jbpm-bpel/jaxen.jar" />
+ <pathelement location="${thirdparty.dir}/commons-collections.jar"/>
+ <pathelement location="${thirdparty.dir}/commons-logging.jar"/>
+ <pathelement location="${thirdparty.dir}/dom4j.jar"/>
+ <pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-logging-log4j.jar"/>
+ <!--
+ <pathelement location="${thirdparty.dir}/log4j.jar"/>
+ <pathelement location="${tests.etc.dir}"/>
+ -->
+ </path>
+ </target>
+
+ <target name="tomcat-classpath" depends="common-classpath" if="jbossws.integration.target.tomcat">
+ <!-- The test client classpath -->
+ <path id="test.client.classpath">
+ <path refid="jbossws.jars.classpath"/>
+ <pathelement location="${tomcat.common.lib}/jbossws-thirdparty.jar"/>
+ <path refid="javac.classpath"/>
+ </path>
+ </target>
+
+
+ <!-- ================================================================== -->
+ <!-- Compiling -->
+ <!-- ================================================================== -->
+
+ <target name="compile" depends="wsdl-java,compile14,compile15" description="Compile sources"/>
+
+ <target name="compile14" depends="init" unless="HAVE_JDK_1.5">
+ <mkdir dir="${tests.output.dir}/classes"/>
+ <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
+ failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}">
+ <src path="${tests.java.dir}"/>
+ <exclude name="org/jboss/test/ws/jaxws/**"/>
+ <exclude name="org/jboss/test/ws/tools/jsr181/**"/>
+ <classpath refid="javac.classpath"/>
+ </javac>
+ </target>
+
+ <target name="compile15" depends="init" if="HAVE_JDK_1.5">
+ <mkdir dir="${tests.output.dir}/classes"/>
+ <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
+ failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}">
+ <src path="${tests.java.dir}"/>
+ <classpath refid="javac.classpath"/>
+ </javac>
+ </target>
+
+ <target name="post-compile" depends="init" description="Compile generated sources">
+ <mkdir dir="${tests.output.dir}/classes"/>
+ <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ <src path="${tests.output.dir}/wstools/java"/>
+ <exclude name="org/jboss/test/ws/interop/microsoft/**"/>
+ <classpath refid="javac.classpath"/>
+ </javac>
+ </target>
+
+ <target name="copy-resources" depends="init" description="Copy the deployment resources.">
+ <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/jndi.properties"/>
+ <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/log4j.xml"/>
+ <!-- Copy resources -->
+ <copy todir="${tests.output.dir}/resources">
+ <fileset dir="${tests.resources.dir}">
+ <include name="**/*.wsdl"/>
+ <include name="**/*.xml"/>
+ <exclude name="jaxrpc/samples-override/**"/>
+ </fileset>
+ <filterset>
+ <filter token="jbosstest.host.name" value="${node0}"/>
+ <filter token="wsdl-publish-location" value="${tests.output.dir}/wsdl-publish"/>
+ </filterset>
+ </copy>
+ <!-- Copy binary files -->
+ <copy todir="${tests.output.dir}/resources">
+ <fileset dir="${tests.resources.dir}">
+ <exclude name="**/*.wsdl"/>
+ <exclude name="**/*.xml"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <target name="main" depends="compile,copy-resources,java-wsdl,post-compile,copy-generated" description="Build the deployments.">
+ <ant antfile="${basedir}/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc" inheritall="true"/>
+ <ant antfile="${basedir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/>
+ <ant antfile="${basedir}/ant-import/build-jars-jaxrpc.xml" target="build-jars-jaxrpc" inheritall="true"/>
+ <ant antfile="${basedir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
+ </target>
+
+ <!--
+ Create artifacts that need to be compiled with the test cases
+ -->
+ <target name="wsdl-java" depends="init">
+ <!-- interop -->
+ <callWsimport wsdlLocation="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" sourceDir="${tests.output.dir}/wstools/java"
+ destDir="${tests.output.dir}/classes" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" verbose="true"/>
+
+ <callWsimport wsdlLocation="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" sourceDir="${tests.output.dir}/wstools/java"
+ destDir="${tests.output.dir}/classes" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" verbose="true"/>
+
+ <callWsimport wsdlLocation="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" sourceDir="${tests.output.dir}/wstools/java"
+ destDir="${tests.output.dir}/classes" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" verbose="true"/>
+
+ <!-- benchmark -->
+ <callWsimport wsdlLocation="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" sourceDir="${tests.output.dir}/wstools/java"
+ destDir="${tests.output.dir}/classes" package="org.jboss.test.ws.benchmark.jaxws.doclit" verbose="true"/>
+ </target>
+
+ <!--
+ Create artifacts that depend on pre-compiled sources
+ -->
+ <target name="java-wsdl" depends="compile" description="Generate the deployment resources.">
+
+ <!-- create jbpm process archives -->
+ <mkdir dir="${tests.output.dir}/libs"/>
+ <zip destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip">
+ <fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/bpel" />
+ </zip>
+ <!-- Copy the BPEL sar -->
+ <copy file="${thirdparty.dir}/jbpm-bpel.sar" todir="${tests.output.dir}/libs"/>
- <target name="prepare">
-
- <available property="jbossws.available" file="${jboss.home}/client/jbossall-client.jar"/>
- <available property="installer.setup" file="jboss-ejb3-client.jar"/>
-
- <mkdir dir="${tests.output.dir}/log"/>
- <touch file="${tests.output.dir}/logtest.log"/>
-
- <tstamp>
- <format property="build.id" pattern="yyyyMMddHHmm"/>
- </tstamp>
-
- <!-- Define the jbossws.client.jar -->
- <condition property="jbossws.client.jar" value="${jboss40.output.lib.dir}/jbossws14-client.jar">
- <not>
- <isset property="HAVE_JDK_1.5"/>
- </not>
- </condition>
- <condition property="jbossws.client.jar" value="${core.output.lib.dir}/jbossws-client.jar">
- <isset property="HAVE_JDK_1.5"/>
- </condition>
-
- <!-- Define excluded tests -->
- <condition property="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt">
- <or>
- <available file="${jboss.client}/jboss-ejb3-client.jar"/>
- <isset property="integration.target.tomcat"/>
- </or>
- </condition>
- <property name="excludes-short-name" value="tests-${jbossws.integration.target}-noejb3-excludes.txt"/>
- <property name="excludesfile" value="${tests.resources.dir}/${excludes-short-name}"/>
-
- <echo/>
- <echo message="-----------------------------------------------"/>
- <echo message="jboss.home = ${jboss.home}"/>
- <echo message="tomcat.home = ${tomcat.home}"/>
- <echo message="java.home = ${java.home}"/>
- <echo message="endorsed = ${endorsed.dirs}"/>
- <echo message="excludesfile = ${excludes-short-name}"/>
- <echo message="-----------------------------------------------"/>
-
- </target>
-
- <!--
- Init the various classpaths
- -->
- <target name="init" depends="prepare,jboss-classpath,tomcat-classpath"/>
-
- <target name="common-classpath" depends="prepare,thirdparty">
-
- <!-- The combined compile classpath -->
- <path id="jbossws.jars.classpath">
- <pathelement location="${jbossws.client.jar}"/>
- <pathelement location="${core.output.lib.dir}/jboss-jaxrpc.jar"/>
- <pathelement location="${core.output.lib.dir}/jboss-jaxws.jar"/>
- <pathelement location="${core.output.lib.dir}/jboss-saaj.jar"/>
- <pathelement location="${jboss50.output.lib.dir}/jbossws-jboss50-integration.jar"/>
- <pathelement location="${jboss42.output.lib.dir}/jbossws-jboss42-integration.jar"/>
- <pathelement location="${jboss40.output.lib.dir}/jbossws-jboss40-integration.jar"/>
- <pathelement location="${tomcat.output.lib.dir}/jbossws-tomcat-integration.jar"/>
- </path>
-
- <!-- The combined compile classpath -->
- <path id="javac.classpath">
- <path refid="core.classpath"/>
- <path refid="jbossws.jars.classpath"/>
- <pathelement location="${thirdparty.dir}/activation.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-vfs.jar"/>
- <pathelement location="${thirdparty.dir}/junit.jar"/>
- <pathelement location="${thirdparty.dir}/mail.jar"/>
- <pathelement location="${thirdparty.dir}/qdox.jar"/>
- <pathelement location="${thirdparty.dir}/policy.jar"/>
- <pathelement location="${thirdparty.dir}/servlet-api.jar"/>
- <pathelement location="${thirdparty.dir}/stax-api.jar"/>
- <pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/>
- <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
- </path>
- </target>
-
- <target name="jboss-classpath" depends="common-classpath" if="jbossws.integration.target.jboss">
-
- <!-- The test client classpath -->
- <path id="test.client.classpath">
- <path refid="jbossws.jars.classpath"/>
- <pathelement location="${jboss.client}/commons-logging.jar"/>
- <pathelement location="${jboss.client}/jboss-backport-concurrent.jar"/>
- <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
- <pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/>
- <pathelement location="${jboss.client}/jboss-aspect-jdk50-client.jar"/>
- <pathelement location="${jboss.client}/jbossretro-rt.jar"/>
- <pathelement location="${jboss.client}/log4j.jar"/>
- <pathelement location="${jboss.client}/jbossall-client.jar"/>
- <pathelement location="${jboss.lib}/jboss-vfs.jar"/>
- <pathelement location="${jboss.server.lib}/hibernate3.jar"/>
- <pathelement location="${jboss.server.lib}/jboss.jar"/>
- <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
- <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
- <path refid="javac.classpath"/>
- </path>
-
- <!-- The jBPM BPEL classpath -->
- <path id="jbpm.bpel.classpath">
- <path refid="jbossws.jars.classpath"/>
- <fileset dir="${thirdparty.dir}/jbpm-bpel">
- <include name="jbpm*.jar" />
- <include name="commons-lang*.jar" />
- <include name="jaxen*.jar" />
- </fileset>
- <pathelement location="${thirdparty.dir}/commons-collections.jar"/>
- <pathelement location="${thirdparty.dir}/commons-logging.jar"/>
- <pathelement location="${thirdparty.dir}/dom4j.jar"/>
- <pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
- <pathelement location="${thirdparty.dir}/jbpm-bpel"/>
- </path>
- </target>
-
- <target name="tomcat-classpath" depends="common-classpath" if="jbossws.integration.target.tomcat">
- <!-- The test client classpath -->
- <path id="test.client.classpath">
- <path refid="jbossws.jars.classpath"/>
- <pathelement location="${tomcat.common.lib}/jbossws-thirdparty.jar"/>
- <path refid="javac.classpath"/>
- </path>
- </target>
-
-
- <!-- ================================================================== -->
- <!-- Compiling -->
- <!-- ================================================================== -->
-
- <target name="compile" depends="WSDLToJava,compile14,compile15" description="Compile sources"/>
-
- <target name="compile14" depends="init" unless="HAVE_JDK_1.5">
- <mkdir dir="${tests.output.dir}/classes"/>
- <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
- failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}">
- <src path="${tests.java.dir}"/>
- <exclude name="org/jboss/test/ws/jaxws/**"/>
- <exclude name="org/jboss/test/ws/tools/jsr181/**"/>
- <classpath refid="javac.classpath"/>
- </javac>
- </target>
-
- <target name="compile15" depends="init" if="HAVE_JDK_1.5">
- <mkdir dir="${tests.output.dir}/classes"/>
- <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
- failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}">
- <src path="${tests.java.dir}"/>
- <classpath refid="javac.classpath"/>
- </javac>
- </target>
-
- <target name="post-compile" depends="init" description="Compile generated sources">
- <mkdir dir="${tests.output.dir}/classes"/>
- <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
- <src path="${tests.output.dir}/wstools/java"/>
- <exclude name="org/jboss/test/ws/interop/microsoft/**"/>
- <classpath refid="javac.classpath"/>
- </javac>
- </target>
-
- <target name="copy-resources" depends="init" description="Copy the deployment resources.">
- <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/jndi.properties"/>
- <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/log4j.xml"/>
- <!-- Copy resources -->
- <copy todir="${tests.output.dir}/resources">
- <fileset dir="${tests.resources.dir}">
- <include name="**/*.wsdl"/>
- <include name="**/*.xml"/>
- <exclude name="jaxrpc/samples-override/**"/>
- </fileset>
- <filterset>
- <filter token="jbosstest.host.name" value="${node0}"/>
- <filter token="wsdl-publish-location" value="${tests.output.dir}/wsdl-publish"/>
- </filterset>
- </copy>
- <!-- Copy binary files -->
- <copy todir="${tests.output.dir}/resources">
- <fileset dir="${tests.resources.dir}">
- <exclude name="**/*.wsdl"/>
- <exclude name="**/*.xml"/>
- </fileset>
- </copy>
- </target>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <target name="main" depends="compile,copy-resources,javaToWSDL,post-compile,copy-generated" description="Build the deployments.">
- <ant antfile="${basedir}/ant-import/build-jars-jaxrpc.xml" target="build-jars" inheritall="true"/>
- <ant antfile="${basedir}/ant-import/build-jars-jaxws.xml" target="build-jars" inheritall="true"/>
- </target>
-
- <!--
- Create artifacts that need to be compiled with the test cases
- -->
- <target name="WSDLToJava">
- <!-- interop -->
- <callWsimport wsdlLocation="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl"
- sourceDir="${tests.output.dir}/wstools/java"
- destDir="${tests.output.dir}/classes"
- package="org.jboss.test.ws.interop.soapwsdl.basedoclitb"
- verbose="true"/>
-
- <callWsimport wsdlLocation="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl"
- sourceDir="${tests.output.dir}/wstools/java"
- destDir="${tests.output.dir}/classes"
- package="org.jboss.test.ws.interop.soapwsdl.basedoclitw"
- verbose="true"/>
-
- <callWsimport wsdlLocation="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl"
- sourceDir="${tests.output.dir}/wstools/java"
- destDir="${tests.output.dir}/classes"
- package="org.jboss.test.ws.interop.soapwsdl.baserpclit"
- verbose="true"/>
-
- <!-- benchmark -->
- <callWsimport wsdlLocation="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl"
- sourceDir="${tests.output.dir}/wstools/java"
- destDir="${tests.output.dir}/classes"
- package="org.jboss.test.ws.benchmark.jaxws.doclit"
- verbose="true"/>
- </target>
-
- <!--
- Create artifacts that depend on pre-compiled sources
- -->
- <target name="javaToWSDL" depends="compile" description="Generate the deployment resources.">
-
- <taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask">
- <classpath refid="jbpm.bpel.classpath"/>
- </taskdef>
- <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
- <classpath refid="core.classpath"/>
- <classpath location="${jbossws.client.jar}"/>
- <classpath location="${thirdparty.dir}/jbossretro-rt.jar"/>
- <classpath location="${thirdparty.dir}/jboss-backport-concurrent.jar"/>
- <classpath location="${thirdparty.dir}/concurrent.jar"/>
- <classpath location="${tests.output.dir}/classes"/>
- <classpath location="${tests.output.dir}"/>
- </taskdef>
-
- <mkdir dir="${tests.output.dir}/libs"/>
- <zip destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/bpel" />
- </zip>
-
- <servicegen processfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"
- outputdir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl" />
-
- <mkdir dir="${tests.output.dir}/wstools/java"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/exception/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/handler/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/holder/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jmstransport/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/doclit/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/rpclit/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/message/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${tests.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml" />
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/>
- <move todir="${tests.output.dir}/wstools/java">
- <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/>
- </move>
-
- </target>
-
- <target name="copy-generated" depends="init" description="Copy the deployment resources.">
- <!-- Copy generated resources -->
- <copy todir="${tests.output.dir}/resources">
- <fileset dir="${tests.output.dir}/wstools/resources">
- <include name="**/*.wsdl"/>
- <include name="**/*.xml"/>
- </fileset>
- </copy>
- <!-- Copy resources that cannot (yet) be generated -->
- <copy todir="${tests.output.dir}/resources/jaxrpc/samples" overwrite="true">
- <fileset dir="${tests.resources.dir}/jaxrpc/samples-override"/>
- <filterset>
- <filter token="jbosstest.host.name" value="${node0}"/>
- </filterset>
- </copy>
- </target>
-
- <!-- Custom targets that are not needed very often -->
-
- <target name="build-benchmark" depends="main">
- <ant antfile="src/test/ant/build-benchmark-jars.xml" target="build-benchmark-jars" inheritall="true"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Testing -->
- <!-- ================================================================== -->
-
- <!-- Run all unit tests and generate a report -->
- <target name="tests" depends="main" description="Run all unit tests and generate a report">
- <antcall target="tests-main">
- <param name="include.wildcard" value="org/jboss/test/ws/**/*TestCase.class"/>
- </antcall>
- <antcall target="tests-report"/>
- </target>
-
- <!-- Run benchmark test cases -->
- <target name="tests-benchmark" depends="init" description="Run benchmark unit tests">
- <antcall target="tests-main">
- <param name="include.wildcard" value="org/jboss/test/ws/benchmark/**/*TestCase.class"/>
- </antcall>
- <antcall target="tests-report"/>
- </target>
-
- <!-- Run samples test cases -->
- <target name="tests-samples" depends="init" description="Run samples unit tests">
- <antcall target="tests-main">
- <param name="include.wildcard" value="org/jboss/test/ws/*/samples/**/*TestCase.class"/>
- </antcall>
- <antcall target="tests-report"/>
- </target>
-
- <!-- Run tools test cases -->
- <target name="tests-tools" depends="init" description="Run tools unit tests">
- <antcall target="tests-main">
- <param name="include.wildcard" value="org/jboss/test/ws/tools/**/*TestCase.class"/>
- </antcall>
- <antcall target="tests-report"/>
- </target>
-
- <!--
- Run a collection of unit tests.
- ant -Dtest=tools test
- -->
- <target name="test" depends="init" if="test" description="Run all unit tests in a given directory">
- <antcall target="tests-main">
- <param name="include.wildcard" value="org/jboss/test/ws/${test}/**/*TestCase.class"/>
- </antcall>
- </target>
-
- <!-- Common test target -->
- <target name="tests-main" depends="init">
- <mkdir dir="${tests.output.dir}/reports"/>
- <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}">
- <jvmarg value="-Djava.security.manager"/>
- <jvmarg value="-ea"/>
- <sysproperty key="build.testlog" value="${tests.output.dir}/log"/>
- <sysproperty key="client.scenario" value="${client.scenario}"/>
- <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/>
- <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
- <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/>
- <sysproperty key="java.security.policy" value="${tests.etc.dir}/tst.policy"/>
- <sysproperty key="jboss.home" value="${jboss.home}"/>
- <sysproperty key="jbosstest.host.name" value="${node0}"/>
- <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/>
- <sysproperty key="tomcat.home" value="${tomcat.home}"/>
- <sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/>
- <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/>
- <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.keystore"/>
- <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.truststore"/>
- <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/>
- <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/>
- <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/>
- <sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/>
- <classpath>
- <path refid="test.client.classpath"/>
- <pathelement location="${tests.output.dir}/classes"/>
- </classpath>
- <formatter type="plain" usefile="true"/>
- <formatter type="xml" usefile="true"/>
- <batchtest todir="${tests.output.dir}/reports" fork="true">
- <fileset dir="${tests.output.dir}/classes" includes="${include.wildcard}" excludesfile="${excludesfile}"/>
- </batchtest>
- </junit>
- </target>
-
- <!--
- Run a single unit test.
- ant -Dtest=org.jboss.test.ws.jaxrpc.samples.jsr109pojo.RpcJSETestCase one-test
- -->
- <target name="one-test" depends="init" if="test" description="Run a single unit test">
- <mkdir dir="${tests.output.dir}/reports"/>
- <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}">
- <jvmarg line="${remote.debug.line}"/>
- <jvmarg value="-Djava.security.manager"/>
- <jvmarg value="-ea"/>
- <sysproperty key="build.testlog" value="${tests.output.dir}/log"/>
- <sysproperty key="client.scenario" value="${client.scenario}"/>
- <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/>
- <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
- <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/>
- <sysproperty key="java.security.policy" value="${tests.etc.dir}/tst.policy"/>
- <sysproperty key="jboss.home" value="${jboss.home}"/>
- <sysproperty key="jbosstest.host.name" value="${node0}"/>
- <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/>
- <sysproperty key="tomcat.home" value="${tomcat.home}"/>
- <sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/>
- <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/>
- <!--
- http://jira.jboss.com/jira/browse/JBWS-917
- <sysproperty key="javax.net.ssl.keyStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.keystore"/>
- <sysproperty key="javax.net.ssl.trustStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.truststore"/>
- <sysproperty key="javax.net.ssl.keyStorePassword" value="jbossws"/>
- <sysproperty key="javax.net.ssl.trustStorePassword" value="jbossws"/>
- <sysproperty key="javax.net.ssl.keyStoreType" value="jks"/>
- <sysproperty key="javax.net.ssl.trustStoreType" value="jks"/>
- -->
- <!-- HTTPS hostname wrong: should be <localhost> -->
- <sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/>
- <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.keystore"/>
- <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.truststore"/>
- <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/>
- <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/>
- <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/>
- <sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/>
- <classpath>
- <path refid="test.client.classpath"/>
- <pathelement location="${tests.output.dir}/classes"/>
- </classpath>
- <formatter type="plain" usefile="true"/>
- <formatter type="xml" usefile="true"/>
- <test todir="${tests.output.dir}/reports" name="${test}" fork="true"/>
- </junit>
- </target>
-
- <!-- ================================================================== -->
- <!-- Reporting -->
- <!-- ================================================================== -->
-
- <!-- Build the tests report -->
- <target name="tests-report" depends="init" description="Build the tests report">
- <junitreport todir="${tests.output.dir}/reports">
- <fileset dir="${tests.output.dir}/reports">
- <include name="TEST-*.xml"/>
- </fileset>
- <report format="frames" todir="${tests.output.dir}/reports/html"/>
- </junitreport>
- <zip destfile="${tests.output.dir}/test-report-${build.id}.zip">
- <fileset dir="${tests.output.dir}" includes="reports/**"/>
- </zip>
- </target>
-
- <!-- ================================================================== -->
- <!-- Cleaning -->
- <!-- ================================================================== -->
-
- <target name="clean" description="Delete all generated test files.">
- <delete dir="${tests.output.dir}"/>
- </target>
-
-</project>
+ <!-- generate wsdl binding and service definitions for bpel processes -->
+ <taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask">
+ <classpath refid="jbpm.bpel.classpath"/>
+ </taskdef>
+ <servicegen processfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"
+ outputdir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl"
+ bindingfile="hello-binding-.wsdl" servicefile="hello-service.wsdl" />
+
+ <!-- generate mapping artifacts -->
+ <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
+ <classpath refid="core.classpath"/>
+ <classpath location="${jbossws.core.jar}"/>
+ <classpath location="${core.output.lib.dir}/jboss-jaxrpc.jar"/>
+ <classpath location="${core.output.lib.dir}/jboss-jaxws.jar"/>
+ <classpath location="${core.output.lib.dir}/jboss-saaj.jar"/>
+ <classpath location="${thirdparty.dir}/jbossretro-rt.jar"/>
+ <classpath location="${thirdparty.dir}/jboss-backport-concurrent.jar"/>
+ <classpath location="${thirdparty.dir}/concurrent.jar"/>
+ <classpath location="${tests.output.dir}/classes"/>
+ <classpath location="${tests.output.dir}"/>
+ </taskdef>
+
+ <mkdir dir="${tests.output.dir}/libs"/>
+ <mkdir dir="${tests.output.dir}/wstools/java"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/exception/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/handler/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/holder/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jmstransport/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/doclit/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/rpclit/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/message/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${tests.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml" />
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/>
+ <move todir="${tests.output.dir}/wstools/java">
+ <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/>
+ </move>
+ </target>
+
+ <target name="copy-generated" depends="init" description="Copy the deployment resources.">
+ <!-- Copy generated resources -->
+ <copy todir="${tests.output.dir}/resources">
+ <fileset dir="${tests.output.dir}/wstools/resources">
+ <include name="**/*.wsdl"/>
+ <include name="**/*.xml"/>
+ </fileset>
+ </copy>
+ <!-- Copy resources that cannot (yet) be generated -->
+ <copy todir="${tests.output.dir}/resources/jaxrpc/samples" overwrite="true">
+ <fileset dir="${tests.resources.dir}/jaxrpc/samples-override"/>
+ <filterset>
+ <filter token="jbosstest.host.name" value="${node0}"/>
+ </filterset>
+ </copy>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Testing -->
+ <!-- ================================================================== -->
+
+ <!-- Run all unit tests and generate a report -->
+ <target name="tests" depends="main" description="Run all unit tests and generate a report">
+ <antcall target="tests-main">
+ <param name="include.wildcard" value="org/jboss/test/ws/**/*TestCase.class"/>
+ </antcall>
+ <antcall target="tests-report"/>
+ </target>
+
+ <!-- Run samples test cases -->
+ <target name="tests-samples" depends="init" description="Run samples unit tests">
+ <antcall target="tests-main">
+ <param name="include.wildcard" value="org/jboss/test/ws/*/samples/**/*TestCase.class"/>
+ </antcall>
+ <antcall target="tests-report"/>
+ </target>
+
+ <!-- Run tools test cases -->
+ <target name="tests-tools" depends="init" description="Run tools unit tests">
+ <antcall target="tests-main">
+ <param name="include.wildcard" value="org/jboss/test/ws/tools/**/*TestCase.class"/>
+ </antcall>
+ <antcall target="tests-report"/>
+ </target>
+
+ <!--
+ Run a collection of unit tests.
+ ant -Dtest=tools test
+ -->
+ <target name="test" depends="init" if="test" description="Run all unit tests in a given directory">
+ <antcall target="tests-main">
+ <param name="include.wildcard" value="org/jboss/test/ws/${test}/**/*TestCase.class"/>
+ </antcall>
+ </target>
+
+ <!-- Common test target -->
+ <target name="tests-main" depends="init">
+ <mkdir dir="${tests.output.dir}/reports"/>
+ <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}">
+ <jvmarg value="-Djava.security.manager"/>
+ <jvmarg value="-ea"/>
+ <sysproperty key="build.testlog" value="${tests.output.dir}/log"/>
+ <sysproperty key="client.scenario" value="${client.scenario}"/>
+ <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/>
+ <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
+ <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/>
+ <sysproperty key="java.security.policy" value="${tests.etc.dir}/tst.policy"/>
+ <sysproperty key="jboss.home" value="${jboss.home}"/>
+ <sysproperty key="jbosstest.host.name" value="${node0}"/>
+ <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/>
+ <sysproperty key="tomcat.home" value="${tomcat.home}"/>
+ <sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/>
+ <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.keystore"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.truststore"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/>
+ <classpath>
+ <path refid="test.client.classpath"/>
+ <pathelement location="${tests.output.dir}/classes"/>
+ </classpath>
+ <formatter type="plain" usefile="true"/>
+ <formatter type="xml" usefile="true"/>
+ <batchtest todir="${tests.output.dir}/reports" fork="true">
+ <fileset dir="${tests.output.dir}/classes" includes="${include.wildcard}" excludesfile="${excludesfile}"/>
+ </batchtest>
+ </junit>
+ </target>
+
+ <!--
+ Run a single unit test.
+ ant -Dtest=org.jboss.test.ws.jaxrpc.samples.jsr109pojo.RpcJSETestCase one-test
+ -->
+ <target name="one-test" depends="init" if="test" description="Run a single unit test">
+ <mkdir dir="${tests.output.dir}/reports"/>
+ <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}">
+ <jvmarg line="${remote.debug.line}"/>
+ <jvmarg value="-Djava.security.manager"/>
+ <jvmarg value="-ea"/>
+ <sysproperty key="build.testlog" value="${tests.output.dir}/log"/>
+ <sysproperty key="client.scenario" value="${client.scenario}"/>
+ <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/>
+ <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
+ <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/>
+ <sysproperty key="java.security.policy" value="${tests.etc.dir}/tst.policy"/>
+ <sysproperty key="jboss.home" value="${jboss.home}"/>
+ <sysproperty key="jbosstest.host.name" value="${node0}"/>
+ <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/>
+ <sysproperty key="tomcat.home" value="${tomcat.home}"/>
+ <sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/>
+ <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/>
+ <!--
+ http://jira.jboss.com/jira/browse/JBWS-917
+ <sysproperty key="javax.net.ssl.keyStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.keystore"/>
+ <sysproperty key="javax.net.ssl.trustStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.truststore"/>
+ <sysproperty key="javax.net.ssl.keyStorePassword" value="jbossws"/>
+ <sysproperty key="javax.net.ssl.trustStorePassword" value="jbossws"/>
+ <sysproperty key="javax.net.ssl.keyStoreType" value="jks"/>
+ <sysproperty key="javax.net.ssl.trustStoreType" value="jks"/>
+ -->
+ <!-- HTTPS hostname wrong: should be <localhost> -->
+ <sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.keystore"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.truststore"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/>
+ <classpath>
+ <path refid="test.client.classpath"/>
+ <pathelement location="${tests.output.dir}/classes"/>
+ </classpath>
+ <formatter type="plain" usefile="true"/>
+ <formatter type="xml" usefile="true"/>
+ <test todir="${tests.output.dir}/reports" name="${test}" fork="true"/>
+ </junit>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Reporting -->
+ <!-- ================================================================== -->
+
+ <!-- Build the tests report -->
+ <target name="tests-report" depends="init" description="Build the tests report">
+ <junitreport todir="${tests.output.dir}/reports">
+ <fileset dir="${tests.output.dir}/reports">
+ <include name="TEST-*.xml"/>
+ </fileset>
+ <report format="frames" todir="${tests.output.dir}/reports/html"/>
+ </junitreport>
+ <zip destfile="${tests.output.dir}/test-report-${build.id}.zip">
+ <fileset dir="${tests.output.dir}" includes="reports/**"/>
+ </zip>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Cleaning -->
+ <!-- ================================================================== -->
+
+ <target name="clean" description="Delete all generated test files.">
+ <delete dir="${tests.output.dir}"/>
+ </target>
+
+</project>
\ No newline at end of file
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossTestDeployer.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossTestDeployer.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossTestDeployer.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,55 +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;
-
-import java.net.URL;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-
-/**
- * A JBossWS test helper that deals with test deployment/undeployment, etc.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 14-Oct-2004
- */
-public class JBossTestDeployer implements JBossWSTestDeployer
-{
- private static final String MAIN_DEPLOYER = "jboss.system:service=MainDeployer";
-
- private MBeanServerConnection server;
-
- public JBossTestDeployer(MBeanServerConnection server)
- {
- this.server = server;
- }
-
- public void deploy(URL url) throws Exception
- {
- server.invoke(new ObjectName(MAIN_DEPLOYER), "deploy", new Object[] { url }, new String[] { "java.net.URL" });
- }
-
- public void undeploy(URL url) throws Exception
- {
- server.invoke(new ObjectName(MAIN_DEPLOYER), "undeploy", new Object[] { url }, new String[] { "java.net.URL" });
- }
-}
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestDeployer.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestDeployer.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestDeployer.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,41 +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;
-
-import java.net.URL;
-
-/**
- * WS test deployer
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 16-May-2006
- */
-public interface JBossWSTestDeployer
-{
- /** Deploy the given archive
- */
- void deploy(URL archive) throws Exception;
-
- /** Undeploy the given archive
- */
- void undeploy(URL archive) throws Exception;
-}
\ No newline at end of file
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -125,17 +125,17 @@
return server;
}
- private JBossWSTestDeployer getDeployer()
+ private TestDeployer getDeployer()
{
if (isTargetJBoss())
{
- return new JBossTestDeployer(getServer());
+ return new TestDeployerJBoss(getServer());
}
else if (isTargetTomcat())
{
String username = System.getProperty("tomcat.manager.username");
String password = System.getProperty("tomcat.manager.password");
- return new TomcatTestDeployer(username, password);
+ return new TestDeployerTomcat(username, password);
}
else
{
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestSetup.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestSetup.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestSetup.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -28,6 +28,7 @@
import java.util.StringTokenizer;
import junit.extensions.TestSetup;
+import junit.framework.Test;
import junit.framework.TestSuite;
/**
@@ -39,16 +40,16 @@
public class JBossWSTestSetup extends TestSetup
{
private JBossWSTestHelper delegate = new JBossWSTestHelper();
- private String[] archives;
+ private String[] archives = new String[0];
public static JBossWSTestSetup newTestSetup(Class testClass, String archiveList)
{
return new JBossWSTestSetup(testClass, archiveList);
}
- public static JBossWSTestSetup newTestSetup(TestSuite testSuite, String archiveList)
+ public static JBossWSTestSetup newTestSetup(Test test, String archiveList)
{
- return new JBossWSTestSetup(testSuite, archiveList);
+ return new JBossWSTestSetup(test, archiveList);
}
protected JBossWSTestSetup(Class testClass, String archiveList)
@@ -57,19 +58,22 @@
getArchiveArray(archiveList);
}
- protected JBossWSTestSetup(TestSuite testSuite, String archiveList)
+ protected JBossWSTestSetup(Test test, String archiveList)
{
- super(testSuite);
+ super(test);
getArchiveArray(archiveList);
}
private void getArchiveArray(String archiveList)
{
- StringTokenizer st = new StringTokenizer(archiveList, ", ");
- archives = new String[st.countTokens()];
+ if (archiveList != null)
+ {
+ StringTokenizer st = new StringTokenizer(archiveList, ", ");
+ archives = new String[st.countTokens()];
- for (int i = 0; i < archives.length; i++)
- archives[i] = st.nextToken();
+ for (int i = 0; i < archives.length; i++)
+ archives[i] = st.nextToken();
+ }
}
protected void setUp() throws Exception
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/TestDeployer.java (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/TestDeployer.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/TestDeployer.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/TestDeployer.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,41 @@
+/*
+ * 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;
+
+import java.net.URL;
+
+/**
+ * WS test deployer
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 16-May-2006
+ */
+public interface TestDeployer
+{
+ /** Deploy the given archive
+ */
+ void deploy(URL archive) throws Exception;
+
+ /** Undeploy the given archive
+ */
+ void undeploy(URL archive) throws Exception;
+}
\ No newline at end of file
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/TestDeployerJBoss.java (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/TestDeployerJBoss.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/TestDeployerJBoss.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/TestDeployerJBoss.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,55 @@
+/*
+ * 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;
+
+import java.net.URL;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+
+/**
+ * A JBossWS test helper that deals with test deployment/undeployment, etc.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 14-Oct-2004
+ */
+public class TestDeployerJBoss implements TestDeployer
+{
+ private static final String MAIN_DEPLOYER = "jboss.system:service=MainDeployer";
+
+ private MBeanServerConnection server;
+
+ public TestDeployerJBoss(MBeanServerConnection server)
+ {
+ this.server = server;
+ }
+
+ public void deploy(URL url) throws Exception
+ {
+ server.invoke(new ObjectName(MAIN_DEPLOYER), "deploy", new Object[] { url }, new String[] { "java.net.URL" });
+ }
+
+ public void undeploy(URL url) throws Exception
+ {
+ server.invoke(new ObjectName(MAIN_DEPLOYER), "undeploy", new Object[] { url }, new String[] { "java.net.URL" });
+ }
+}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/TestDeployerTomcat.java (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/TestDeployerTomcat.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/TestDeployerTomcat.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/TestDeployerTomcat.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,129 @@
+/*
+ * 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;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.lang.reflect.Method;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.ProtocolException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.util.Base64;
+
+/**
+ * A deployer that deploys to Tomcat
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 16-May-2006
+ */
+public class TestDeployerTomcat implements TestDeployer
+{
+ private String username, password;
+
+ // Map<String,String> of URL to context path
+ private static Map pathMap = new HashMap();
+
+ public TestDeployerTomcat(String username, String password)
+ {
+ this.username = username;
+ this.password = password;
+ }
+
+ public void deploy(URL url) throws Exception
+ {
+ File destDir = new File(new File(url.getFile()).getParent() + "/wspublish");
+ destDir.mkdirs();
+
+ // Use reflection to invoke wspublish.process() from the tomcat integration layer
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ Class wspublishClass = loader.loadClass("org.jboss.ws.integration.tomcat.wspublish");
+ Method process = wspublishClass.getMethod("process", new Class[]{URL.class, File.class, String.class});
+ URL warURL = (URL)process.invoke(wspublishClass.newInstance(), new Object[]{url, destDir, null});
+
+ String path = warURL.toExternalForm();
+ path = path.substring(path.lastIndexOf("/"));
+ if (path.endsWith(".war"))
+ path = path.substring(0, path.length() - 4);
+
+ URL managerURL = new URL(getManagerPath() + "/deploy?path=" + path + "&war=" + warURL.toExternalForm());
+ HttpURLConnection con = getURLConnection(managerURL);
+
+ con.connect();
+
+ BufferedReader br = new BufferedReader(new InputStreamReader(con.getInputStream()));
+ String status = br.readLine();
+
+ if (status == null)
+ throw new IllegalStateException("Cannot obtain deploy status");
+
+ if (status.startsWith("OK") == false)
+ throw new IllegalStateException("Cannot deploy application: " + status);
+
+ path = status.substring(status.indexOf("/"));
+ pathMap.put(url.toExternalForm(), path);
+ }
+
+ public void undeploy(URL url) throws Exception
+ {
+ String path = (String) pathMap.get(url.toExternalForm());
+ if (path != null)
+ {
+ URL managerURL = new URL(getManagerPath() + "/undeploy?path=" + path);
+ HttpURLConnection con = getURLConnection(managerURL);
+
+ con.connect();
+
+ BufferedReader br = new BufferedReader(new InputStreamReader(con.getInputStream()));
+ String status = br.readLine();
+
+ if (status == null)
+ throw new IllegalStateException("Cannot obtain undeploy status");
+
+ if (status.startsWith("OK") == false)
+ throw new IllegalStateException("Cannot undeploy application: " + status);
+ }
+ }
+
+ private String getManagerPath() throws MalformedURLException
+ {
+ String hostName = System.getProperty("jbosstest.server.host", "localhost");
+ return "http://" + hostName + ":8080/manager";
+ }
+
+ private HttpURLConnection getURLConnection(URL managerURL) throws IOException, ProtocolException
+ {
+ HttpURLConnection con = (HttpURLConnection)managerURL.openConnection();
+ con.setRequestMethod("GET");
+ con.setDoInput(true);
+
+ String authorization = username + ":" + password;
+ authorization = Base64.encodeBytes(authorization.getBytes());
+ con.setRequestProperty("Authorization", "Basic " + authorization);
+ return con;
+ }
+}
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/TomcatTestDeployer.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/TomcatTestDeployer.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/TomcatTestDeployer.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,129 +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;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.lang.reflect.Method;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.ProtocolException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.jboss.util.Base64;
-
-/**
- * A deployer that deploys to Tomcat
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 16-May-2006
- */
-public class TomcatTestDeployer implements JBossWSTestDeployer
-{
- private String username, password;
-
- // Map<String,String> of URL to context path
- private static Map pathMap = new HashMap();
-
- public TomcatTestDeployer(String username, String password)
- {
- this.username = username;
- this.password = password;
- }
-
- public void deploy(URL url) throws Exception
- {
- File destDir = new File(new File(url.getFile()).getParent() + "/wspublish");
- destDir.mkdirs();
-
- // Use reflection to invoke wspublish.process() from the tomcat integration layer
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- Class wspublishClass = loader.loadClass("org.jboss.ws.integration.tomcat.wspublish");
- Method process = wspublishClass.getMethod("process", new Class[]{URL.class, File.class, String.class});
- URL warURL = (URL)process.invoke(wspublishClass.newInstance(), new Object[]{url, destDir, null});
-
- String path = warURL.toExternalForm();
- path = path.substring(path.lastIndexOf("/"));
- if (path.endsWith(".war"))
- path = path.substring(0, path.length() - 4);
-
- URL managerURL = new URL(getManagerPath() + "/deploy?path=" + path + "&war=" + warURL.toExternalForm());
- HttpURLConnection con = getURLConnection(managerURL);
-
- con.connect();
-
- BufferedReader br = new BufferedReader(new InputStreamReader(con.getInputStream()));
- String status = br.readLine();
-
- if (status == null)
- throw new IllegalStateException("Cannot obtain deploy status");
-
- if (status.startsWith("OK") == false)
- throw new IllegalStateException("Cannot deploy application: " + status);
-
- path = status.substring(status.indexOf("/"));
- pathMap.put(url.toExternalForm(), path);
- }
-
- public void undeploy(URL url) throws Exception
- {
- String path = (String) pathMap.get(url.toExternalForm());
- if (path != null)
- {
- URL managerURL = new URL(getManagerPath() + "/undeploy?path=" + path);
- HttpURLConnection con = getURLConnection(managerURL);
-
- con.connect();
-
- BufferedReader br = new BufferedReader(new InputStreamReader(con.getInputStream()));
- String status = br.readLine();
-
- if (status == null)
- throw new IllegalStateException("Cannot obtain undeploy status");
-
- if (status.startsWith("OK") == false)
- throw new IllegalStateException("Cannot undeploy application: " + status);
- }
- }
-
- private String getManagerPath() throws MalformedURLException
- {
- String hostName = System.getProperty("jbosstest.server.host", "localhost");
- return "http://" + hostName + ":8080/manager";
- }
-
- private HttpURLConnection getURLConnection(URL managerURL) throws IOException, ProtocolException
- {
- HttpURLConnection con = (HttpURLConnection)managerURL.openConnection();
- con.setRequestMethod("GET");
- con.setDoInput(true);
-
- String authorization = username + ":" + password;
- authorization = Base64.encodeBytes(authorization.getBytes());
- con.setRequestProperty("Authorization", "Basic " + authorization);
- return con;
- }
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/XOPTestSupport.java (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/XOPTestSupport.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/XOPTestSupport.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/XOPTestSupport.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,106 @@
+/*
+ * 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;
+
+// $Id$
+
+import java.awt.Image;
+import java.awt.Toolkit;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import javax.activation.DataHandler;
+import javax.xml.transform.stream.StreamSource;
+
+/**
+ * @author Heiko Braun <heiko.braun(a)jboss.com>
+ * @since 22-Sep-2006
+ */
+public class XOPTestSupport
+{
+
+ public static byte[] getBytesFromFile(File file) throws IOException
+ {
+ InputStream is = new FileInputStream(file);
+
+ long length = file.length();
+ byte[] bytes = new byte[(int)length];
+
+ int offset = 0;
+ int numRead = 0;
+ while (offset < bytes.length && (numRead = is.read(bytes, offset, bytes.length - offset)) >= 0)
+ {
+ offset += numRead;
+ }
+
+ is.close();
+ return bytes;
+ }
+
+ public static Image createTestImage(File imgFile)
+ {
+ Image image = null;
+ try
+ {
+ URL url = imgFile.toURL();
+
+ image = null;
+ try
+ {
+ image = Toolkit.getDefaultToolkit().createImage(url);
+ }
+ catch (Throwable th)
+ {
+ //log.warn("Cannot create Image: " + th);
+ }
+ }
+ catch (MalformedURLException e)
+ {
+ throw new RuntimeException(e);
+ }
+
+ return image;
+ }
+
+ public static StreamSource createTestSource()
+ {
+ return new StreamSource(new ByteArrayInputStream("<some><nestedXml/></some>".getBytes()));
+ }
+
+ public static DataHandler createDataHandler(File imgFile)
+ {
+ try
+ {
+ URL url = imgFile.toURL();
+ return new DataHandler(url);
+ }
+ catch (MalformedURLException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+}
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -50,7 +50,7 @@
public void setUp() throws Exception
{
super.setUp();
- if (port == null && isTargetJBoss50() == false)
+ if (port == null)
{
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
@@ -60,12 +60,6 @@
public void testCall() throws Exception
{
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments");
- return;
- }
-
String response = port.echoString("Hello");
assertEquals("Hello", response);
}
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -38,9 +38,10 @@
import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
/**
- * Test case to test that when a deployment contains both an endpoint and a
- * servlet both are deployed correctly and can be accessed.
+ * Deploying a war that also contains normal servlets the web.xml is modified as if they are all endpoints
*
+ * http://jira.jboss.org/jira/browse/JBWS-1093
+ *
* @author darran.lofthouse(a)jboss.com
* @since 17-October-2006
*/
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -30,9 +30,10 @@
import org.jboss.test.ws.JBossWSTestSetup;
/**
- * Test a call to an endpoint that uses an anonymous simple
- * type with restriction.
+ * Anonymous Simple Type causes NullPointerException
*
+ * http://jira.jboss.org/jira/browse/JBWS-1148
+ *
* @author darran.lofthouse(a)jboss.com
* @since Oct 22, 2006
*/
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -32,7 +32,10 @@
import org.jboss.test.ws.JBossWSTestSetup;
/**
+ * Each web services invocation causes a new HTTP session to be created.
*
+ * http://jira.jboss.org/jira/browse/JBWS-1179
+ *
* @author darran.lofthouse(a)jboss.com
* @since 18-October-2006
*/
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -30,7 +30,7 @@
import org.jboss.test.ws.JBossWSTestSetup;
/**
- * [JBWS-1190] WSDL generated for JSR-181 POJO does not take 'transport-guarantee' in web.xml into account
+ * WSDL generated for JSR-181 POJO does not take 'transport-guarantee' in web.xml into account
*
* http://jira.jboss.org/jira/browse/JBWS-1190
*
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -30,6 +30,10 @@
import org.jboss.test.ws.JBossWSTestSetup;
/**
+ * WS Client does not clean up temporary xsd files
+ *
+ * http://jira.jboss.com/jira/browse/JBWS-1205
+ *
* @author darran.lofthouse(a)jboss.com
* @since 21-September-2006
*/
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -72,12 +72,6 @@
public final void testWsdlParser() throws Exception
{
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments");
- return;
- }
-
WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
File wsdlFile = new File("resources/jaxrpc/jbws1427/META-INF/wsdl/ProcessClaim.wsdl");
assertTrue("File exists: " + wsdlFile, wsdlFile.exists());
@@ -87,12 +81,6 @@
public final void testEndpointAccess() throws Exception
{
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments");
- return;
- }
-
Message inObj = new Message("Kermit", new Integer(100));
Message retObj = port.processClaim(inObj);
assertEquals(inObj, retObj);
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -33,6 +33,7 @@
/**
* Handling of xml:lang and any namespace="##other"
+ *
* http://jira.jboss.com/jira/browse/JBWS-720
*
* @author Thomas.Diesler(a)jboss.org
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -31,6 +31,7 @@
/**
* Empty unwrapped arrays incorrectly unmarshalled as a null value
+ *
* http://jira.jboss.org/jira/browse/JBWS-732
*
* @author Thomas.Diesler(a)jboss.org
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -38,9 +38,9 @@
import org.jboss.ws.core.utils.DOMWriter;
/**
- * Web services deployment can fail when deploying multiple EJB JARs
+ * ComplexType cannot be constructed from attributes
*
- * http://jira.jboss.com/jira/browse/JBWS-772
+ * http://jira.jboss.com/jira/browse/JBWS-775
*
* @author Thomas.Diesler(a)jboss.org
* @since 24-Mar-2006
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -48,7 +48,7 @@
{
super.setUp();
- if (endpoint == null && isTargetJBoss50() == false)
+ if (endpoint == null)
{
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceEJB");
@@ -58,12 +58,6 @@
public void testEchoString() throws Exception
{
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments");
- return;
- }
-
String hello = "Hello";
String world = "world!";
Object retObj = endpoint.echoString(hello, world);
@@ -72,12 +66,6 @@
public void testEchoSimpleUserType() throws Exception
{
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments");
- return;
- }
-
String hello = "Hello";
SimpleUserType userType = new SimpleUserType(1, 2);
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -58,7 +58,7 @@
{
super.setUp();
- if (call == null && isTargetJBoss50() == false)
+ if (call == null)
{
File javaWsdlMappingFile = new File("resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jaxrpc-mapping.xml");
assertTrue(javaWsdlMappingFile.exists());
@@ -73,12 +73,6 @@
public void testEchoString() throws Exception
{
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments");
- return;
- }
-
QName operationName = new QName(TARGET_NAMESPACE, "echoString");
call.setOperationName(operationName);
assertFalse(call.isParameterAndReturnSpecRequired(operationName));
@@ -97,12 +91,6 @@
public void testEchoSimpleUserType() throws Exception
{
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments");
- return;
- }
-
QName operationName = new QName(TARGET_NAMESPACE, "echoSimpleUserType");
call.setOperationName(operationName);
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -65,12 +65,6 @@
call.setTargetEndpointAddress(TARGET_ENDPOINT_ADDRESS);
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments");
- return;
- }
-
String hello = "Hello";
String world = "world!";
Object retObj = call.invoke(new Object[]{hello, world});
@@ -96,12 +90,6 @@
call.setTargetEndpointAddress(TARGET_ENDPOINT_ADDRESS);
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments");
- return;
- }
-
String hello = "Hello";
SimpleUserType userType = new SimpleUserType(1, 2);
Object retObj = call.invoke(new Object[]{hello, userType});
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -48,7 +48,7 @@
{
super.setUp();
- if (port == null && isTargetJBoss50() == false)
+ if (port == null)
{
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceEJB");
@@ -61,12 +61,6 @@
String hello = "Hello";
String world = "world!";
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments");
- return;
- }
-
Object retObj = port.echoString(hello, world);
assertEquals(hello + world, retObj);
}
@@ -76,12 +70,6 @@
String hello = "Hello";
SimpleUserType userType = new SimpleUserType(1, 2);
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments");
- return;
- }
-
Object retObj = port.echoSimpleUserType(hello, userType);
assertEquals(userType, retObj);
}
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -55,7 +55,7 @@
{
super.setUp();
- if (port == null && isTargetJBoss50() == false)
+ if (port == null)
{
File javaWsdlMappingFile = new File("resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jaxrpc-mapping.xml");
assertTrue(javaWsdlMappingFile.exists());
@@ -73,12 +73,6 @@
String hello = "Hello";
String world = "world!";
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments");
- return;
- }
-
Object retObj = port.echoString(hello, world);
assertEquals(hello + world, retObj);
}
@@ -88,12 +82,6 @@
String hello = "Hello";
SimpleUserType userType = new SimpleUserType(1, 2);
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments");
- return;
- }
-
Object retObj = port.echoSimpleUserType(hello, userType);
assertEquals(userType, retObj);
}
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -63,12 +63,6 @@
*/
public void testRoleSecuredSLSB() throws Exception
{
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments");
- return;
- }
-
InitialContext iniCtx = getInitialContext();
OrganizationHome home = (OrganizationHome)iniCtx.lookup("ejb/RoleSecuredSLSB");
@@ -94,12 +88,6 @@
*/
public void testBasicSecuredSLSB() throws Exception
{
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments");
- return;
- }
-
InitialContext iniCtx = getInitialContext();
OrganizationHome home = (OrganizationHome)iniCtx.lookup("ejb/BasicSecuredSLSB");
@@ -110,12 +98,6 @@
public void testBasicSecuredServiceAccess() throws Exception
{
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments");
- return;
- }
-
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/BasicSecured");
QName portName = new QName("http://org.jboss.ws/samples/secureejb", "BasicSecuredPort");
@@ -141,12 +123,6 @@
public void testRoleSecuredServiceAccess() throws Exception
{
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments");
- return;
- }
-
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/RoleSecured");
QName portName = new QName("http://org.jboss.ws/samples/secureejb", "RoleSecuredPort");
@@ -172,12 +148,6 @@
public void testConfidentialServiceAccess() throws Exception
{
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments");
- return;
- }
-
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/ConfidentialSecured");
QName portName = new QName("http://org.jboss.ws/samples/secureejb", "ConfidentialPort");
@@ -192,8 +162,11 @@
{
stub._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-ejb/ConfidentialSecured");
port.getContactInfo("mafia");
- System.out.println("FIXME: JBAS-3595");
- //fail("Security exception expected");
+
+ if (isTargetJBoss50())
+ System.out.println("FIXME: [JBAS-3595] - Tomcat allows http access with transport guarantie CONFIDENTIAL");
+ else
+ fail("Security exception expected");
}
catch (RemoteException ignore)
{
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop)
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,119 +0,0 @@
-package org.jboss.test.ws.jaxrpc.samples.xop;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.xerces.xs.XSComplexTypeDefinition;
-import org.apache.xerces.xs.XSModel;
-import org.apache.xerces.xs.XSTypeDefinition;
-import org.jboss.ws.extensions.xop.jaxrpc.XOPScanner;
-import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
-import org.jboss.ws.metadata.wsdl.xmlschema.WSSchemaUtils;
-import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils;
-import org.jboss.xb.binding.NamespaceRegistry;
-
-/**
- * @author Heiko Braun <heiko.braun(a)jboss.com>
- * @since Jun 9, 2006
- */
-public class XOPTypeDefTestCase extends TestCase
-{
- public XOPTypeDefTestCase(String string)
- {
- super(string);
- }
-
- protected void setUp() throws Exception
- {
- super.setUp();
- }
-
- public void testCircularReferences() throws Exception
- {
- SchemaUtils utils = SchemaUtils.getInstance();
- File f = new File("resources/jaxrpc/samples/xop/circular.xsd");
- assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists());
-
- XSModel xsModel = utils.parseSchema(f.toURL());
- assertNotNull(xsModel);
- WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://complex.jsr181.jaxws.ws.test.jboss.org/jaws");
- JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel);
-
- XSTypeDefinition xsType = schemaModel.getTypeDefinition("Customer", "http://complex.jsr181.jaxws.ws.test.jboss.org/jaws");
-
- assertNotNull("Root type def not found", xsType);
- XOPScanner scanner = new XOPScanner();
-
- if (xsType instanceof XSComplexTypeDefinition)
- {
- XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType;
- XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType);
-
- // it fails when getting a stack overflow ;)
- }
- }
-
- public void testXOPElementScan() throws Exception
- {
- SchemaUtils utils = SchemaUtils.getInstance();
- File f = new File("resources/jaxrpc/samples/xop/schema.xsd");
- assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists());
-
- XSModel xsModel = utils.parseSchema(f.toURL());
- assertNotNull(xsModel);
- WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit");
- JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel);
-
- // test custom binary declaration
- XSTypeDefinition xsType = schemaModel.getTypeDefinition(">PingMsg", "http://jboss.org/test/ws/xop/doclit");
-
- assertNotNull("Root type def not found", xsType);
- XOPScanner scanner = new XOPScanner();
-
- if (xsType instanceof XSComplexTypeDefinition)
- {
- XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType;
- XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType);
- assertNotNull("Unable to find xop typedef in schema", resultType);
- }
-
- scanner.reset();
-
- // test the xmime binary declaration
- xsType = schemaModel.getTypeDefinition(">PingMsgResponse", "http://jboss.org/test/ws/xop/doclit");
- assertNotNull("Root type def not found", xsType);
- if (xsType instanceof XSComplexTypeDefinition)
- {
- XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType;
- XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType);
- assertNotNull("Unable to find XOP typedef in schema", resultType);
- }
-
- }
-
- public void testMSFTElementScan() throws Exception
- {
-
- SchemaUtils utils = SchemaUtils.getInstance();
- File f = new File("resources/jaxrpc/samples/xop/schema.xsd");
- assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists());
-
- XSModel xsModel = utils.parseSchema(f.toURL());
- assertNotNull(xsModel);
- WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit");
- JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel);
-
- XSTypeDefinition xsType = schemaModel.getTypeDefinition(">MSFTBinary", "http://jboss.org/test/ws/xop/doclit");
-
- assertNotNull("Root type def not found", xsType);
- XOPScanner scanner = new XOPScanner();
-
- if (xsType instanceof XSComplexTypeDefinition)
- {
- XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType;
- XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType);
- assertNotNull("Unable to find xop typedef in schema", resultType);
- }
- }
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,119 @@
+package org.jboss.test.ws.jaxrpc.samples.xop;
+
+import java.io.File;
+
+import junit.framework.TestCase;
+
+import org.apache.xerces.xs.XSComplexTypeDefinition;
+import org.apache.xerces.xs.XSModel;
+import org.apache.xerces.xs.XSTypeDefinition;
+import org.jboss.ws.extensions.xop.jaxrpc.XOPScanner;
+import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
+import org.jboss.ws.metadata.wsdl.xmlschema.WSSchemaUtils;
+import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils;
+import org.jboss.xb.binding.NamespaceRegistry;
+
+/**
+ * @author Heiko Braun <heiko.braun(a)jboss.com>
+ * @since Jun 9, 2006
+ */
+public class XOPTypeDefTestCase extends TestCase
+{
+ public XOPTypeDefTestCase(String string)
+ {
+ super(string);
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ }
+
+ public void testCircularReferences() throws Exception
+ {
+ SchemaUtils utils = SchemaUtils.getInstance();
+ File f = new File("resources/jaxrpc/samples/xop/circular.xsd");
+ assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists());
+
+ XSModel xsModel = utils.parseSchema(f.toURL());
+ assertNotNull(xsModel);
+ WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://complex.jsr181.jaxws.ws.test.jboss.org/jaws");
+ JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel);
+
+ XSTypeDefinition xsType = schemaModel.getTypeDefinition("Customer", "http://complex.jsr181.jaxws.ws.test.jboss.org/jaws");
+
+ assertNotNull("Root type def not found", xsType);
+ XOPScanner scanner = new XOPScanner();
+
+ if (xsType instanceof XSComplexTypeDefinition)
+ {
+ XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType;
+ XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType);
+
+ // it fails when getting a stack overflow ;)
+ }
+ }
+
+ public void testXOPElementScan() throws Exception
+ {
+ SchemaUtils utils = SchemaUtils.getInstance();
+ File f = new File("resources/jaxrpc/samples/xop/schema.xsd");
+ assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists());
+
+ XSModel xsModel = utils.parseSchema(f.toURL());
+ assertNotNull(xsModel);
+ WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit");
+ JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel);
+
+ // test custom binary declaration
+ XSTypeDefinition xsType = schemaModel.getTypeDefinition(">PingMsg", "http://jboss.org/test/ws/xop/doclit");
+
+ assertNotNull("Root type def not found", xsType);
+ XOPScanner scanner = new XOPScanner();
+
+ if (xsType instanceof XSComplexTypeDefinition)
+ {
+ XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType;
+ XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType);
+ assertNotNull("Unable to find xop typedef in schema", resultType);
+ }
+
+ scanner.reset();
+
+ // test the xmime binary declaration
+ xsType = schemaModel.getTypeDefinition(">PingMsgResponse", "http://jboss.org/test/ws/xop/doclit");
+ assertNotNull("Root type def not found", xsType);
+ if (xsType instanceof XSComplexTypeDefinition)
+ {
+ XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType;
+ XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType);
+ assertNotNull("Unable to find XOP typedef in schema", resultType);
+ }
+
+ }
+
+ public void testMSFTElementScan() throws Exception
+ {
+
+ SchemaUtils utils = SchemaUtils.getInstance();
+ File f = new File("resources/jaxrpc/samples/xop/schema.xsd");
+ assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists());
+
+ XSModel xsModel = utils.parseSchema(f.toURL());
+ assertNotNull(xsModel);
+ WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit");
+ JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel);
+
+ XSTypeDefinition xsType = schemaModel.getTypeDefinition(">MSFTBinary", "http://jboss.org/test/ws/xop/doclit");
+
+ assertNotNull("Root type def not found", xsType);
+ XOPScanner scanner = new XOPScanner();
+
+ if (xsType instanceof XSComplexTypeDefinition)
+ {
+ XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType;
+ XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType);
+ assertNotNull("Unable to find xop typedef in schema", resultType);
+ }
+ }
+}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit)
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/InlineHandler.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/InlineHandler.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/InlineHandler.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,86 +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.xop.doclit;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.handler.GenericHandler;
-import javax.xml.rpc.handler.HandlerInfo;
-import javax.xml.rpc.handler.MessageContext;
-import javax.xml.rpc.handler.soap.SOAPMessageContext;
-import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPMessage;
-
-import org.jboss.logging.Logger;
-import org.jboss.ws.core.soap.NameImpl;
-
-/**
- * @author Heiko Braun <heiko.braun(a)jboss.com>
- * @version $Id$
- * @since Sep 25, 2006
- */
-public class InlineHandler extends GenericHandler
-{
- HandlerInfo config;
-
- private static Logger log = Logger.getLogger(InlineHandler.class);
-
- public QName[] getHeaders()
- {
- return new QName[0];
- }
-
- public void init(HandlerInfo config) {
- this.config = config;
- }
-
- public boolean handleRequest(MessageContext messageContext)
- {
- dumpMessage(messageContext);
- return true;
- }
-
- public boolean handleResponse(MessageContext messageContext)
- {
- dumpMessage(messageContext);
- return true;
- }
-
- private void dumpMessage(MessageContext messageContext)
- {
- try
- {
- SOAPMessage soapMessage = ((SOAPMessageContext)messageContext).getMessage();
- SOAPBody soapBody = soapMessage.getSOAPBody();
-
- SOAPElement bodyElement = (SOAPElement)soapBody.getChildElements().next();
- SOAPElement xopElement = (SOAPElement)bodyElement.getChildElements(new NameImpl("xopContent")).next();
- String base64Value = xopElement.getValue();
- log.debug("base64Value: " + base64Value);
- messageContext.setProperty("xop.inline.value", base64Value);
- }
- catch (Exception e)
- {
- log.error("Failed to access inline XOP values", e);
- }
- }
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/InlineHandler.java (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/InlineHandler.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/InlineHandler.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/InlineHandler.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,86 @@
+/*
+* 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.xop.doclit;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.handler.GenericHandler;
+import javax.xml.rpc.handler.HandlerInfo;
+import javax.xml.rpc.handler.MessageContext;
+import javax.xml.rpc.handler.soap.SOAPMessageContext;
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPMessage;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.core.soap.NameImpl;
+
+/**
+ * @author Heiko Braun <heiko.braun(a)jboss.com>
+ * @version $Id$
+ * @since Sep 25, 2006
+ */
+public class InlineHandler extends GenericHandler
+{
+ HandlerInfo config;
+
+ private static Logger log = Logger.getLogger(InlineHandler.class);
+
+ public QName[] getHeaders()
+ {
+ return new QName[0];
+ }
+
+ public void init(HandlerInfo config) {
+ this.config = config;
+ }
+
+ public boolean handleRequest(MessageContext messageContext)
+ {
+ dumpMessage(messageContext);
+ return true;
+ }
+
+ public boolean handleResponse(MessageContext messageContext)
+ {
+ dumpMessage(messageContext);
+ return true;
+ }
+
+ private void dumpMessage(MessageContext messageContext)
+ {
+ try
+ {
+ SOAPMessage soapMessage = ((SOAPMessageContext)messageContext).getMessage();
+ SOAPBody soapBody = soapMessage.getSOAPBody();
+
+ SOAPElement bodyElement = (SOAPElement)soapBody.getChildElements().next();
+ SOAPElement xopElement = (SOAPElement)bodyElement.getChildElements(new NameImpl("xopContent")).next();
+ String base64Value = xopElement.getValue();
+ log.debug("base64Value: " + base64Value);
+ messageContext.setProperty("xop.inline.value", base64Value);
+ }
+ catch (Exception e)
+ {
+ log.error("Failed to access inline XOP values", e);
+ }
+ }
+}
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPBase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPBase.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPBase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,195 +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.xop.doclit;
-
-import java.awt.Image;
-import java.io.File;
-
-import javax.activation.DataHandler;
-import javax.xml.rpc.Stub;
-import javax.xml.transform.Source;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.XOPTestSupport;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse;
-import org.jboss.ws.core.StubExt;
-import org.jboss.ws.core.utils.IOUtils;
-
-/**
- * @author Heiko Braun <heiko.braun(a)jboss.com>
- * @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 {
-
- private File imgFile = new File("resources/jaxrpc/samples/xop/shared/attach.jpeg");
-
- 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(imgFile);
-
- // 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(imgFile);
-
- // 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(imgFile);
-
- 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());
- }
- }
-
- public void testImageRequestOptimized() throws Exception {
-
- Image image = XOPTestSupport.createTestImage(imgFile);
-
- 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());
- }
- }
-
- 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(imgFile);
-
- // 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(imgFile);
-
- // 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());
- }
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPBase.java (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPBase.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPBase.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPBase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -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.samples.xop.doclit;
+
+import java.awt.Image;
+import java.io.File;
+
+import javax.activation.DataHandler;
+import javax.xml.rpc.Stub;
+import javax.xml.transform.Source;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.XOPTestSupport;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse;
+import org.jboss.ws.core.StubExt;
+import org.jboss.ws.core.utils.IOUtils;
+
+/**
+ * @author Heiko Braun <heiko.braun(a)jboss.com>
+ * @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 {
+
+ private File imgFile = new File("resources/jaxrpc/samples/xop/shared/attach.jpeg");
+
+ 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(imgFile);
+
+ // 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(imgFile);
+
+ // 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(imgFile);
+
+ 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());
+ }
+ }
+
+ public void testImageRequestOptimized() throws Exception {
+
+ Image image = XOPTestSupport.createTestImage(imgFile);
+
+ 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());
+ }
+ }
+
+ 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(imgFile);
+
+ // 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(imgFile);
+
+ // 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());
+ }
+}
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPHandlerTestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPHandlerTestCase.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPHandlerTestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,65 +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.xop.doclit;
-
-import javax.naming.InitialContext;
-import javax.xml.rpc.Service;
-
-import junit.framework.Test;
-
-import org.jboss.test.ws.JBossWSTestSetup;
-
-/**
- * Test MTOM functionality with jaxrpc-handlers in place.<br>
- * This basically determines wether XB needs to handle base64 values directly
- * or uses callbacks to XOPMarshaller/Unmarshaller.
- *
- * @author Heiko Braun <heiko.braun(a)jboss.com>
- * @version $Id$
- * @since Sep 22, 2006
- */
-public class XOPHandlerTestCase extends XOPBase {
-
- private XOPPing port;
-
- public static Test suite()
- {
- return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxrpc-samples-xop-doclit_handler.war, jaxrpc-samples-xop-doclit_handler-client.jar");
- }
-
- protected void setUp() throws Exception
- {
- super.setUp();
- if (port == null)
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPHandlerTestCase");
- port = (XOPPing)service.getPort(XOPPing.class);
- }
-
- //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-doclit_handler");
- }
-
- protected XOPPing getPort() {
- return port;
- }
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPHandlerTestCase.java (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPHandlerTestCase.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPHandlerTestCase.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPHandlerTestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,65 @@
+/*
+* 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.xop.doclit;
+
+import javax.naming.InitialContext;
+import javax.xml.rpc.Service;
+
+import junit.framework.Test;
+
+import org.jboss.test.ws.JBossWSTestSetup;
+
+/**
+ * Test MTOM functionality with jaxrpc-handlers in place.<br>
+ * This basically determines wether XB needs to handle base64 values directly
+ * or uses callbacks to XOPMarshaller/Unmarshaller.
+ *
+ * @author Heiko Braun <heiko.braun(a)jboss.com>
+ * @version $Id$
+ * @since Sep 22, 2006
+ */
+public class XOPHandlerTestCase extends XOPBase {
+
+ private XOPPing port;
+
+ public static Test suite()
+ {
+ return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxrpc-samples-xop-doclit_handler.war, jaxrpc-samples-xop-doclit_handler-client.jar");
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ if (port == null)
+ {
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPHandlerTestCase");
+ port = (XOPPing)service.getPort(XOPPing.class);
+ }
+
+ //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-doclit_handler");
+ }
+
+ protected XOPPing getPort() {
+ return port;
+ }
+}
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPing.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPing.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPing.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,24 +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.samples.xop.doclit;
-
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse;
-
-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: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPing.java (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPing.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPing.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPing.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,24 @@
+/*
+ * 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.samples.xop.doclit;
+
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse;
+
+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;
+}
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPingImpl.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPingImpl.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPingImpl.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,43 +0,0 @@
-package org.jboss.test.ws.jaxrpc.samples.xop.doclit;
-
-import java.rmi.RemoteException;
-
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.MTOMServiceBase;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse;
-
-/**
- * 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: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPingImpl.java (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPingImpl.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPingImpl.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPingImpl.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,43 @@
+package org.jboss.test.ws.jaxrpc.samples.xop.doclit;
+
+import java.rmi.RemoteException;
+
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.MTOMServiceBase;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse;
+
+/**
+ * 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());
+ }
+}
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPingService.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPingService.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPingService.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -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.samples.xop.doclit;
-
-
-import javax.xml.rpc.ServiceException;
-
-
-public interface XOPPingService extends javax.xml.rpc.Service
-{
-
- public org.jboss.test.ws.jaxrpc.samples.xop.doclit.XOPPing getTestServicePort() throws ServiceException;
-
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPingService.java (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPingService.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPingService.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPingService.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -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.samples.xop.doclit;
+
+
+import javax.xml.rpc.ServiceException;
+
+
+public interface XOPPingService extends javax.xml.rpc.Service
+{
+
+ public org.jboss.test.ws.jaxrpc.samples.xop.doclit.XOPPing getTestServicePort() throws ServiceException;
+
+}
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPTestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPTestCase.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPTestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,66 +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.xop.doclit;
-
-// $Id$
-
-import javax.naming.InitialContext;
-import javax.xml.rpc.Service;
-
-import junit.framework.Test;
-
-import org.jboss.test.ws.JBossWSTestSetup;
-
-/**
- * Test MTOM functionaly without any jaxrpc handlers in place.
- *
- * @author Heiko.Braun(a)jboss.org
- * @since Sep 22, 2006
- */
-public class XOPTestCase extends XOPBase {
-
- private XOPPing port;
-
- public static Test suite()
- {
- return JBossWSTestSetup.newTestSetup(XOPTestCase.class, "jaxrpc-samples-xop-doclit.war, jaxrpc-samples-xop-doclit-client.jar");
- }
-
- protected void setUp() throws Exception
- {
- super.setUp();
- if (port == null)
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPTestCase");
- port = (XOPPing)service.getPort(XOPPing.class);
- }
-
- //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-doclit");
- }
-
- protected XOPPing getPort()
- {
- return port;
- }
-
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPTestCase.java (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPTestCase.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPTestCase.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPTestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,66 @@
+/*
+ * 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.xop.doclit;
+
+// $Id$
+
+import javax.naming.InitialContext;
+import javax.xml.rpc.Service;
+
+import junit.framework.Test;
+
+import org.jboss.test.ws.JBossWSTestSetup;
+
+/**
+ * Test MTOM functionaly without any jaxrpc handlers in place.
+ *
+ * @author Heiko.Braun(a)jboss.org
+ * @since Sep 22, 2006
+ */
+public class XOPTestCase extends XOPBase {
+
+ private XOPPing port;
+
+ public static Test suite()
+ {
+ return JBossWSTestSetup.newTestSetup(XOPTestCase.class, "jaxrpc-samples-xop-doclit.war, jaxrpc-samples-xop-doclit-client.jar");
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ if (port == null)
+ {
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPTestCase");
+ port = (XOPPing)service.getPort(XOPPing.class);
+ }
+
+ //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-doclit");
+ }
+
+ protected XOPPing getPort()
+ {
+ return port;
+ }
+
+}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit)
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/InlineHandler.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/InlineHandler.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/InlineHandler.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,65 +0,0 @@
-package org.jboss.test.ws.jaxrpc.samples.xop.rpclit;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.handler.GenericHandler;
-import javax.xml.rpc.handler.HandlerInfo;
-import javax.xml.rpc.handler.MessageContext;
-import javax.xml.rpc.handler.soap.SOAPMessageContext;
-import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPMessage;
-
-import org.jboss.logging.Logger;
-import org.jboss.ws.core.soap.NameImpl;
-
-/**
- * @author Heiko Braun <heiko.braun(a)jboss.com>
- * @since Jun 16, 2006
- */
-public class InlineHandler extends GenericHandler
-{
- HandlerInfo config;
-
- private static Logger log = Logger.getLogger(InlineHandler.class);
-
- public QName[] getHeaders()
- {
- return new QName[0];
- }
-
- public void init(HandlerInfo config) {
- this.config = config;
- }
-
- public boolean handleRequest(MessageContext messageContext)
- {
- dumpMessage(messageContext, "parameters");
- return true;
- }
-
- public boolean handleResponse(MessageContext messageContext)
- {
- dumpMessage(messageContext, "result");
- return true;
- }
-
- private void dumpMessage(MessageContext messageContext, String parentName)
- {
- try
- {
- SOAPMessage soapMessage = ((SOAPMessageContext)messageContext).getMessage();
- SOAPBody soapBody = soapMessage.getSOAPBody();
-
- SOAPElement bodyElement = (SOAPElement)soapBody.getChildElements().next();
- SOAPElement wrapper = (SOAPElement)bodyElement.getChildElements(new NameImpl(parentName)).next();
- SOAPElement xopElement = (SOAPElement)wrapper.getChildElements(new NameImpl("xopContent")).next();
- String base64Value = xopElement.getValue();
- log.debug("base64Value: " + base64Value);
- messageContext.setProperty("xop.inline.value", base64Value);
- }
- catch (Exception e)
- {
- // ingore, happens when simple types are send
- }
- }
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/InlineHandler.java (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/InlineHandler.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/InlineHandler.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/InlineHandler.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,65 @@
+package org.jboss.test.ws.jaxrpc.samples.xop.rpclit;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.handler.GenericHandler;
+import javax.xml.rpc.handler.HandlerInfo;
+import javax.xml.rpc.handler.MessageContext;
+import javax.xml.rpc.handler.soap.SOAPMessageContext;
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPMessage;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.core.soap.NameImpl;
+
+/**
+ * @author Heiko Braun <heiko.braun(a)jboss.com>
+ * @since Jun 16, 2006
+ */
+public class InlineHandler extends GenericHandler
+{
+ HandlerInfo config;
+
+ private static Logger log = Logger.getLogger(InlineHandler.class);
+
+ public QName[] getHeaders()
+ {
+ return new QName[0];
+ }
+
+ public void init(HandlerInfo config) {
+ this.config = config;
+ }
+
+ public boolean handleRequest(MessageContext messageContext)
+ {
+ dumpMessage(messageContext, "parameters");
+ return true;
+ }
+
+ public boolean handleResponse(MessageContext messageContext)
+ {
+ dumpMessage(messageContext, "result");
+ return true;
+ }
+
+ private void dumpMessage(MessageContext messageContext, String parentName)
+ {
+ try
+ {
+ SOAPMessage soapMessage = ((SOAPMessageContext)messageContext).getMessage();
+ SOAPBody soapBody = soapMessage.getSOAPBody();
+
+ SOAPElement bodyElement = (SOAPElement)soapBody.getChildElements().next();
+ SOAPElement wrapper = (SOAPElement)bodyElement.getChildElements(new NameImpl(parentName)).next();
+ SOAPElement xopElement = (SOAPElement)wrapper.getChildElements(new NameImpl("xopContent")).next();
+ String base64Value = xopElement.getValue();
+ log.debug("base64Value: " + base64Value);
+ messageContext.setProperty("xop.inline.value", base64Value);
+ }
+ catch (Exception e)
+ {
+ // ingore, happens when simple types are send
+ }
+ }
+}
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPBase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPBase.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPBase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,219 +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.xop.rpclit;
-
-import java.awt.Image;
-import java.io.File;
-import java.util.StringTokenizer;
-
-import javax.activation.DataHandler;
-import javax.xml.rpc.Stub;
-import javax.xml.transform.Source;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.XOPTestSupport;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse;
-import org.jboss.ws.core.StubExt;
-import org.jboss.ws.core.utils.IOUtils;
-
-/**
- * @author Heiko Braun <heiko.braun(a)jboss.com>
- * @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
-{
- private File imgFile = new File("resources/jaxrpc/samples/xop/shared/attach.jpeg");
-
- 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(imgFile);
- requestComplex(new PingMsg("0|1", bytesIn));
-
- }
-
- public void testRequestOptimized() throws Exception
- {
-
- byte[] bytesIn = XOPTestSupport.getBytesFromFile(imgFile);
- 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(imgFile);
-
- 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());
- }
- }
-
- public void testImageRequestOptimized() throws Exception
- {
-
- Image image = XOPTestSupport.createTestImage(imgFile);
-
- 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());
- }
- }
-
- 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(imgFile);
-
- // 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(imgFile);
-
- // 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());
- }
-
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPBase.java (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPBase.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPBase.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPBase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,219 @@
+/*
+ * 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.xop.rpclit;
+
+import java.awt.Image;
+import java.io.File;
+import java.util.StringTokenizer;
+
+import javax.activation.DataHandler;
+import javax.xml.rpc.Stub;
+import javax.xml.transform.Source;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.XOPTestSupport;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse;
+import org.jboss.ws.core.StubExt;
+import org.jboss.ws.core.utils.IOUtils;
+
+/**
+ * @author Heiko Braun <heiko.braun(a)jboss.com>
+ * @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
+{
+ private File imgFile = new File("resources/jaxrpc/samples/xop/shared/attach.jpeg");
+
+ 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(imgFile);
+ requestComplex(new PingMsg("0|1", bytesIn));
+
+ }
+
+ public void testRequestOptimized() throws Exception
+ {
+
+ byte[] bytesIn = XOPTestSupport.getBytesFromFile(imgFile);
+ 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(imgFile);
+
+ 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());
+ }
+ }
+
+ public void testImageRequestOptimized() throws Exception
+ {
+
+ Image image = XOPTestSupport.createTestImage(imgFile);
+
+ 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());
+ }
+ }
+
+ 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(imgFile);
+
+ // 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(imgFile);
+
+ // 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());
+ }
+
+}
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPHandlerTestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPHandlerTestCase.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPHandlerTestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,61 +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.xop.rpclit;
-
-import javax.naming.InitialContext;
-import javax.xml.rpc.Service;
-
-import junit.framework.Test;
-
-import org.jboss.test.ws.JBossWSTestSetup;
-
-/**
- * @author Heiko Braun <heiko.braun(a)jboss.com>
- * @version $Id$
- * @since Sep 22, 2006
- */
-public class XOPHandlerTestCase extends XOPBase {
-
- private XOPPing port;
-
- public static Test suite()
- {
- return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxrpc-samples-xop-rpclit_handler.war, jaxrpc-samples-xop-rpclit_handler-client.jar");
- }
-
- protected void setUp() throws Exception
- {
- super.setUp();
- if (port == null)
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPHandlerTestCaseRPC");
- port = (XOPPing)service.getPort(XOPPing.class);
- }
-
- //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-rpclit_handler");
- }
-
- protected XOPPing getPort() {
- return port;
- }
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPHandlerTestCase.java (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPHandlerTestCase.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPHandlerTestCase.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPHandlerTestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,61 @@
+/*
+* 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.xop.rpclit;
+
+import javax.naming.InitialContext;
+import javax.xml.rpc.Service;
+
+import junit.framework.Test;
+
+import org.jboss.test.ws.JBossWSTestSetup;
+
+/**
+ * @author Heiko Braun <heiko.braun(a)jboss.com>
+ * @version $Id$
+ * @since Sep 22, 2006
+ */
+public class XOPHandlerTestCase extends XOPBase {
+
+ private XOPPing port;
+
+ public static Test suite()
+ {
+ return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxrpc-samples-xop-rpclit_handler.war, jaxrpc-samples-xop-rpclit_handler-client.jar");
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ if (port == null)
+ {
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPHandlerTestCaseRPC");
+ port = (XOPPing)service.getPort(XOPPing.class);
+ }
+
+ //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-rpclit_handler");
+ }
+
+ protected XOPPing getPort() {
+ return port;
+ }
+}
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPing.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPing.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPing.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,23 +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.samples.xop.rpclit;
-
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse;
-
-public interface XOPPing extends java.rmi.Remote
-{
- public org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse ping(org.jboss.test.ws.jaxrpc.samples.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;
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPing.java (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPing.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPing.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPing.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,23 @@
+/*
+ * 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.samples.xop.rpclit;
+
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse;
+
+public interface XOPPing extends java.rmi.Remote
+{
+ public org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse ping(org.jboss.test.ws.jaxrpc.samples.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;
+}
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPingImpl.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPingImpl.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPingImpl.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,49 +0,0 @@
-package org.jboss.test.ws.jaxrpc.samples.xop.rpclit;
-
-import java.rmi.RemoteException;
-
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.MTOMServiceBase;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource;
-import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse;
-
-/**
- * @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());
- }
-
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPingImpl.java (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPingImpl.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPingImpl.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPingImpl.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,49 @@
+package org.jboss.test.ws.jaxrpc.samples.xop.rpclit;
+
+import java.rmi.RemoteException;
+
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.MTOMServiceBase;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource;
+import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse;
+
+/**
+ * @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());
+ }
+
+}
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPingService.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPingService.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPingService.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -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.samples.xop.rpclit;
-
-
-import javax.xml.rpc.ServiceException;
-
-
-public interface XOPPingService extends javax.xml.rpc.Service
-{
- public org.jboss.test.ws.jaxrpc.samples.xop.rpclit.XOPPing getTestServicePort() throws ServiceException;
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPingService.java (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPingService.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPingService.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPingService.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -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.samples.xop.rpclit;
+
+
+import javax.xml.rpc.ServiceException;
+
+
+public interface XOPPingService extends javax.xml.rpc.Service
+{
+ public org.jboss.test.ws.jaxrpc.samples.xop.rpclit.XOPPing getTestServicePort() throws ServiceException;
+}
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPTestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPTestCase.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPTestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,64 +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.xop.rpclit;
-
-// $Id$
-
-import javax.naming.InitialContext;
-import javax.xml.rpc.Service;
-
-import junit.framework.Test;
-
-import org.jboss.test.ws.JBossWSTestSetup;
-
-/**
- *
- * @author Heiko.Braun(a)jboss.org
- * @since 11-Nov-2005
- */
-public class XOPTestCase extends XOPBase {
-
- private XOPPing port;
-
- public static Test suite()
- {
- return JBossWSTestSetup.newTestSetup(XOPTestCase.class, "jaxrpc-samples-xop-rpclit.war, jaxrpc-samples-xop-rpclit-client.jar");
- }
-
- protected void setUp() throws Exception
- {
- super.setUp();
- if (port == null)
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPTestCaseRPC");
- port = (XOPPing)service.getPort(XOPPing.class);
- }
-
- //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-rpclit");
- }
-
- protected XOPPing getPort() {
- return port;
- }
-
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPTestCase.java (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPTestCase.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPTestCase.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPTestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,64 @@
+/*
+ * 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.xop.rpclit;
+
+// $Id$
+
+import javax.naming.InitialContext;
+import javax.xml.rpc.Service;
+
+import junit.framework.Test;
+
+import org.jboss.test.ws.JBossWSTestSetup;
+
+/**
+ *
+ * @author Heiko.Braun(a)jboss.org
+ * @since 11-Nov-2005
+ */
+public class XOPTestCase extends XOPBase {
+
+ private XOPPing port;
+
+ public static Test suite()
+ {
+ return JBossWSTestSetup.newTestSetup(XOPTestCase.class, "jaxrpc-samples-xop-rpclit.war, jaxrpc-samples-xop-rpclit-client.jar");
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ if (port == null)
+ {
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPTestCaseRPC");
+ port = (XOPPing)service.getPort(XOPPing.class);
+ }
+
+ //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-rpclit");
+ }
+
+ protected XOPPing getPort() {
+ return port;
+ }
+
+}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared)
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/MTOMServiceBase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/MTOMServiceBase.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/MTOMServiceBase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,54 +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.xop.shared;
-
-import java.util.StringTokenizer;
-
-import org.jboss.ws.core.CommonMessageContext;
-import org.jboss.ws.core.StubExt;
-import org.jboss.ws.core.soap.MessageContextAssociation;
-import org.jboss.ws.extensions.xop.XOPContext;
-
-/**
- * @author Heiko Braun <heiko.braun(a)jboss.com>
- * @version $Id$
- * @since Sep 25, 2006
- */
-public class MTOMServiceBase {
- protected void toggleXOP(String message) {
- StringTokenizer tok = new StringTokenizer(message, "|");
- String requestOptimized = tok.nextToken();
- String responseOptimized = tok.nextToken();
- System.out.println(requestOptimized+"|"+responseOptimized);
-
- if(requestOptimized.equals("1") && !XOPContext.isXOPEncodedRequest())
- {
- throw new RuntimeException("Illegal state: No XOP encoded request found");
- }
-
- if(responseOptimized.equals("0"))
- {
- CommonMessageContext ctx = MessageContextAssociation.peekMessageContext();
- ctx.setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
- }
- }
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/MTOMServiceBase.java (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/MTOMServiceBase.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/MTOMServiceBase.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/MTOMServiceBase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,54 @@
+/*
+* 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.xop.shared;
+
+import java.util.StringTokenizer;
+
+import org.jboss.ws.core.CommonMessageContext;
+import org.jboss.ws.core.StubExt;
+import org.jboss.ws.core.soap.MessageContextAssociation;
+import org.jboss.ws.extensions.xop.XOPContext;
+
+/**
+ * @author Heiko Braun <heiko.braun(a)jboss.com>
+ * @version $Id$
+ * @since Sep 25, 2006
+ */
+public class MTOMServiceBase {
+ protected void toggleXOP(String message) {
+ StringTokenizer tok = new StringTokenizer(message, "|");
+ String requestOptimized = tok.nextToken();
+ String responseOptimized = tok.nextToken();
+ System.out.println(requestOptimized+"|"+responseOptimized);
+
+ if(requestOptimized.equals("1") && !XOPContext.isXOPEncodedRequest())
+ {
+ throw new RuntimeException("Illegal state: No XOP encoded request found");
+ }
+
+ if(responseOptimized.equals("0"))
+ {
+ CommonMessageContext ctx = MessageContextAssociation.peekMessageContext();
+ ctx.setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
+ }
+ }
+}
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingDataHandler.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingDataHandler.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingDataHandler.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,57 +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.xop.shared;
-
-import javax.activation.DataHandler;
-
-/**
- * @author Heiko Braun <heiko.braun(a)jboss.com>
- * @version $Id: PingDataHandler.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $
- * @since Oct 23, 2006
- */
-public class PingDataHandler {
- String message;
- DataHandler xopContent;
-
- public PingDataHandler() {
- }
-
- public PingDataHandler(DataHandler dataHandler) {
- this.xopContent = dataHandler;
- }
-
- public String getMessage() {
- return message;
- }
-
- public void setMessage(String message) {
- this.message = message;
- }
-
- public DataHandler getXopContent() {
- return xopContent;
- }
-
- public void setXopContent(DataHandler xopContent) {
- this.xopContent = xopContent;
- }
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingDataHandler.java (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingDataHandler.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingDataHandler.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingDataHandler.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -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.xop.shared;
+
+import javax.activation.DataHandler;
+
+/**
+ * @author Heiko Braun <heiko.braun(a)jboss.com>
+ * @version $Id: PingDataHandler.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $
+ * @since Oct 23, 2006
+ */
+public class PingDataHandler {
+ String message;
+ DataHandler xopContent;
+
+ public PingDataHandler() {
+ }
+
+ public PingDataHandler(DataHandler dataHandler) {
+ this.xopContent = dataHandler;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public DataHandler getXopContent() {
+ return xopContent;
+ }
+
+ public void setXopContent(DataHandler xopContent) {
+ this.xopContent = xopContent;
+ }
+}
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingDataHandlerResponse.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingDataHandlerResponse.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingDataHandlerResponse.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,48 +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.xop.shared;
-
-import javax.activation.DataHandler;
-
-/**
- * @author Heiko Braun <heiko.braun(a)jboss.com>
- * @version $Id: PingDataHandlerResponse.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $
- * @since Oct 23, 2006
- */
-public class PingDataHandlerResponse {
- DataHandler xopContent;
-
- public PingDataHandlerResponse() {
- }
-
- public PingDataHandlerResponse(DataHandler dataHandler) {
- this.xopContent = dataHandler;
- }
-
- public DataHandler getXopContent() {
- return xopContent;
- }
-
- public void setXopContent(DataHandler xopContent) {
- this.xopContent = xopContent;
- }
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingDataHandlerResponse.java (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingDataHandlerResponse.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingDataHandlerResponse.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingDataHandlerResponse.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,48 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.ws.jaxrpc.samples.xop.shared;
+
+import javax.activation.DataHandler;
+
+/**
+ * @author Heiko Braun <heiko.braun(a)jboss.com>
+ * @version $Id: PingDataHandlerResponse.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $
+ * @since Oct 23, 2006
+ */
+public class PingDataHandlerResponse {
+ DataHandler xopContent;
+
+ public PingDataHandlerResponse() {
+ }
+
+ public PingDataHandlerResponse(DataHandler dataHandler) {
+ this.xopContent = dataHandler;
+ }
+
+ public DataHandler getXopContent() {
+ return xopContent;
+ }
+
+ public void setXopContent(DataHandler xopContent) {
+ this.xopContent = xopContent;
+ }
+}
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingImage.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingImage.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingImage.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,59 +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.xop.shared;
-
-import java.awt.Image;
-
-/**
- * @author Heiko Braun <heiko.braun(a)jboss.com>
- * @version $Id: PingImage.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $
- * @since Oct 17, 2006
- */
-public class PingImage {
-
- String message;
- Image xopContent;
-
- public PingImage() {
- }
-
- public PingImage(String message, Image xopContent) {
- this.message = message;
- this.xopContent = xopContent;
- }
-
- public String getMessage() {
- return message;
- }
-
- public void setMessage(String message) {
- this.message = message;
- }
-
- public Image getXopContent() {
- return xopContent;
- }
-
- public void setXopContent(Image xopContent) {
- this.xopContent = xopContent;
- }
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingImage.java (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingImage.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingImage.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingImage.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,59 @@
+/*
+* 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.xop.shared;
+
+import java.awt.Image;
+
+/**
+ * @author Heiko Braun <heiko.braun(a)jboss.com>
+ * @version $Id: PingImage.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $
+ * @since Oct 17, 2006
+ */
+public class PingImage {
+
+ String message;
+ Image xopContent;
+
+ public PingImage() {
+ }
+
+ public PingImage(String message, Image xopContent) {
+ this.message = message;
+ this.xopContent = xopContent;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public Image getXopContent() {
+ return xopContent;
+ }
+
+ public void setXopContent(Image xopContent) {
+ this.xopContent = xopContent;
+ }
+}
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingImageResponse.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingImageResponse.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingImageResponse.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,49 +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.xop.shared;
-
-import java.awt.Image;
-
-/**
- * @author Heiko Braun <heiko.braun(a)jboss.com>
- * @version $Id: PingImageResponse.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $
- * @since Oct 17, 2006
- */
-public class PingImageResponse {
-
- Image xopContent;
-
- public PingImageResponse() {
- }
-
- public PingImageResponse(Image xopContent) {
- this.xopContent = xopContent;
- }
-
- public Image getXopContent() {
- return xopContent;
- }
-
- public void setXopContent(Image xopContent) {
- this.xopContent = xopContent;
- }
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingImageResponse.java (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingImageResponse.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingImageResponse.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingImageResponse.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,49 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.ws.jaxrpc.samples.xop.shared;
+
+import java.awt.Image;
+
+/**
+ * @author Heiko Braun <heiko.braun(a)jboss.com>
+ * @version $Id: PingImageResponse.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $
+ * @since Oct 17, 2006
+ */
+public class PingImageResponse {
+
+ Image xopContent;
+
+ public PingImageResponse() {
+ }
+
+ public PingImageResponse(Image xopContent) {
+ this.xopContent = xopContent;
+ }
+
+ public Image getXopContent() {
+ return xopContent;
+ }
+
+ public void setXopContent(Image xopContent) {
+ this.xopContent = xopContent;
+ }
+}
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingMsg.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingMsg.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingMsg.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,32 +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.samples.xop.shared;
-
-public class PingMsg
-{
- protected String message;
- protected byte[] xopContent;
-
- public PingMsg(){}
-
- public PingMsg(String message, byte[] dataHandler){
- this.message=message;
- this.xopContent = dataHandler;
- }
-
- public java.lang.String getMessage() { return message ;}
-
- public void setMessage(java.lang.String message){ this.message=message; }
-
- public byte[] getXopContent() {
- return xopContent;
- }
-
- public void setXopContent(byte[] xopContent) {
- this.xopContent = xopContent;
- }
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingMsg.java (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingMsg.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingMsg.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingMsg.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,32 @@
+/*
+ * 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.samples.xop.shared;
+
+public class PingMsg
+{
+ protected String message;
+ protected byte[] xopContent;
+
+ public PingMsg(){}
+
+ public PingMsg(String message, byte[] dataHandler){
+ this.message=message;
+ this.xopContent = dataHandler;
+ }
+
+ public java.lang.String getMessage() { return message ;}
+
+ public void setMessage(java.lang.String message){ this.message=message; }
+
+ public byte[] getXopContent() {
+ return xopContent;
+ }
+
+ public void setXopContent(byte[] xopContent) {
+ this.xopContent = xopContent;
+ }
+}
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingMsgResponse.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingMsgResponse.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingMsgResponse.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,28 +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.samples.xop.shared;
-
-public class PingMsgResponse
-{
- protected byte[] xopContent;
-
- public PingMsgResponse(){
- }
-
- public PingMsgResponse(byte[] dataHandler) {
- this.xopContent = dataHandler;
- }
-
- public byte[] getXopContent() {
- return xopContent;
- }
-
- public void setXopContent(byte[] xopContent) {
- this.xopContent = xopContent;
- }
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingMsgResponse.java (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingMsgResponse.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingMsgResponse.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingMsgResponse.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,28 @@
+/*
+ * 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.samples.xop.shared;
+
+public class PingMsgResponse
+{
+ protected byte[] xopContent;
+
+ public PingMsgResponse(){
+ }
+
+ public PingMsgResponse(byte[] dataHandler) {
+ this.xopContent = dataHandler;
+ }
+
+ public byte[] getXopContent() {
+ return xopContent;
+ }
+
+ public void setXopContent(byte[] xopContent) {
+ this.xopContent = xopContent;
+ }
+}
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingSource.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingSource.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingSource.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,50 +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.xop.shared;
-
-import javax.xml.transform.Source;
-
-/**
- * @author Heiko Braun <heiko.braun(a)jboss.com>
- * @version $Id: PingSource.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $
- * @since Oct 19, 2006
- */
-public class PingSource {
- String message;
- Source xopContent;
-
- public String getMessage() {
- return message;
- }
-
- public void setMessage(String message) {
- this.message = message;
- }
-
- public Source getXopContent() {
- return xopContent;
- }
-
- public void setXopContent(Source xopContent) {
- this.xopContent = xopContent;
- }
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingSource.java (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingSource.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingSource.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingSource.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,50 @@
+/*
+* 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.xop.shared;
+
+import javax.xml.transform.Source;
+
+/**
+ * @author Heiko Braun <heiko.braun(a)jboss.com>
+ * @version $Id: PingSource.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $
+ * @since Oct 19, 2006
+ */
+public class PingSource {
+ String message;
+ Source xopContent;
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public Source getXopContent() {
+ return xopContent;
+ }
+
+ public void setXopContent(Source xopContent) {
+ this.xopContent = xopContent;
+ }
+}
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingSourceResponse.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingSourceResponse.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingSourceResponse.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,49 +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.xop.shared;
-
-import javax.xml.transform.Source;
-
-/**
- * @author Heiko Braun <heiko.braun(a)jboss.com>
- * @version $Id: PingSourceResponse.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $
- * @since Oct 19, 2006
- */
-public class PingSourceResponse {
-
- Source xopContent;
-
- public PingSourceResponse() {
- }
-
- public PingSourceResponse(Source source) {
- this.xopContent = source;
- }
-
- public Source getXopContent() {
- return xopContent;
- }
-
- public void setXopContent(Source xopContent) {
- this.xopContent = xopContent;
- }
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingSourceResponse.java (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingSourceResponse.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingSourceResponse.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingSourceResponse.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,49 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.ws.jaxrpc.samples.xop.shared;
+
+import javax.xml.transform.Source;
+
+/**
+ * @author Heiko Braun <heiko.braun(a)jboss.com>
+ * @version $Id: PingSourceResponse.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $
+ * @since Oct 19, 2006
+ */
+public class PingSourceResponse {
+
+ Source xopContent;
+
+ public PingSourceResponse() {
+ }
+
+ public PingSourceResponse(Source source) {
+ this.xopContent = source;
+ }
+
+ public Source getXopContent() {
+ return xopContent;
+ }
+
+ public void setXopContent(Source xopContent) {
+ this.xopContent = xopContent;
+ }
+}
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -62,12 +62,6 @@
public void testDynamicProxy() throws Exception
{
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments");
- return;
- }
-
URL wsdlURL = new File("resources/jaxrpc/webserviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL();
URL mappingURL = new File("resources/jaxrpc/webserviceref/META-INF/jaxrpc-mapping.xml").toURL();
QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService");
@@ -81,12 +75,6 @@
public void testEJBClient() throws Exception
{
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments");
- return;
- }
-
InitialContext iniCtx = getInitialContext();
EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup("/ejb/EJBClient");
EJBRemote ejbRemote = ejbHome.create();
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish (from rev 2229, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish)
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpoint.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpoint.java 2007-02-01 00:52:54 UTC (rev 2229)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpoint.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,31 +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.wsdlpublish;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-public interface TestEndpoint extends Remote
-{
- String echoSimple(String inStr) throws RemoteException;
-
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpoint.java (from rev 2229, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpoint.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpoint.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpoint.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,31 @@
+/*
+ * 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.wsdlpublish;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+public interface TestEndpoint extends Remote
+{
+ String echoSimple(String inStr) throws RemoteException;
+
+}
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpointImpl.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpointImpl.java 2007-02-01 00:52:54 UTC (rev 2229)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpointImpl.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -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.wsdlpublish;
-
-import java.io.File;
-import java.net.URL;
-
-import org.jboss.logging.Logger;
-import org.jboss.ws.WSException;
-import org.jboss.ws.core.server.ServerConfig;
-import org.jboss.ws.core.server.ServerConfigFactory;
-import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
-import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
-
-public class TestEndpointImpl implements TestEndpoint
-{
- private Logger log = Logger.getLogger(TestEndpointImpl.class);
-
- public String echoSimple(String inStr)
- {
- // Get the server data dir
- ServerConfigFactory factory = ServerConfigFactory.getInstance();
- ServerConfig serverConfig = factory.getServerConfig();
- File dataDir = serverConfig.getServerDataDir();
-
- // Parse the wsdl from the expected publish location
- // Append the portType name to the return string
- try
- {
- URL wsdlURL = new File(dataDir.getAbsolutePath() + "/wsdl/some-wsdl-location/foo/bar/TestService.wsdl").toURL();
- WSDLDefinitions wsdl = WSDLDefinitionsFactory.newInstance().parse(wsdlURL);
- inStr += ":" + wsdl.getInterfaces()[0].getName();
- }
- catch (Exception ex)
- {
- WSException.rethrow(ex);
- }
-
- log.info("echoSimple: " + inStr);
-
- return inStr;
- }
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpointImpl.java (from rev 2229, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpointImpl.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpointImpl.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpointImpl.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,58 @@
+/*
+ * 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.wsdlpublish;
+
+import java.io.File;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.WSException;
+import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
+import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+
+public class TestEndpointImpl implements TestEndpoint
+{
+ private Logger log = Logger.getLogger(TestEndpointImpl.class);
+
+ public String echoSimple(String wsdlPath)
+ {
+ log.info("echoSimple: " + wsdlPath);
+
+ // Parse the wsdl from the expected publish location
+ // Append the portType name to the return string
+ QName portType = null;
+ try
+ {
+ URL wsdlURL = new File(wsdlPath).toURL();
+ WSDLDefinitions wsdl = WSDLDefinitionsFactory.newInstance().parse(wsdlURL);
+ portType = wsdl.getInterfaces()[0].getQName();
+ }
+ catch (Exception ex)
+ {
+ WSException.rethrow(ex);
+ }
+
+ return portType.toString();
+ }
+}
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java 2007-02-01 00:52:54 UTC (rev 2229)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,61 +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.wsdlpublish;
-
-import java.io.File;
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.Service;
-
-import junit.framework.Test;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
-
-/**
- * Test <wsdl-publish-location>
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 31-Jan-2007
- */
-public class WsdlPublishTestCase extends JBossWSTest
-{
- public static Test suite() throws Exception
- {
- return JBossWSTestSetup.newTestSetup(WsdlPublishTestCase.class, "jaxrpc-wsdlpublish.war");
- }
-
- public void testClientProxy() throws Exception
- {
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-wsdlpublish?wsdl");
- URL mappingURL = new File("resources/jaxrpc/wsdlpublish/WEB-INF/jaxrpc-mapping.xml").toURL();
- QName serviceName = new QName("http://org.jboss.test.ws/wsdlpublish", "TestService");
- Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL);
-
- TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
-
- String resStr = port.echoSimple("Hello");
- assertEquals("Hello:TestEndpoint", resStr);
- }
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java (from rev 2229, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,61 @@
+/*
+ * 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.wsdlpublish;
+
+import java.io.File;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.Service;
+
+import junit.framework.Test;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+
+/**
+ * Test <wsdl-publish-location>
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 31-Jan-2007
+ */
+public class WsdlPublishTestCase extends JBossWSTest
+{
+ public static Test suite() throws Exception
+ {
+ return JBossWSTestSetup.newTestSetup(WsdlPublishTestCase.class, "jaxrpc-wsdlpublish.war");
+ }
+
+ public void testClientProxy() throws Exception
+ {
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-wsdlpublish?wsdl");
+ URL mappingURL = new File("resources/jaxrpc/wsdlpublish/WEB-INF/jaxrpc-mapping.xml").toURL();
+ QName serviceName = new QName("http://org.jboss.test.ws/wsdlpublish", "TestService");
+ Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL);
+
+ TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
+
+ String resStr = port.echoSimple(new File("wsdl-publish/some-wsdl-location/foo/bar/TestService.wsdl").getAbsolutePath());
+ assertEquals("{http://org.jboss.test.ws/wsdlpublish}TestEndpoint", resStr);
+ }
+}
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -52,13 +52,11 @@
{
super.setUp();
- if (port == null && isTargetJBoss50() == false)
+ if (port == null)
{
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceEJB");
port = (JaxRpcTestService)service.getPort(JaxRpcTestService.class);
- ((Stub)port)._setProperty(Stub.USERNAME_PROPERTY, "kermit");
- ((Stub)port)._setProperty(Stub.PASSWORD_PROPERTY, "thefrog");
}
Properties props = System.getProperties();
@@ -72,12 +70,6 @@
public void testEchoString() throws Exception
{
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments");
- return;
- }
-
String hello = "Hello";
String world = "world!";
Object retObj = port.echoString(hello, world);
@@ -86,12 +78,6 @@
public void testEchoSimpleUserType() throws Exception
{
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments");
- return;
- }
-
String hello = "Hello";
SimpleUserType userType = new SimpleUserType(1, 2);
Object retObj = port.echoSimpleUserType(hello, userType);
@@ -100,12 +86,6 @@
public void testEchoStringNoUsername() throws Exception
{
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments");
- return;
- }
-
String hello = "Hello";
String world = "world!";
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -32,7 +32,7 @@
import org.jboss.test.ws.JBossWSTestSetup;
/**
- * [JBWS-1190] WSDL generated for JSR-181 POJO does not take 'transport-guarantee' in web.xml into account
+ * WSDL generated for JSR-181 POJO does not take 'transport-guarantee' in web.xml into account
*
* http://jira.jboss.org/jira/browse/JBWS-1190
*
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -33,7 +33,9 @@
import org.jboss.test.ws.JBossWSTestSetup;
/**
- * Test JBWS-1357 (jsps in deployment)
+ * JAXWSDeployerJSE is not handling jsp servlet defs correctly
+ *
+ * http://jira.jboss.org/jira/browse/JBWS-1357
*
* @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a>
* @version $Revision:1370 $
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2007-02-02 13:13:28 UTC (rev 2250)
@@ -23,15 +23,15 @@
import java.awt.Image;
import java.awt.image.BufferedImage;
+import java.io.File;
import java.io.InputStream;
-import java.net.URL;
import javax.activation.DataHandler;
import javax.xml.transform.Source;
import javax.xml.ws.soap.SOAPBinding;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport;
+import org.jboss.test.ws.XOPTestSupport;
/**
* User: hbraun
@@ -39,6 +39,8 @@
*/
public abstract class XOPBase extends JBossWSTest
{
+ private File imgFile = new File("resources/jaxws/samples/xop/shared/attach.jpeg");
+
protected MTOMEndpoint port;
protected SOAPBinding binding;
@@ -50,8 +52,7 @@
{
getBinding().setMTOMEnabled(true);
- URL url = new URL("file:resources/jaxws/samples/xop/shared/attach.jpeg");
- DataHandler dh = new DataHandler(url);
+ DataHandler dh = new DataHandler(imgFile.toURL());
DHResponse response = getPort().echoDataHandler(new DHRequest(dh));
assertNotNull(response);
assertEquals(response.getDataHandler().getContentType(), "image/jpeg");
@@ -62,8 +63,7 @@
{
getBinding().setMTOMEnabled(false);
- URL url = new URL("file:resources/jaxws/samples/xop/shared/attach.jpeg");
- DataHandler dh = new DataHandler(url);
+ DataHandler dh = new DataHandler(imgFile.toURL());
DHResponse response = getPort().echoDataHandler(new DHRequest(dh));
assertNotNull(response);
assertEquals(response.getDataHandler().getContentType(), "application/octet-stream");
@@ -74,7 +74,7 @@
{
getBinding().setMTOMEnabled(true);
- Image img = XOPTestSupport.createTestImage();
+ Image img = XOPTestSupport.createTestImage(imgFile);
if (img != null) // might fail on unix
{
ImageRequest request = new ImageRequest();
@@ -91,7 +91,7 @@
{
getBinding().setMTOMEnabled(false);
- Image img = XOPTestSupport.createTestImage();
+ Image img = XOPTestSupport.createTestImage(imgFile);
if (img != null) // might fail on unix
{
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws424/META-INF/application-client.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/jbws424/META-INF/application-client.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws424/META-INF/application-client.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -15,12 +15,10 @@
<port-component-ref>
<service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws424.TestSEI</service-endpoint-interface>
</port-component-ref>
- <!-- FIXME: SAAJ view of fault detail is broken in ws4ee
<handler>
<handler-name>TestHandler</handler-name>
<handler-class>org.jboss.test.ws.jaxrpc.jbws424.TestHandler</handler-class>
</handler>
- -->
</service-ref>
</application-client>
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/wsbpel/hello/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/wsbpel/hello/wstools-config.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/wsbpel/hello/wstools-config.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -4,7 +4,7 @@
<package-namespace package="org.jboss.test.ws.jaxrpc.samples.wsbpel.hello"
namespace="http://jbpm.org/examples/hello" />
</global>
- <wsdl-java location="wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl/service.wsdl">
+ <wsdl-java location="wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl/hello-service.wsdl">
<mapping file="jaxrpc-mapping.xml" />
</wsdl-java>
</configuration>
\ No newline at end of file
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop)
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/circular.xsd
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/circular.xsd 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/circular.xsd 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,134 +0,0 @@
-<schema elementFormDefault="qualified" targetNamespace="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws" xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:ns2="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws"
- xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/"
- xmlns:tns="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <import namespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws"/>
-
- <complexType name="Address">
- <sequence>
- <element name="city" nillable="true" type="string"/>
- <element name="state" nillable="true" type="string"/>
- <element name="street" nillable="true" type="string"/>
- <element name="zip" nillable="true" type="string"/>
- </sequence>
- </complexType>
- <complexType name="AlreadyRegisteredException">
- <complexContent>
- <extension base="tns:RegistrationException">
- <sequence>
- <element name="existingId" type="long"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <complexType name="BulkRegister">
- <sequence>
- <element maxOccurs="unbounded" minOccurs="0" name="Customers" nillable="true" type="tns:Customer"/>
- <element name="When" nillable="true" type="dateTime"/>
- </sequence>
- </complexType>
- <complexType name="BulkRegisterResponse">
- <sequence>
- <element maxOccurs="unbounded" minOccurs="0" name="RegisteredIDs" type="long"/>
- </sequence>
- </complexType>
- <complexType name="Customer">
- <sequence>
- <element name="address" nillable="true" type="tns:Address"/>
- <element maxOccurs="unbounded" minOccurs="0" name="contactNumbers" nillable="true" type="tns:PhoneNumber"/>
- <element name="id" type="long"/>
- <element name="name" nillable="true" type="tns:Name"/>
- <element maxOccurs="unbounded" minOccurs="0" name="referredCustomers" nillable="true" type="tns:Customer"/>
- </sequence>
- </complexType>
- <complexType name="GetStatistics">
- <sequence>
- <element name="Customer" nillable="true" type="tns:Customer"/>
- </sequence>
- </complexType>
- <complexType name="GetStatisticsResponse">
- <sequence>
- <element name="Statistics" nillable="true" type="Statistics"/>
- </sequence>
- </complexType>
-
- <complexType name="Statistics">
- <sequence>
- <element name="activationTime" nillable="true" type="dateTime"/>
- <element name="hits" type="long"/>
- </sequence>
- </complexType>
-
-
- <complexType name="InvoiceCustomer">
- <complexContent>
- <extension base="tns:Customer">
- <sequence>
- <element name="cycleDay" type="int"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <complexType name="Name">
- <sequence>
- <element name="firstName" nillable="true" type="string"/>
- <element name="lastName" nillable="true" type="string"/>
- <element name="middleName" nillable="true" type="string"/>
- </sequence>
- </complexType>
- <complexType name="PhoneNumber">
- <sequence>
- <element name="areaCode" nillable="true" type="string"/>
- <element name="exchange" nillable="true" type="string"/>
- <element name="line" nillable="true" type="string"/>
- </sequence>
- </complexType>
- <complexType name="Register">
- <sequence>
- <element name="Customer" nillable="true" type="tns:Customer"/>
- <element name="When" nillable="true" type="dateTime"/>
- </sequence>
- </complexType>
- <complexType name="RegisterForInvoice">
- <sequence>
- <element name="InvoiceCustomer" nillable="true" type="tns:InvoiceCustomer"/>
- </sequence>
- </complexType>
- <complexType name="RegisterForInvoiceResponse">
- <sequence>
- <element name="done" type="boolean"/>
- </sequence>
- </complexType>
- <complexType name="RegisterResponse">
- <sequence>
- <element name="RegisteredID" type="long"/>
- </sequence>
- </complexType>
- <complexType name="RegistrationException">
- <sequence>
- <element name="message" nillable="true" type="string"/>
- </sequence>
- </complexType>
- <complexType name="ValidationException">
- <complexContent>
- <extension base="tns:RegistrationException">
- <sequence>
- <element maxOccurs="unbounded" minOccurs="0" name="failiedCustomers" type="long"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <element name="AlreadyRegisteredException" type="tns:AlreadyRegisteredException"/>
- <element name="BulkRegister" type="tns:BulkRegister"/>
- <element name="BulkRegisterResponse" type="tns:BulkRegisterResponse"/>
- <element name="GetStatistics" type="tns:GetStatistics"/>
- <element name="GetStatisticsResponse" type="tns:GetStatisticsResponse"/>
- <element name="Register" type="tns:Register"/>
- <element name="RegisterForInvoice" type="tns:RegisterForInvoice"/>
- <element name="RegisterForInvoiceResponse" type="tns:RegisterForInvoiceResponse"/>
- <element name="RegisterResponse" type="tns:RegisterResponse"/>
- <element name="RegistrationException" type="tns:RegistrationException"/>
- <element name="ValidationException" type="tns:ValidationException"/>
-</schema>
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/circular.xsd (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/circular.xsd)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/circular.xsd (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/circular.xsd 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,134 @@
+<schema elementFormDefault="qualified" targetNamespace="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws" xmlns="http://www.w3.org/2001/XMLSchema"
+ xmlns:ns2="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws"
+ xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/"
+ xmlns:tns="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+ <import namespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws"/>
+
+ <complexType name="Address">
+ <sequence>
+ <element name="city" nillable="true" type="string"/>
+ <element name="state" nillable="true" type="string"/>
+ <element name="street" nillable="true" type="string"/>
+ <element name="zip" nillable="true" type="string"/>
+ </sequence>
+ </complexType>
+ <complexType name="AlreadyRegisteredException">
+ <complexContent>
+ <extension base="tns:RegistrationException">
+ <sequence>
+ <element name="existingId" type="long"/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name="BulkRegister">
+ <sequence>
+ <element maxOccurs="unbounded" minOccurs="0" name="Customers" nillable="true" type="tns:Customer"/>
+ <element name="When" nillable="true" type="dateTime"/>
+ </sequence>
+ </complexType>
+ <complexType name="BulkRegisterResponse">
+ <sequence>
+ <element maxOccurs="unbounded" minOccurs="0" name="RegisteredIDs" type="long"/>
+ </sequence>
+ </complexType>
+ <complexType name="Customer">
+ <sequence>
+ <element name="address" nillable="true" type="tns:Address"/>
+ <element maxOccurs="unbounded" minOccurs="0" name="contactNumbers" nillable="true" type="tns:PhoneNumber"/>
+ <element name="id" type="long"/>
+ <element name="name" nillable="true" type="tns:Name"/>
+ <element maxOccurs="unbounded" minOccurs="0" name="referredCustomers" nillable="true" type="tns:Customer"/>
+ </sequence>
+ </complexType>
+ <complexType name="GetStatistics">
+ <sequence>
+ <element name="Customer" nillable="true" type="tns:Customer"/>
+ </sequence>
+ </complexType>
+ <complexType name="GetStatisticsResponse">
+ <sequence>
+ <element name="Statistics" nillable="true" type="Statistics"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="Statistics">
+ <sequence>
+ <element name="activationTime" nillable="true" type="dateTime"/>
+ <element name="hits" type="long"/>
+ </sequence>
+ </complexType>
+
+
+ <complexType name="InvoiceCustomer">
+ <complexContent>
+ <extension base="tns:Customer">
+ <sequence>
+ <element name="cycleDay" type="int"/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name="Name">
+ <sequence>
+ <element name="firstName" nillable="true" type="string"/>
+ <element name="lastName" nillable="true" type="string"/>
+ <element name="middleName" nillable="true" type="string"/>
+ </sequence>
+ </complexType>
+ <complexType name="PhoneNumber">
+ <sequence>
+ <element name="areaCode" nillable="true" type="string"/>
+ <element name="exchange" nillable="true" type="string"/>
+ <element name="line" nillable="true" type="string"/>
+ </sequence>
+ </complexType>
+ <complexType name="Register">
+ <sequence>
+ <element name="Customer" nillable="true" type="tns:Customer"/>
+ <element name="When" nillable="true" type="dateTime"/>
+ </sequence>
+ </complexType>
+ <complexType name="RegisterForInvoice">
+ <sequence>
+ <element name="InvoiceCustomer" nillable="true" type="tns:InvoiceCustomer"/>
+ </sequence>
+ </complexType>
+ <complexType name="RegisterForInvoiceResponse">
+ <sequence>
+ <element name="done" type="boolean"/>
+ </sequence>
+ </complexType>
+ <complexType name="RegisterResponse">
+ <sequence>
+ <element name="RegisteredID" type="long"/>
+ </sequence>
+ </complexType>
+ <complexType name="RegistrationException">
+ <sequence>
+ <element name="message" nillable="true" type="string"/>
+ </sequence>
+ </complexType>
+ <complexType name="ValidationException">
+ <complexContent>
+ <extension base="tns:RegistrationException">
+ <sequence>
+ <element maxOccurs="unbounded" minOccurs="0" name="failiedCustomers" type="long"/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <element name="AlreadyRegisteredException" type="tns:AlreadyRegisteredException"/>
+ <element name="BulkRegister" type="tns:BulkRegister"/>
+ <element name="BulkRegisterResponse" type="tns:BulkRegisterResponse"/>
+ <element name="GetStatistics" type="tns:GetStatistics"/>
+ <element name="GetStatisticsResponse" type="tns:GetStatisticsResponse"/>
+ <element name="Register" type="tns:Register"/>
+ <element name="RegisterForInvoice" type="tns:RegisterForInvoice"/>
+ <element name="RegisterForInvoiceResponse" type="tns:RegisterForInvoiceResponse"/>
+ <element name="RegisterResponse" type="tns:RegisterResponse"/>
+ <element name="RegistrationException" type="tns:RegistrationException"/>
+ <element name="ValidationException" type="tns:ValidationException"/>
+</schema>
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit)
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF)
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF/application-client.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF/application-client.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<application-client 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://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
- version="1.4">
-
- <display-name>XOP DOC/Lit without handlers</display-name>
-
- <service-ref>
- <service-ref-name>service/XOPTestCase</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <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.samples.xop.doclit.XOPPing</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
-</application-client>
-
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF/application-client.xml (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF/application-client.xml)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF/application-client.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF/application-client.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application-client 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://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
+ version="1.4">
+
+ <display-name>XOP DOC/Lit without handlers</display-name>
+
+ <service-ref>
+ <service-ref-name>service/XOPTestCase</service-ref-name>
+ <service-interface>javax.xml.rpc.Service</service-interface>
+ <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.samples.xop.doclit.XOPPing</service-endpoint-interface>
+ </port-component-ref>
+ </service-ref>
+
+</application-client>
+
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF/jboss-client.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF/jboss-client.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,15 +0,0 @@
-<?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>
-
- <service-ref>
- <service-ref-name>service/XOPTestCase</service-ref-name>
- <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-doclit?wsdl</wsdl-override>
- </service-ref>
-
-</jboss-client>
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF/jboss-client.xml (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF/jboss-client.xml)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF/jboss-client.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF/jboss-client.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,15 @@
+<?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>
+
+ <service-ref>
+ <service-ref-name>service/XOPTestCase</service-ref-name>
+ <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-doclit?wsdl</wsdl-override>
+ </service-ref>
+
+</jboss-client>
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF)
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/jaxrpc-mapping.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/jaxrpc-mapping.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,194 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
- <package-mapping>
- <package-type>org.jboss.test.ws.jaxrpc.samples.xop.doclit</package-type>
- <namespaceURI>http://jboss.org/test/ws/xop</namespaceURI>
- </package-mapping>
-
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg</java-type>
- <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>
- <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.samples.xop.shared.PingMsgResponse</java-type>
- <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>
- <xml-element-name>xopContent</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
-
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage</java-type>
- <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>
- <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.samples.xop.shared.PingImageResponse</java-type>
- <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>
- <xml-element-name>xopContent</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
-
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource</java-type>
- <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>
- <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.samples.xop.shared.PingSourceResponse</java-type>
- <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>
- <xml-element-name>xopContent</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
-
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler</java-type>
- <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>
- <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.samples.xop.shared.PingDataHandlerResponse</java-type>
- <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>
- <xml-element-name>xopContent</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
-
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jaxrpc.samples.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>
- </port-mapping>
- </service-interface-mapping>
-
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.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>
- <wsdl-operation>ping</wsdl-operation>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg</param-type>
- <wsdl-message-mapping>
- <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.samples.xop.shared.PingMsgResponse</method-return-value>
- <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>
-
- <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.samples.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.samples.xop.shared.PingImageResponse</method-return-value>
- <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>
-
- <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.samples.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.samples.xop.shared.PingSourceResponse</method-return-value>
- <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>
-
- <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.samples.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.samples.xop.shared.PingDataHandlerResponse</method-return-value>
- <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>
-
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/jaxrpc-mapping.xml (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/jaxrpc-mapping.xml)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/jaxrpc-mapping.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/jaxrpc-mapping.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,194 @@
+<?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.samples.xop.doclit</package-type>
+ <namespaceURI>http://jboss.org/test/ws/xop</namespaceURI>
+ </package-mapping>
+
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg</java-type>
+ <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>
+ <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.samples.xop.shared.PingMsgResponse</java-type>
+ <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>
+ <xml-element-name>xopContent</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage</java-type>
+ <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>
+ <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.samples.xop.shared.PingImageResponse</java-type>
+ <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>
+ <xml-element-name>xopContent</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource</java-type>
+ <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>
+ <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.samples.xop.shared.PingSourceResponse</java-type>
+ <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>
+ <xml-element-name>xopContent</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler</java-type>
+ <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>
+ <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.samples.xop.shared.PingDataHandlerResponse</java-type>
+ <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>
+ <xml-element-name>xopContent</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jaxrpc.samples.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>
+ </port-mapping>
+ </service-interface-mapping>
+
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.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>
+ <wsdl-operation>ping</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg</param-type>
+ <wsdl-message-mapping>
+ <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.samples.xop.shared.PingMsgResponse</method-return-value>
+ <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>
+
+ <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.samples.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.samples.xop.shared.PingImageResponse</method-return-value>
+ <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>
+
+ <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.samples.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.samples.xop.shared.PingSourceResponse</method-return-value>
+ <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>
+
+ <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.samples.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.samples.xop.shared.PingDataHandlerResponse</method-return-value>
+ <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>
+
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/web.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/web.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app 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://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
-
- <servlet>
- <servlet-name>TestService</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxrpc.samples.xop.doclit.XOPPingImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestService</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-
-</web-app>
-
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/web.xml (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/web.xml)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/web.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/web.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app 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://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>TestService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxrpc.samples.xop.doclit.XOPPingImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/webservices.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/webservices.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- 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/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.samples.xop.doclit.XOPPing</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>TestService</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/webservices.xml (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/webservices.xml)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/webservices.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/webservices.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
+ 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/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.samples.xop.doclit.XOPPing</service-endpoint-interface>
+ <service-impl-bean>
+ <servlet-link>TestService</servlet-link>
+ </service-impl-bean>
+ </port-component>
+ </webservice-description>
+</webservices>
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl)
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,62 +0,0 @@
-<?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
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl 2007-02-02 13:13:28 UTC (rev 2250)
@@ -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
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,60 +0,0 @@
-<?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
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl 2007-02-02 13:13:28 UTC (rev 2250)
@@ -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
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl/xsd0.xsd
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl/xsd0.xsd 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl/xsd0.xsd 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,108 +0,0 @@
-<?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
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl/xsd0.xsd (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl/xsd0.xsd)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl/xsd0.xsd (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/wsdl/xsd0.xsd 2007-02-02 13:13:28 UTC (rev 2250)
@@ -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
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/attach.jpeg
===================================================================
(Binary files differ)
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/attach.jpeg (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/attach.jpeg)
===================================================================
(Binary files differ)
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig)
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF)
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF/application-client.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF/application-client.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<application-client 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://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
- version="1.4">
-
- <display-name>XOP DOC/Lit with handlers</display-name>
-
- <service-ref>
- <service-ref-name>service/XOPHandlerTestCase</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <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.samples.xop.doclit.XOPPing</service-endpoint-interface>
- </port-component-ref>
- <handler>
- <handler-name>XOPInlineHandler</handler-name>
- <handler-class>org.jboss.test.ws.jaxrpc.samples.xop.doclit.InlineHandler</handler-class>
- </handler>
- </service-ref>
-
-</application-client>
-
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF/application-client.xml (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF/application-client.xml)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF/application-client.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF/application-client.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application-client 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://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
+ version="1.4">
+
+ <display-name>XOP DOC/Lit with handlers</display-name>
+
+ <service-ref>
+ <service-ref-name>service/XOPHandlerTestCase</service-ref-name>
+ <service-interface>javax.xml.rpc.Service</service-interface>
+ <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.samples.xop.doclit.XOPPing</service-endpoint-interface>
+ </port-component-ref>
+ <handler>
+ <handler-name>XOPInlineHandler</handler-name>
+ <handler-class>org.jboss.test.ws.jaxrpc.samples.xop.doclit.InlineHandler</handler-class>
+ </handler>
+ </service-ref>
+
+</application-client>
+
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF/jboss-client.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF/jboss-client.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,15 +0,0 @@
-<?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>
-
- <service-ref>
- <service-ref-name>service/XOPHandlerTestCase</service-ref-name>
- <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-doclit_handler?wsdl</wsdl-override>
- </service-ref>
-
-</jboss-client>
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF/jboss-client.xml (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF/jboss-client.xml)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF/jboss-client.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF/jboss-client.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,15 @@
+<?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>
+
+ <service-ref>
+ <service-ref-name>service/XOPHandlerTestCase</service-ref-name>
+ <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-doclit_handler?wsdl</wsdl-override>
+ </service-ref>
+
+</jboss-client>
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/WEB-INF (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/WEB-INF)
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/WEB-INF/webservices.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/WEB-INF/webservices.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- 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/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.samples.xop.doclit.XOPPing</service-endpoint-interface>
- <handler>
- <handler-name>XOPInlineHandler</handler-name>
- <handler-class>org.jboss.test.ws.jaxrpc.samples.xop.doclit.InlineHandler</handler-class>
- </handler>
- <service-impl-bean>
- <servlet-link>TestService</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/WEB-INF/webservices.xml (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/WEB-INF/webservices.xml)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/WEB-INF/webservices.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/WEB-INF/webservices.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
+ 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/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.samples.xop.doclit.XOPPing</service-endpoint-interface>
+ <handler>
+ <handler-name>XOPInlineHandler</handler-name>
+ <handler-class>org.jboss.test.ws.jaxrpc.samples.xop.doclit.InlineHandler</handler-class>
+ </handler>
+ <service-impl-bean>
+ <servlet-link>TestService</servlet-link>
+ </service-impl-bean>
+ </port-component>
+ </webservice-description>
+</webservices>
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit)
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF)
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF/application-client.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF/application-client.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<application-client 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://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
- version="1.4">
-
- <display-name>XOP DOC/Lit without handlers</display-name>
-
- <service-ref>
- <service-ref-name>service/XOPTestCaseRPC</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <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.samples.xop.rpclit.XOPPing</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
-</application-client>
-
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF/application-client.xml (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF/application-client.xml)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF/application-client.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF/application-client.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application-client 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://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
+ version="1.4">
+
+ <display-name>XOP DOC/Lit without handlers</display-name>
+
+ <service-ref>
+ <service-ref-name>service/XOPTestCaseRPC</service-ref-name>
+ <service-interface>javax.xml.rpc.Service</service-interface>
+ <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.samples.xop.rpclit.XOPPing</service-endpoint-interface>
+ </port-component-ref>
+ </service-ref>
+
+</application-client>
+
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF/jboss-client.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF/jboss-client.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,15 +0,0 @@
-<?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>
-
- <service-ref>
- <service-ref-name>service/XOPTestCaseRPC</service-ref-name>
- <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-rpclit?wsdl</wsdl-override>
- </service-ref>
-
-</jboss-client>
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF/jboss-client.xml (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF/jboss-client.xml)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF/jboss-client.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF/jboss-client.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,15 @@
+<?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>
+
+ <service-ref>
+ <service-ref-name>service/XOPTestCaseRPC</service-ref-name>
+ <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-rpclit?wsdl</wsdl-override>
+ </service-ref>
+
+</jboss-client>
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF)
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/jaxrpc-mapping.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/jaxrpc-mapping.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,231 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<java-wsdl-mapping version='1.1'
- xmlns='http://java.sun.com/xml/ns/j2ee'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
- xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
- <package-mapping>
- <package-type>org.jboss.test.ws.jaxrpc.samples.xop.rpclit</package-type>
- <namespaceURI>http://jboss.org/test/ws/xop</namespaceURI>
- </package-mapping>
- <package-mapping>
- <package-type>org.jboss.test.ws.jaxrpc.samples.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.samples.xop.shared.PingMsg</java-type>
- <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>
- <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.samples.xop.shared.PingMsgResponse</java-type>
- <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>
- <xml-element-name>xopContent</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
-
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.samples.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.samples.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.samples.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.samples.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.samples.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.samples.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.samples.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>
- </port-mapping>
- </service-interface-mapping>
-
- <service-endpoint-interface-mapping>
-
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.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>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.samples.xop.shared.PingMsg</param-type>
- <wsdl-message-mapping>
- <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.samples.xop.shared.PingMsgResponse</method-return-value>
- <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>
-
- <service-endpoint-method-mapping>
- <java-method-name>pingSimple</java-method-name>
- <wsdl-operation>pingSimple</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://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>
- </method-param-parts-mapping>
- <method-param-parts-mapping>
- <param-position>1</param-position>
- <param-type>byte[]</param-type>
- <wsdl-message-mapping>
- <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>byte[]</method-return-value>
- <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.samples.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.samples.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.samples.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.samples.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.samples.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.samples.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
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/jaxrpc-mapping.xml (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/jaxrpc-mapping.xml)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/jaxrpc-mapping.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/jaxrpc-mapping.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,231 @@
+<?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.samples.xop.rpclit</package-type>
+ <namespaceURI>http://jboss.org/test/ws/xop</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jaxrpc.samples.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.samples.xop.shared.PingMsg</java-type>
+ <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>
+ <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.samples.xop.shared.PingMsgResponse</java-type>
+ <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>
+ <xml-element-name>xopContent</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jaxrpc.samples.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.samples.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.samples.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.samples.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.samples.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.samples.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.samples.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>
+ </port-mapping>
+ </service-interface-mapping>
+
+ <service-endpoint-interface-mapping>
+
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.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>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.samples.xop.shared.PingMsg</param-type>
+ <wsdl-message-mapping>
+ <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.samples.xop.shared.PingMsgResponse</method-return-value>
+ <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>
+
+ <service-endpoint-method-mapping>
+ <java-method-name>pingSimple</java-method-name>
+ <wsdl-operation>pingSimple</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://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>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping>
+ <param-position>1</param-position>
+ <param-type>byte[]</param-type>
+ <wsdl-message-mapping>
+ <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>byte[]</method-return-value>
+ <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.samples.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.samples.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.samples.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.samples.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.samples.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.samples.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
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/web.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/web.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app 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://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
-
- <servlet>
- <servlet-name>TestService</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxrpc.samples.xop.rpclit.XOPPingImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestService</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-
-</web-app>
-
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/web.xml (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/web.xml)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/web.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/web.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app 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://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>TestService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxrpc.samples.xop.rpclit.XOPPingImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/webservices.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/webservices.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- 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/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.samples.xop.rpclit.XOPPing</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>TestService</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/webservices.xml (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/webservices.xml)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/webservices.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/webservices.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
+ 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/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.samples.xop.rpclit.XOPPing</service-endpoint-interface>
+ <service-impl-bean>
+ <servlet-link>TestService</servlet-link>
+ </service-impl-bean>
+ </port-component>
+ </webservice-description>
+</webservices>
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/wsdl (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/wsdl)
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,190 +0,0 @@
-<?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
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl 2007-02-02 13:13:28 UTC (rev 2250)
@@ -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
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig)
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF)
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF/application-client.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF/application-client.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<application-client 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://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
- version="1.4">
-
- <display-name>XOP DOC/Lit with handlers</display-name>
-
- <service-ref>
- <service-ref-name>service/XOPHandlerTestCaseRPC</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <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.samples.xop.rpclit.XOPPing</service-endpoint-interface>
- </port-component-ref>
- <handler>
- <handler-name>XOPInlineHandler</handler-name>
- <handler-class>org.jboss.test.ws.jaxrpc.samples.xop.rpclit.InlineHandler</handler-class>
- </handler>
- </service-ref>
-
-</application-client>
-
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF/application-client.xml (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF/application-client.xml)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF/application-client.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF/application-client.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application-client 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://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
+ version="1.4">
+
+ <display-name>XOP DOC/Lit with handlers</display-name>
+
+ <service-ref>
+ <service-ref-name>service/XOPHandlerTestCaseRPC</service-ref-name>
+ <service-interface>javax.xml.rpc.Service</service-interface>
+ <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.samples.xop.rpclit.XOPPing</service-endpoint-interface>
+ </port-component-ref>
+ <handler>
+ <handler-name>XOPInlineHandler</handler-name>
+ <handler-class>org.jboss.test.ws.jaxrpc.samples.xop.rpclit.InlineHandler</handler-class>
+ </handler>
+ </service-ref>
+
+</application-client>
+
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF/jboss-client.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF/jboss-client.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,15 +0,0 @@
-<?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>
-
- <service-ref>
- <service-ref-name>service/XOPHandlerTestCaseRPC</service-ref-name>
- <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-rpclit_handler?wsdl</wsdl-override>
- </service-ref>
-
-</jboss-client>
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF/jboss-client.xml (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF/jboss-client.xml)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF/jboss-client.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF/jboss-client.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,15 @@
+<?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>
+
+ <service-ref>
+ <service-ref-name>service/XOPHandlerTestCaseRPC</service-ref-name>
+ <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-rpclit_handler?wsdl</wsdl-override>
+ </service-ref>
+
+</jboss-client>
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/WEB-INF (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/WEB-INF)
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/WEB-INF/webservices.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/WEB-INF/webservices.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- 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/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.samples.xop.rpclit.XOPPing</service-endpoint-interface>
- <handler>
- <handler-name>XOPInlineHandler</handler-name>
- <handler-class>org.jboss.test.ws.jaxrpc.samples.xop.rpclit.InlineHandler</handler-class>
- </handler>
- <service-impl-bean>
- <servlet-link>TestService</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/WEB-INF/webservices.xml (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/WEB-INF/webservices.xml)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/WEB-INF/webservices.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/WEB-INF/webservices.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
+ 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/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.samples.xop.rpclit.XOPPing</service-endpoint-interface>
+ <handler>
+ <handler-name>XOPInlineHandler</handler-name>
+ <handler-class>org.jboss.test.ws.jaxrpc.samples.xop.rpclit.InlineHandler</handler-class>
+ </handler>
+ <service-impl-bean>
+ <servlet-link>TestService</servlet-link>
+ </service-impl-bean>
+ </port-component>
+ </webservice-description>
+</webservices>
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/schema.xsd
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/schema.xsd 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/schema.xsd 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,41 +0,0 @@
-<s:schema xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://jboss.org/test/ws/xop/doclit"
- xmlns:xmime="http://www.w3.org/2005/05/xmlmime"
- xmlns:tns="http://jboss.org/test/ws/xop/doclit">
-
- <s:import schemaLocation="http://www.w3.org/2005/05/xmlmime" namespace="http://www.w3.org/2005/05/xmlmime"/>
-
- <s:element name="PingMsg">
- <s:complexType>
- <s:sequence>
- <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" />
- <s:element name="xopContent" xmime:contentType="image/jpeg" type="tns:XOPBinary"/>
- </s:sequence>
- </s:complexType>
- </s:element>
-
- <s:element name="PingMsgResponse">
- <s:complexType>
- <s:sequence>
- <s:element name="xopContent" xmime:contentType="image/jpeg" type="xmime:base64Binary"/>
- </s:sequence>
- </s:complexType>
- </s:element>
-
- <s:complexType name="XOPBinary" >
- <s:simpleContent>
- <s:extension base="s:base64Binary" >
- <s:attribute ref="xmime:contentType" use="optional"/>
- </s:extension>
- </s:simpleContent>
- </s:complexType>
-
- <s:element name="MSFTBinary">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" name="xopContent" nillable="true" type="s:base64Binary"/>
- </s:sequence>
- </s:complexType>
- </s:element>
-
-</s:schema>
\ No newline at end of file
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/schema.xsd (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/schema.xsd)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/schema.xsd (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/schema.xsd 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,41 @@
+<s:schema xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://jboss.org/test/ws/xop/doclit"
+ xmlns:xmime="http://www.w3.org/2005/05/xmlmime"
+ xmlns:tns="http://jboss.org/test/ws/xop/doclit">
+
+ <s:import schemaLocation="http://www.w3.org/2005/05/xmlmime" namespace="http://www.w3.org/2005/05/xmlmime"/>
+
+ <s:element name="PingMsg">
+ <s:complexType>
+ <s:sequence>
+ <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" />
+ <s:element name="xopContent" xmime:contentType="image/jpeg" type="tns:XOPBinary"/>
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+
+ <s:element name="PingMsgResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element name="xopContent" xmime:contentType="image/jpeg" type="xmime:base64Binary"/>
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+
+ <s:complexType name="XOPBinary" >
+ <s:simpleContent>
+ <s:extension base="s:base64Binary" >
+ <s:attribute ref="xmime:contentType" use="optional"/>
+ </s:extension>
+ </s:simpleContent>
+ </s:complexType>
+
+ <s:element name="MSFTBinary">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" name="xopContent" nillable="true" type="s:base64Binary"/>
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+
+</s:schema>
\ No newline at end of file
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared)
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/attach.jpeg
===================================================================
(Binary files differ)
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/attach.jpeg (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/attach.jpeg)
===================================================================
(Binary files differ)
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/attach.txt
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/attach.txt 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/attach.txt 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1 +0,0 @@
-This is a plain text attachment.
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/attach.txt (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/attach.txt)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/attach.txt (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/attach.txt 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1 @@
+This is a plain text attachment.
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/attach.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/attach.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/attach.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<mime-message>This is an xml attachment.</mime-message>
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/attach.xml (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/attach.xml)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/attach.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/attach.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<mime-message>This is an xml attachment.</mime-message>
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/disguised_jpeg.xcf
===================================================================
(Binary files differ)
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/disguised_jpeg.xcf (from rev 2249, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/shared/disguised_jpeg.xcf)
===================================================================
(Binary files differ)
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish (from rev 2229, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish)
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/META-INF (from rev 2229, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/META-INF)
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/META-INF/application-client.xml 2007-02-01 00:52:54 UTC (rev 2229)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/META-INF/application-client.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<application-client 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://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
- version="1.4">
-
- <display-name>HelloService</display-name>
-
- <service-ref>
- <service-ref-name>service/TestService</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/TestService.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.jbws812.TestEndpoint</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
-</application-client>
-
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/META-INF/application-client.xml (from rev 2229, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/META-INF/application-client.xml)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/META-INF/application-client.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/META-INF/application-client.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application-client 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://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
+ version="1.4">
+
+ <display-name>HelloService</display-name>
+
+ <service-ref>
+ <service-ref-name>service/TestService</service-ref-name>
+ <service-interface>javax.xml.rpc.Service</service-interface>
+ <wsdl-file>META-INF/wsdl/TestService.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.jbws812.TestEndpoint</service-endpoint-interface>
+ </port-component-ref>
+ </service-ref>
+
+</application-client>
+
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/META-INF/jboss-client.xml 2007-02-01 00:52:54 UTC (rev 2229)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/META-INF/jboss-client.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,13 +0,0 @@
-<?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>
-
- <service-ref>
- <service-ref-name>service/TestService</service-ref-name>
- <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws812?wsdl</wsdl-override>
- </service-ref>
-
-</jboss-client>
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/META-INF/jboss-client.xml (from rev 2229, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/META-INF/jboss-client.xml)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/META-INF/jboss-client.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/META-INF/jboss-client.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,13 @@
+<?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>
+
+ <service-ref>
+ <service-ref-name>service/TestService</service-ref-name>
+ <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws812?wsdl</wsdl-override>
+ </service-ref>
+
+</jboss-client>
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF (from rev 2229, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF)
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/jaxrpc-mapping.xml 2007-02-01 00:52:54 UTC (rev 2229)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/jaxrpc-mapping.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,37 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
- <package-mapping>
- <package-type>org.jboss.test.ws.jaxrpc.wsdlpublish</package-type>
- <namespaceURI>http://org.jboss.test.ws/wsdlpublish/types</namespaceURI>
- </package-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jaxrpc.wsdlpublish.TestService</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/wsdlpublish'>serviceNS:TestService</wsdl-service-name>
- <port-mapping>
- <port-name>TestEndpointPort</port-name>
- <java-port-name>TestEndpointPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.wsdlpublish.TestEndpoint</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/wsdlpublish'>portTypeNS:TestEndpoint</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/wsdlpublish'>bindingNS:TestEndpointBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>echoSimple</java-method-name>
- <wsdl-operation>echoSimple</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.test.ws/wsdlpublish'>wsdlMsgNS:TestEndpoint_echoSimple</wsdl-message>
- <wsdl-message-part-name>String_1</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.String</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/wsdlpublish'>wsdlMsgNS:TestEndpoint_echoSimpleResponse</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
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/jaxrpc-mapping.xml (from rev 2229, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/jaxrpc-mapping.xml)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/jaxrpc-mapping.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/jaxrpc-mapping.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,37 @@
+<?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.wsdlpublish</package-type>
+ <namespaceURI>http://org.jboss.test.ws/wsdlpublish/types</namespaceURI>
+ </package-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jaxrpc.wsdlpublish.TestService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/wsdlpublish'>serviceNS:TestService</wsdl-service-name>
+ <port-mapping>
+ <port-name>TestEndpointPort</port-name>
+ <java-port-name>TestEndpointPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.wsdlpublish.TestEndpoint</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/wsdlpublish'>portTypeNS:TestEndpoint</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/wsdlpublish'>bindingNS:TestEndpointBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>echoSimple</java-method-name>
+ <wsdl-operation>echoSimple</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.test.ws/wsdlpublish'>wsdlMsgNS:TestEndpoint_echoSimple</wsdl-message>
+ <wsdl-message-part-name>String_1</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.String</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/wsdlpublish'>wsdlMsgNS:TestEndpoint_echoSimpleResponse</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
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/jboss-web.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/jboss-web.xml 2007-02-01 00:52:54 UTC (rev 2229)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/jboss-web.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,9 +0,0 @@
-<?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>
- <webservice-description>
- <webservice-description-name>TestService</webservice-description-name>
- <wsdl-publish-location>file:@wsdl-publish-location@/some-wsdl-location</wsdl-publish-location>
- </webservice-description>
-</jboss-web>
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/jboss-web.xml (from rev 2229, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/jboss-web.xml)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/jboss-web.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/jboss-web.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,9 @@
+<?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>
+ <webservice-description>
+ <webservice-description-name>TestService</webservice-description-name>
+ <wsdl-publish-location>file:@wsdl-publish-location@/some-wsdl-location</wsdl-publish-location>
+ </webservice-description>
+</jboss-web>
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/web.xml 2007-02-01 00:52:54 UTC (rev 2229)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/web.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app 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://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
-
- <servlet>
- <servlet-name>TestEndpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxrpc.wsdlpublish.TestEndpointImpl</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>TestEndpoint</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-</web-app>
-
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/web.xml (from rev 2229, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/web.xml)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/web.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/web.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app 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://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>TestEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxrpc.wsdlpublish.TestEndpointImpl</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
+
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/webservices.xml 2007-02-01 00:52:54 UTC (rev 2229)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/webservices.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,15 +0,0 @@
-<webservices 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_web_services_1_1.xsd'>
- <webservice-description>
- <webservice-description-name>TestService</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/foo/bar/TestService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component>
- <port-component-name>TestEndpointPort</port-component-name>
- <wsdl-port xmlns:portNS='http://org.jboss.test.ws/wsdlpublish'>portNS:TestEndpointPort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.wsdlpublish.TestEndpoint</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>TestEndpoint</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
\ No newline at end of file
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/webservices.xml (from rev 2229, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/webservices.xml)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/webservices.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/webservices.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,15 @@
+<webservices 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_web_services_1_1.xsd'>
+ <webservice-description>
+ <webservice-description-name>TestService</webservice-description-name>
+ <wsdl-file>WEB-INF/wsdl/foo/bar/TestService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component>
+ <port-component-name>TestEndpointPort</port-component-name>
+ <wsdl-port xmlns:portNS='http://org.jboss.test.ws/wsdlpublish'>portNS:TestEndpointPort</wsdl-port>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.wsdlpublish.TestEndpoint</service-endpoint-interface>
+ <service-impl-bean>
+ <servlet-link>TestEndpoint</servlet-link>
+ </service-impl-bean>
+ </port-component>
+ </webservice-description>
+</webservices>
\ No newline at end of file
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl (from rev 2229, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl)
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo (from rev 2229, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo)
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/TestServicePortType.wsdl
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/TestServicePortType.wsdl 2007-02-01 00:52:54 UTC (rev 2229)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/TestServicePortType.wsdl 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestServicePortType' targetNamespace='http://org.jboss.test.ws/wsdlpublish' xmlns='http://schemas.xmlsoap.org/wsdl/'
- xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/wsdlpublish' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
-
- <types/>
-
- <message name='TestEndpoint_echoSimple'>
- <part name='String_1' type='xsd:string'/>
- </message>
- <message name='TestEndpoint_echoSimpleResponse'>
- <part name='result' type='xsd:string'/>
- </message>
-
- <portType name='TestEndpoint'>
- <operation name='echoSimple' parameterOrder='String_1'>
- <input message='tns:TestEndpoint_echoSimple'/>
- <output message='tns:TestEndpoint_echoSimpleResponse'/>
- </operation>
- </portType>
-
-</definitions>
\ No newline at end of file
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/TestServicePortType.wsdl (from rev 2229, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/TestServicePortType.wsdl)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/TestServicePortType.wsdl (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/TestServicePortType.wsdl 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestServicePortType' targetNamespace='http://org.jboss.test.ws/wsdlpublish' xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/wsdlpublish' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+
+ <types/>
+
+ <message name='TestEndpoint_echoSimple'>
+ <part name='String_1' type='xsd:string'/>
+ </message>
+ <message name='TestEndpoint_echoSimpleResponse'>
+ <part name='result' type='xsd:string'/>
+ </message>
+
+ <portType name='TestEndpoint'>
+ <operation name='echoSimple' parameterOrder='String_1'>
+ <input message='tns:TestEndpoint_echoSimple'/>
+ <output message='tns:TestEndpoint_echoSimpleResponse'/>
+ </operation>
+ </portType>
+
+</definitions>
\ No newline at end of file
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/bar (from rev 2229, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/bar)
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/bar/TestService.wsdl
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/bar/TestService.wsdl 2007-02-01 00:52:54 UTC (rev 2229)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/bar/TestService.wsdl 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/wsdlpublish' xmlns='http://schemas.xmlsoap.org/wsdl/'
- xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/wsdlpublish' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
-
- <import namespace="http://org.jboss.test.ws/wsdlpublish" location="../../foo/TestServicePortType.wsdl"/>
-
- <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
- <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='echoSimple'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body namespace='http://org.jboss.test.ws/wsdlpublish' use='literal'/>
- </input>
- <output>
- <soap:body namespace='http://org.jboss.test.ws/wsdlpublish' use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='TestService'>
- <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/bar/TestService.wsdl (from rev 2229, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/bar/TestService.wsdl)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/bar/TestService.wsdl (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/bar/TestService.wsdl 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/wsdlpublish' xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/wsdlpublish' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+
+ <import namespace="http://org.jboss.test.ws/wsdlpublish" location="../../foo/TestServicePortType.wsdl"/>
+
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echoSimple'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws/wsdlpublish' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws/wsdlpublish' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='TestService'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/wstools-config.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/wstools-config.xml 2007-02-01 00:52:54 UTC (rev 2229)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/wstools-config.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- wstools -cp ../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
--->
-
-<configuration xmlns="http://www.jboss.org/jbossws-tools" 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" endpoint="org.jboss.test.ws.jaxrpc.wsdlpublish.TestEndpoint" style="rpc">
- </service>
- <namespaces target-namespace="http://org.jboss.test.ws/wsdlpublish" type-namespace="http://org.jboss.test.ws/wsdlpublish/types"/>
- <mapping file="jaxrpc-mapping.xml"/>
- <webservices servlet-link="TestEndpoint"/>
- </java-wsdl>
-</configuration>
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/wstools-config.xml (from rev 2229, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/wstools-config.xml)
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/wstools-config.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/wstools-config.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ wstools -cp ../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
+-->
+
+<configuration xmlns="http://www.jboss.org/jbossws-tools" 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" endpoint="org.jboss.test.ws.jaxrpc.wsdlpublish.TestEndpoint" style="rpc">
+ </service>
+ <namespaces target-namespace="http://org.jboss.test.ws/wsdlpublish" type-namespace="http://org.jboss.test.ws/wsdlpublish/types"/>
+ <mapping file="jaxrpc-mapping.xml"/>
+ <webservices servlet-link="TestEndpoint"/>
+ </java-wsdl>
+</configuration>
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/wsse/username/META-INF/jboss-client.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/wsse/username/META-INF/jboss-client.xml 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/wsse/username/META-INF/jboss-client.xml 2007-02-02 13:13:28 UTC (rev 2250)
@@ -8,6 +8,17 @@
<service-ref>
<service-ref-name>service/TestServiceEJB</service-ref-name>
<config-name>Standard WSSecurity Client</config-name>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.wsse.JaxRpcTestService</service-endpoint-interface>
+ <call-property>
+ <prop-name>javax.xml.rpc.security.auth.username</prop-name>
+ <prop-value>kermit</prop-value>
+ </call-property>
+ <call-property>
+ <prop-name>javax.xml.rpc.security.auth.password</prop-name>
+ <prop-value>thefrog</prop-value>
+ </call-property>
+ </port-component-ref>
<wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-wsse-username?wsdl</wsdl-override>
</service-ref>
Modified: trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt
===================================================================
--- trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt 2007-02-02 13:13:28 UTC (rev 2250)
@@ -3,7 +3,7 @@
org/jboss/test/ws/jaxrpc/benchmark/**
org/jboss/test/ws/jaxws/benchmark/**
-# Resolve before JBoss50 goes final
+# Fix before JBoss50 goes final
org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.*
org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.*
org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.*
@@ -13,6 +13,8 @@
org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.*
org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.*
org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.*
+org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.*
org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.*
+org/jboss/test/ws/jaxrpc/wsdlpublish/**
Modified: trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt
===================================================================
--- trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-02-02 11:54:02 UTC (rev 2249)
+++ trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-02-02 13:13:28 UTC (rev 2250)
@@ -15,8 +15,9 @@
# JBoss excludes
org/jboss/test/ws/jaxrpc/samples/dynamichandler/*TestCase.*
-org/jboss/test/ws/jaxrpc/samples/jmstransport/**
-org/jboss/test/ws/jaxrpc/samples/wsbpel/**
+org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
+org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.*
+org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
# TODO: Why are these excluded
# [JBWS-1471] - Remove unwanted tomcat excludes
17 years, 3 months
- 1
- 0
JBossWS SVN: r2249 - in branches/jbossws-1.2.0: jbossws-core and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-02 06:54:02 -0500 (Fri, 02 Feb 2007)
New Revision: 2249
Modified:
branches/jbossws-1.2.0/integration-tomcat/build.xml
branches/jbossws-1.2.0/jbossws-core/build.xml
branches/jbossws-1.2.0/jbossws-tests/build.xml
Log:
Remove javax classes from jbossws-client.jar
Modified: branches/jbossws-1.2.0/integration-tomcat/build.xml
===================================================================
--- branches/jbossws-1.2.0/integration-tomcat/build.xml 2007-02-02 10:55:37 UTC (rev 2248)
+++ branches/jbossws-1.2.0/integration-tomcat/build.xml 2007-02-02 11:54:02 UTC (rev 2249)
@@ -99,6 +99,9 @@
<include name="META-INF/standard-jaxws-client-config.xml"/>
<include name="META-INF/standard-jaxws-endpoint-config.xml"/>
</fileset>
+ <webinf dir="${tomcat.resources.dir}/jbossws.war/WEB-INF">
+ <include name="log4j.xml"/>
+ </webinf>
</war>
</target>
Modified: branches/jbossws-1.2.0/jbossws-core/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/build.xml 2007-02-02 10:55:37 UTC (rev 2248)
+++ branches/jbossws-1.2.0/jbossws-core/build.xml 2007-02-02 11:54:02 UTC (rev 2249)
@@ -125,7 +125,6 @@
<include name="javax/annotation/**"/>
<include name="javax/jws/**"/>
<include name="javax/xml/ws/**"/>
- <include name="org/jboss/ws/jaxws/injection/**"/>
</fileset>
<metainf dir="${core.resources.dir}/jboss-jaxws.jar/META-INF"/>
</jar>
@@ -136,7 +135,6 @@
<fileset dir="${core.output.classes.dir}">
<include name="org/jboss/annotation/**"/>
<include name="org/jboss/ws/**"/>
- <exclude name="org/jboss/ws/integration/**"/>
</fileset>
<fileset dir="${core.resources.dir}">
<include name="schema/**"/>
@@ -146,14 +144,9 @@
<!-- Build jbossws-client.jar -->
<jar jarfile="${core.output.lib.dir}/jbossws-client.jar" manifest="${etc.dir}/default.mf">
- <fileset dir="${core.output.classes14.dir}">
- <include name="javax/xml/rpc/**"/>
- <include name="javax/xml/soap/**"/>
- </fileset>
<fileset dir="${core.output.classes.dir}">
- <include name="javax/xml/ws/**"/>
- <include name="javax/jws/**"/>
<include name="org/jboss/ws/**"/>
+ <exclude name="org/jboss/ws/core/server/**"/>
</fileset>
<fileset dir="${core.resources.dir}/jbossws.sar">
<include name="META-INF/standard-jaxrpc-client-config.xml"/>
@@ -168,7 +161,6 @@
<include name="wstools.bat"/>
<include name="wstools-log4j.xml"/>
</fileset>
- <metainf dir="${core.resources.dir}/jboss-saaj.jar/META-INF"/>
</jar>
</target>
Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-02 10:55:37 UTC (rev 2248)
+++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-02 11:54:02 UTC (rev 2249)
@@ -115,15 +115,17 @@
<format property="build.id" pattern="yyyyMMddHHmm"/>
</tstamp>
+ <!-- Define the jbossws.core.jar -->
+ <condition property="jbossws.core.jar" value="${core.output.lib.dir}/jbossws-core.jar">
+ <isset property="HAVE_JDK_1.5"/>
+ </condition>
+ <property name="jbossws.core.jar" value="${jboss40.output.lib.dir}/jbossws14-core.jar"/>
+
<!-- Define the jbossws.client.jar -->
- <condition property="jbossws.client.jar" value="${jboss40.output.lib.dir}/jbossws14-client.jar">
- <not>
- <isset property="HAVE_JDK_1.5"/>
- </not>
- </condition>
<condition property="jbossws.client.jar" value="${core.output.lib.dir}/jbossws-client.jar">
<isset property="HAVE_JDK_1.5"/>
</condition>
+ <property name="jbossws.client.jar" value="${jboss40.output.lib.dir}/jbossws14-client.jar"/>
<!-- Define excluded tests -->
<condition property="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt">
@@ -155,6 +157,7 @@
<!-- The combined compile classpath -->
<path id="jbossws.jars.classpath">
+ <pathelement location="${jbossws.core.jar}"/>
<pathelement location="${jbossws.client.jar}"/>
<pathelement location="${core.output.lib.dir}/jboss-jaxrpc.jar"/>
<pathelement location="${core.output.lib.dir}/jboss-jaxws.jar"/>
@@ -326,7 +329,10 @@
<!-- generate mapping artifacts -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="core.classpath"/>
- <classpath location="${jbossws.client.jar}"/>
+ <classpath location="${jbossws.core.jar}"/>
+ <classpath location="${core.output.lib.dir}/jboss-jaxrpc.jar"/>
+ <classpath location="${core.output.lib.dir}/jboss-jaxws.jar"/>
+ <classpath location="${core.output.lib.dir}/jboss-saaj.jar"/>
<classpath location="${thirdparty.dir}/jbossretro-rt.jar"/>
<classpath location="${thirdparty.dir}/jboss-backport-concurrent.jar"/>
<classpath location="${thirdparty.dir}/concurrent.jar"/>
17 years, 3 months
- 1
- 0
JBossWS SVN: r2248 - branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-02 05:55:37 -0500 (Fri, 02 Feb 2007)
New Revision: 2248
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java
Log:
Use key without deployment name
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-02-02 09:13:22 UTC (rev 2247)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-02-02 10:55:37 UTC (rev 2248)
@@ -304,10 +304,7 @@
{
// The key should not after it is assigned
if (wsdlCacheKey == null)
- {
- String deploymentName = wsMetaData.getDeploymentName();
- wsdlCacheKey = deploymentName + "/" + (wsdlLocation != null ? wsdlLocation : wsdlFile);
- }
+ wsdlCacheKey = "#" + (wsdlLocation != null ? wsdlLocation : wsdlFile);
wsdlDefinitions = (WSDLDefinitions)wsMetaData.getWsdlDefinition(wsdlCacheKey);
if (wsdlDefinitions == null)
17 years, 3 months
- 1
- 0
JBossWS SVN: r2247 - in branches/jbossws-1.2.0: jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1190 and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-02 04:13:22 -0500 (Fri, 02 Feb 2007)
New Revision: 2247
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java
Log:
Make wsdl cache key constant
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-02-02 00:55:22 UTC (rev 2246)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-02-02 09:13:22 UTC (rev 2247)
@@ -86,13 +86,16 @@
// Arbitrary properties given by <call-property>
private Properties properties;
-
+
// derived cached encoding style
private Use encStyle;
-
+
// The security configuration
private WSSecurityConfiguration securityConfig;
-
+
+ // The key to the wsdl cache
+ private String wsdlCacheKey;
+
public ServiceMetaData(UnifiedMetaData wsMetaData, QName serviceName)
{
this.wsMetaData = wsMetaData;
@@ -299,13 +302,19 @@
WSDLDefinitions wsdlDefinitions = null;
if (wsdlURL != null)
{
- String wsdlKey = wsMetaData.getDeploymentName() + getServiceName();
- wsdlDefinitions = (WSDLDefinitions)wsMetaData.getWsdlDefinition(wsdlKey);
+ // The key should not after it is assigned
+ if (wsdlCacheKey == null)
+ {
+ String deploymentName = wsMetaData.getDeploymentName();
+ wsdlCacheKey = deploymentName + "/" + (wsdlLocation != null ? wsdlLocation : wsdlFile);
+ }
+
+ wsdlDefinitions = (WSDLDefinitions)wsMetaData.getWsdlDefinition(wsdlCacheKey);
if (wsdlDefinitions == null)
{
WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
wsdlDefinitions = factory.parse(wsdlURL);
- wsMetaData.addWsdlDefinition(wsdlKey, wsdlDefinitions);
+ wsMetaData.addWsdlDefinition(wsdlCacheKey, wsdlDefinitions);
}
}
return wsdlDefinitions;
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java 2007-02-02 00:55:22 UTC (rev 2246)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java 2007-02-02 09:13:22 UTC (rev 2247)
@@ -30,7 +30,7 @@
import org.jboss.test.ws.JBossWSTestSetup;
/**
- * [JBWS-1190] WSDL generated for JSR-181 POJO does not take 'transport-guarantee' in web.xml into account
+ * WSDL generated for JSR-181 POJO does not take 'transport-guarantee' in web.xml into account
*
* http://jira.jboss.org/jira/browse/JBWS-1190
*
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2007-02-02 00:55:22 UTC (rev 2246)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2007-02-02 09:13:22 UTC (rev 2247)
@@ -32,7 +32,7 @@
import org.jboss.test.ws.JBossWSTestSetup;
/**
- * [JBWS-1190] WSDL generated for JSR-181 POJO does not take 'transport-guarantee' in web.xml into account
+ * WSDL generated for JSR-181 POJO does not take 'transport-guarantee' in web.xml into account
*
* http://jira.jboss.org/jira/browse/JBWS-1190
*
17 years, 3 months
- 1
- 0
JBossWS SVN: r2246 - branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-01 19:55:22 -0500 (Thu, 01 Feb 2007)
New Revision: 2246
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
Log:
Init PRE/POST handlers in initConfig
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-02-02 00:31:28 UTC (rev 2245)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-02-02 00:55:22 UTC (rev 2246)
@@ -652,7 +652,6 @@
log.debug("Reconfiguration forced, new config is '" + configName + "'");
initEndpointConfig();
- reconfigHandlerMetaData();
configObservable.doNotify(configName);
}
}
@@ -662,6 +661,8 @@
log.debug("Create new config [name=" + getConfigName() + ",file=" + getConfigFile() + "]");
JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance();
config = factory.getConfig(getRootFile(), getConfigName(), getConfigFile());
+
+ reconfigHandlerMetaData();
}
private void reconfigHandlerMetaData()
17 years, 3 months
- 1
- 0