JBossWS SVN: r12483 - stack/native/branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-06-16 07:29:17 -0400 (Wed, 16 Jun 2010)
New Revision: 12483
Removed:
stack/native/branches/dlofthouse/JBPAPP-4447/
Log:
Recreate
15 years, 10 months
- 1
- 0
JBossWS SVN: r12482 - stack/native/branches/dlofthouse/JBPAPP-4447.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-06-16 07:20:01 -0400 (Wed, 16 Jun 2010)
New Revision: 12482
Added:
stack/native/branches/dlofthouse/JBPAPP-4447/jbossws-native-2.0.1.SP2_CP/
Log:
Branch to backport nonce support.
Copied: stack/native/branches/dlofthouse/JBPAPP-4447/jbossws-native-2.0.1.SP2_CP (from rev 12481, stack/native/branches/jbossws-native-2.0.1.SP2_CP)
15 years, 10 months
- 1
- 0
JBossWS SVN: r12481 - in stack/cxf: tags and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-15 09:48:57 -0400 (Tue, 15 Jun 2010)
New Revision: 12481
Added:
stack/cxf/tags/jbossws-cxf-3.3.1.SP1/
Removed:
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/
Log:
Tagging jbossws-cxf-3.3.1.SP1
Copied: stack/cxf/tags/jbossws-cxf-3.3.1.SP1 (from rev 12480, stack/cxf/branches/jbossws-cxf-3.3.1.SP1)
15 years, 10 months
- 1
- 0
JBossWS SVN: r12480 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-15 09:00:25 -0400 (Tue, 15 Jun 2010)
New Revision: 12480
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/web.xml
Log:
[JBWS-3059] Adding spaces in servlet-name, to have a testcase
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/web.xml 2010-06-15 11:42:30 UTC (rev 12479)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/web.xml 2010-06-15 13:00:25 UTC (rev 12480)
@@ -6,12 +6,12 @@
version="2.4">
<servlet>
- <servlet-name>TestService</servlet-name>
+ <servlet-name>Test Service Servlet</servlet-name>
<servlet-class>org.jboss.test.ws.jaxws.cxf.descriptor.DescriptorEndpointImpl</servlet-class>
</servlet>
<servlet-mapping>
- <servlet-name>TestService</servlet-name>
+ <servlet-name>Test Service Servlet</servlet-name>
<url-pattern>/*</url-pattern>
</servlet-mapping>
15 years, 10 months
- 1
- 0
JBossWS SVN: r12479 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark.
by jbossws-commits＠lists.jboss.org
Author: rsvoboda(a)redhat.com
Date: 2010-06-15 07:42:30 -0400 (Tue, 15 Jun 2010)
New Revision: 12479
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/Runner.java
Log:
Optimalization for threads:
- ThreadPool initialized only once pre test
- Finished threads were still in wait state, shutdown method on ExecutorService solves the issue.
(problem only when running more tests at once, could end with java.lang.OutOfMemoryError: unable to create new native thread)
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/Runner.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/Runner.java 2010-06-15 11:29:21 UTC (rev 12478)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/Runner.java 2010-06-15 11:42:30 UTC (rev 12479)
@@ -199,6 +199,7 @@
long total = 0;
long failed = 0;
long procTime = 0;
+ ExecutorService es = Executors.newFixedThreadPool(threadCount);
for (int run = 0; run < runs; run++)
{
System.out.println("*\n RUN " + run + "\n*");
@@ -210,7 +211,6 @@
DOMUtils.clearThreadLocals();
- ExecutorService es = Executors.newFixedThreadPool(threadCount);
long startProcTime = new Date().getTime();
List<Future<Result>> futures = es.invokeAll(callables);
long currentRunProcTime = new Date().getTime() - startProcTime;
@@ -249,6 +249,8 @@
System.out.println("------------------------------------");
System.out.println();
}
+ es.shutdown();
+
System.out.println("------------------------------------");
System.out.println("Iterations: " + total);
System.out.println("Failures: " + failed);
15 years, 10 months
- 1
- 0
JBossWS SVN: r12478 - in stack/cxf/branches/jbossws-cxf-3.3.1.SP1: modules/client and 16 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-15 07:29:21 -0400 (Tue, 15 Jun 2010)
New Revision: 12478
Added:
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EndpointAssociationInterceptor.java
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOne.java
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.java
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwo.java
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.java
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java
Removed:
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/client/src/main/resources/META-INF/services/javax.ws.rs.ext.RuntimeDelegate
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EndpointAssociationInterceptor.java
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOne.java
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.java
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwo.java
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.java
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java
Modified:
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/client/pom.xml
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/client/src/main/resources/META-INF/bus-extensions.xml
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/endorsed/pom.xml
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/management/pom.xml
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/resources/pom.xml
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/pom.xml
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/pom.xml
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/framework-tests/pom.xml
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/pom.xml
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/pom.xml
Log:
- Update poms
- [JBWS-3060] fixed issue with oneway operations
- [JBWS-3064] removed references to apache cxf jaxrs impl
Modified: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/client/pom.xml 2010-06-15 09:17:04 UTC (rev 12477)
+++ stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/client/pom.xml 2010-06-15 11:29:21 UTC (rev 12478)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.3.1.GA</version>
+ <version>3.3.1.SP1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -64,10 +64,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
</dependency>
<dependency>
Modified: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/client/src/main/resources/META-INF/bus-extensions.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/client/src/main/resources/META-INF/bus-extensions.xml 2010-06-15 09:17:04 UTC (rev 12477)
+++ stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/client/src/main/resources/META-INF/bus-extensions.xml 2010-06-15 11:29:21 UTC (rev 12478)
@@ -81,8 +81,5 @@
<extension class="org.apache.cxf.binding.http.HttpBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
<namespace>http://apache.org/cxf/binding/http</namespace>
</extension>
- <extension class="org.apache.cxf.jaxrs.JAXRSBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
- <namespace>http://apache.org/cxf/binding/jaxrs</namespace>
- </extension>
</extensions>
Deleted: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/client/src/main/resources/META-INF/services/javax.ws.rs.ext.RuntimeDelegate
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/client/src/main/resources/META-INF/services/javax.ws.rs.ext.RuntimeDelegate 2010-06-15 09:17:04 UTC (rev 12477)
+++ stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/client/src/main/resources/META-INF/services/javax.ws.rs.ext.RuntimeDelegate 2010-06-15 11:29:21 UTC (rev 12478)
@@ -1 +0,0 @@
-org.apache.cxf.jaxrs.impl.RuntimeDelegateImpl
\ No newline at end of file
Modified: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/endorsed/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/endorsed/pom.xml 2010-06-15 09:17:04 UTC (rev 12477)
+++ stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/endorsed/pom.xml 2010-06-15 11:29:21 UTC (rev 12478)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.3.1.GA</version>
+ <version>3.3.1.SP1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/management/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/management/pom.xml 2010-06-15 09:17:04 UTC (rev 12477)
+++ stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/management/pom.xml 2010-06-15 11:29:21 UTC (rev 12478)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.3.1.GA</version>
+ <version>3.3.1.SP1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/resources/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/resources/pom.xml 2010-06-15 09:17:04 UTC (rev 12477)
+++ stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/resources/pom.xml 2010-06-15 11:29:21 UTC (rev 12478)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.3.1.GA</version>
+ <version>3.3.1.SP1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/pom.xml 2010-06-15 09:17:04 UTC (rev 12477)
+++ stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/pom.xml 2010-06-15 11:29:21 UTC (rev 12478)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.3.1.GA</version>
+ <version>3.3.1.SP1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -67,10 +67,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
</dependency>
<dependency>
Modified: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2010-06-15 09:17:04 UTC (rev 12477)
+++ stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2010-06-15 11:29:21 UTC (rev 12478)
@@ -72,7 +72,6 @@
import org.apache.cxf.service.invoker.Invoker;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.invocation.EndpointAssociation;
import org.jboss.wsf.spi.invocation.Invocation;
import org.jboss.wsf.spi.invocation.InvocationContext;
import org.jboss.wsf.spi.invocation.InvocationHandler;
@@ -82,6 +81,7 @@
*
* @author Thomas.Diesler(a)jboss.org
* @author richard.opalka(a)jboss.com
+ * @author alessio.soldano(a)jboss.com
*
* @see org.apache.cxf.jaxws.AbstractJAXWSMethodInvoker
*/
@@ -138,7 +138,7 @@
}
}
- Endpoint ep = EndpointAssociation.getEndpoint();
+ Endpoint ep = exchange.get(Endpoint.class);
InvocationHandler invHandler = ep.getInvocationHandler();
Invocation inv = invHandler.createInvocation();
Modified: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2010-06-15 09:17:04 UTC (rev 12477)
+++ stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2010-06-15 11:29:21 UTC (rev 12478)
@@ -63,7 +63,6 @@
public static final String ENABLE_CXF_MANAGEMENT = "enable.cxf.management";
protected Endpoint endpoint;
- protected EndpointRegistry epRegistry;
@Override
public ServletController createServletController(ServletConfig servletConfig)
@@ -91,7 +90,7 @@
private void updateAvailableBusWithServletInfo(ServletConfig servletConfig)
{
- BusHolder holder = endpoint.getAttachment(BusHolder.class);
+ BusHolder holder = endpoint.getService().getDeployment().getAttachment(BusHolder.class);
//set the bus from deployment into the CXF servlet and assign it to the current thread
bus = holder.getBus();
BusFactory.possiblySetDefaultBus(bus);
@@ -108,11 +107,11 @@
private void initEndpoint(ServletConfig servletConfig)
{
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
+ EndpointRegistry epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
ServletContext context = servletConfig.getServletContext();
String contextPath = context.getContextPath();
- endpoint = initServiceEndpoint(contextPath);
+ endpoint = initServiceEndpoint(epRegistry, contextPath);
}
@Override
@@ -121,6 +120,11 @@
try
{
BusFactory.setThreadDefaultBus(getBus());
+ //set the current endpoint into the threadlocal association that is later
+ //used by the EndpointAssociationInterceptor for linking the message exchange
+ //related to this invocation to the proper endpoint serving it (the bus, and
+ //hence the interceptor, can span multiple invocation related to multiple
+ //endpoints)
EndpointAssociation.setEndpoint(endpoint);
RequestHandler requestHandler = (RequestHandler)endpoint.getRequestHandler();
requestHandler.handleHttpRequest(endpoint, req, res, getServletContext());
@@ -138,7 +142,7 @@
/** Initialize the service endpoint
*/
- private Endpoint initServiceEndpoint(String contextPath)
+ private Endpoint initServiceEndpoint(EndpointRegistry epRegistry, String contextPath)
{
if (contextPath.startsWith("/"))
contextPath = contextPath.substring(1);
Modified: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java 2010-06-15 09:17:04 UTC (rev 12477)
+++ stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java 2010-06-15 11:29:21 UTC (rev 12478)
@@ -55,7 +55,6 @@
public class ServletControllerExt extends ServletController
{
private ServletTransportFactory cxfTransport;
- private ServletContext servletCtx;
private Bus bus;
private ServerConfig serverConfig;
@@ -63,7 +62,6 @@
{
super(cxfTransport, config, servletCtx, bus);
this.cxfTransport = cxfTransport;
- this.servletCtx = servletCtx;
this.bus = bus;
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
@@ -80,7 +78,6 @@
// Find destination based on request URI
String requestURI = req.getRequestURI();
Collection<ServletDestination> destinations = cxfTransport.getDestinations();
- String exactMatch = null;
ServletDestination returnValue = null;
for (ServletDestination destination : destinations)
{
Modified: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2010-06-15 09:17:04 UTC (rev 12477)
+++ stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2010-06-15 11:29:21 UTC (rev 12478)
@@ -42,6 +42,7 @@
import org.jboss.wsf.stack.cxf.client.configuration.JBossWSCXFConfigurer;
import org.jboss.wsf.stack.cxf.client.configuration.JBossWSSpringBusFactory;
import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher;
+import org.jboss.wsf.stack.cxf.interceptor.EndpointAssociationInterceptor;
import org.jboss.wsf.stack.cxf.spring.handler.NamespaceHandlerResolver;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.context.ApplicationContext;
@@ -120,6 +121,7 @@
{
bus.setExtension(configurer, Configurer.class);
}
+ setInterceptors(bus);
setSoapTransportFactory(bus, soapTransportFactory);
setResourceResolver(bus, resolver);
if (jbossCxfXml != null)
@@ -190,6 +192,13 @@
}
}
+ protected static void setInterceptors(Bus bus)
+ {
+ //Install the EndpointAssociationInterceptor for linking every message exchange
+ //with the proper spi Endpoint retrieved in CXFServletExt
+ bus.getInInterceptors().add(new EndpointAssociationInterceptor());
+ }
+
protected static void setResourceResolver(Bus bus, ResourceResolver resourceResolver)
{
if (resourceResolver != null)
Modified: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2010-06-15 09:17:04 UTC (rev 12477)
+++ stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2010-06-15 11:29:21 UTC (rev 12478)
@@ -32,7 +32,6 @@
import org.jboss.wsf.spi.binding.BindingCustomization;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.ResourceResolver;
import org.jboss.wsf.stack.cxf.configuration.BusHolder;
import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher;
@@ -93,24 +92,12 @@
SecurityActions.setContextClassLoader(origClassLoader);
}
- for (Endpoint endpoint : dep.getService().getEndpoints())
- {
- endpoint.addAttachment(BusHolder.class, holder);
- }
dep.addAttachment(BusHolder.class, holder);
}
@Override
public void stop(Deployment dep)
{
- for (Endpoint endpoint : dep.getService().getEndpoints())
- {
- BusHolder holder = endpoint.removeAttachment(BusHolder.class);
- if (holder != null)
- {
- holder.close();
- }
- }
BusHolder holder = dep.removeAttachment(BusHolder.class);
if (holder != null)
{
Copied: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor (from rev 12465, stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor)
Deleted: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EndpointAssociationInterceptor.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EndpointAssociationInterceptor.java 2010-06-10 20:39:35 UTC (rev 12465)
+++ stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EndpointAssociationInterceptor.java 2010-06-15 11:29:21 UTC (rev 12478)
@@ -1,58 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.wsf.stack.cxf.interceptor;
-
-import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.message.Exchange;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.phase.AbstractPhaseInterceptor;
-import org.apache.cxf.phase.Phase;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.invocation.EndpointAssociation;
-
-/**
- * A RECEIVE phase interceptor that sets the @see{org.jboss.wsf.spi.deployment.Endpoint}
- * associated to the current message exchange. This is performed early in the chain,
- * before any thread pool comes into the game, preventing the EndpointAssociation
- * threadlocal to retrieve the correct Endpoint instance.
- *
- * @author alessio.soldano(a)jboss.com
- * @since 10-Jun-2010
- *
- */
-public class EndpointAssociationInterceptor extends AbstractPhaseInterceptor<Message>
-{
-
- public EndpointAssociationInterceptor()
- {
- super(Phase.RECEIVE);
- }
-
- @Override
- public void handleMessage(Message message) throws Fault
- {
- Endpoint endpoint = EndpointAssociation.getEndpoint();
- Exchange exchange = message.getExchange();
- exchange.put(Endpoint.class, endpoint);
- }
-
-}
Copied: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EndpointAssociationInterceptor.java (from rev 12465, stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EndpointAssociationInterceptor.java)
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EndpointAssociationInterceptor.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EndpointAssociationInterceptor.java 2010-06-15 11:29:21 UTC (rev 12478)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.wsf.stack.cxf.interceptor;
+
+import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.message.Exchange;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.AbstractPhaseInterceptor;
+import org.apache.cxf.phase.Phase;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.EndpointAssociation;
+
+/**
+ * A RECEIVE phase interceptor that sets the @see{org.jboss.wsf.spi.deployment.Endpoint}
+ * associated to the current message exchange. This is performed early in the chain,
+ * before any thread pool comes into the game, preventing the EndpointAssociation
+ * threadlocal to retrieve the correct Endpoint instance.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 10-Jun-2010
+ *
+ */
+public class EndpointAssociationInterceptor extends AbstractPhaseInterceptor<Message>
+{
+
+ public EndpointAssociationInterceptor()
+ {
+ super(Phase.RECEIVE);
+ }
+
+ @Override
+ public void handleMessage(Message message) throws Fault
+ {
+ Endpoint endpoint = EndpointAssociation.getEndpoint();
+ Exchange exchange = message.getExchange();
+ exchange.put(Endpoint.class, endpoint);
+ }
+
+}
Modified: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/pom.xml 2010-06-15 09:17:04 UTC (rev 12477)
+++ stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/pom.xml 2010-06-15 11:29:21 UTC (rev 12478)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>3.3.1.GA</version>
+ <version>3.3.1.SP1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2010-06-15 09:17:04 UTC (rev 12477)
+++ stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2010-06-15 11:29:21 UTC (rev 12478)
@@ -96,6 +96,14 @@
<include name="**/*" />
</metainf>
</jar>
+
+ <!-- jaxws-cxf-jbws3060 -->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3060.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.class"/>
+ </fileset>
+ </jar>
<!-- jaxws-cxf-management -->
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-management.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/management/WEB-INF/web.xml">
Copied: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060 (from rev 12473, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060)
Deleted: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOne.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOne.java 2010-06-11 20:47:39 UTC (rev 12473)
+++ stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOne.java 2010-06-15 11:29:21 UTC (rev 12478)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.cxf.jbws3060;
-
-import javax.jws.Oneway;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3060", serviceName = "ServiceOne")
-@SOAPBinding(style = SOAPBinding.Style.RPC)
-public interface EndpointOne
-{
- String echo(String input);
-
- @Oneway
- void echoOneWay(String input);
-
- int getCount();
-}
Copied: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOne.java (from rev 12473, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOne.java)
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOne.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOne.java 2010-06-15 11:29:21 UTC (rev 12478)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.cxf.jbws3060;
+
+import javax.jws.Oneway;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3060", serviceName = "ServiceOne")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface EndpointOne
+{
+ String echo(String input);
+
+ @Oneway
+ void echoOneWay(String input);
+
+ int getCount();
+}
Deleted: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.java 2010-06-11 20:47:39 UTC (rev 12473)
+++ stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.java 2010-06-15 11:29:21 UTC (rev 12478)
@@ -1,60 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.cxf.jbws3060;
-
-import javax.ejb.Stateless;
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-import org.jboss.logging.Logger;
-
-@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3060", serviceName = "ServiceOne")
-@SOAPBinding(style = SOAPBinding.Style.RPC)
-@Stateless
-public class EndpointOneImpl
-{
- private volatile static int count = 0;
-
- @WebMethod
- public String echo(String input)
- {
- Logger.getLogger(this.getClass()).info("echo: " + input);
- count++;
- return input;
- }
-
- @WebMethod
- @Oneway
- public void echoOneWay(String input)
- {
- Logger.getLogger(this.getClass()).info("echoOneWay: " + input);
- count++;
- }
-
- @WebMethod
- public int getCount()
- {
- return count;
- }
-}
Copied: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.java (from rev 12473, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.java)
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.java 2010-06-15 11:29:21 UTC (rev 12478)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.cxf.jbws3060;
+
+import javax.ejb.Stateless;
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.jboss.logging.Logger;
+
+@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3060", serviceName = "ServiceOne")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+@Stateless
+public class EndpointOneImpl
+{
+ private volatile static int count = 0;
+
+ @WebMethod
+ public String echo(String input)
+ {
+ Logger.getLogger(this.getClass()).info("echo: " + input);
+ count++;
+ return input;
+ }
+
+ @WebMethod
+ @Oneway
+ public void echoOneWay(String input)
+ {
+ Logger.getLogger(this.getClass()).info("echoOneWay: " + input);
+ count++;
+ }
+
+ @WebMethod
+ public int getCount()
+ {
+ return count;
+ }
+}
Deleted: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwo.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwo.java 2010-06-11 20:47:39 UTC (rev 12473)
+++ stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwo.java 2010-06-15 11:29:21 UTC (rev 12478)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.cxf.jbws3060;
-
-import javax.jws.Oneway;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-@WebService(name = "EndpointTwo", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3060", serviceName = "ServiceTwo")
-@SOAPBinding(style = SOAPBinding.Style.RPC)
-public interface EndpointTwo
-{
- String sayHello(String input);
-
- @Oneway
- void sayHelloOneWay(String input);
-
- int getCount();
-}
Copied: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwo.java (from rev 12473, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwo.java)
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwo.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwo.java 2010-06-15 11:29:21 UTC (rev 12478)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.cxf.jbws3060;
+
+import javax.jws.Oneway;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService(name = "EndpointTwo", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3060", serviceName = "ServiceTwo")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface EndpointTwo
+{
+ String sayHello(String input);
+
+ @Oneway
+ void sayHelloOneWay(String input);
+
+ int getCount();
+}
Deleted: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.java 2010-06-11 20:47:39 UTC (rev 12473)
+++ stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.java 2010-06-15 11:29:21 UTC (rev 12478)
@@ -1,60 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.cxf.jbws3060;
-
-import javax.ejb.Stateless;
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-import org.jboss.logging.Logger;
-
-@WebService(name = "EndpointTwo", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3060", serviceName = "ServiceTwo")
-@SOAPBinding(style = SOAPBinding.Style.RPC)
-@Stateless
-public class EndpointTwoImpl
-{
- private volatile static int count = 0;
-
- @WebMethod
- public String sayHello(String input)
- {
- Logger.getLogger(this.getClass()).info("sayHello: " + input);
- count++;
- return "Hi " + input;
- }
-
- @WebMethod
- @Oneway
- public void sayHelloOneWay(String input)
- {
- Logger.getLogger(this.getClass()).info("sayHelloOneWay: " + input);
- count++;
- }
-
- @WebMethod
- public int getCount()
- {
- return count;
- }
-}
Copied: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.java (from rev 12473, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.java)
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.java 2010-06-15 11:29:21 UTC (rev 12478)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.cxf.jbws3060;
+
+import javax.ejb.Stateless;
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.jboss.logging.Logger;
+
+@WebService(name = "EndpointTwo", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3060", serviceName = "ServiceTwo")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+@Stateless
+public class EndpointTwoImpl
+{
+ private volatile static int count = 0;
+
+ @WebMethod
+ public String sayHello(String input)
+ {
+ Logger.getLogger(this.getClass()).info("sayHello: " + input);
+ count++;
+ return "Hi " + input;
+ }
+
+ @WebMethod
+ @Oneway
+ public void sayHelloOneWay(String input)
+ {
+ Logger.getLogger(this.getClass()).info("sayHelloOneWay: " + input);
+ count++;
+ }
+
+ @WebMethod
+ public int getCount()
+ {
+ return count;
+ }
+}
Deleted: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java 2010-06-11 20:47:39 UTC (rev 12473)
+++ stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java 2010-06-15 11:29:21 UTC (rev 12478)
@@ -1,172 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.cxf.jbws3060;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-
-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;
-
-/**
- * Test a CXF endpoint with provided jbossws-cxf.xml
- *
- * @author alessio.soldano(a)jboss.com
- * @since 11-Jun-2010
- */
-public class JBWS3060TestCase extends JBossWSTest
-{
- private String endpointOneURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060/EndpointOne";
- private String endpointTwoURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060/EndpointTwo";
- private String targetNS = "http://org.jboss.ws.jaxws.cxf/jbws3060";
-
- private EndpointOne portOne;
- private EndpointTwo portTwo;
-
- public static Test suite()
- {
- return new JBossWSTestSetup(JBWS3060TestCase.class, "jaxws-cxf-jbws3060.jar");
- }
-
- public void testAccess() throws Exception
- {
- initPorts();
- int count1 = portOne.getCount();
- int count2 = portTwo.getCount();
- Object retObj = portOne.echo("Hello");
- assertEquals("Hello", retObj);
- retObj = portTwo.sayHello("John");
- assertEquals("Hi John", retObj);
- assertEquals(1, portOne.getCount() - count1);
- assertEquals(1, portTwo.getCount() - count2);
- }
-
- public void testConcurrentInvocations() throws Exception
- {
- runConcurrentTests(false);
- }
-
- public void testConcurrentOneWayInvocations() throws Exception
- {
- runConcurrentTests(true);
- }
-
- private void runConcurrentTests(boolean oneway) throws Exception
- {
- initPorts();
- final int size = 30;
- int count1 = portOne.getCount();
- int count2 = portTwo.getCount();
- ExecutorService es = Executors.newFixedThreadPool(size*2);
- List<Callable<Boolean>> callables = new ArrayList<Callable<Boolean>>(size*2);
- for (int i = 0; i < size; i++)
- {
- callables.add(new CallableOne(portOne, oneway));
- callables.add(new CallableTwo(portTwo, oneway));
- }
- List<Future<Boolean>> futures = es.invokeAll(callables);
- for (Future<Boolean> f : futures)
- {
- assertTrue(f.get());
- }
- assertEquals(size, portOne.getCount() - count1);
- assertEquals(size, portTwo.getCount() - count2);
- }
-
- private void initPorts() throws MalformedURLException
- {
- URL wsdlOneURL = new URL(endpointOneURL + "?wsdl");
- QName serviceOneName = new QName(targetNS, "ServiceOne");
- Service serviceOne = Service.create(wsdlOneURL, serviceOneName);
- portOne = (EndpointOne)serviceOne.getPort(EndpointOne.class);
-
- URL wsdlTwoURL = new URL(endpointTwoURL + "?wsdl");
- QName serviceTwoName = new QName(targetNS, "ServiceTwo");
- Service serviceTwo = Service.create(wsdlTwoURL, serviceTwoName);
- portTwo = (EndpointTwo)serviceTwo.getPort(EndpointTwo.class);
- }
-
- private static class CallableOne implements Callable<Boolean>
- {
- private EndpointOne port;
- private boolean oneway;
-
- public CallableOne(EndpointOne port, boolean oneway)
- {
- this.port = port;
- this.oneway = oneway;
- }
-
- public Boolean call() throws Exception
- {
- String arg = "Foo";
- if (oneway)
- {
- port.echoOneWay(arg);
- return true;
- }
- else
- {
- String result = port.echo(arg);
- return arg.equals(result);
- }
- }
- }
-
- private static class CallableTwo implements Callable<Boolean>
- {
- private EndpointTwo port;
- private boolean oneway;
-
- public CallableTwo(EndpointTwo port, boolean oneway)
- {
- this.port = port;
- this.oneway = oneway;
- }
-
- public Boolean call() throws Exception
- {
- String arg = "John";
- if (oneway)
- {
- port.sayHelloOneWay(arg);
- return true;
- }
- else
- {
- String result = port.sayHello(arg);
- return ("Hi " + arg).equals(result);
- }
- }
- }
-}
Copied: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java (from rev 12473, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java)
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java 2010-06-15 11:29:21 UTC (rev 12478)
@@ -0,0 +1,172 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.cxf.jbws3060;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+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;
+
+/**
+ * Test a CXF endpoint with provided jbossws-cxf.xml
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 11-Jun-2010
+ */
+public class JBWS3060TestCase extends JBossWSTest
+{
+ private String endpointOneURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060/EndpointOne";
+ private String endpointTwoURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060/EndpointTwo";
+ private String targetNS = "http://org.jboss.ws.jaxws.cxf/jbws3060";
+
+ private EndpointOne portOne;
+ private EndpointTwo portTwo;
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS3060TestCase.class, "jaxws-cxf-jbws3060.jar");
+ }
+
+ public void testAccess() throws Exception
+ {
+ initPorts();
+ int count1 = portOne.getCount();
+ int count2 = portTwo.getCount();
+ Object retObj = portOne.echo("Hello");
+ assertEquals("Hello", retObj);
+ retObj = portTwo.sayHello("John");
+ assertEquals("Hi John", retObj);
+ assertEquals(1, portOne.getCount() - count1);
+ assertEquals(1, portTwo.getCount() - count2);
+ }
+
+ public void testConcurrentInvocations() throws Exception
+ {
+ runConcurrentTests(false);
+ }
+
+ public void testConcurrentOneWayInvocations() throws Exception
+ {
+ runConcurrentTests(true);
+ }
+
+ private void runConcurrentTests(boolean oneway) throws Exception
+ {
+ initPorts();
+ final int size = 30;
+ int count1 = portOne.getCount();
+ int count2 = portTwo.getCount();
+ ExecutorService es = Executors.newFixedThreadPool(size*2);
+ List<Callable<Boolean>> callables = new ArrayList<Callable<Boolean>>(size*2);
+ for (int i = 0; i < size; i++)
+ {
+ callables.add(new CallableOne(portOne, oneway));
+ callables.add(new CallableTwo(portTwo, oneway));
+ }
+ List<Future<Boolean>> futures = es.invokeAll(callables);
+ for (Future<Boolean> f : futures)
+ {
+ assertTrue(f.get());
+ }
+ assertEquals(size, portOne.getCount() - count1);
+ assertEquals(size, portTwo.getCount() - count2);
+ }
+
+ private void initPorts() throws MalformedURLException
+ {
+ URL wsdlOneURL = new URL(endpointOneURL + "?wsdl");
+ QName serviceOneName = new QName(targetNS, "ServiceOne");
+ Service serviceOne = Service.create(wsdlOneURL, serviceOneName);
+ portOne = (EndpointOne)serviceOne.getPort(EndpointOne.class);
+
+ URL wsdlTwoURL = new URL(endpointTwoURL + "?wsdl");
+ QName serviceTwoName = new QName(targetNS, "ServiceTwo");
+ Service serviceTwo = Service.create(wsdlTwoURL, serviceTwoName);
+ portTwo = (EndpointTwo)serviceTwo.getPort(EndpointTwo.class);
+ }
+
+ private static class CallableOne implements Callable<Boolean>
+ {
+ private EndpointOne port;
+ private boolean oneway;
+
+ public CallableOne(EndpointOne port, boolean oneway)
+ {
+ this.port = port;
+ this.oneway = oneway;
+ }
+
+ public Boolean call() throws Exception
+ {
+ String arg = "Foo";
+ if (oneway)
+ {
+ port.echoOneWay(arg);
+ return true;
+ }
+ else
+ {
+ String result = port.echo(arg);
+ return arg.equals(result);
+ }
+ }
+ }
+
+ private static class CallableTwo implements Callable<Boolean>
+ {
+ private EndpointTwo port;
+ private boolean oneway;
+
+ public CallableTwo(EndpointTwo port, boolean oneway)
+ {
+ this.port = port;
+ this.oneway = oneway;
+ }
+
+ public Boolean call() throws Exception
+ {
+ String arg = "John";
+ if (oneway)
+ {
+ port.sayHelloOneWay(arg);
+ return true;
+ }
+ else
+ {
+ String result = port.sayHello(arg);
+ return ("Hi " + arg).equals(result);
+ }
+ }
+ }
+}
Modified: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/framework-tests/pom.xml 2010-06-15 09:17:04 UTC (rev 12477)
+++ stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/framework-tests/pom.xml 2010-06-15 11:29:21 UTC (rev 12478)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>3.3.1.GA</version>
+ <version>3.3.1.SP1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/pom.xml 2010-06-15 09:17:04 UTC (rev 12477)
+++ stack/cxf/branches/jbossws-cxf-3.3.1.SP1/modules/testsuite/pom.xml 2010-06-15 11:29:21 UTC (rev 12478)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.3.1.GA</version>
+ <version>3.3.1.SP1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.3.1.SP1/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.3.1.SP1/pom.xml 2010-06-15 09:17:04 UTC (rev 12477)
+++ stack/cxf/branches/jbossws-cxf-3.3.1.SP1/pom.xml 2010-06-15 11:29:21 UTC (rev 12478)
@@ -18,7 +18,7 @@
<packaging>pom</packaging>
<description>JBossWS CXF stack</description>
- <version>3.3.1.GA</version>
+ <version>3.3.1.SP1</version>
<!-- Parent -->
<parent>
@@ -29,9 +29,9 @@
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf-3....</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/tags/jbossws-cxf-3.3.1.GA</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf-3....</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/tags/jbossws-cxf-3.3.1...</url>
</scm>
<!-- Modules -->
@@ -301,11 +301,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version>
</dependency>
15 years, 10 months
- 1
- 0
JBossWS SVN: r12476 - stack/cxf/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-15 05:06:06 -0400 (Tue, 15 Jun 2010)
New Revision: 12476
Added:
stack/cxf/branches/jbossws-cxf-3.3.1.SP1/
Log:
Branching for 3.3.1.SP1 release (from 3.3.1.GA tag)
Copied: stack/cxf/branches/jbossws-cxf-3.3.1.SP1 (from rev 12475, stack/cxf/tags/jbossws-cxf-3.3.1.GA)
15 years, 10 months
- 1
- 0
JBossWS SVN: r12475 - in projects/plugins/maven/jaxws-tools/trunk: src/test/resources/test-embedded/testWsConsume and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-14 09:13:47 -0400 (Mon, 14 Jun 2010)
New Revision: 12475
Modified:
projects/plugins/maven/jaxws-tools/trunk/pom.xml
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-metro.xml
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-metro.xml
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml
Log:
Moving to latest final versions of stacks and spi
Modified: projects/plugins/maven/jaxws-tools/trunk/pom.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/pom.xml 2010-06-14 10:53:58 UTC (rev 12474)
+++ projects/plugins/maven/jaxws-tools/trunk/pom.xml 2010-06-14 13:13:47 UTC (rev 12475)
@@ -25,16 +25,16 @@
<!-- Properties -->
<properties>
- <jbossws.spi.version>1.3.0.CR2</jbossws.spi.version>
+ <jbossws.spi.version>1.3.0.GA</jbossws.spi.version>
<maven.project.version>2.0.4</maven.project.version>
<maven.plugin.api.version>2.0.4</maven.plugin.api.version>
<maven.invoker.plugin.version>1.5</maven.invoker.plugin.version>
<!-- For test -->
<junit.version>4.7</junit.version>
<maven.plugin.testing.harness.version>1.1</maven.plugin.testing.harness.version>
- <jbossws.cxf.client.version>3.3.0.CR2</jbossws.cxf.client.version>
- <jbossws.metro.client.version>3.3.0.CR2</jbossws.metro.client.version>
- <jbossws.native.client.version>3.3.0.CR2</jbossws.native.client.version>
+ <jbossws.cxf.client.version>3.3.1.GA</jbossws.cxf.client.version>
+ <jbossws.metro.client.version>3.3.1.GA</jbossws.metro.client.version>
+ <jbossws.native.client.version>3.3.1.GA</jbossws.native.client.version>
<jbossxb.version>2.0.1.GA</jbossxb.version>
</properties>
Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml 2010-06-14 10:53:58 UTC (rev 12474)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml 2010-06-14 13:13:47 UTC (rev 12475)
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-client</artifactId>
- <version>3.3.0.Beta1</version>
+ <version>3.3.1.GA</version>
</dependency>
</dependencies>
</project>
Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-metro.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-metro.xml 2010-06-14 10:53:58 UTC (rev 12474)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-metro.xml 2010-06-14 13:13:47 UTC (rev 12475)
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.jboss.ws.metro</groupId>
<artifactId>jbossws-metro-client</artifactId>
- <version>3.3.0.Beta1</version>
+ <version>3.3.1.GA</version>
</dependency>
</dependencies>
</project>
Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml 2010-06-14 10:53:58 UTC (rev 12474)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml 2010-06-14 13:13:47 UTC (rev 12475)
@@ -31,6 +31,7 @@
<artifactId>maven-jaxws-tools-plugin</artifactId>
<version>@pom.version@</version>
<configuration>
+ <target>2.1</target>
<verbose>true</verbose>
</configuration>
<executions>
@@ -93,7 +94,7 @@
<dependency>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-client</artifactId>
- <version>3.3.0.Beta4</version>
+ <version>3.3.1.GA</version>
</dependency>
</dependencies>
</project>
Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml 2010-06-14 10:53:58 UTC (rev 12474)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml 2010-06-14 13:13:47 UTC (rev 12475)
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-client</artifactId>
- <version>3.3.0.Beta1</version>
+ <version>3.3.1.GA</version>
</dependency>
</dependencies>
</project>
Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-metro.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-metro.xml 2010-06-14 10:53:58 UTC (rev 12474)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-metro.xml 2010-06-14 13:13:47 UTC (rev 12475)
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.jboss.ws.metro</groupId>
<artifactId>jbossws-metro-client</artifactId>
- <version>3.3.0.Beta1</version>
+ <version>3.3.1.GA</version>
</dependency>
<dependency>
<groupId>com.sun</groupId>
Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml 2010-06-14 10:53:58 UTC (rev 12474)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml 2010-06-14 13:13:47 UTC (rev 12475)
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-client</artifactId>
- <version>3.3.0.Beta4</version>
+ <version>3.3.1.GA</version>
</dependency>
</dependencies>
</project>
15 years, 10 months
- 1
- 0
JBossWS SVN: r12474 - projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-14 06:53:58 -0400 (Mon, 14 Jun 2010)
New Revision: 12474
Modified:
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsProvideMojo.java
Log:
[JBWS-3065] Fixing error message
Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsProvideMojo.java
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsProvideMojo.java 2010-06-11 20:47:39 UTC (rev 12473)
+++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsProvideMojo.java 2010-06-14 10:53:58 UTC (rev 12474)
@@ -97,7 +97,7 @@
}
catch (Exception e)
{
- throw new MojoExecutionException("Error while running wsconsume", e);
+ throw new MojoExecutionException("Error while running wsprovide", e);
}
finally
{
15 years, 10 months
- 1
- 0
JBossWS SVN: r12473 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/cxf and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-11 16:47:39 -0400 (Fri, 11 Jun 2010)
New Revision: 12473
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOne.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwo.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
Log:
[JBWS-3060] Adding testcase
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2010-06-11 20:44:33 UTC (rev 12472)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2010-06-11 20:47:39 UTC (rev 12473)
@@ -96,6 +96,14 @@
<include name="**/*" />
</metainf>
</jar>
+
+ <!-- jaxws-cxf-jbws3060 -->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3060.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.class"/>
+ </fileset>
+ </jar>
<!-- jaxws-cxf-management -->
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-management.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/management/WEB-INF/web.xml">
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOne.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOne.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOne.java 2010-06-11 20:47:39 UTC (rev 12473)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.cxf.jbws3060;
+
+import javax.jws.Oneway;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3060", serviceName = "ServiceOne")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface EndpointOne
+{
+ String echo(String input);
+
+ @Oneway
+ void echoOneWay(String input);
+
+ int getCount();
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOne.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.java 2010-06-11 20:47:39 UTC (rev 12473)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.cxf.jbws3060;
+
+import javax.ejb.Stateless;
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.jboss.logging.Logger;
+
+@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3060", serviceName = "ServiceOne")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+@Stateless
+public class EndpointOneImpl
+{
+ private volatile static int count = 0;
+
+ @WebMethod
+ public String echo(String input)
+ {
+ Logger.getLogger(this.getClass()).info("echo: " + input);
+ count++;
+ return input;
+ }
+
+ @WebMethod
+ @Oneway
+ public void echoOneWay(String input)
+ {
+ Logger.getLogger(this.getClass()).info("echoOneWay: " + input);
+ count++;
+ }
+
+ @WebMethod
+ public int getCount()
+ {
+ return count;
+ }
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwo.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwo.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwo.java 2010-06-11 20:47:39 UTC (rev 12473)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.cxf.jbws3060;
+
+import javax.jws.Oneway;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService(name = "EndpointTwo", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3060", serviceName = "ServiceTwo")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface EndpointTwo
+{
+ String sayHello(String input);
+
+ @Oneway
+ void sayHelloOneWay(String input);
+
+ int getCount();
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwo.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.java 2010-06-11 20:47:39 UTC (rev 12473)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.cxf.jbws3060;
+
+import javax.ejb.Stateless;
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.jboss.logging.Logger;
+
+@WebService(name = "EndpointTwo", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3060", serviceName = "ServiceTwo")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+@Stateless
+public class EndpointTwoImpl
+{
+ private volatile static int count = 0;
+
+ @WebMethod
+ public String sayHello(String input)
+ {
+ Logger.getLogger(this.getClass()).info("sayHello: " + input);
+ count++;
+ return "Hi " + input;
+ }
+
+ @WebMethod
+ @Oneway
+ public void sayHelloOneWay(String input)
+ {
+ Logger.getLogger(this.getClass()).info("sayHelloOneWay: " + input);
+ count++;
+ }
+
+ @WebMethod
+ public int getCount()
+ {
+ return count;
+ }
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java 2010-06-11 20:47:39 UTC (rev 12473)
@@ -0,0 +1,172 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.cxf.jbws3060;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+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;
+
+/**
+ * Test a CXF endpoint with provided jbossws-cxf.xml
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 11-Jun-2010
+ */
+public class JBWS3060TestCase extends JBossWSTest
+{
+ private String endpointOneURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060/EndpointOne";
+ private String endpointTwoURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060/EndpointTwo";
+ private String targetNS = "http://org.jboss.ws.jaxws.cxf/jbws3060";
+
+ private EndpointOne portOne;
+ private EndpointTwo portTwo;
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS3060TestCase.class, "jaxws-cxf-jbws3060.jar");
+ }
+
+ public void testAccess() throws Exception
+ {
+ initPorts();
+ int count1 = portOne.getCount();
+ int count2 = portTwo.getCount();
+ Object retObj = portOne.echo("Hello");
+ assertEquals("Hello", retObj);
+ retObj = portTwo.sayHello("John");
+ assertEquals("Hi John", retObj);
+ assertEquals(1, portOne.getCount() - count1);
+ assertEquals(1, portTwo.getCount() - count2);
+ }
+
+ public void testConcurrentInvocations() throws Exception
+ {
+ runConcurrentTests(false);
+ }
+
+ public void testConcurrentOneWayInvocations() throws Exception
+ {
+ runConcurrentTests(true);
+ }
+
+ private void runConcurrentTests(boolean oneway) throws Exception
+ {
+ initPorts();
+ final int size = 30;
+ int count1 = portOne.getCount();
+ int count2 = portTwo.getCount();
+ ExecutorService es = Executors.newFixedThreadPool(size*2);
+ List<Callable<Boolean>> callables = new ArrayList<Callable<Boolean>>(size*2);
+ for (int i = 0; i < size; i++)
+ {
+ callables.add(new CallableOne(portOne, oneway));
+ callables.add(new CallableTwo(portTwo, oneway));
+ }
+ List<Future<Boolean>> futures = es.invokeAll(callables);
+ for (Future<Boolean> f : futures)
+ {
+ assertTrue(f.get());
+ }
+ assertEquals(size, portOne.getCount() - count1);
+ assertEquals(size, portTwo.getCount() - count2);
+ }
+
+ private void initPorts() throws MalformedURLException
+ {
+ URL wsdlOneURL = new URL(endpointOneURL + "?wsdl");
+ QName serviceOneName = new QName(targetNS, "ServiceOne");
+ Service serviceOne = Service.create(wsdlOneURL, serviceOneName);
+ portOne = (EndpointOne)serviceOne.getPort(EndpointOne.class);
+
+ URL wsdlTwoURL = new URL(endpointTwoURL + "?wsdl");
+ QName serviceTwoName = new QName(targetNS, "ServiceTwo");
+ Service serviceTwo = Service.create(wsdlTwoURL, serviceTwoName);
+ portTwo = (EndpointTwo)serviceTwo.getPort(EndpointTwo.class);
+ }
+
+ private static class CallableOne implements Callable<Boolean>
+ {
+ private EndpointOne port;
+ private boolean oneway;
+
+ public CallableOne(EndpointOne port, boolean oneway)
+ {
+ this.port = port;
+ this.oneway = oneway;
+ }
+
+ public Boolean call() throws Exception
+ {
+ String arg = "Foo";
+ if (oneway)
+ {
+ port.echoOneWay(arg);
+ return true;
+ }
+ else
+ {
+ String result = port.echo(arg);
+ return arg.equals(result);
+ }
+ }
+ }
+
+ private static class CallableTwo implements Callable<Boolean>
+ {
+ private EndpointTwo port;
+ private boolean oneway;
+
+ public CallableTwo(EndpointTwo port, boolean oneway)
+ {
+ this.port = port;
+ this.oneway = oneway;
+ }
+
+ public Boolean call() throws Exception
+ {
+ String arg = "John";
+ if (oneway)
+ {
+ port.sayHelloOneWay(arg);
+ return true;
+ }
+ else
+ {
+ String result = port.sayHello(arg);
+ return ("Hi " + arg).equals(result);
+ }
+ }
+ }
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
15 years, 10 months
- 1
- 0