JBossWS SVN: r13834 - stack/native/trunk/modules/dist/management.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-03-03 05:31:06 -0500 (Thu, 03 Mar 2011)
New Revision: 13834
Modified:
stack/native/trunk/modules/dist/management/pom.xml
Log:
fixing parent relative path
Modified: stack/native/trunk/modules/dist/management/pom.xml
===================================================================
--- stack/native/trunk/modules/dist/management/pom.xml 2011-03-02 21:33:18 UTC (rev 13833)
+++ stack/native/trunk/modules/dist/management/pom.xml 2011-03-03 10:31:06 UTC (rev 13834)
@@ -9,7 +9,7 @@
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
<version>4.0.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
13 years, 9 months
- 1
- 0
JBossWS SVN: r13833 - in stack/cxf/branches/JBWS-3236/modules/testsuite: cxf-tests/scripts and 10 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-02 16:33:18 -0500 (Wed, 02 Mar 2011)
New Revision: 13833
Added:
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060EJB3TestCase.java
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060ServletTestCase.java
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060Tests.java
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/WEB-INF/
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/WEB-INF/web.xml
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3060/
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3060/WEB-INF/
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3060/WEB-INF/web.xml
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3098/
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3098/WEB-INF/
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3098/WEB-INF/web.xml
Removed:
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java
Modified:
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPTestCase.java
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/HelloWorldImpl.java
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/EndpointOneImpl.java
stack/cxf/branches/JBWS-3236/modules/testsuite/pom.xml
Log:
- Converting jbws3098 and gzip cxf testcases to using pojo endpoints instead of ejb3 ones, to start having test coverage on AS7 (it does not really matter what kind of endpoint is used here, but the tests are pretty much significant from a CXF integration point of view)
- Added a pojo endpoint version of the jbws3060 testcase, which should have been done in any case since the beginning (the test acts as load tests too)
Modified: stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-03-02 18:42:59 UTC (rev 13832)
+++ stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-03-02 21:33:18 UTC (rev 13833)
@@ -71,11 +71,11 @@
</war>
<!-- jaxws-cxf-gzip -->
- <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-gzip.jar">
- <fileset dir="${tests.output.dir}/test-classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-gzip.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/gzip/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/cxf/gzip/HelloWorld*.class"/>
- </fileset>
- </jar>
+ </classes>
+ </war>
<!-- jaxws-cxf-jaxbintros -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jaxbintros.jar">
@@ -96,13 +96,19 @@
<include name="org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.class"/>
</fileset>
</jar>
+ <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3060.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/jbws3060/WEB-INF/web.xml">
+ <classes 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"/>
+ </classes>
+ </war>
<!-- jaxws-cxf-jbws3098 -->
- <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3098.jar">
- <fileset dir="${tests.output.dir}/test-classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3098.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/jbws3098/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/cxf/jbws3098/EndpointOneImpl.class"/>
- </fileset>
- </jar>
+ </classes>
+ </war>
<!-- jaxws-cxf-logging -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-logging.jar">
Modified: stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPTestCase.java
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPTestCase.java 2011-03-02 18:42:59 UTC (rev 13832)
+++ stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPTestCase.java 2011-03-02 21:33:18 UTC (rev 13833)
@@ -61,7 +61,7 @@
public static Test suite()
{
- return new JBossWSCXFTestSetup(GZIPTestCase.class, "jaxws-cxf-gzip.jar");
+ return new JBossWSCXFTestSetup(GZIPTestCase.class, "jaxws-cxf-gzip.war");
}
public void testGZIPUsingFeatureOnBus() throws Exception
Modified: stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/HelloWorldImpl.java
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/HelloWorldImpl.java 2011-03-02 18:42:59 UTC (rev 13832)
+++ stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/HelloWorldImpl.java 2011-03-02 21:33:18 UTC (rev 13833)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.cxf.gzip;
-import javax.ejb.Stateless;
import javax.jws.WebService;
import org.apache.cxf.annotations.GZIP;
@@ -33,7 +32,6 @@
targetNamespace = "http://org.jboss.ws/jaxws/cxf/gzip"
)
@GZIP(threshold = 0)
-@Stateless
public class HelloWorldImpl implements HelloWorld
{
public String echo(String input)
Added: stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060EJB3TestCase.java
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060EJB3TestCase.java (rev 0)
+++ stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060EJB3TestCase.java 2011-03-02 21:33:18 UTC (rev 13833)
@@ -0,0 +1,39 @@
+/*
+ * 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 junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 11-Jun-2010
+ */
+public class JBWS3060EJB3TestCase extends JBWS3060Tests
+{
+ public static Test suite()
+ {
+ return new JBossWSCXFTestSetup(JBWS3060EJB3TestCase.class, "jaxws-cxf-jbws3060.jar");
+ }
+}
Added: stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060ServletTestCase.java
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060ServletTestCase.java (rev 0)
+++ stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060ServletTestCase.java 2011-03-02 21:33:18 UTC (rev 13833)
@@ -0,0 +1,46 @@
+/*
+ * 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 junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 11-Jun-2010
+ */
+public class JBWS3060ServletTestCase extends JBWS3060Tests
+{
+ public static Test suite()
+ {
+ return new JBossWSCXFTestSetup(JBWS3060ServletTestCase.class, "jaxws-cxf-jbws3060.war");
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ System.out.println("FIXME: JBWS3060ServletTestCase temporarly running with limited concurrency, investigate load issue.");
+ this.defaultSize = 10;
+ }
+
+}
Deleted: stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java 2011-03-02 18:42:59 UTC (rev 13832)
+++ stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java 2011-03-02 21:33:18 UTC (rev 13833)
@@ -1,171 +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.JBossWSCXFTestSetup;
-import org.jboss.wsf.test.JBossWSTest;
-
-/**
- *
- * @author alessio.soldano(a)jboss.com
- * @since 11-Jun-2010
- */
-public class JBWS3060TestCase extends JBossWSTest
-{
- private String endpointOneURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060/ServiceOne/EndpointOne";
- private String endpointTwoURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060/ServiceTwo/EndpointTwo";
- private String targetNS = "http://org.jboss.ws.jaxws.cxf/jbws3060";
-
- private EndpointOne portOne;
- private EndpointTwo portTwo;
-
- public static Test suite()
- {
- return new JBossWSCXFTestSetup(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);
- }
- }
- }
-}
Added: stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060Tests.java
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060Tests.java (rev 0)
+++ stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060Tests.java 2011-03-02 21:33:18 UTC (rev 13833)
@@ -0,0 +1,165 @@
+/*
+ * 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 org.jboss.wsf.test.JBossWSTest;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 11-Jun-2010
+ */
+public abstract class JBWS3060Tests extends JBossWSTest //*Tests does not match the configured surefire filter on test classes' names
+{
+ private String endpointOneURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060/ServiceOne/EndpointOne";
+ private String endpointTwoURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060/ServiceTwo/EndpointTwo";
+ private String targetNS = "http://org.jboss.ws.jaxws.cxf/jbws3060";
+
+ private EndpointOne portOne;
+ private EndpointTwo portTwo;
+
+ protected int defaultSize = 30;
+
+ 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 = defaultSize;
+ 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/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java 2011-03-02 18:42:59 UTC (rev 13832)
+++ stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java 2011-03-02 21:33:18 UTC (rev 13833)
@@ -50,7 +50,7 @@
public static Test suite()
{
- return new JBossWSCXFTestSetup(ClientServerLifeCycleTestCase.class, "jaxws-cxf-jbws3098.jar");
+ return new JBossWSCXFTestSetup(ClientServerLifeCycleTestCase.class, "jaxws-cxf-jbws3098.war");
}
public void testClientLifeCycleManager()
Modified: stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/EndpointOneImpl.java
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/EndpointOneImpl.java 2011-03-02 18:42:59 UTC (rev 13832)
+++ stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/EndpointOneImpl.java 2011-03-02 21:33:18 UTC (rev 13833)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.cxf.jbws3098;
-import javax.ejb.Stateless;
import javax.jws.WebMethod;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
@@ -30,7 +29,6 @@
@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3098", serviceName = "ServiceOne")
@SOAPBinding(style = SOAPBinding.Style.RPC)
-@Stateless
public class EndpointOneImpl
{
@WebMethod
Added: stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/WEB-INF/web.xml
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/WEB-INF/web.xml (rev 0)
+++ stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/WEB-INF/web.xml 2011-03-02 21:33:18 UTC (rev 13833)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd">
+
+ <servlet>
+ <servlet-name>TestServlet</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.cxf.gzip.HelloWorldImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestServlet</servlet-name>
+ <url-pattern>/HelloWorldService/HelloWorldImpl</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
Added: stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3060/WEB-INF/web.xml
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3060/WEB-INF/web.xml (rev 0)
+++ stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3060/WEB-INF/web.xml 2011-03-02 21:33:18 UTC (rev 13833)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd">
+
+ <servlet>
+ <servlet-name>Ep1Servlet</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.cxf.jbws3060.EndpointOneImpl</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>Ep2Servlet</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.cxf.jbws3060.EndpointTwoImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Ep1Servlet</servlet-name>
+ <url-pattern>/ServiceOne/EndpointOne</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Ep2Servlet</servlet-name>
+ <url-pattern>/ServiceTwo/EndpointTwo</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
Added: stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3098/WEB-INF/web.xml
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3098/WEB-INF/web.xml (rev 0)
+++ stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3098/WEB-INF/web.xml 2011-03-02 21:33:18 UTC (rev 13833)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd">
+
+ <servlet>
+ <servlet-name>EpServlet</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.cxf.jbws3098.EndpointOneImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>EpServlet</servlet-name>
+ <url-pattern>/ServiceOne/EndpointOne</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
Modified: stack/cxf/branches/JBWS-3236/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/pom.xml 2011-03-02 18:42:59 UTC (rev 13832)
+++ stack/cxf/branches/JBWS-3236/modules/testsuite/pom.xml 2011-03-02 21:33:18 UTC (rev 13833)
@@ -876,10 +876,8 @@
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**/*EJB3TestCase*</exclude>
<exclude>org/jboss/test/ws/management/recording/**</exclude>
<exclude>org/jboss/test/ws/jaxws/cxf/bus/*EJB3*</exclude>
- <exclude>org/jboss/test/ws/jaxws/cxf/gzip/**</exclude>
<exclude>org/jboss/test/ws/jaxws/cxf/jaxbintros/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/cxf/jbws3060/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/cxf/jbws3060/*EJB3*</exclude>
<exclude>org/jboss/test/ws/jaxws/cxf/logging/**</exclude>
<!-- # [JBWS-3219] unexpected element 'security-domain' encountered -->
13 years, 9 months
- 1
- 0
JBossWS SVN: r13832 - stack/cxf/branches/JBWS-3236/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-02 13:42:59 -0500 (Wed, 02 Mar 2011)
New Revision: 13832
Modified:
stack/cxf/branches/JBWS-3236/modules/testsuite/pom.xml
Log:
Enabling mtom testcase
Modified: stack/cxf/branches/JBWS-3236/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/pom.xml 2011-03-02 18:23:55 UTC (rev 13831)
+++ stack/cxf/branches/JBWS-3236/modules/testsuite/pom.xml 2011-03-02 18:42:59 UTC (rev 13832)
@@ -911,9 +911,6 @@
<!-- # [JBWS-3229] DOMUtils issue on test classpath - probably missing xercesImpl on CP? -->
<exclude>org/jboss/test/ws/jaxws/jbws2960/**</exclude>
- <!-- # [JBWS-3231] not satisfied policy alternatives -->
- <exclude>org/jboss/test/ws/jaxws/samples/mtom/MtomTestCase*</exclude>
-
<!-- # [JBWS-3232] javax.naming.NameNotFoundException: Name 'service' not found in context 'env' -->
<exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
13 years, 9 months
- 1
- 0
JBossWS SVN: r13831 - stack/cxf/branches/JBWS-3236/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-02 13:23:55 -0500 (Wed, 02 Mar 2011)
New Revision: 13831
Modified:
stack/cxf/branches/JBWS-3236/modules/testsuite/pom.xml
Log:
Enabling wsrm api testcase
Modified: stack/cxf/branches/JBWS-3236/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/pom.xml 2011-03-02 18:13:38 UTC (rev 13830)
+++ stack/cxf/branches/JBWS-3236/modules/testsuite/pom.xml 2011-03-02 18:23:55 UTC (rev 13831)
@@ -911,9 +911,6 @@
<!-- # [JBWS-3229] DOMUtils issue on test classpath - probably missing xercesImpl on CP? -->
<exclude>org/jboss/test/ws/jaxws/jbws2960/**</exclude>
- <!-- # [JBWS-3230] WS RM namespace issue -->
- <exclude>org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase*</exclude>
-
<!-- # [JBWS-3231] not satisfied policy alternatives -->
<exclude>org/jboss/test/ws/jaxws/samples/mtom/MtomTestCase*</exclude>
13 years, 9 months
- 1
- 0
JBossWS SVN: r13830 - stack/cxf/branches/JBWS-3236.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-02 13:13:38 -0500 (Wed, 02 Mar 2011)
New Revision: 13830
Modified:
stack/cxf/branches/JBWS-3236/pom.xml
Log:
Adding jboss700 profile in pom.xml
Modified: stack/cxf/branches/JBWS-3236/pom.xml
===================================================================
--- stack/cxf/branches/JBWS-3236/pom.xml 2011-03-02 18:04:57 UTC (rev 13829)
+++ stack/cxf/branches/JBWS-3236/pom.xml 2011-03-02 18:13:38 UTC (rev 13830)
@@ -1279,6 +1279,18 @@
</profile>
<!--
+ Name: jboss700
+ Descr: JBoss-7.0.0 specific options
+ -->
+ <profile>
+ <id>jboss700</id>
+ <properties>
+ <jbossws.integration.target>jboss700</jbossws.integration.target>
+ <jboss.home>${jboss700.home}</jboss.home>
+ </properties>
+ </profile>
+
+ <!--
Name: smoketest
Descr: Executes the smoke tests
-->
13 years, 9 months
- 1
- 0
JBossWS SVN: r13829 - stack/cxf/branches/JBWS-3236/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-02 13:04:57 -0500 (Wed, 02 Mar 2011)
New Revision: 13829
Modified:
stack/cxf/branches/JBWS-3236/modules/testsuite/pom.xml
Log:
Updating excludes
Modified: stack/cxf/branches/JBWS-3236/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/pom.xml 2011-03-01 22:06:28 UTC (rev 13828)
+++ stack/cxf/branches/JBWS-3236/modules/testsuite/pom.xml 2011-03-02 18:04:57 UTC (rev 13829)
@@ -875,7 +875,7 @@
<exclude>org/jboss/test/ws/jaxws/samples/webservice/**/*EJB3TestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**/*EJB3TestCase*</exclude>
<exclude>org/jboss/test/ws/management/recording/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/cxf/bus/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/cxf/bus/*EJB3*</exclude>
<exclude>org/jboss/test/ws/jaxws/cxf/gzip/**</exclude>
<exclude>org/jboss/test/ws/jaxws/cxf/jaxbintros/**</exclude>
<exclude>org/jboss/test/ws/jaxws/cxf/jbws3060/**</exclude>
@@ -895,9 +895,6 @@
<exclude>org/jboss/test/ws/jaxws/smoke/tools/*ScriptTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase*</exclude>
- <!-- # [JBWS-3236] Ensure JBossWSBusFactory is built properly on AS7 -->
- <exclude>org/jboss/test/ws/jaxws/cxf/endorse/**</exclude>
-
<!-- # [JBWS-3225] jbossws console not yet available -->
<exclude>org/jboss/test/ws/console/**</exclude>
13 years, 9 months
- 1
- 0
JBossWS SVN: r13828 - in stack/cxf/branches/JBWS-3236/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client: configuration and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-01 17:06:28 -0500 (Tue, 01 Mar 2011)
New Revision: 13828
Modified:
stack/cxf/branches/JBWS-3236/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java
stack/cxf/branches/JBWS-3236/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java
Log:
Providing proper classloader to be used for loading apache cxf bus extensions and fixing comments accordingly
Modified: stack/cxf/branches/JBWS-3236/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2011-03-01 22:03:09 UTC (rev 13827)
+++ stack/cxf/branches/JBWS-3236/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2011-03-01 22:06:28 UTC (rev 13828)
@@ -185,9 +185,11 @@
catch (Exception e)
{
//[JBWS-3223] On AS7 the TCCL that's set for basic (non-ws-endpoint) servlet/ejb3
- //apps doesn't have visibility on any WS implementation class, so Apache CXF
- //can't load its components through it - we need to change the TCCL using
- //the classloader that has been used to load this javax.xml.ws.spi.Provider impl.
+ //apps doesn't have visibility on any WS implementation class, nor on any class
+ //coming from dependencies provided in the ws modules only. This means for instance
+ //the JAXBContext is not going to find a context impl, etc.
+ //In general, we need to change the TCCL using the classloader that has been used
+ //to load this javax.xml.ws.spi.Provider impl, which is the jaxws-client module.
ClassLoader clientClassLoader = ProviderImpl.class.getClassLoader();
//first ensure the default bus is loaded through the client classloader only
@@ -197,7 +199,7 @@
JBossWSBusFactory.getDefaultBus(clientClassLoader);
}
//then setup a new TCCL having visibility over both the client path (JBossWS
- //client module on AS7) and the the former TCCL (i.e. the deployment classloader)
+ //jaxws-client module on AS7) and the the former TCCL (i.e. the deployment classloader)
setContextClassLoader(new DelegateClassLoader(clientClassLoader, origClassLoader));
return true;
}
Modified: stack/cxf/branches/JBWS-3236/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2011-03-01 22:03:09 UTC (rev 13827)
+++ stack/cxf/branches/JBWS-3236/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2011-03-01 22:06:28 UTC (rev 13828)
@@ -21,6 +21,7 @@
*/
package org.jboss.wsf.stack.cxf.client.configuration;
+import java.lang.ref.WeakReference;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedList;
@@ -54,6 +55,7 @@
import org.apache.cxf.ws.rm.RMManager;
import org.apache.cxf.ws.rm.policy.RMAssertionBuilder;
import org.apache.cxf.ws.rm.policy.RMPolicyInterceptorProvider;
+import org.jboss.wsf.stack.cxf.client.ProviderImpl;
/**
*
@@ -77,7 +79,10 @@
preparePolicyEngine(extensions);
- Bus bus = new ExtensionManagerBus(extensions, properties);
+ //Explicitly ask for the ProviderImpl.class.getClassLoader() to be used for getting
+ //cxf bus extensions (as that classloader is the jaxws-client module one which 'sees' all
+ //extensions, unless different dependencies are explicitly set)
+ Bus bus = new ExtensionManagerBus(extensions, properties, ProviderImpl.class.getClassLoader());
initPolicyEngine((PolicyEngineImpl)extensions.get(PolicyEngine.class), bus);
13 years, 9 months
- 1
- 0
JBossWS SVN: r13827 - stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/endorse/META-INF.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-01 17:03:09 -0500 (Tue, 01 Mar 2011)
New Revision: 13827
Modified:
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/endorse/META-INF/MANIFEST.MF
Log:
Fix endorse test deployment dependencies
Modified: stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/endorse/META-INF/MANIFEST.MF
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/endorse/META-INF/MANIFEST.MF 2011-03-01 22:01:41 UTC (rev 13826)
+++ stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/endorse/META-INF/MANIFEST.MF 2011-03-01 22:03:09 UTC (rev 13827)
@@ -1,2 +1,2 @@
Manifest-Version: 1.0
-Dependencies: org.jboss.ws.jaxws-client services
\ No newline at end of file
+Dependencies: org.jboss.ws.cxf.jbossws-cxf-client services export
\ No newline at end of file
13 years, 9 months
- 1
- 0
JBossWS SVN: r13826 - in stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/cxf/bus and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-01 17:01:41 -0500 (Tue, 01 Mar 2011)
New Revision: 13826
Added:
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClient.java
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClientBusTestCase.java
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/MANIFEST.MF
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/web.xml
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/wsdl/
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/wsdl/Endpoint.wsdl
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF/
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF/web.xml
Modified:
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/BusTestException.java
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3Client.java
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java
stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EndpointImpl.java
Log:
Modifying jbossws-cxf bus testcases to test with servlet deployments and servlet ws endpoints too
Modified: stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-03-01 21:58:57 UTC (rev 13825)
+++ stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-03-01 22:01:41 UTC (rev 13826)
@@ -23,12 +23,12 @@
<mkdir dir="${tests.output.dir}/test-libs"/>
<!-- jaxws-cxf-bus -->
- <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-bus.jar">
- <fileset dir="${tests.output.dir}/test-classes">
+ <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/Endpoint.class"/>
<include name="org/jboss/test/ws/jaxws/cxf/bus/EndpointImpl.class"/>
- </fileset>
- </jar>
+ </classes>
+ </war>
<!-- jaxws-cxf-bus-ejb3-client -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-bus-ejb3-client.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -40,10 +40,26 @@
<include name="org/jboss/test/ws/jaxws/cxf/bus/BusTestException.class"/>
</fileset>
<metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/bus/META-INF">
- <include name="**/*" />
+ <include name="wsdl/**/*" />
</metainf>
</jar>
+ <!-- jaxws-cxf-bus-servlet-client -->
+ <war destfile="${tests.output.dir}/test-libs/jaxws-cxf-bus-servlet-client.war"
+ manifest="${tests.output.dir}/test-resources/jaxws/cxf/bus/META-INF/MANIFEST.MF"
+ webxml="${tests.output.dir}/test-resources/jaxws/cxf/bus/WEB-INF-client/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/bus/Endpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/bus/EndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/bus/ServletClient.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/bus/BusTestException.class"/>
+ </classes>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/cxf/bus/WEB-INF-client/wsdl"
+ prefix="WEB-INF/wsdl"/>
+ </war>
+
<!-- jaxws-cxf-endorse -->
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-endorse.war"
manifest="${tests.output.dir}/test-resources/jaxws/cxf/endorse/META-INF/MANIFEST.MF"
Modified: stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java 2011-03-01 21:58:57 UTC (rev 13825)
+++ stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java 2011-03-01 22:01:41 UTC (rev 13826)
@@ -43,22 +43,67 @@
* @since 05-Oct-2010
*
*/
-public abstract class AbstractClient
+public class AbstractClient
{
- public abstract void testBusCreation() throws BusTestException;
+ public static void testBusCreation() throws BusTestException
+ {
+ Bus initialDefaultBus = BusFactory.getDefaultBus(false);
+ Bus initialThreadBus = BusFactory.getThreadDefaultBus(false);
+ BusFactory factory = BusFactory.newInstance();
+ Bus bus = factory.createBus();
+ assert (bus != null);
+ if (initialThreadBus == null) //if the thread bus was not set before, it should now be
+ {
+ checkThreadBus(bus);
+ }
+ checkDefaultBus(initialDefaultBus);
+ BusFactory.setThreadDefaultBus(initialThreadBus);
+ checkThreadBus(initialThreadBus);
+ checkDefaultBus(initialDefaultBus);
+ }
- public abstract void testSOAPConnection(String host) throws BusTestException, Exception;
+ public static void testSOAPConnection(String host) throws BusTestException, Exception
+ {
+ Bus initialDefaultBus = BusFactory.getDefaultBus(false);
+ Bus initialThreadBus = BusFactory.getThreadDefaultBus(false);
+ //first call... the thread bus is reused if not null, otherwise a new one is created
+ performSOAPCall(getEndpointURL(host));
+ checkDefaultBus(initialDefaultBus);
+ if (initialThreadBus != null)
+ {
+ checkThreadBus(initialThreadBus);
+ }
+ else
+ {
+ initialThreadBus = BusFactory.getThreadDefaultBus(false);
+ }
+ //second call...
+ performSOAPCall(getEndpointURL(host));
+ checkThreadBus(initialThreadBus);
+ checkDefaultBus(initialDefaultBus);
+ }
- public abstract void testWebServiceRef() throws BusTestException;
+ public static void testWebServiceRef(Endpoint port) throws BusTestException
+ {
+ Bus initialDefaultBus = BusFactory.getDefaultBus(false);
+ Bus initialThreadBus = BusFactory.getThreadDefaultBus(false);
+ checkThreadBus(initialThreadBus); //this can probably be relaxed as below
+ checkDefaultBus(initialDefaultBus);
+ }
- public abstract void testWebServiceClient(String host) throws BusTestException, Exception;
+ public static void testWebServiceClient(String host) throws BusTestException, Exception
+ {
+ Bus initialDefaultBus = BusFactory.getDefaultBus(false);
+ performInvocation(getEndpointURL(host));
+ checkDefaultBus(initialDefaultBus);
+ }
- protected String getEndpointURL(String host)
+ protected static String getEndpointURL(String host)
{
return "http://" + host + ":8080/jaxws-cxf-bus/EndpointService/Endpoint";
}
- protected void performSOAPCall(String endpointAddress) throws SOAPException, MalformedURLException
+ protected static void performSOAPCall(String endpointAddress) throws SOAPException, MalformedURLException
{
SOAPFactory soapFac = SOAPFactory.newInstance();
MessageFactory msgFac = MessageFactory.newInstance();
@@ -73,13 +118,13 @@
assert (response != null);
}
- protected void performInvocation(Endpoint endpoint)
+ protected static void performInvocation(Endpoint endpoint)
{
String result = endpoint.echo("Alessio");
assert ("Alessio".equals(result));
}
- protected void performInvocation(String endpointUrl) throws MalformedURLException
+ protected static void performInvocation(String endpointUrl) throws MalformedURLException
{
URL wsdlURL = new URL(endpointUrl + "?wsdl");
QName serviceName = new QName("http://org.jboss.ws/bus", "EndpointService");
@@ -89,7 +134,7 @@
performInvocation(endpoint);
}
- protected void checkDefaultBus(Bus expectedDefaultBus) throws BusTestException
+ protected static void checkDefaultBus(Bus expectedDefaultBus) throws BusTestException
{
Bus bus = BusFactory.getDefaultBus(false);
if (bus != expectedDefaultBus)
@@ -98,7 +143,7 @@
}
}
- protected void checkThreadBus(Bus expectedThreadBus) throws BusTestException
+ protected static void checkThreadBus(Bus expectedThreadBus) throws BusTestException
{
Bus bus = BusFactory.getThreadDefaultBus(false);
if (bus != expectedThreadBus)
Modified: stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/BusTestException.java
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/BusTestException.java 2011-03-01 21:58:57 UTC (rev 13825)
+++ stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/BusTestException.java 2011-03-01 22:01:41 UTC (rev 13826)
@@ -23,6 +23,8 @@
public class BusTestException extends Exception
{
+ private static final long serialVersionUID = 1L;
+
public BusTestException(String message)
{
super(message);
Modified: stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3Client.java
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3Client.java 2011-03-01 21:58:57 UTC (rev 13825)
+++ stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3Client.java 2011-03-01 22:01:41 UTC (rev 13826)
@@ -25,9 +25,6 @@
import javax.ejb.Stateless;
import javax.xml.ws.WebServiceRef;
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
-
/**
* This class verifies the default bus is not changed by
* basic client use (creation of bus through BusFactory.newInstance().createBus(),
@@ -39,59 +36,28 @@
*/
@Stateless
@Remote(EJB3ClientRemoteInterface.class)
-public class EJB3Client extends AbstractClient
+public class EJB3Client
{
@WebServiceRef(value = EndpointService.class, type = Endpoint.class, wsdlLocation = "META-INF/wsdl/Endpoint.wsdl")
public Endpoint port;
public void testBusCreation() throws BusTestException
{
- Bus initialDefaultBus = BusFactory.getDefaultBus(false);
- Bus initialThreadBus = BusFactory.getThreadDefaultBus(false);
- BusFactory factory = BusFactory.newInstance();
- Bus bus = factory.createBus();
- assert (bus != null);
- checkThreadBus(bus);
- checkDefaultBus(initialDefaultBus);
- BusFactory.setThreadDefaultBus(initialThreadBus);
- checkThreadBus(initialThreadBus);
- checkDefaultBus(initialDefaultBus);
+ AbstractClient.testBusCreation();
}
public void testSOAPConnection(String host) throws BusTestException, Exception
{
- Bus initialDefaultBus = BusFactory.getDefaultBus(false);
- Bus initialThreadBus = BusFactory.getThreadDefaultBus(false);
- //first call... the thread bus is reused if not null, otherwise a new one is created
- performSOAPCall(getEndpointURL(host));
- checkDefaultBus(initialDefaultBus);
- if (initialThreadBus != null)
- {
- checkThreadBus(initialThreadBus);
- }
- else
- {
- initialThreadBus = BusFactory.getThreadDefaultBus(false);
- }
- //second call...
- performSOAPCall(getEndpointURL(host));
- checkThreadBus(initialThreadBus);
- checkDefaultBus(initialDefaultBus);
+ AbstractClient.testSOAPConnection(host);
}
public void testWebServiceRef() throws BusTestException
{
- Bus initialDefaultBus = BusFactory.getDefaultBus(false);
- Bus initialThreadBus = BusFactory.getThreadDefaultBus(false);
- performInvocation(port);
- checkThreadBus(initialThreadBus); //this can probably be relaxed as below
- checkDefaultBus(initialDefaultBus);
+ AbstractClient.testWebServiceRef(port);
}
public void testWebServiceClient(String host) throws BusTestException, Exception
{
- Bus initialDefaultBus = BusFactory.getDefaultBus(false);
- performInvocation(getEndpointURL(host));
- checkDefaultBus(initialDefaultBus);
+ AbstractClient.testWebServiceClient(host);
}
}
Modified: stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java 2011-03-01 21:58:57 UTC (rev 13825)
+++ stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java 2011-03-01 22:01:41 UTC (rev 13826)
@@ -39,7 +39,7 @@
{
public static Test suite()
{
- return new JBossWSCXFTestSetup(EJB3ClientBusTestCase.class, "jaxws-cxf-bus.jar");
+ return new JBossWSCXFTestSetup(EJB3ClientBusTestCase.class, "jaxws-cxf-bus.war");
}
public void testSingleDeploy() throws Exception
Modified: stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EndpointImpl.java
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EndpointImpl.java 2011-03-01 21:58:57 UTC (rev 13825)
+++ stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EndpointImpl.java 2011-03-01 22:01:41 UTC (rev 13826)
@@ -21,14 +21,12 @@
*/
package org.jboss.test.ws.jaxws.cxf.bus;
-import javax.ejb.Stateless;
import javax.jws.WebMethod;
import javax.jws.WebService;
import org.jboss.logging.Logger;
@WebService(name = "Endpoint", serviceName = "EndpointService", targetNamespace = "http://org.jboss.ws/bus")
-@Stateless
public class EndpointImpl
{
// Provide logging
Added: stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClient.java
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClient.java (rev 0)
+++ stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClient.java 2011-03-01 22:01:41 UTC (rev 13826)
@@ -0,0 +1,105 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, 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.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.ws.WebServiceRef;
+
+/**
+ * This class verifies the default bus is not changed by
+ * basic client use (creation of bus through BusFactory.newInstance().createBus(),
+ * SAAJ invocation, endpoint invocation, endpoint invocation using webserviceref).
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 01-Mar-2011
+ *
+ */
+public class ServletClient extends HttpServlet
+{
+ private static final long serialVersionUID = 1L;
+
+ @WebServiceRef(value = EndpointService.class, type = Endpoint.class, wsdlLocation = "WEB-INF/wsdl/Endpoint.wsdl")
+ public Endpoint port;
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
+ {
+ String inStr = req.getParameter("method");
+ try
+ {
+ if (inStr.equalsIgnoreCase("testBusCreation"))
+ {
+ testBusCreation();
+ }
+ else if (inStr.equalsIgnoreCase("testSOAPConnection"))
+ {
+ testSOAPConnection(req.getParameter("host"));
+ }
+ else if (inStr.equalsIgnoreCase("testWebServiceRef"))
+ {
+ testWebServiceRef();
+ }
+ else if (inStr.equalsIgnoreCase("testWebServiceClient"))
+ {
+ testWebServiceClient(req.getParameter("host"));
+ }
+ else
+ {
+ throw new IllegalArgumentException("Unsupported test method: " + inStr);
+ }
+ res.getWriter().print("OK " + inStr);
+ }
+ catch (BusTestException bte)
+ {
+ res.getWriter().print(bte.getMessage());
+ }
+ catch (Exception e)
+ {
+ throw new IOException(e);
+ }
+ }
+
+ public void testBusCreation() throws BusTestException
+ {
+// AbstractClient.testBusCreation();
+ }
+
+ public void testSOAPConnection(String host) throws BusTestException, Exception
+ {
+ AbstractClient.testSOAPConnection(host);
+ }
+
+ public void testWebServiceRef() throws BusTestException
+ {
+// AbstractClient.testWebServiceRef(port);
+ }
+
+ public void testWebServiceClient(String host) throws BusTestException, Exception
+ {
+// AbstractClient.testWebServiceClient(host);
+ }
+}
Added: stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClientBusTestCase.java
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClientBusTestCase.java (rev 0)
+++ stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClientBusTestCase.java 2011-03-01 22:01:41 UTC (rev 13826)
@@ -0,0 +1,79 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, 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.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * A test case that verifies Bus references do not leak into servlet clients
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 01-Mar-2011
+ *
+ */
+public class ServletClientBusTestCase extends JBossWSTest
+{
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-cxf-bus-servlet-client";
+
+ public static Test suite()
+ {
+ return new JBossWSCXFTestSetup(ServletClientBusTestCase.class, "jaxws-cxf-bus.war");
+ }
+
+ public void testSingleDeploy() throws Exception
+ {
+ deploy("jaxws-cxf-bus-servlet-client.war");
+ try
+ {
+ URL url = new URL(TARGET_ENDPOINT_ADDRESS + "?method=testBusCreation");
+ BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+ String retStr = br.readLine();
+ assertEquals("OK testBusCreation", retStr);
+
+ url = new URL(TARGET_ENDPOINT_ADDRESS + "?method=testSOAPConnection&host=" + getServerHost());
+ br = new BufferedReader(new InputStreamReader(url.openStream()));
+ retStr = br.readLine();
+ assertEquals("OK testSOAPConnection", retStr);
+
+ url = new URL(TARGET_ENDPOINT_ADDRESS + "?method=testWebServiceRef");
+ br = new BufferedReader(new InputStreamReader(url.openStream()));
+ retStr = br.readLine();
+ assertEquals("OK testWebServiceRef", retStr);
+
+ url = new URL(TARGET_ENDPOINT_ADDRESS + "?method=testWebServiceClient&host=" + getServerHost());
+ br = new BufferedReader(new InputStreamReader(url.openStream()));
+ retStr = br.readLine();
+ assertEquals("OK testWebServiceClient", retStr);
+ }
+ finally
+ {
+ undeploy("jaxws-cxf-bus-servlet-client.war");
+ }
+ }
+}
Added: stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/MANIFEST.MF
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/MANIFEST.MF (rev 0)
+++ stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/MANIFEST.MF 2011-03-01 22:01:41 UTC (rev 13826)
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Dependencies: org.jboss.ws.cxf.jbossws-cxf-client services export,com.sun.xml.messaging.saaj services
\ No newline at end of file
Added: stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF/web.xml
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF/web.xml (rev 0)
+++ stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF/web.xml 2011-03-01 22:01:41 UTC (rev 13826)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd">
+
+ <servlet>
+ <servlet-name>EpServlet</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.cxf.bus.EndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>EpServlet</servlet-name>
+ <url-pattern>/EndpointService/Endpoint</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
Added: stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/web.xml
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/web.xml (rev 0)
+++ stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/web.xml 2011-03-01 22:01:41 UTC (rev 13826)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd">
+
+ <servlet>
+ <servlet-name>ServletClient</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.cxf.bus.ServletClient</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>ServletClient</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
Added: stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/wsdl/Endpoint.wsdl
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/wsdl/Endpoint.wsdl (rev 0)
+++ stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/wsdl/Endpoint.wsdl 2011-03-01 22:01:41 UTC (rev 13826)
@@ -0,0 +1,56 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<wsdl:definitions name="EndpointService" targetNamespace="http://org.jboss.ws/bus" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://org.jboss.ws/bus" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <wsdl:types>
+<xs:schema elementFormDefault="unqualified" targetNamespace="http://org.jboss.ws/bus" version="1.0" xmlns:tns="http://org.jboss.ws/bus" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:element name="echo" type="tns:echo" />
+<xs:element name="echoResponse" type="tns:echoResponse" />
+<xs:complexType name="echo">
+<xs:sequence>
+<xs:element minOccurs="0" name="arg0" type="xs:string" />
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="echoResponse">
+<xs:sequence>
+<xs:element minOccurs="0" name="return" type="xs:string" />
+</xs:sequence>
+</xs:complexType>
+</xs:schema>
+
+ </wsdl:types>
+ <wsdl:message name="echoResponse">
+ <wsdl:part element="tns:echoResponse" name="parameters">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="echo">
+ <wsdl:part element="tns:echo" name="parameters">
+ </wsdl:part>
+ </wsdl:message>
+
+ <wsdl:portType name="Endpoint">
+ <wsdl:operation name="echo">
+ <wsdl:input message="tns:echo" name="echo">
+ </wsdl:input>
+ <wsdl:output message="tns:echoResponse" name="echoResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="EndpointServiceSoapBinding" type="tns:Endpoint">
+
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="echo">
+ <soap:operation soapAction="" style="document" />
+ <wsdl:input name="echo">
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output name="echoResponse">
+ <soap:body use="literal" />
+ </wsdl:output>
+
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="EndpointService">
+ <wsdl:port binding="tns:EndpointServiceSoapBinding" name="EndpointPort">
+ <soap:address location="http://@jboss.bind.address@:8080/jaxws-cxf-bus/EndpointService/Endpoint" />
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
\ No newline at end of file
13 years, 9 months
- 1
- 0
JBossWS SVN: r13825 - in stack/cxf/branches/JBWS-3236/modules/resources/src/main/resources/modules/org/jboss/ws/cxf: jbossws-cxf-client and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-01 16:58:57 -0500 (Tue, 01 Mar 2011)
New Revision: 13825
Added:
stack/cxf/branches/JBWS-3236/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-client/
stack/cxf/branches/JBWS-3236/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-client/main/
stack/cxf/branches/JBWS-3236/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
Log:
Adding jbossws-cxf-client as user facility for easily setting up client jbossws w/ cxf depedencies in non-ws deployments
Added: stack/cxf/branches/JBWS-3236/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml (rev 0)
+++ stack/cxf/branches/JBWS-3236/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml 2011-03-01 21:58:57 UTC (rev 13825)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2011, Red Hat, Inc., 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.
+ -->
+
+<module xmlns="urn:jboss:module:1.0" name="org.jboss.ws.cxf.jbossws-cxf-client">
+
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <!-- JAXB API + REF IMPL -->
+ <module name="javax.xml.bind.api" export="true"/>
+ <module name="com.sun.xml.bind" services="import"/>
+ <module name="javax.xml.ws.api" />
+ <!-- JBossWS API -->
+ <module name="org.jboss.ws.api" export="true" />
+ <!-- JBossWS JAXWS client -->
+ <module name="org.jboss.ws.jaxws-client" export="true" services="export" />
+ <!-- JBossWS configuration of Apache CXF -->
+ <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="export" />
+ <module name="org.apache.cxf" export="true" services="export" />
+ <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" export="true" services="export" />
+ </dependencies>
+</module>
13 years, 9 months
- 1
- 0