JBossWS SVN: r5445 - framework/trunk/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-01-09 16:47:16 -0500 (Wed, 09 Jan 2008)
New Revision: 5445
Modified:
framework/trunk/src/test/ant-import/build-testsuite.xml
Log:
Add jboss-container.jar to jboss50 client cp
Modified: framework/trunk/src/test/ant-import/build-testsuite.xml
===================================================================
--- framework/trunk/src/test/ant-import/build-testsuite.xml 2008-01-09 21:39:17 UTC (rev 5444)
+++ framework/trunk/src/test/ant-import/build-testsuite.xml 2008-01-09 21:47:16 UTC (rev 5445)
@@ -170,6 +170,7 @@
<pathelement location="${jboss.client}/trove.jar"/>
<!-- FIXME jars should be available in the client dir -->
<pathelement location="${jboss.lib}/jboss-aop-jdk50.jar"/>
+ <pathelement location="${jboss.lib}/jboss-container.jar"/>
<pathelement location="${jboss.lib}/jboss-vfs.jar"/>
<pathelement location="${jboss.server.lib}/jboss.jar"/>
<pathelement location="${jboss.server.lib}/jbosssx.jar"/>
16 years, 4 months
JBossWS SVN: r5444 - framework/trunk/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-01-09 16:39:17 -0500 (Wed, 09 Jan 2008)
New Revision: 5444
Modified:
framework/trunk/src/test/ant-import/build-testsuite.xml
Log:
Add trove.jar to jboss50 client cp
Modified: framework/trunk/src/test/ant-import/build-testsuite.xml
===================================================================
--- framework/trunk/src/test/ant-import/build-testsuite.xml 2008-01-09 21:14:02 UTC (rev 5443)
+++ framework/trunk/src/test/ant-import/build-testsuite.xml 2008-01-09 21:39:17 UTC (rev 5444)
@@ -139,11 +139,11 @@
</path>
<!--
- The 'tests.client.classpath' contains jars that are available in the target container's client directory.
- There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir.
-
- The 'ws.stack.classpath' contains jars that come with a specific stack distribution.
- The 'tests.extra.classpath' contains stack specific jars that are needed to run the stack specific tests.
+ The 'tests.client.classpath' contains jars that are available in the target container's client directory.
+ There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir.
+
+ The 'ws.stack.classpath' contains jars that come with a specific stack distribution.
+ The 'tests.extra.classpath' contains stack specific jars that are needed to run the stack specific tests.
-->
<path id="tests.client.classpath">
<path refid="ws.stack.classpath"/>
@@ -162,11 +162,12 @@
<pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
<pathelement location="${jboss.client}/jbossall-client.jar"/>
<pathelement location="${jboss.client}/jbossws-jboss50.jar"/>
- <pathelement location="${jboss.client}/jaxws-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
+ <pathelement location="${jboss.client}/jaxws-tools.jar"/>
+ <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
<pathelement location="${jboss.client}/log4j.jar"/>
<pathelement location="${jboss.client}/mail.jar"/>
<pathelement location="${jboss.client}/stax-api.jar"/>
+ <pathelement location="${jboss.client}/trove.jar"/>
<!-- FIXME jars should be available in the client dir -->
<pathelement location="${jboss.lib}/jboss-aop-jdk50.jar"/>
<pathelement location="${jboss.lib}/jboss-vfs.jar"/>
16 years, 4 months
JBossWS SVN: r5443 - framework/trunk/src/main/java/org/jboss/wsf/framework/deployment.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-01-09 16:14:02 -0500 (Wed, 09 Jan 2008)
New Revision: 5443
Modified:
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java
Log:
Use InvocationType.JAXWS.MDB3
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2008-01-09 21:11:00 UTC (rev 5442)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2008-01-09 21:14:02 UTC (rev 5443)
@@ -30,6 +30,7 @@
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.LifecycleHandler;
import org.jboss.wsf.spi.deployment.LifecycleHandlerFactory;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.spi.invocation.InvocationHandler;
import org.jboss.wsf.spi.invocation.InvocationHandlerFactory;
import org.jboss.wsf.spi.invocation.InvocationType;
@@ -87,17 +88,23 @@
private InvocationHandler getInvocationHandler(Endpoint ep)
{
Deployment dep = ep.getService().getDeployment();
- String key = dep.getType().toString();
+ DeploymentType depType = dep.getType();
+
+ String key = depType.toString();
// Use a special key for MDB endpoints
EJBArchiveMetaData uapp = dep.getAttachment(EJBArchiveMetaData.class);
if (uapp != null)
{
EJBMetaData bmd = uapp.getBeanByEjbName(ep.getShortName());
- if (bmd instanceof MDBMetaData)
+ if (depType == DeploymentType.JAXRPC_EJB21 && bmd instanceof MDBMetaData)
{
- key = "JAXRPC_MDB21";
+ key = InvocationType.JAXRPC_MDB21.toString();
}
+ else if (depType == DeploymentType.JAXWS_EJB3 && bmd instanceof MDBMetaData)
+ {
+ key = InvocationType.JAXWS_MDB3.toString();
+ }
}
InvocationType type = InvocationType.valueOf(key);
16 years, 4 months
JBossWS SVN: r5442 - spi/trunk/src/main/java/org/jboss/wsf/spi/invocation.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-01-09 16:11:00 -0500 (Wed, 09 Jan 2008)
New Revision: 5442
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerFactory.java
Log:
Remove redundant import
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerFactory.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerFactory.java 2008-01-09 20:55:27 UTC (rev 5441)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerFactory.java 2008-01-09 21:11:00 UTC (rev 5442)
@@ -23,8 +23,6 @@
import org.jboss.wsf.spi.SPIView;
-import javax.xml.ws.handler.MessageContext;
-
/**
* Creates invocation related artefacts.
*
16 years, 4 months
JBossWS SVN: r5441 - in stack/native/trunk: src/main/resources and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-01-09 15:55:27 -0500 (Wed, 09 Jan 2008)
New Revision: 5441
Removed:
stack/native/trunk/src/main/resources/jbossws.war/
Modified:
stack/native/trunk/build.xml
stack/native/trunk/src/main/resources/jbossws-context.war/index.html
stack/native/trunk/src/main/resources/jbossws-context.war/styles.css
Log:
Clean up web console, include implementation version and build id
Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2008-01-09 20:37:24 UTC (rev 5440)
+++ stack/native/trunk/build.xml 2008-01-09 20:55:27 UTC (rev 5441)
@@ -235,12 +235,17 @@
</jar>
<!-- Build jbossws-context.war -->
- <copy todir="${core.output.lib.dir}/jbossws-context.war">
+ <copy todir="${core.output.lib.dir}/jbossws-context.war" filtering="true">
<fileset dir="${core.resources.dir}/jbossws-context.war">
<include name="index.html"/>
<include name="styles.css"/>
<include name="WEB-INF/**"/>
</fileset>
+ <filterset>
+ <filter token="build.id" value="${build.id}"/>
+ <filter token="implementation.version" value="jbossws-native-${version.id}"/>
+ <filtersfile file="${core.dir}/version.properties"/>
+ </filterset>
</copy>
<!-- Build jbossws-core-scripts.zip -->
Modified: stack/native/trunk/src/main/resources/jbossws-context.war/index.html
===================================================================
--- stack/native/trunk/src/main/resources/jbossws-context.war/index.html 2008-01-09 20:37:24 UTC (rev 5440)
+++ stack/native/trunk/src/main/resources/jbossws-context.war/index.html 2008-01-09 20:55:27 UTC (rev 5441)
@@ -1,14 +1,14 @@
<html><head>
<meta http-equiv='Content-Type content='text/html; charset=iso-8859-1'>
-<title>JBossWS</title>
+<title>JBossWS (@implementation.version@)</title>
<link rel='stylesheet' href='./styles.css'>
</head>
<body>
-<div class='pageHeader'>Welcome to JBoss Web Services</div>
+<div class='pageHeader'>JBossWS</div>
<div class="pageSection">
-<h2>J2EE compatible web services</h2>
+<h2>Welcome to JBoss Web Services</h2>
JBossWS is a JAX-WS compliant web service stack developed to be part of JBoss' JavaEE5 offering.
</div>
@@ -18,7 +18,9 @@
<fieldset>
<legend><b>Runtime information</b></legend>
<ul>
- <li><a href="services">View a list of deployed services</a></li>
+ <li><b>Revision: @implementation.version@</b></li>
+ <li><b>Build: @build.id@</b></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>
Modified: stack/native/trunk/src/main/resources/jbossws-context.war/styles.css
===================================================================
--- stack/native/trunk/src/main/resources/jbossws-context.war/styles.css 2008-01-09 20:37:24 UTC (rev 5440)
+++ stack/native/trunk/src/main/resources/jbossws-context.war/styles.css 2008-01-09 20:55:27 UTC (rev 5441)
@@ -18,7 +18,7 @@
padding-left:15px;
padding-top:5px;
padding-bottom:5px;
- background-color: #aaaadd;
+ background-color: #3b4f66;
max-width: 900px;
}
@@ -29,7 +29,7 @@
}
.metrics
-{
+{
font-size: 6pt;
background-color: #dddddd;
width: 100%;
@@ -41,7 +41,7 @@
font-size: 8pt;
font-weight: 600;
text-align: center;
- background-color: #aaaadd;
+ background-color: #3b4f66;
}
/* table row list view */
@@ -171,7 +171,7 @@
a {
font-family: Verdana, sans-serif;
- color: #0000dd;
+ color: #3b4f66;
text-decoration: none;
}
16 years, 4 months
JBossWS SVN: r5440 - spi/trunk/src/main/java/org/jboss/wsf/spi/deployment.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-01-09 15:37:24 -0500 (Wed, 09 Jan 2008)
New Revision: 5440
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java
Log:
Remove unsupported deployment type
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2008-01-09 20:33:23 UTC (rev 5439)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2008-01-09 20:37:24 UTC (rev 5440)
@@ -36,7 +36,7 @@
{
public enum DeploymentType
{
- JAXRPC_CLIENT, JAXRPC_JSE, JAXRPC_EJB21, JAXRPC_EJB3, JAXWS_JSE, JAXWS_EJB3
+ JAXRPC_CLIENT, JAXRPC_JSE, JAXRPC_EJB21, JAXWS_JSE, JAXWS_EJB3
};
public enum DeploymentState
16 years, 4 months
JBossWS SVN: r5439 - spi/trunk/src/main/java/org/jboss/wsf/spi/invocation.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-01-09 15:33:23 -0500 (Wed, 09 Jan 2008)
New Revision: 5439
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationType.java
Log:
Remove unsupported invocation types
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationType.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationType.java 2008-01-09 15:00:23 UTC (rev 5438)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationType.java 2008-01-09 20:33:23 UTC (rev 5439)
@@ -29,5 +29,5 @@
*/
public enum InvocationType
{
- JAXRPC_JSE, JAXRPC_EJB21, JAXRPC_MDB21, JAXWS_JSE, JAXWS_EJB21, JAXWS_EJB3, JAXWS_MDB21, JAXWS_MDB3;
+ JAXRPC_JSE, JAXRPC_EJB21, JAXRPC_MDB21, JAXWS_JSE, JAXWS_EJB3, JAXWS_MDB3;
}
16 years, 4 months
JBossWS SVN: r5438 - stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-01-09 10:00:23 -0500 (Wed, 09 Jan 2008)
New Revision: 5438
Modified:
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWSIface.java
Log:
[JBWS-1845] repairing runtime generated wrapper bean name
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java 2008-01-09 14:38:50 UTC (rev 5437)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java 2008-01-09 15:00:23 UTC (rev 5438)
@@ -53,7 +53,7 @@
{
@WebMethod(operationName="processSpamComplaints")
@WebResult(name="SpamResult")
- @ResponseWrapper(className="com.rsys.rsystools.ws.jaxws.ProcessSpamComplaintsResponse")
+ @ResponseWrapper(className="org.jboss.test.ws.jaxws.jbws1845.jaxws.SpamResult")
public SpamResult processSpamComplaints(
@WebParam(name = "email") String email,
@WebParam(name = "fromAddress") String fromAddress,
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWSIface.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWSIface.java 2008-01-09 14:38:50 UTC (rev 5437)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWSIface.java 2008-01-09 15:00:23 UTC (rev 5438)
@@ -41,7 +41,7 @@
{
@WebMethod(operationName="processSpamComplaints")
@WebResult(name="SpamResult")
- @ResponseWrapper(className="com.rsys.rsystools.ws.jaxws.ProcessSpamComplaintsResponse")
+ @ResponseWrapper(className="org.jboss.test.ws.jaxws.jbws1845.jaxws.SpamResult")
public SpamResult processSpamComplaints(
@WebParam(name = "email") String email,
@WebParam(name = "fromAddress") String fromAddress,
16 years, 4 months
JBossWS SVN: r5437 - in stack/native/trunk: src/test/java/org/jboss/test/ws/jaxws and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-01-09 09:38:50 -0500 (Wed, 09 Jan 2008)
New Revision: 5437
Added:
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/JBWS1845TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWSIface.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamResult.java
Modified:
stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt
Log:
[JBWS-1845] test
Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-01-09 12:54:39 UTC (rev 5436)
+++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-01-09 14:38:50 UTC (rev 5437)
@@ -554,6 +554,14 @@
<include name="wsdl/**"/>
</webinf>
</war>
+
+ <!-- jaxws-jbws1845 -->
+ <jar destfile="${tests.output.dir}/libs/jaxws-jbws1845.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1845/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws1845/*TestCase.class"/>
+ </fileset>
+ </jar>
<!-- jaxws-jbws1854 -->
<war destfile="${tests.output.dir}/libs/jaxws-jbws1854.war" webxml="${tests.output.dir}/resources/jaxws/jbws1854/WEB-INF/web.xml">
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/JBWS1845TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/JBWS1845TestCase.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/JBWS1845TestCase.java 2008-01-09 14:38:50 UTC (rev 5437)
@@ -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.jaxws.jbws1845;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-1854] Use of @ResponseWrapper annotation cause generation of incorrect wsdl upon deployment
+ *
+ * @author richard.opalka(a)jboss.com
+ *
+ * @since Jan 9, 2008
+ */
+public final class JBWS1845TestCase extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS1845TestCase.class, "jaxws-jbws1845.jar");
+ }
+
+ public void testIssue() throws Exception
+ {
+ QName serviceName = new QName("http://service.responsys.com/rsystools/ws/SpamComplaintWS/1.0", "SpamService");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1845/SpamService?wsdl");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ SpamComplaintWSIface proxy = (SpamComplaintWSIface)service.getPort(SpamComplaintWSIface.class);
+
+ String[] orig = { "email", "fromAddress", "mailDate", "complaintDate", "mailbox", "complainer", "xRext", "accountName"};
+ String[] returned = proxy.processSpamComplaints(orig[0], orig[1], orig[2], orig[3], orig[4], orig[5], orig[6], orig[7]).get();
+ for (int i = 0; i < orig.length; i++)
+ {
+ assertEquals(orig[i], returned[i]);
+ }
+ }
+
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/JBWS1845TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java 2008-01-09 14:38:50 UTC (rev 5437)
@@ -0,0 +1,69 @@
+/*
+ * 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.jaxws.jbws1845;
+
+import javax.ejb.Stateless;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.xml.ws.ResponseWrapper;
+
+import org.jboss.wsf.spi.annotation.WebContext;
+
+/**
+ * Webservice impl
+ *
+ * @author richard.opalka(a)jboss.com
+ *
+ * @since Jan 9, 2008
+ */
+@Stateless
+@WebService
+(
+ targetNamespace="http://service.responsys.com/rsystools/ws/SpamComplaintWS/1.0",
+ serviceName="SpamService"
+)
+@WebContext
+(
+ transportGuarantee="NONE",
+ contextRoot="/jaxws-jbws1845",
+ urlPattern="/SpamService"
+)
+public final class SpamComplaintWS implements SpamComplaintWSIface
+{
+ @WebMethod(operationName="processSpamComplaints")
+ @WebResult(name="SpamResult")
+ @ResponseWrapper(className="com.rsys.rsystools.ws.jaxws.ProcessSpamComplaintsResponse")
+ public SpamResult processSpamComplaints(
+ @WebParam(name = "email") String email,
+ @WebParam(name = "fromAddress") String fromAddress,
+ @WebParam(name = "mailDate") String mailDate,
+ @WebParam(name = "complaintDate") String complaintDate,
+ @WebParam(name = "mailbox") String mailbox,
+ @WebParam(name = "complainer") String complainer,
+ @WebParam(name = "xRext") String xRext,
+ @WebParam(name = "accountName") String accountName)
+ {
+ return new SpamResult(email, fromAddress, mailDate, complaintDate, mailbox, complainer, xRext, accountName);
+ }
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWSIface.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWSIface.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWSIface.java 2008-01-09 14:38:50 UTC (rev 5437)
@@ -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.jaxws.jbws1845;
+
+import javax.ejb.Remote;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.xml.ws.ResponseWrapper;
+
+/**
+ * Webservice iface
+ *
+ * @author richard.opalka(a)jboss.com
+ *
+ * @since Jan 9, 2008
+ */
+@Remote
+@WebService
+public interface SpamComplaintWSIface
+{
+ @WebMethod(operationName="processSpamComplaints")
+ @WebResult(name="SpamResult")
+ @ResponseWrapper(className="com.rsys.rsystools.ws.jaxws.ProcessSpamComplaintsResponse")
+ public SpamResult processSpamComplaints(
+ @WebParam(name = "email") String email,
+ @WebParam(name = "fromAddress") String fromAddress,
+ @WebParam(name = "mailDate") String mailDate,
+ @WebParam(name = "complaintDate") String complaintDate,
+ @WebParam(name = "mailbox") String mailbox,
+ @WebParam(name = "complainer") String complainer,
+ @WebParam(name = "xRext") String xRext,
+ @WebParam(name = "accountName") String accountName
+ );
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWSIface.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamResult.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamResult.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamResult.java 2008-01-09 14:38:50 UTC (rev 5437)
@@ -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.jaxws.jbws1845;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * Custom response object
+ *
+ * @author richard.opalka(a)jboss.com
+ *
+ * @since Jan 9, 2008
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "SpamResult", propOrder = {
+ "email",
+ "fromAddress",
+ "mailDate",
+ "complaintDate",
+ "mailbox",
+ "complainer",
+ "xRext",
+ "accountName"
+})
+public final class SpamResult
+{
+ @XmlElement(required = true, nillable = true)
+ protected String email;
+ @XmlElement(required = true, nillable = true)
+ protected String fromAddress;
+ @XmlElement(required = true, nillable = true)
+ protected String mailDate;
+ @XmlElement(required = true, nillable = true)
+ protected String complaintDate;
+ @XmlElement(required = true, nillable = true)
+ protected String mailbox;
+ @XmlElement(required = true, nillable = true)
+ protected String complainer;
+ @XmlElement(required = true, nillable = true)
+ protected String xRext;
+ @XmlElement(required = true, nillable = true)
+ protected String accountName;
+
+ public SpamResult()
+ {
+ }
+
+ public SpamResult(String email, String fromAddress, String mailDate, String complaintDate, String mailbox, String complainer, String xRext, String accountName)
+ {
+ this.email = email;
+ this.fromAddress = fromAddress;
+ this.mailDate = mailDate;
+ this.complaintDate = complaintDate;
+ this.mailbox = mailbox;
+ this.complainer = complainer;
+ this.xRext = xRext;
+ this.accountName = accountName;
+ }
+
+ public String[] get()
+ {
+ return new String[] { email, fromAddress, mailDate, complaintDate, mailbox, complainer, xRext, accountName };
+ }
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamResult.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt 2008-01-09 12:54:39 UTC (rev 5436)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt 2008-01-09 14:38:50 UTC (rev 5437)
@@ -3,7 +3,7 @@
# JBossAS-4.0 excludes
org/jboss/test/ws/jaxrpc/jbws723/**
-# EJB3 compilation excludes
+# EJB3 excludes
org/jboss/test/ws/jaxws/binding/**
org/jboss/test/ws/jaxws/jbws771/**
org/jboss/test/ws/jaxws/jbws944/**
@@ -26,6 +26,7 @@
org/jboss/test/ws/jaxws/jbws1815/**
org/jboss/test/ws/jaxws/jbws1822/**
org/jboss/test/ws/jaxws/jbws1840/**
+org/jboss/test/ws/jaxws/jbws1845/**
org/jboss/test/ws/jaxws/jbws1904/**
org/jboss/test/ws/jaxws/namespace/**
org/jboss/test/ws/jaxws/handlerlifecycle/**
16 years, 4 months
JBossWS SVN: r5436 - framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-01-09 07:54:39 -0500 (Wed, 09 Jan 2008)
New Revision: 5436
Modified:
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java
Log:
Update XOP excludes. Valid for JBoss 5 only
Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java
===================================================================
--- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java 2008-01-09 12:53:26 UTC (rev 5435)
+++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java 2008-01-09 12:54:39 UTC (rev 5436)
@@ -72,7 +72,7 @@
public void testDataHandlerRoundtrip() throws Exception
{
- if(isIntegrationSunRI())
+ if(isIntegrationSunRI() && isTargetJBoss50())
{
System.out.println("FIXME JBWS-1949: Metro MTOM ignores content-type on attachment part");
return;
@@ -96,7 +96,7 @@
*/
public void testDataHandlerResponseOptimzed() throws Exception
{
- if(isIntegrationSunRI())
+ if(isIntegrationSunRI() && isTargetJBoss50())
{
System.out.println("FIXME JBWS-1949: Metro MTOM ignores content-type on attachment part");
return;
Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java
===================================================================
--- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2008-01-09 12:53:26 UTC (rev 5435)
+++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2008-01-09 12:54:39 UTC (rev 5436)
@@ -71,7 +71,7 @@
public void testParameterAnnotation() throws Exception
{
- if(isIntegrationSunRI())
+ if(isIntegrationSunRI() && isTargetJBoss50())
{
System.out.println("FIXME JBWS-1949: Metro MTOM ignores content-type on attachment part");
return;
16 years, 4 months