Author: asoldano
Date: 2014-01-27 11:49:11 -0500 (Mon, 27 Jan 2014)
New Revision: 18280
Added:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/JBWS3753TestCase.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/ServiceAImpl.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/ServiceBImpl.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/ServiceImpl.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/ServiceInterface.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3753/
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3753/WEB-INF/
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3753/WEB-INF/web.xml
Modified:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml
Log:
[JBWS-3753] Adding testcase
Modified:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml
===================================================================
---
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 2014-01-27
16:48:40 UTC (rev 18279)
+++
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 2014-01-27
16:49:11 UTC (rev 18280)
@@ -1366,6 +1366,13 @@
</classes>
</war>
+ <!-- jaxws-jbws3753 -->
+ <war destfile="${tests.output.dir}/test-libs/jaxws-jbws3753.war"
webxml="${tests.output.dir}/test-resources/jaxws/jbws3753/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws3753/Service*.class" />
+ </classes>
+ </war>
+
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws3367-usecase2.war"
needxmlfile="false">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws3367/EndpointIface.class"
/>
Added:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/JBWS3753TestCase.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/JBWS3753TestCase.java
(rev 0)
+++
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/JBWS3753TestCase.java 2014-01-27
16:49:11 UTC (rev 18280)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.jbws3753;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-3753] Improve destination matching when processing requests
+ *
+ * @author alessio.soldano(a)jboss.com
+ */
+public class JBWS3753TestCase extends JBossWSTest
+{
+ public static Test suite() {
+ return new JBossWSTestSetup(JBWS3753TestCase.class,
"jaxws-jbws3753.war");
+ }
+
+ public void testService() throws Exception
+ {
+ Service service = Service.create(new URL("http://" + getServerHost() +
":8080/jaxws-jbws3753/service?wsdl"), new
QName("http://org.jboss.ws/jaxws/jbws3753/", "MyService"));
+ ServiceInterface port = service.getPort(ServiceInterface.class);
+ assertEquals("Hi John", port.greetMe("John"));
+ }
+
+ public void testServiceA() throws Exception
+ {
+ Service service = Service.create(new URL("http://" + getServerHost() +
":8080/jaxws-jbws3753/serviceA?wsdl"), new
QName("http://org.jboss.ws/jaxws/jbws3753/", "MyService"));
+ ServiceInterface port = service.getPort(ServiceInterface.class);
+ assertEquals("(A) Hi John", port.greetMe("John"));
+ }
+
+ public void testServiceB() throws Exception
+ {
+ Service service = Service.create(new URL("http://" + getServerHost() +
":8080/jaxws-jbws3753/serviceB?wsdl"), new
QName("http://org.jboss.ws/jaxws/jbws3753/", "MyService"));
+ ServiceInterface port = service.getPort(ServiceInterface.class);
+ assertEquals("(B) Hi John", port.greetMe("John"));
+ }
+
+}
Property changes on:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/JBWS3753TestCase.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/ServiceAImpl.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/ServiceAImpl.java
(rev 0)
+++
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/ServiceAImpl.java 2014-01-27
16:49:11 UTC (rev 18280)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.jbws3753;
+
+import javax.jws.WebService;
+
+@WebService
+(
+ serviceName = "MyService",
+ endpointInterface = "org.jboss.test.ws.jaxws.jbws3753.ServiceInterface",
+ targetNamespace = "http://org.jboss.ws/jaxws/jbws3753/"
+)
+public class ServiceAImpl implements ServiceInterface
+{
+
+ public String greetMe(String input)
+ {
+ return "(A) Hi " + input;
+ }
+
+}
Property changes on:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/ServiceAImpl.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/ServiceBImpl.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/ServiceBImpl.java
(rev 0)
+++
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/ServiceBImpl.java 2014-01-27
16:49:11 UTC (rev 18280)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.jbws3753;
+
+import javax.jws.WebService;
+
+@WebService
+(
+ serviceName = "MyService",
+ endpointInterface = "org.jboss.test.ws.jaxws.jbws3753.ServiceInterface",
+ targetNamespace = "http://org.jboss.ws/jaxws/jbws3753/"
+)
+public class ServiceBImpl implements ServiceInterface
+{
+
+ public String greetMe(String input)
+ {
+ return "(B) Hi " + input;
+ }
+
+}
Property changes on:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/ServiceBImpl.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/ServiceImpl.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/ServiceImpl.java
(rev 0)
+++
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/ServiceImpl.java 2014-01-27
16:49:11 UTC (rev 18280)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.jbws3753;
+
+import javax.jws.WebService;
+
+@WebService
+(
+ serviceName = "MyService",
+ endpointInterface = "org.jboss.test.ws.jaxws.jbws3753.ServiceInterface",
+ targetNamespace = "http://org.jboss.ws/jaxws/jbws3753/"
+)
+public class ServiceImpl implements ServiceInterface
+{
+
+ public String greetMe(String input)
+ {
+ return "Hi " + input;
+ }
+
+}
Property changes on:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/ServiceImpl.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/ServiceInterface.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/ServiceInterface.java
(rev 0)
+++
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/ServiceInterface.java 2014-01-27
16:49:11 UTC (rev 18280)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.jbws3753;
+
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://org.jboss.ws/jaxws/jbws3753/")
+public interface ServiceInterface
+{
+
+ String greetMe(String input);
+}
Property changes on:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/ServiceInterface.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3753/WEB-INF/web.xml
===================================================================
---
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3753/WEB-INF/web.xml
(rev 0)
+++
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3753/WEB-INF/web.xml 2014-01-27
16:49:11 UTC (rev 18280)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app
xmlns="http://java.sun.com/xml/ns/j2ee"
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>ServiceA</servlet-name>
+
<servlet-class>org.jboss.test.ws.jaxws.jbws3753.ServiceAImpl</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>ServiceB</servlet-name>
+
<servlet-class>org.jboss.test.ws.jaxws.jbws3753.ServiceBImpl</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>Service</servlet-name>
+
<servlet-class>org.jboss.test.ws.jaxws.jbws3753.ServiceImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>ServiceA</servlet-name>
+ <url-pattern>/serviceA</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>ServiceB</servlet-name>
+ <url-pattern>/serviceB</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Service</servlet-name>
+ <url-pattern>/service</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
Property changes on:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3753/WEB-INF/web.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native