JBossWS SVN: r16575 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-08-06 10:03:01 -0400 (Mon, 06 Aug 2012)
New Revision: 16575
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java
Log:
Merged revisions 16516 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r16516 | alessio.soldano(a)jboss.com | 2012-07-23 16:38:52 +0200 (Mon, 23 Jul 2012) | 2 lines
[JBWS-3518] Improving log message
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16315,16323,16407-16408,16530-16532
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16315,16323,16407-16408,16516,16530-16532
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2012-08-06 13:51:18 UTC (rev 16574)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2012-08-06 14:03:01 UTC (rev 16575)
@@ -242,7 +242,7 @@
}
if (this.wsdlLocation != null)
{
- writer.write(" wsdlLocation='" + this.wsdlLocation + "'");
+ writer.write(" wsdlLocationOverride='" + this.wsdlLocation + "'");
}
writer.write(">");
12 years, 1 month
- 1
- 0
JBossWS SVN: r16574 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/server/src/main/java/org/jboss/wsf/stack/cxf and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-08-06 09:51:18 -0400 (Mon, 06 Aug 2012)
New Revision: 16574
Added:
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ClientEndpoint.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ClientEndpointBusTestCase.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ClientEndpointImpl.java
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOneImpl.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF/web.xml
Log:
[JBPAPP-9650] Server side Bus used for creating JAX-WS clients in endpoint business logic
Merged revisions 16407-16408 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r16407 | alessio.soldano(a)jboss.com | 2012-06-13 16:27:55 +0200 (Wed, 13 Jun 2012) | 2 lines
[JBWS-3513] Clean-up thread default bus before handing control over to ws endpoint business methods
.......
r16408 | alessio.soldano(a)jboss.com | 2012-06-13 16:32:04 +0200 (Wed, 13 Jun 2012) | 2 lines
[JBWS-3513] Adding testcase + fixing existing one to avoid assuming the thread bus is the deployment one
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16315,16323,16530-16532
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16315,16323,16407-16408,16530-16532
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java 2012-08-06 13:33:46 UTC (rev 16573)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java 2012-08-06 13:51:18 UTC (rev 16574)
@@ -178,6 +178,7 @@
Bus threadBus = BusFactory.getThreadDefaultBus(false);
try
{
+ BusFactory.setThreadDefaultBus(null);
invHandler.invoke(ep, inv);
retObj = inv.getReturnValue();
} catch (InvocationTargetException e) {
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2012-08-06 13:33:46 UTC (rev 16573)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2012-08-06 13:51:18 UTC (rev 16574)
@@ -41,9 +41,14 @@
<!-- jaxws-cxf-bus -->
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-bus.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/bus/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/bus/ClientEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/bus/ClientEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxws/cxf/bus/Endpoint.class"/>
<include name="org/jboss/test/ws/jaxws/cxf/bus/EndpointImpl.class"/>
</classes>
+ <manifest>
+ <attribute name="Dependencies" value="org.apache.cxf"/>
+ </manifest>
</war>
<!-- jaxws-cxf-bus-ejb3-client -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-bus-ejb3-client.jar">
@@ -193,7 +198,7 @@
<include name="**/*" />
</metainf>
<manifest>
- <attribute name="Dependencies" value="org.apache.cxf"/>
+ <attribute name="Dependencies" value="org.apache.cxf,org.jboss.ws.cxf.jbossws-cxf-server"/>
</manifest>
</jar>
Copied: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ClientEndpoint.java (from rev 16408, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ClientEndpoint.java)
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ClientEndpoint.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ClientEndpoint.java 2012-08-06 13:51:18 UTC (rev 16574)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.bus;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+@WebService(name = "Endpoint", targetNamespace = "http://org.jboss.ws/bus")
+public interface ClientEndpoint
+{
+ @WebMethod
+ public String testClient(String input, String host) throws Exception;
+
+ @WebMethod
+ public String testCachedPort(String input, String host) throws Exception;
+
+ @WebMethod
+ public String testCachedService(String input, String host) throws Exception;
+
+}
Copied: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ClientEndpointBusTestCase.java (from rev 16408, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ClientEndpointBusTestCase.java)
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ClientEndpointBusTestCase.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ClientEndpointBusTestCase.java 2012-08-06 13:51:18 UTC (rev 16574)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.bus;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * A test case that verifies a client running inside and endpoint business method
+ * does not use the deployment bus.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 13-Jun-2012
+ *
+ */
+public class ClientEndpointBusTestCase extends JBossWSTest
+{
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-cxf-bus/ClientEndpointService/ClientEndpoint";
+
+ public static Test suite()
+ {
+ return new JBossWSCXFTestSetup(ClientEndpointBusTestCase.class, "jaxws-cxf-bus.war");
+ }
+
+ public void testClient() throws Exception
+ {
+ ClientEndpoint port = getPort();
+ assertEquals("Foo", port.testClient("Foo", getServerHost()));
+ }
+
+ public void testCachedPort() throws Exception
+ {
+ ClientEndpoint port = getPort();
+ assertEquals("Foo", port.testCachedPort("Foo", getServerHost()));
+ }
+
+ public void testCachedService() throws Exception
+ {
+ ClientEndpoint port = getPort();
+ assertEquals("Foo", port.testCachedService("Foo", getServerHost()));
+ }
+
+ private ClientEndpoint getPort() throws Exception {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ QName serviceName = new QName("http://org.jboss.ws/bus", "ClientEndpointService");
+ Service service = Service.create(wsdlURL, serviceName);
+ QName portQName = new QName("http://org.jboss.ws/bus", "ClientEndpointPort");
+ return (ClientEndpoint) service.getPort(portQName, ClientEndpoint.class);
+ }
+}
Copied: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ClientEndpointImpl.java (from rev 16408, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ClientEndpointImpl.java)
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ClientEndpointImpl.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ClientEndpointImpl.java 2012-08-06 13:51:18 UTC (rev 16574)
@@ -0,0 +1,91 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.bus;
+
+import java.net.URL;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import org.apache.cxf.BusFactory;
+
+@WebService(name = "ClientEndpoint", serviceName = "ClientEndpointService", targetNamespace = "http://org.jboss.ws/bus")
+public class ClientEndpointImpl
+{
+ @WebMethod
+ public String testClient(String input, String host) throws Exception
+ {
+ if (BusFactory.getThreadDefaultBus(false) != null) {
+ throw new Exception("Expected null thread default bus, but got " + BusFactory.getThreadDefaultBus(false));
+ }
+ Endpoint endpoint = getPort(getWsdlURL(host));
+ return endpoint.echo(input);
+ }
+
+ @WebMethod
+ public String testCachedPort(String input, String host) throws Exception
+ {
+ if (BusFactory.getThreadDefaultBus(false) != null) {
+ throw new Exception("Expected null thread default bus, but got " + BusFactory.getThreadDefaultBus(false));
+ }
+ Endpoint port = getPort(getWsdlURL(host));
+ BusFactory.setThreadDefaultBus(null);
+ return port.echo(input);
+ }
+
+ @WebMethod
+ public String testCachedService(String input, String host) throws Exception
+ {
+ if (BusFactory.getThreadDefaultBus(false) != null) {
+ throw new Exception("Expected null thread default bus, but got " + BusFactory.getThreadDefaultBus(false));
+ }
+ Service service = getService(getWsdlURL(host));
+ BusFactory.setThreadDefaultBus(null);
+ Endpoint port = getPort(service);
+ return port.echo(input);
+ }
+
+ private static URL getWsdlURL(String host) throws Exception
+ {
+ return new URL("http://" + host + ":8080/jaxws-cxf-bus/EndpointService/Endpoint?wsdl");
+ }
+
+ private static Endpoint getPort(URL wsdlURL)
+ {
+ Service service = getService(wsdlURL);
+ return getPort(service);
+ }
+
+ private static Endpoint getPort(Service service)
+ {
+ QName portQName = new QName("http://org.jboss.ws/bus", "EndpointPort");
+ return (Endpoint) service.getPort(portQName, Endpoint.class);
+ }
+
+ private static Service getService(URL wsdlURL)
+ {
+ QName serviceName = new QName("http://org.jboss.ws/bus", "EndpointService");
+ return Service.create(wsdlURL, serviceName);
+ }
+}
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOneImpl.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOneImpl.java 2012-08-06 13:33:46 UTC (rev 16573)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOneImpl.java 2012-08-06 13:51:18 UTC (rev 16574)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2012, 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.
*
@@ -23,17 +23,20 @@
import java.util.concurrent.atomic.AtomicInteger;
+import javax.annotation.Resource;
import javax.ejb.Stateless;
import javax.jws.Oneway;
import javax.jws.WebMethod;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
+import javax.xml.ws.WebServiceContext;
import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
import org.apache.cxf.workqueue.AutomaticWorkQueue;
import org.apache.cxf.workqueue.WorkQueueManager;
import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.invocation.EndpointAssociation;
+import org.jboss.wsf.stack.cxf.configuration.BusHolder;
@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3497", serviceName = "ServiceOne")
@SOAPBinding(style = SOAPBinding.Style.RPC)
@@ -42,12 +45,15 @@
{
private static AtomicInteger count = new AtomicInteger(0);
+ @Resource
+ WebServiceContext ctx;
+
@WebMethod
public String echo(String input)
{
- Bus bus = BusFactory.getThreadDefaultBus(false);
+ //this is just a verification, so going the dirty way...
+ Bus bus = EndpointAssociation.getEndpoint().getService().getDeployment().getAttachment(BusHolder.class).getBus();
AutomaticWorkQueue queue = bus.getExtension(WorkQueueManager.class).getAutomaticWorkQueue();
- //this is just a verification, so going the dirty way...
Long qs = null;
Integer it = null;
try
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF/web.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF/web.xml 2012-08-06 13:33:46 UTC (rev 16573)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF/web.xml 2012-08-06 13:51:18 UTC (rev 16574)
@@ -9,8 +9,18 @@
<servlet-class>org.jboss.test.ws.jaxws.cxf.bus.EndpointImpl</servlet-class>
</servlet>
+ <servlet>
+ <servlet-name>Ep2Servlet</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.cxf.bus.ClientEndpointImpl</servlet-class>
+ </servlet>
+
<servlet-mapping>
<servlet-name>EpServlet</servlet-name>
<url-pattern>/EndpointService/Endpoint</url-pattern>
</servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Ep2Servlet</servlet-name>
+ <url-pattern>/ClientEndpointService/ClientEndpoint</url-pattern>
+ </servlet-mapping>
</web-app>
\ No newline at end of file
12 years, 1 month
- 1
- 0
JBossWS SVN: r16573 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/client/src/main/java/org/jboss/wsf/stack/cxf/client and 9 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-08-06 09:33:46 -0400 (Mon, 06 Aug 2012)
New Revision: 16573
Added:
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOne.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOneImpl.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/JBWS3497TestCase.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3497/
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3497/META-INF/
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3497/META-INF/jboss-webservices.xml
Removed:
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOne.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOneImpl.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/JBWS3497TestCase.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3497/META-INF/
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3497/META-INF/jboss-webservices.xml
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/Constants.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java
Log:
[JBPAPP-9649] Add ability to configure the queue depth on the asynchronous (@Oneway) work queue
Merged revisions 16315 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r16315 | alessio.soldano(a)jboss.com | 2012-05-24 18:58:38 +0200 (Thu, 24 May 2012) | 2 lines
[JBWS-3497] Allow configuring cxf work queues using properties from jboss-webservices.xml
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16323,16530-16532
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16315,16323,16530-16532
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/Constants.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/Constants.java 2012-08-06 13:32:21 UTC (rev 16572)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/Constants.java 2012-08-06 13:33:46 UTC (rev 16573)
@@ -32,4 +32,11 @@
{
public static final String DEPLOYMENT_BUS = "deployment-bus";
public static final String JBOSSWS_CXF_SPRING_DD = "jbossws-cxf.xml";
+
+ public static final String CXF_QUEUE_PREFIX = "cxf.queue.";
+ public static final String CXF_QUEUE_MAX_QUEUE_SIZE_PROP = "maxQueueSize";
+ public static final String CXF_QUEUE_INITIAL_THREADS_PROP = "initialThreads";
+ public static final String CXF_QUEUE_HIGH_WATER_MARK_PROP = "highWaterMark";
+ public static final String CXF_QUEUE_LOW_WATER_MARK_PROP = "lowWaterMark";
+ public static final String CXF_QUEUE_DEQUEUE_TIMEOUT_PROP = "dequeueTimeout";
}
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2012-08-06 13:32:21 UTC (rev 16572)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2012-08-06 13:33:46 UTC (rev 16573)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2012, 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.
*
@@ -21,7 +21,9 @@
*/
package org.jboss.wsf.stack.cxf.configuration;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.apache.cxf.Bus;
import org.apache.cxf.binding.soap.SoapTransportFactory;
@@ -31,12 +33,17 @@
import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.resource.ResourceResolver;
import org.apache.cxf.transport.DestinationFactoryManager;
+import org.apache.cxf.workqueue.AutomaticWorkQueue;
+import org.apache.cxf.workqueue.AutomaticWorkQueueImpl;
+import org.apache.cxf.workqueue.WorkQueueManager;
import org.apache.cxf.ws.policy.PolicyEngine;
import org.apache.cxf.ws.policy.selector.MaximalAlternativeSelector;
import org.jboss.ws.api.binding.BindingCustomization;
-import org.jboss.ws.common.Constants;
+import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
+import org.jboss.wsf.stack.cxf.client.Constants;
import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher;
import org.jboss.wsf.stack.cxf.interceptor.EnableOneWayDecoupledFaultInterceptor;
import org.jboss.wsf.stack.cxf.interceptor.EndpointAssociationInterceptor;
@@ -72,8 +79,9 @@
* @param soapTransportFactory The SoapTransportFactory to configure, if any
* @param resolver The ResourceResolver to configure, if any
* @param configurer The JBossWSCXFConfigurer to install in the bus, if any
+ * @param dep The current JBossWS-SPI Deployment
*/
- public void configure(SoapTransportFactory soapTransportFactory, ResourceResolver resolver, Configurer configurer)
+ public void configure(SoapTransportFactory soapTransportFactory, ResourceResolver resolver, Configurer configurer, Deployment dep)
{
bus.setProperty(org.jboss.wsf.stack.cxf.client.Constants.DEPLOYMENT_BUS, true);
busHolderListener = new BusHolderLifeCycleListener();
@@ -92,6 +100,11 @@
{
bus.getExtension(PolicyEngine.class).setAlternativeSelector(new MaximalAlternativeSelector());
}
+
+ if (dep != null)
+ {
+ setAdditionalWorkQueues(bus, dep.getAttachment(JBossWebservicesMetaData.class));
+ }
}
@@ -143,11 +156,70 @@
{
DestinationFactoryManager dfm = bus.getExtension(DestinationFactoryManager.class);
factory.setBus(bus);
- dfm.registerDestinationFactory(Constants.NS_SOAP11, factory);
- dfm.registerDestinationFactory(Constants.NS_SOAP12, factory);
+ dfm.registerDestinationFactory(org.jboss.ws.common.Constants.NS_SOAP11, factory);
+ dfm.registerDestinationFactory(org.jboss.ws.common.Constants.NS_SOAP12, factory);
}
}
+
+ /**
+ * Adds work queues parsing simple values of properties in jboss-webservices.xml:
+ * cxf.queue.<queue-name>.<parameter> = value
+ * e.g.
+ * cxf.queue.default.maxQueueSize = 500
+ *
+ * See constants in {@link org.jboss.wsf.stack.cxf.client.Constants}.
+ *
+ * @param bus
+ * @param wsmd
+ */
+ protected static void setAdditionalWorkQueues(Bus bus, JBossWebservicesMetaData wsmd)
+ {
+ if (wsmd != null) {
+ Map<String, String> props = wsmd.getProperties();
+ if (props != null && !props.isEmpty()) {
+ Map<String, Map<String, String>> queuesMap = new HashMap<String, Map<String,String>>();
+ for (final String k : props.keySet()) {
+ if (k.startsWith(Constants.CXF_QUEUE_PREFIX)) {
+ String sk = k.substring(Constants.CXF_QUEUE_PREFIX.length());
+ int i = sk.indexOf(".");
+ if (i > 0) {
+ String queueName = sk.substring(0, i);
+ String queueProp = sk.substring(i+1);
+ Map<String, String> m = queuesMap.get(queueName);
+ if (m == null) {
+ m = new HashMap<String, String>();
+ queuesMap.put(queueName, m);
+ }
+ m.put(queueProp, props.get(k));
+ }
+ }
+ }
+ WorkQueueManager mgr = bus.getExtension(WorkQueueManager.class);
+ for (String queueName : queuesMap.keySet()) {
+ AutomaticWorkQueue q = createWorkQueue(queueName, queuesMap.get(queueName));
+ mgr.addNamedWorkQueue(queueName, q);
+ }
+ }
+ }
+ }
+ private static AutomaticWorkQueue createWorkQueue(String name, Map<String, String> props) {
+ int mqs = parseInt(props.get(Constants.CXF_QUEUE_MAX_QUEUE_SIZE_PROP), 256);
+ int initialThreads = parseInt(props.get(Constants.CXF_QUEUE_INITIAL_THREADS_PROP), 0);
+ int highWaterMark = parseInt(props.get(Constants.CXF_QUEUE_HIGH_WATER_MARK_PROP), 25);
+ int lowWaterMark = parseInt(props.get(Constants.CXF_QUEUE_LOW_WATER_MARK_PROP), 5);
+ long dequeueTimeout = parseLong(props.get(Constants.CXF_QUEUE_DEQUEUE_TIMEOUT_PROP), 2 * 60 * 1000L);
+ return new AutomaticWorkQueueImpl(mqs, initialThreads, highWaterMark, lowWaterMark, dequeueTimeout, name);
+ }
+
+ private static int parseInt(String prop, int defaultValue) {
+ return prop != null ? Integer.parseInt(prop) : defaultValue;
+ }
+
+ private static long parseLong(String prop, long defaultValue) {
+ return prop != null ? Long.parseLong(prop) : defaultValue;
+ }
+
/**
* Return the hold bus
*
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2012-08-06 13:32:21 UTC (rev 16572)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2012-08-06 13:33:46 UTC (rev 16573)
@@ -40,6 +40,7 @@
import org.apache.cxf.ws.rm.RMManager;
import org.jboss.ws.api.binding.BindingCustomization;
import org.jboss.ws.api.util.BundleUtils;
+import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.stack.cxf.client.configuration.JBossWSNonSpringBusFactory;
@@ -83,13 +84,13 @@
* @param configurer The JBossWSCXFConfigurer to install in the bus, if any
*/
@Override
- public void configure(SoapTransportFactory soapTransportFactory, ResourceResolver resolver, Configurer configurer)
+ public void configure(SoapTransportFactory soapTransportFactory, ResourceResolver resolver, Configurer configurer, Deployment dep)
{
if (configured)
{
throw new IllegalStateException(BundleUtils.getMessage(bundle, "BUS_IS_ALREADY_CONFIGURED"));
}
- super.configure(soapTransportFactory, resolver, configurer);
+ super.configure(soapTransportFactory, resolver, configurer, dep);
for (DDEndpoint dde : metadata.getEndpoints())
{
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2012-08-06 13:32:21 UTC (rev 16572)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2012-08-06 13:33:46 UTC (rev 16573)
@@ -39,6 +39,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.api.binding.BindingCustomization;
import org.jboss.ws.api.util.BundleUtils;
+import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.stack.cxf.client.configuration.JBossWSSpringBusFactory;
@@ -115,15 +116,16 @@
* @param soapTransportFactory The SoapTransportFactory to configure, if any
* @param resolver The ResourceResolver to configure, if any
* @param configurer The JBossWSCXFConfigurer to install in the bus, if any
+ * @param dep The current JBossWS-SPI Deployment
*/
@Override
- public void configure(SoapTransportFactory soapTransportFactory, ResourceResolver resolver, Configurer configurer)
+ public void configure(SoapTransportFactory soapTransportFactory, ResourceResolver resolver, Configurer configurer, Deployment dep)
{
if (configured)
{
throw new IllegalStateException(BundleUtils.getMessage(bundle, "BUS_IS_ALREADY_CONFIGURED"));
}
- super.configure(soapTransportFactory, resolver, configurer);
+ super.configure(soapTransportFactory, resolver, configurer, dep);
if (additionalLocations != null)
{
for (URL jbossCxfXml : additionalLocations)
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2012-08-06 13:32:21 UTC (rev 16572)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2012-08-06 13:33:46 UTC (rev 16573)
@@ -110,7 +110,7 @@
}
Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class),
new WSDLFilePublisher(aDep), dep.getService().getEndpoints(), aDep.getRootFile());
- holder.configure(new SoapTransportFactoryExt(), resolver, configurer);
+ holder.configure(new SoapTransportFactoryExt(), resolver, configurer, dep);
dep.addAttachment(BusHolder.class, holder);
}
finally
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2012-08-06 13:32:21 UTC (rev 16572)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2012-08-06 13:33:46 UTC (rev 16573)
@@ -184,6 +184,19 @@
</classes>
</war>
+ <!-- jaxws-cxf-jbws3497 -->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3497.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/jbws3497/Endpoint*.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/jbws3497/META-INF">
+ <include name="**/*" />
+ </metainf>
+ <manifest>
+ <attribute name="Dependencies" value="org.apache.cxf"/>
+ </manifest>
+ </jar>
+
<!-- jaxws-cxf-logging -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-logging.jar">
<fileset dir="${tests.output.dir}/test-classes">
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java 2012-08-06 13:32:21 UTC (rev 16572)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java 2012-08-06 13:33:46 UTC (rev 16573)
@@ -63,7 +63,7 @@
Bus bus = holder.getBus();
TestLifeCycleListener listener = new TestLifeCycleListener();
bus.getExtension(BusLifeCycleManager.class).registerLifeCycleListener(listener);
- holder.configure(null, null, null);
+ holder.configure(null, null, null, null);
holder.close();
assertEquals("preShutdown method on listener should be called exactly once; number of actual calls: "
+ listener.getCount(), 1, listener.getCount());
@@ -74,7 +74,7 @@
Bus bus = holder.getBus();
TestLifeCycleListener listener = new TestLifeCycleListener();
bus.getExtension(BusLifeCycleManager.class).registerLifeCycleListener(listener);
- holder.configure(null, null, null);
+ holder.configure(null, null, null, null);
bus.shutdown(true);
holder.close();
assertEquals("preShutdown method on listener should be called exactly once; number of actual calls: "
@@ -86,7 +86,7 @@
Bus bus = holder.getBus();
TestLifeCycleListener listener = new TestLifeCycleListener();
bus.getExtension(BusLifeCycleManager.class).registerLifeCycleListener(listener);
- holder.configure(null, null, null);
+ holder.configure(null, null, null, null);
assertEquals("preShutdown method on listener shouldn't be called before holder is closed: number of actual calls: "
+ listener.getCount(), 0, listener.getCount());
holder.close();
Deleted: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOne.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOne.java 2012-05-24 16:58:38 UTC (rev 16315)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOne.java 2012-08-06 13:33:46 UTC (rev 16573)
@@ -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.jbws3497;
-
-import javax.jws.Oneway;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3497", 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-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOne.java (from rev 16315, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOne.java)
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOne.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOne.java 2012-08-06 13:33:46 UTC (rev 16573)
@@ -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.jbws3497;
+
+import javax.jws.Oneway;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3497", 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-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOneImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOneImpl.java 2012-05-24 16:58:38 UTC (rev 16315)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOneImpl.java 2012-08-06 13:33:46 UTC (rev 16573)
@@ -1,88 +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.jbws3497;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.ejb.Stateless;
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.workqueue.AutomaticWorkQueue;
-import org.apache.cxf.workqueue.WorkQueueManager;
-import org.jboss.logging.Logger;
-
-@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3497", serviceName = "ServiceOne")
-@SOAPBinding(style = SOAPBinding.Style.RPC)
-@Stateless
-public class EndpointOneImpl
-{
- private static AtomicInteger count = new AtomicInteger(0);
-
- @WebMethod
- public String echo(String input)
- {
- Bus bus = BusFactory.getThreadDefaultBus(false);
- AutomaticWorkQueue queue = bus.getExtension(WorkQueueManager.class).getAutomaticWorkQueue();
- //this is just a verification, so going the dirty way...
- Long qs = null;
- Integer it = null;
- try
- {
- qs = (Long) queue.getClass().getMethod("getMaxSize").invoke(queue);
- it = (Integer) queue.getClass().getMethod("getHighWaterMark").invoke(queue);
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
- if (qs != 10)
- {
- throw new RuntimeException("Expected max queue size '10' but got '" + qs + "'!");
- }
- if (it != 8)
- {
- throw new RuntimeException("Expected highWaterMark '8' but got '" + it + "'!");
- }
- Logger.getLogger(this.getClass()).info("echo: " + input);
- count.incrementAndGet();
- return input;
- }
-
- @WebMethod
- @Oneway
- public void echoOneWay(String input)
- {
- Logger.getLogger(this.getClass()).info("echoOneWay: " + input);
- count.incrementAndGet();
- }
-
- @WebMethod
- public int getCount()
- {
- return count.get();
- }
-}
Copied: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOneImpl.java (from rev 16315, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOneImpl.java)
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOneImpl.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOneImpl.java 2012-08-06 13:33:46 UTC (rev 16573)
@@ -0,0 +1,88 @@
+/*
+ * 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.jbws3497;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.ejb.Stateless;
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.workqueue.AutomaticWorkQueue;
+import org.apache.cxf.workqueue.WorkQueueManager;
+import org.jboss.logging.Logger;
+
+@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3497", serviceName = "ServiceOne")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+@Stateless
+public class EndpointOneImpl
+{
+ private static AtomicInteger count = new AtomicInteger(0);
+
+ @WebMethod
+ public String echo(String input)
+ {
+ Bus bus = BusFactory.getThreadDefaultBus(false);
+ AutomaticWorkQueue queue = bus.getExtension(WorkQueueManager.class).getAutomaticWorkQueue();
+ //this is just a verification, so going the dirty way...
+ Long qs = null;
+ Integer it = null;
+ try
+ {
+ qs = (Long) queue.getClass().getMethod("getMaxSize").invoke(queue);
+ it = (Integer) queue.getClass().getMethod("getHighWaterMark").invoke(queue);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ if (qs != 10)
+ {
+ throw new RuntimeException("Expected max queue size '10' but got '" + qs + "'!");
+ }
+ if (it != 8)
+ {
+ throw new RuntimeException("Expected highWaterMark '8' but got '" + it + "'!");
+ }
+ Logger.getLogger(this.getClass()).info("echo: " + input);
+ count.incrementAndGet();
+ return input;
+ }
+
+ @WebMethod
+ @Oneway
+ public void echoOneWay(String input)
+ {
+ Logger.getLogger(this.getClass()).info("echoOneWay: " + input);
+ count.incrementAndGet();
+ }
+
+ @WebMethod
+ public int getCount()
+ {
+ return count.get();
+ }
+}
Deleted: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/JBWS3497TestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/JBWS3497TestCase.java 2012-05-24 16:58:38 UTC (rev 16315)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/JBWS3497TestCase.java 2012-08-06 13:33:46 UTC (rev 16573)
@@ -1,138 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2012, 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.jbws3497;
-
-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.JBossWSCXFTestSetup;
-import org.jboss.wsf.test.JBossWSTest;
-
-/**
- * [JBWS-3497] Add ability to configure the queue depth on the asynchronous (@Oneway) work queue.
- *
- * @author alessio.soldano(a)jboss.com
- *
- */
-public class JBWS3497TestCase extends JBossWSTest
-{
- private String endpointOneURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3497/ServiceOne/EndpointOne";
- private String targetNS = "http://org.jboss.ws.jaxws.cxf/jbws3497";
-
- private EndpointOne portOne;
-
- protected int defaultSize = 200;
-
-
- public static Test suite()
- {
- return new JBossWSCXFTestSetup(JBWS3497TestCase.class, "jaxws-cxf-jbws3497.jar");
- }
-
- public void testAccess() throws Exception
- {
- initPorts();
- int count1 = portOne.getCount();
- Object retObj = portOne.echo("Hello");
- assertEquals("Hello", retObj);
- assertEquals(1, portOne.getCount() - count1);
- }
-
- //Disabled as there's no easy way for knowing the server is logging WARN messages saying the @OneWay processing queue is full.
- //Manually enable this test if willing to check (and try modifying 'cxf.queue.default.maxQueueSize' prop value in jboss-webservices.xml);
- //otherwise the EndpointOne implementation simply checks the related AutomaticWorkQueue is properly configured.
- public void _testConcurrentOneWayInvocations() throws Exception
- {
- runConcurrentTests(true);
- }
-
- private void runConcurrentTests(boolean oneway) throws Exception
- {
- initPorts();
- final int size = defaultSize;
- int count1 = portOne.getCount();
- ExecutorService es = Executors.newFixedThreadPool(size);
- List<Callable<Boolean>> callables = new ArrayList<Callable<Boolean>>(size*3);
- for (int i = 0; i < size*3; i++)
- {
- callables.add(new CallableOne(portOne, oneway, i));
- }
- List<Future<Boolean>> futures = es.invokeAll(callables);
- for (Future<Boolean> f : futures)
- {
- assertTrue(f.get());
- }
- if (oneway) {
- Thread.sleep(3000);
- }
- assertEquals(size*3, portOne.getCount() - count1);
- }
-
- 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);
- }
-
- private static class CallableOne implements Callable<Boolean>
- {
- private EndpointOne port;
- private boolean oneway;
- private int seqNum;
-
- public CallableOne(EndpointOne port, boolean oneway, int seqNum)
- {
- this.port = port;
- this.oneway = oneway;
- this.seqNum = seqNum;
- }
-
- public Boolean call() throws Exception
- {
- String arg = "Foo" + seqNum;
- if (oneway)
- {
- port.echoOneWay(arg);
- return true;
- }
- else
- {
- String result = port.echo(arg);
- return arg.equals(result);
- }
- }
- }
-
-}
Copied: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/JBWS3497TestCase.java (from rev 16315, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/JBWS3497TestCase.java)
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/JBWS3497TestCase.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/JBWS3497TestCase.java 2012-08-06 13:33:46 UTC (rev 16573)
@@ -0,0 +1,138 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.jbws3497;
+
+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.JBossWSCXFTestSetup;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * [JBWS-3497] Add ability to configure the queue depth on the asynchronous (@Oneway) work queue.
+ *
+ * @author alessio.soldano(a)jboss.com
+ *
+ */
+public class JBWS3497TestCase extends JBossWSTest
+{
+ private String endpointOneURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3497/ServiceOne/EndpointOne";
+ private String targetNS = "http://org.jboss.ws.jaxws.cxf/jbws3497";
+
+ private EndpointOne portOne;
+
+ protected int defaultSize = 200;
+
+
+ public static Test suite()
+ {
+ return new JBossWSCXFTestSetup(JBWS3497TestCase.class, "jaxws-cxf-jbws3497.jar");
+ }
+
+ public void testAccess() throws Exception
+ {
+ initPorts();
+ int count1 = portOne.getCount();
+ Object retObj = portOne.echo("Hello");
+ assertEquals("Hello", retObj);
+ assertEquals(1, portOne.getCount() - count1);
+ }
+
+ //Disabled as there's no easy way for knowing the server is logging WARN messages saying the @OneWay processing queue is full.
+ //Manually enable this test if willing to check (and try modifying 'cxf.queue.default.maxQueueSize' prop value in jboss-webservices.xml);
+ //otherwise the EndpointOne implementation simply checks the related AutomaticWorkQueue is properly configured.
+ public void _testConcurrentOneWayInvocations() throws Exception
+ {
+ runConcurrentTests(true);
+ }
+
+ private void runConcurrentTests(boolean oneway) throws Exception
+ {
+ initPorts();
+ final int size = defaultSize;
+ int count1 = portOne.getCount();
+ ExecutorService es = Executors.newFixedThreadPool(size);
+ List<Callable<Boolean>> callables = new ArrayList<Callable<Boolean>>(size*3);
+ for (int i = 0; i < size*3; i++)
+ {
+ callables.add(new CallableOne(portOne, oneway, i));
+ }
+ List<Future<Boolean>> futures = es.invokeAll(callables);
+ for (Future<Boolean> f : futures)
+ {
+ assertTrue(f.get());
+ }
+ if (oneway) {
+ Thread.sleep(3000);
+ }
+ assertEquals(size*3, portOne.getCount() - count1);
+ }
+
+ 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);
+ }
+
+ private static class CallableOne implements Callable<Boolean>
+ {
+ private EndpointOne port;
+ private boolean oneway;
+ private int seqNum;
+
+ public CallableOne(EndpointOne port, boolean oneway, int seqNum)
+ {
+ this.port = port;
+ this.oneway = oneway;
+ this.seqNum = seqNum;
+ }
+
+ public Boolean call() throws Exception
+ {
+ String arg = "Foo" + seqNum;
+ if (oneway)
+ {
+ port.echoOneWay(arg);
+ return true;
+ }
+ else
+ {
+ String result = port.echo(arg);
+ return arg.equals(result);
+ }
+ }
+ }
+
+}
Deleted: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3497/META-INF/jboss-webservices.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3497/META-INF/jboss-webservices.xml 2012-05-24 16:58:38 UTC (rev 16315)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3497/META-INF/jboss-webservices.xml 2012-08-06 13:33:46 UTC (rev 16573)
@@ -1,17 +0,0 @@
-<?xml version="1.1" encoding="UTF-8"?>
-<webservices
- xmlns="http://www.jboss.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="1.2"
- xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee">
-
- <property>
- <name>cxf.queue.default.maxQueueSize</name>
- <value>10</value>
- </property>
- <property>
- <name>cxf.queue.default.highWaterMark</name>
- <value>8</value>
- </property>
-
-</webservices>
\ No newline at end of file
Copied: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3497/META-INF/jboss-webservices.xml (from rev 16315, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3497/META-INF/jboss-webservices.xml)
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3497/META-INF/jboss-webservices.xml (rev 0)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3497/META-INF/jboss-webservices.xml 2012-08-06 13:33:46 UTC (rev 16573)
@@ -0,0 +1,17 @@
+<?xml version="1.1" encoding="UTF-8"?>
+<webservices
+ xmlns="http://www.jboss.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.2"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee">
+
+ <property>
+ <name>cxf.queue.default.maxQueueSize</name>
+ <value>10</value>
+ </property>
+ <property>
+ <name>cxf.queue.default.highWaterMark</name>
+ <value>8</value>
+ </property>
+
+</webservices>
\ No newline at end of file
12 years, 1 month
- 1
- 0
JBossWS SVN: r16572 - in spi/branches/jbossws-spi-2.0.x/src/main: java/org/jboss/wsf/spi/metadata/webservices and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-08-06 09:32:21 -0400 (Mon, 06 Aug 2012)
New Revision: 16572
Added:
spi/branches/jbossws-spi-2.0.x/src/main/resources/schema/jboss_web_services_1.2.xsd
Modified:
spi/branches/jbossws-spi-2.0.x/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java
spi/branches/jbossws-spi-2.0.x/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java
spi/branches/jbossws-spi-2.0.x/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesMetaData.java
Log:
[JBPAPP-9649] svn merge -r 16313:16314 https://svn.jboss.org/repos/jbossws/spi/trunk .
Modified: spi/branches/jbossws-spi-2.0.x/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java
===================================================================
--- spi/branches/jbossws-spi-2.0.x/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java 2012-08-06 13:26:14 UTC (rev 16571)
+++ spi/branches/jbossws-spi-2.0.x/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java 2012-08-06 13:32:21 UTC (rev 16572)
@@ -143,6 +143,10 @@
public static final String PROPERTY_VALUE = "property-value";
+ public static final String NAME = "name";
+
+ public static final String VALUE = "value";
+
public static final String SECURE_WSDL_ACCESS = "secure-wsdl-access";
public static final String TRANSPORT_GUARANTEE = "transport-guarantee";
Modified: spi/branches/jbossws-spi-2.0.x/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java
===================================================================
--- spi/branches/jbossws-spi-2.0.x/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java 2012-08-06 13:26:14 UTC (rev 16571)
+++ spi/branches/jbossws-spi-2.0.x/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java 2012-08-06 13:32:21 UTC (rev 16572)
@@ -33,6 +33,9 @@
import static org.jboss.wsf.spi.metadata.ParserConstants.PORT_COMPONENT;
import static org.jboss.wsf.spi.metadata.ParserConstants.PORT_COMPONENT_NAME;
import static org.jboss.wsf.spi.metadata.ParserConstants.PORT_COMPONENT_URI;
+import static org.jboss.wsf.spi.metadata.ParserConstants.PROPERTY;
+import static org.jboss.wsf.spi.metadata.ParserConstants.NAME;
+import static org.jboss.wsf.spi.metadata.ParserConstants.VALUE;
import static org.jboss.wsf.spi.metadata.ParserConstants.SECURE_WSDL_ACCESS;
import static org.jboss.wsf.spi.metadata.ParserConstants.TRANSPORT_GUARANTEE;
import static org.jboss.wsf.spi.metadata.ParserConstants.WEBSERVICES;
@@ -59,6 +62,7 @@
/**
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a>
*/
public class JBossWebservicesFactory {
@@ -192,6 +196,8 @@
metadata.setConfigName(elementAsString(reader));
} else if (match(reader, nsUri, CONFIG_FILE)) {
metadata.setConfigFile(elementAsString(reader));
+ } else if (match(reader, nsUri, PROPERTY)) {
+ parseProperty(reader, nsUri, metadata);
} else if (match(reader, nsUri, PORT_COMPONENT)) {
metadata.addPortComponent(parsePortComponent(reader, nsUri));
} else if (match(reader, nsUri, WEBSERVICE_DESCRIPTION)) {
@@ -268,5 +274,45 @@
}
throw new IllegalStateException(BundleUtils.getMessage(bundle, "REACHED_END_OF_XML_DOCUMENT_UNEXPECTEDLY"));
}
+
+ private void parseProperty(XMLStreamReader reader, String nsUri, JBossWebservicesMetaData metadata) throws XMLStreamException
+ {
+ String name = null;
+ String value = null;
+ while (reader.hasNext())
+ {
+ switch (reader.nextTag())
+ {
+ case XMLStreamConstants.END_ELEMENT : {
+ if (match(reader, nsUri, PROPERTY))
+ {
+ if (name == null)
+ {
+ throw new IllegalStateException(BundleUtils.getMessage(bundle, "COULD_NOT_GET_PROPERTY_NAME"));
+ }
+ metadata.setProperty(name, value);
+ return;
+ }
+ else
+ {
+ throw new IllegalStateException(BundleUtils.getMessage(bundle, "UNEXPECTED_END_TAG", reader.getLocalName()));
+ }
+ }
+ case XMLStreamConstants.START_ELEMENT : {
+ if (match(reader, nsUri, NAME)) {
+ name = elementAsString(reader);
+ }
+ else if (match(reader, nsUri, VALUE)) {
+ value = elementAsString(reader);
+ }
+ else
+ {
+ throw new IllegalStateException(BundleUtils.getMessage(bundle, "UNEXPECTED_ELEMENT", reader.getLocalName()));
+ }
+ }
+ }
+ }
+ throw new IllegalStateException(BundleUtils.getMessage(bundle, "REACHED_END_OF_XML_DOCUMENT_UNEXPECTEDLY"));
+ }
}
Modified: spi/branches/jbossws-spi-2.0.x/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesMetaData.java
===================================================================
--- spi/branches/jbossws-spi-2.0.x/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesMetaData.java 2012-08-06 13:26:14 UTC (rev 16571)
+++ spi/branches/jbossws-spi-2.0.x/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesMetaData.java 2012-08-06 13:32:21 UTC (rev 16572)
@@ -23,8 +23,10 @@
package org.jboss.wsf.spi.metadata.webservices;
import java.net.URL;
+import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
/**
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
@@ -36,6 +38,8 @@
private String configName;
private String configFile;
+
+ private Map<String, String> properties = new HashMap<String, String>();
private List<JBossPortComponentMetaData> portComponents = new LinkedList<JBossPortComponentMetaData>();
@@ -94,5 +98,17 @@
webserviceDescriptions.toArray(array);
return array;
}
+
+ public void setProperty(String name, String value) {
+ properties.put(name, value);
+ }
+ public String getProperty(String name) {
+ return properties.get(name);
+ }
+
+ public Map<String, String> getProperties() {
+ return properties;
+ }
+
}
Copied: spi/branches/jbossws-spi-2.0.x/src/main/resources/schema/jboss_web_services_1.2.xsd (from rev 16314, spi/trunk/src/main/resources/schema/jboss_web_services_1.2.xsd)
===================================================================
--- spi/branches/jbossws-spi-2.0.x/src/main/resources/schema/jboss_web_services_1.2.xsd (rev 0)
+++ spi/branches/jbossws-spi-2.0.x/src/main/resources/schema/jboss_web_services_1.2.xsd 2012-08-06 13:32:21 UTC (rev 16572)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema
+ targetNamespace="http://www.jboss.com/xml/ns/javaee"
+ xmlns:jboss="http://www.jboss.com/xml/ns/javaee"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="1.2">
+
+ <xsd:element name="webservices" type="jboss:webservicesType"/>
+
+ <xsd:complexType name="webservicesType">
+ <xsd:sequence>
+ <xsd:element name="context-root" type="xsd:token" minOccurs="0"/>
+ <xsd:element name="config-name" type="xsd:token" minOccurs="0"/>
+ <xsd:element name="config-file" type="xsd:token" minOccurs="0"/>
+ <xsd:element name="property" type="jboss:webservicePropertyType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="port-component" type="jboss:portComponentType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="webservice-description" type="jboss:webserviceDescriptionType" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="portComponentType">
+ <xsd:sequence>
+ <xsd:element name="ejb-name" type="xsd:token"/>
+ <xsd:element name="port-component-name" type="xsd:token"/>
+ <xsd:element name="port-component-uri" type="xsd:token" minOccurs="0"/>
+ <xsd:element name="auth-method" type="xsd:token" minOccurs="0"/>
+ <xsd:element name="transport-guarantee" type="xsd:token" minOccurs="0"/>
+ <xsd:element name="secure-wsdl-access" type="xsd:boolean" minOccurs="0"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="webserviceDescriptionType">
+ <xsd:sequence>
+ <xsd:element name="webservice-description-name" type="xsd:token"/>
+ <xsd:element name="wsdl-publish-location" type="xsd:token" minOccurs="0"/>
+ <xsd:element name="port-component" type="jboss:portComponentType" minOccurs="1" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="webservicePropertyType">
+ <xsd:sequence>
+ <xsd:element name="name" type="xsd:string"/>
+ <xsd:element name="value" type="xsd:string"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+</xsd:schema>
12 years, 1 month
- 1
- 0
JBossWS SVN: r16571 - stack/cxf/branches/jbossws-cxf-4.0.x.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-08-06 09:26:14 -0400 (Mon, 06 Aug 2012)
New Revision: 16571
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml
Log:
Moving to latest spi snapshot
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-08-06 12:36:45 UTC (rev 16570)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-08-06 13:26:14 UTC (rev 16571)
@@ -60,7 +60,7 @@
<!-- Properties -->
<properties>
<jbossws.api.version>1.0.0.GA</jbossws.api.version>
- <jbossws.spi.version>2.0.3.GA</jbossws.spi.version>
+ <jbossws.spi.version>2.0.4-SNAPSHOT</jbossws.spi.version>
<jbossws.common.version>2.0.4.GA</jbossws.common.version>
<jbossws.common.tools.version>1.0.1.GA</jbossws.common.tools.version>
<jbossws.shared.testsuite.version>4.0.5-SNAPSHOT</jbossws.shared.testsuite.version>
12 years, 1 month
- 1
- 0
JBossWS SVN: r16570 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-08-06 08:36:45 -0400 (Mon, 06 Aug 2012)
New Revision: 16570
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/
Log:
[JBPAPP-9648] WSConsume generates sources in current dir even if -keep option is not specified
Merged revisions 16530,16532 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r16530 | alessio.soldano(a)jboss.com | 2012-07-25 12:48:18 +0200 (Wed, 25 Jul 2012) | 2 lines
[JBWS-3519] Remove generated sources when -k (keep/generateSource) option is not used + fix wrong impl of JBWS-3193
.......
r16532 | alessio.soldano(a)jboss.com | 2012-07-25 12:49:50 +0200 (Wed, 25 Jul 2012) | 2 lines
Fixing wrong svn:ignore
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16323
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16323,16530-16532
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java 2012-08-06 12:35:40 UTC (rev 16569)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java 2012-08-06 12:36:45 UTC (rev 16570)
@@ -28,6 +28,7 @@
import java.util.List;
import java.util.ResourceBundle;
+import org.apache.cxf.helpers.FileUtils;
import org.apache.cxf.tools.common.ToolContext;
import org.apache.cxf.tools.wsdlto.WSDLToJava;
import org.jboss.ws.api.tools.WSContractConsumer;
@@ -162,27 +163,31 @@
args.add("-exsh");
args.add(additionalHeaders ? "true" : "false");
-
- if (generateSource && sourceDir == null)
+
+ if (targetPackage != null)
{
- sourceDir = outputDir;
+ args.add("-p");
+ args.add(targetPackage);
}
- if (sourceDir != null && generateSource)
- {
+ File sourceTempDir = null;
+ if (generateSource) {
+ if (sourceDir == null)
+ {
+ sourceDir = outputDir;
+ }
if (!sourceDir.exists() && !sourceDir.mkdirs())
throw new IllegalStateException(BundleUtils.getMessage(bundle, "COULD_NOT_MAKE_DIRECTORY", sourceDir.getName()));
args.add("-d");
args.add(sourceDir.getAbsolutePath());
+ } else {
+ sourceTempDir = new File(outputDir, "tmp" + Math.round(Math.random() * 10000000));
+ FileUtils.mkDir(sourceTempDir);
+ args.add("-d");
+ args.add(sourceTempDir.getAbsolutePath());
}
- if (targetPackage != null)
- {
- args.add("-p");
- args.add(targetPackage);
- }
-
if (wsdlLocation != null)
{
args.add("-wsdlLocation");
@@ -213,11 +218,6 @@
args.add("-classdir");
args.add(outputDir.getAbsolutePath());
}
- if (nocompile && !generateSource)
- {
- args.add("-d");
- args.add(outputDir.getAbsolutePath());
- }
// Always set the target
if (target != null)
@@ -261,5 +261,12 @@
t.printStackTrace();
}
}
+ finally
+ {
+ if (sourceTempDir != null)
+ {
+ FileUtils.removeDir(sourceTempDir);
+ }
+ }
}
}
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests
___________________________________________________________________
Modified: svn:ignore
- .classpath
.project
.settings
target
org
+ .classpath
.project
.settings
target
12 years, 1 month
- 1
- 0
JBossWS SVN: r16569 - shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-08-06 08:35:40 -0400 (Mon, 06 Aug 2012)
New Revision: 16569
Modified:
shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java
shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java
shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCaseForked.java
Log:
[JBPAPP-9648] svn merge -r 16530:16531 https://svn.jboss.org/repos/jbossws/shared-testsuite/trunk .
Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java
===================================================================
--- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2012-08-06 11:30:08 UTC (rev 16568)
+++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2012-08-06 12:35:40 UTC (rev 16569)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2012, 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.
*
@@ -26,7 +26,6 @@
import java.lang.reflect.InvocationTargetException;
import java.net.URL;
import java.net.URLClassLoader;
-import java.util.Arrays;
import java.util.List;
import java.util.LinkedList;
import java.util.StringTokenizer;
Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java
===================================================================
--- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2012-08-06 11:30:08 UTC (rev 16568)
+++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2012-08-06 12:35:40 UTC (rev 16569)
@@ -155,31 +155,76 @@
assertTrue("Source directory switch ignored", sei.exists());
}
- public void testNocompileNoKeep() throws Exception
+ public void testNoCompile() throws Exception
{
- File sourceDir = new File(workDirectory, "wsconsumeNoCPNOKeepsource/java/");
- File outputDir = new File(workDirectory, "wsconsumeNoCPNOKeepOutput/java/");
+ File sourceDir = new File(workDirectory, "wsconsumeNoCPSources/java/");
+ File outputDir = new File(workDirectory, "wsconsumeNoCPOutput/java/");
consumer.setTargetPackage("org.jboss.test.ws.tools.testSourceDirectory");
consumer.setSourceDirectory(sourceDir);
consumer.setOutputDirectory(outputDir);
+ consumer.setGenerateSource(true);
consumer.consume(getResourceFile("jaxws/smoke/tools/wsdl/TestService.wsdl").getCanonicalPath());
- File sei = new File(workDirectory, "wsconsumeNoCPNOKeepOutput/java/org/jboss/test/ws/tools/testSourceDirectory/EndpointInterface.java");
+ File sei = new File(workDirectory, "wsconsumeNoCPSources/java/org/jboss/test/ws/tools/testSourceDirectory/EndpointInterface.java");
assertTrue("Expected sei not generated in the expected directory " + outputDir.getPath() , sei.exists());
- File notExistSei = new File(workDirectory, "wsconsumeNoCPNOKeepsource/java/org/jboss/test/ws/tools/testSourceDirectory/EndpointInterface.java");
+ File notExistSei = new File(workDirectory, "wsconsumeNoCPOutput/java/org/jboss/test/ws/tools/testSourceDirectory/EndpointInterface.java");
assertFalse("Directory " + sourceDir.getPath() + " is expected to empty", notExistSei.exists());
}
+ public void testNoCompileNoKeep() throws Exception
+ {
+ File sourceDir = new File(workDirectory, "wsconsumeNoCPNoKeepsource/java/");
+ File outputDir = new File(workDirectory, "wsconsumeNoCPNoKeepOutput/java/");
+ consumer.setTargetPackage("org.jboss.test.ws.tools.testSourceDirectory");
+ consumer.setSourceDirectory(sourceDir);
+ consumer.setOutputDirectory(outputDir);
+ consumer.setGenerateSource(false);
+
+ consumer.consume(getResourceFile("jaxws/smoke/tools/wsdl/TestService.wsdl").getCanonicalPath());
+
+ File sourceSei = new File(workDirectory, "wsconsumeNoCPNoKeepsource/java/org/jboss/test/ws/tools/testSourceDirectory/EndpointInterface.java");
+ assertFalse("Directory " + sourceDir.getPath() + " is expected to be empty", sourceSei.exists());
+
+ File outputSei = new File(workDirectory, "wsconsumeNoCPNoKeepOutput/java/org/jboss/test/ws/tools/testSourceDirectory/EndpointInterface.java");
+ assertFalse("Directory " + sourceDir.getPath() + " is expected to be empty", outputSei.exists());
+ }
+
/**
* Enables/Disables Java source generation.
*
*/
public void testGenerateSource() throws Exception
{
- testTargetPackage();
+ File sourceDir = new File(workDirectory, "wsconsumeGenerateSource/java/");
+ consumer.setTargetPackage("org.jboss.test.ws.tools.testGenerateSource");
+ consumer.setSourceDirectory(sourceDir);
+ consumer.setGenerateSource(true);
+ consumer.setNoCompile(true);
+
+ consumeWSDL();
+
+ File packageDir = new File(sourceDir, "org/jboss/test/ws/tools/testGenerateSource");
+ assertTrue("Package not created", packageDir.exists());
+
+ File seiSource = new File(sourceDir, "org/jboss/test/ws/tools/testGenerateSource/EndpointInterface.java");
+ assertTrue("SEI not generated", seiSource.exists());
+
+ sourceDir = new File(workDirectory, "wsconsumeGenerateSource2/java/");
+ consumer.setTargetPackage("org.jboss.test.ws.tools.testGenerateSource2");
+ consumer.setSourceDirectory(sourceDir);
+ consumer.setGenerateSource(false);
+ consumer.setNoCompile(false);
+
+ consumeWSDL();
+
+ packageDir = new File(sourceDir, "org/jboss/test/ws/tools/testGenerateSource2");
+ assertFalse("Package should not have been created!", packageDir.exists());
+
+ File interfaceClass = new File(outputDirectory, "org/jboss/test/ws/tools/testGenerateSource2/EndpointInterface.class");
+ assertTrue("SEI not generated", interfaceClass.exists());
}
/**
Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCaseForked.java
===================================================================
--- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCaseForked.java 2012-08-06 11:30:08 UTC (rev 16568)
+++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCaseForked.java 2012-08-06 12:35:40 UTC (rev 16569)
@@ -92,22 +92,29 @@
/**
- *JBWS-3193
- * If there are "-n" and "-s" flag, without "-k", the generated
- * artifacts should be placed in output directory
+ * If there are "-n" and "-s" flag, with "-k", the generated
+ * artifacts should be placed in source directory
*/
- public void testNocompileNoKeep() throws Exception
+ public void testNoCompile() throws Exception
{
- dispatch("testNocompileNoKeep");
+ dispatch("testNoCompile");
}
/**
+ * If there are "-n" and "-s" flag, without "-k", nothing should be generated
+ */
+ public void testNoCompileNoKeep() throws Exception
+ {
+ dispatch("testNoCompileNoKeep");
+ }
+
+ /**
* Enables/Disables Java source generation.
*
*/
public void testGenerateSource() throws Exception
{
- testTargetPackage();
+ dispatch("testGenerateSource");
}
/**
12 years, 1 month
- 1
- 0
JBossWS SVN: r16568 - stack/cxf/branches/jbossws-cxf-4.0.x.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-08-06 07:30:08 -0400 (Mon, 06 Aug 2012)
New Revision: 16568
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
Log:
Blocked revisions 16486,16488-16489,16493,16500,16509,16549-16550,16552-16553,16565 via svnmerge
.......
r16486 | alessio.soldano(a)jboss.com | 2012-07-18 16:33:20 +0200 (Wed, 18 Jul 2012) | 2 lines
[JBWS-3446] set client sysprops, add and copy keystores, update testcases
.......
r16488 | alessio.soldano(a)jboss.com | 2012-07-18 17:40:15 +0200 (Wed, 18 Jul 2012) | 2 lines
[JBWS-3446] Enabling tests for AS 7.1.1
.......
r16489 | alessio.soldano(a)jboss.com | 2012-07-18 17:57:23 +0200 (Wed, 18 Jul 2012) | 2 lines
Removing native wsse sys props from cxf testsuite run...
.......
r16493 | richard.opalka(a)jboss.com | 2012-07-19 12:32:17 +0200 (Thu, 19 Jul 2012) | 1 line
[JBWS-3484] refactoring AS 71x integration layers
.......
r16500 | richard.opalka(a)jboss.com | 2012-07-19 12:50:39 +0200 (Thu, 19 Jul 2012) | 1 line
[JBWS-3484] refactoring AS 720 integration layer
.......
r16509 | asoldano | 2012-07-20 18:38:34 +0200 (Fri, 20 Jul 2012) | 2 lines
[JBWS-3446] Enabling tests
.......
r16549 | alessio.soldano(a)jboss.com | 2012-07-26 16:04:23 +0200 (Thu, 26 Jul 2012) | 2 lines
[JBWS-3529] Adding jbossws-cxf implementation of ClientConfigurer
.......
r16550 | alessio.soldano(a)jboss.com | 2012-07-26 16:04:53 +0200 (Thu, 26 Jul 2012) | 2 lines
[JBWS-3529] Adding wsse testcase
.......
r16552 | alessio.soldano(a)jboss.com | 2012-07-27 10:47:57 +0200 (Fri, 27 Jul 2012) | 2 lines
Trying change on test to figure out the reason for failures reproducable on hudson only...
.......
r16553 | alessio.soldano(a)jboss.com | 2012-07-27 13:04:16 +0200 (Fri, 27 Jul 2012) | 2 lines
Another try...
.......
r16565 | alessio.soldano(a)jboss.com | 2012-08-03 10:27:54 +0200 (Fri, 03 Aug 2012) | 2 lines
[JBWS-3335] Fixing detection of jboss-modules environment to cope with jboss-modules enabled out-of-container clients
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-blocked
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156...
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156...
12 years, 1 month
- 1
- 0
JBossWS SVN: r16567 - stack/cxf/branches/jbossws-cxf-4.0.x.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-08-06 06:28:23 -0400 (Mon, 06 Aug 2012)
New Revision: 16567
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
Log:
Blocked revisions 16396,16401,16416-16417,16419-16420,16426,16471 via svnmerge
.......
r16396 | alessio.soldano(a)jboss.com | 2012-06-07 19:04:59 +0200 (Thu, 07 Jun 2012) | 2 lines
[JBWS-3335] Modifying ProviderImpl for reading default client configuration from server config and setting it into the client proxy; also adding an out interceptor for sorting PRE/POST handlers
.......
r16401 | alessio.soldano(a)jboss.com | 2012-06-08 15:30:59 +0200 (Fri, 08 Jun 2012) | 2 lines
[JBWS-3335] Allow jbossws-common service resolution from jbossws-api
.......
r16416 | alessio.soldano(a)jboss.com | 2012-06-20 12:58:57 +0200 (Wed, 20 Jun 2012) | 2 lines
[JBWS-3522] Updating JBossWSInvoker to re-use existing Apache CXF Invoker hierarchy and limit the additions over that to the minimum to ease future new features integration
.......
r16417 | alessio.soldano(a)jboss.com | 2012-06-20 13:06:18 +0200 (Wed, 20 Jun 2012) | 1 line
.......
r16419 | alessio.soldano(a)jboss.com | 2012-06-21 12:15:55 +0200 (Thu, 21 Jun 2012) | 2 lines
[JBWS-3523] Adding testcase for server side async with CXF @UseAsynchMethod
.......
r16420 | alessio.soldano(a)jboss.com | 2012-06-21 14:05:22 +0200 (Thu, 21 Jun 2012) | 2 lines
[JBWS-3409] Adding testcase for manual/direct usage of Apache CXF continuations api
.......
r16426 | alessio.soldano(a)jboss.com | 2012-06-25 13:41:09 +0200 (Mon, 25 Jun 2012) | 2 lines
[JBWS-3434] Properly delegate UT auth on STS to JAAS integration
.......
r16471 | alessio.soldano(a)jboss.com | 2012-07-16 20:24:36 +0200 (Mon, 16 Jul 2012) | 2 lines
[JBWS-3475] Enabling tests
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-blocked
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156...
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156...
12 years, 1 month
- 1
- 0
JBossWS SVN: r16566 - stack/cxf/branches/jbossws-cxf-4.0.x.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-08-06 06:17:49 -0400 (Mon, 06 Aug 2012)
New Revision: 16566
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
Log:
Blocked revisions 16277,16307,16317-16320,16336-16337 via svnmerge
.......
r16277 | alessio.soldano(a)jboss.com | 2012-05-11 17:28:32 +0200 (Fri, 11 May 2012) | 2 lines
[JBWS-3434] [CXF-4308] use ws-security.sts.disable-wsmex-call-using-epr-address option
.......
r16307 | alessio.soldano(a)jboss.com | 2012-05-23 16:26:09 +0200 (Wed, 23 May 2012) | 2 lines
[JBWS-3495][JBWS-3434][CXF-4304] Enabling test
.......
r16317 | alessio.soldano(a)jboss.com | 2012-05-25 16:40:23 +0200 (Fri, 25 May 2012) | 2 lines
[JBWS-3504] Adding option for setting policy alternative selector on server side
.......
r16318 | alessio.soldano(a)jboss.com | 2012-05-25 17:02:51 +0200 (Fri, 25 May 2012) | 2 lines
[JBWS-3504] Renaming constant
.......
r16319 | alessio.soldano(a)jboss.com | 2012-05-25 18:20:22 +0200 (Fri, 25 May 2012) | 2 lines
[JBWS-3405] Keep spi Deployment out of BusHolder
.......
r16320 | alessio.soldano(a)jboss.com | 2012-05-25 19:09:13 +0200 (Fri, 25 May 2012) | 2 lines
[JBWS-3287] Using deployment descriptor contribution too for jbossws endpoint config name / file
.......
r16336 | alessio.soldano(a)jboss.com | 2012-05-31 17:50:23 +0200 (Thu, 31 May 2012) | 2 lines
Using latest jbossws-api
.......
r16337 | alessio.soldano(a)jboss.com | 2012-05-31 17:51:26 +0200 (Thu, 31 May 2012) | 2 lines
[JBWS-3505] Removing duplicated code
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-blocked
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156...
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156...
12 years, 1 month
- 1
- 0