JBossWS SVN: r18862 - stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-08-25 07:15:01 -0400 (Mon, 25 Aug 2014)
New Revision: 18862
Modified:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java
Log:
Adding comment
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java 2014-08-25 10:37:34 UTC (rev 18861)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java 2014-08-25 11:15:01 UTC (rev 18862)
@@ -34,8 +34,8 @@
import org.jboss.wsf.test.JBossWSTestSetup;
/**
+ * [JBWS-3820] JAXWS 2.1 / 2.0 clients and WebServiceRef using JAXWS features cause NoSuchMethodException
*
- *
* @author alessio.soldano(a)jboss.com
*/
public class WebServiceRefMTOMTestCase extends JBossWSTest
10 years, 4 months
- 1
- 0
JBossWS SVN: r18861 - in stack/cxf/trunk/modules/testsuite/shared-tests/src/test: resources/jaxws/jbws2307/WEB-INF-client and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-08-25 06:37:34 -0400 (Mon, 25 Aug 2014)
New Revision: 18861
Added:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/ClientServlet2.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/ClientServlet3.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/DeploymentArchives.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/HelloServiceJAXWS22.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/web2.xml
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/web3.xml
Modified:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java
Log:
[JBWS-3820] Adding testcase
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/ClientServlet2.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/ClientServlet2.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/ClientServlet2.java 2014-08-25 10:37:34 UTC (rev 18861)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2014, 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.jbws2307;
+
+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;
+import javax.xml.ws.soap.MTOM;
+
+/**
+ * Client servlet with injected JAX-WS 2.0 service
+ *
+ * @author alessio.soldano(a)jboss.com
+ */
+public class ClientServlet2 extends HttpServlet
+{
+ private static final long serialVersionUID = 323764398209417743L;
+
+ @WebServiceRef(name="service/jbws2307service")
+ @MTOM
+ HelloService service;
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
+ {
+ Hello hello = service.getHelloPort();
+ hello.hello("Foo");
+ resp.getWriter().print(true);
+ }
+
+}
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/ClientServlet2.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/jbws2307/ClientServlet3.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/ClientServlet3.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/ClientServlet3.java 2014-08-25 10:37:34 UTC (rev 18861)
@@ -0,0 +1,81 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2014, 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.jbws2307;
+
+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.BindingProvider;
+import javax.xml.ws.WebServiceRef;
+import javax.xml.ws.soap.MTOM;
+import javax.xml.ws.soap.SOAPBinding;
+
+import org.jboss.logging.Logger;
+
+/**
+ * Client servlet using the injected JAXWS 2.2 service
+ *
+ * @author alessio.soldano(a)jboss.com
+ */
+public class ClientServlet3 extends HttpServlet
+{
+
+ private static final long serialVersionUID = 323764398209417744L;
+
+ private final Logger log = Logger.getLogger(ClientServlet3.class);
+
+ @WebServiceRef(name="service/jbws2307service")
+ @MTOM
+ HelloServiceJAXWS22 service;
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
+ {
+ boolean result = false;
+ try
+ {
+ log.info("service = "+service);
+ Hello hello = service.getHelloPort();
+ SOAPBinding binding = (SOAPBinding)((BindingProvider)hello).getBinding();
+ if ("true".equals(req.getParameter("mtom")))
+ {
+ log.info("mtom enabled = " + binding.isMTOMEnabled());
+ if (!binding.isMTOMEnabled())
+ {
+ throw new Exception("Expected mtom enabled because of @MTOM annotation");
+ }
+ }
+ result = hello.getMessageContextTest();
+ log.info("result = " + result);
+ }
+ catch (Exception e)
+ {
+ log.error("Error while invoking service!", e);
+ throw new ServletException(e);
+ }
+ resp.getWriter().print(result);
+ }
+
+}
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/ClientServlet3.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/jbws2307/DeploymentArchives.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/DeploymentArchives.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/DeploymentArchives.java 2014-08-25 10:37:34 UTC (rev 18861)
@@ -0,0 +1,86 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2014, 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.jbws2307;
+
+import java.io.File;
+
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.wsf.test.JBossWSTestHelper;
+
+public final class DeploymentArchives
+{
+ public static final String SERVER = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-jbws2307-service.war") { {
+ archive
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloImpl.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloService.class)
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/jboss-web.xml"), "jboss-web.xml")
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/web.xml"), "web.xml")
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl")
+ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/web.xml"));
+ }
+ });
+
+ public static final String CLIENT_2 = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-jbws2307-client-2.war") { {
+ archive
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.jbws2307.ClientServlet2.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloService.class)
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/jboss-web.xml"), "jboss-web.xml")
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web2.xml"), "web.xml")
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl")
+ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web2.xml"));
+ }
+ });
+
+ public static final String CLIENT_3 = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-jbws2307-client-3.war") { {
+ archive
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.jbws2307.ClientServlet3.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloServiceJAXWS22.class)
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/jboss-web.xml"), "jboss-web.xml")
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web3.xml"), "web.xml")
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl")
+ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web3.xml"));
+ }
+ });
+
+ public static final String CLIENT = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-jbws2307-client.war") { {
+ archive
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.jbws2307.ClientServlet.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloService.class)
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/jboss-web.xml"), "jboss-web.xml")
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web.xml"), "web.xml")
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl")
+ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web.xml"));
+ }
+ });
+
+ private DeploymentArchives() {
+ //NOOP
+ }
+}
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/DeploymentArchives.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/jbws2307/HelloServiceJAXWS22.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/HelloServiceJAXWS22.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/HelloServiceJAXWS22.java 2014-08-25 10:37:34 UTC (rev 18861)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2014, 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.jbws2307;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+import javax.xml.ws.WebServiceFeature;
+
+@WebServiceClient(name = "HelloService", targetNamespace = "http://helloservice.org/wsdl", wsdlLocation = "WEB-INF/wsdl/HelloService.wsdl")
+public class HelloServiceJAXWS22 extends Service
+{
+ private static final URL HELLOSERVICE_WSDL_LOCATION;
+
+ public HelloServiceJAXWS22(URL wsdlLocation, QName serviceName)
+ {
+ super(wsdlLocation, serviceName);
+ }
+
+ public HelloServiceJAXWS22()
+ {
+ super(HELLOSERVICE_WSDL_LOCATION, new QName("http://helloservice.org/wsdl", "HelloService"));
+ }
+
+ public HelloServiceJAXWS22(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
+ super(wsdlLocation, serviceName, features);
+ }
+
+ @WebEndpoint(name = "HelloPort")
+ public Hello getHelloPort()
+ {
+ return ((Hello)super.getPort(new QName("http://helloservice.org/wsdl", "HelloPort"), Hello.class));
+ }
+
+ static
+ {
+ URL url = null;
+ try
+ {
+ url = new URL("http://files1/releng/cts_5.x/cts-5.0c-temp/bin/WEB-INF/wsdl/HelloService....");
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ HELLOSERVICE_WSDL_LOCATION = url;
+ }
+}
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/HelloServiceJAXWS22.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2014-08-25 10:35:56 UTC (rev 18860)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2014-08-25 10:37:34 UTC (rev 18861)
@@ -22,19 +22,14 @@
package org.jboss.test.ws.jaxws.jbws2307;
import java.io.BufferedReader;
-import java.io.File;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
-import java.util.LinkedList;
-import java.util.List;
import junit.framework.Test;
import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestHelper;
-import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment;
import org.jboss.wsf.test.JBossWSTestSetup;
/**
@@ -44,38 +39,9 @@
*/
public class JBWS2307MTOMTestCase extends JBossWSTest
{
- public static BaseDeployment<?>[] createDeployments() {
- List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>();
- list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2307-service.war") { {
- archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class)
- .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloImpl.class)
- .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloService.class)
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/jboss-web.xml"), "jboss-web.xml")
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/web.xml"), "web.xml")
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl")
- .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/web.xml"));
- }
- });
- list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2307-client.war") { {
- archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.jbws2307.ClientServlet.class)
- .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class)
- .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloService.class)
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/jboss-web.xml"), "jboss-web.xml")
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web.xml"), "web.xml")
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl")
- .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web.xml"));
- }
- });
- return list.toArray(new BaseDeployment<?>[list.size()]);
- }
-
public static Test suite()
{
- return new JBossWSTestSetup(JBWS2307MTOMTestCase.class, JBossWSTestHelper.writeToFile(createDeployments()), true);
+ return new JBossWSTestSetup(JBWS2307MTOMTestCase.class, DeploymentArchives.SERVER + " " + DeploymentArchives.CLIENT, true);
}
public void testMTOM() throws Exception
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java 2014-08-25 10:37:34 UTC (rev 18861)
@@ -0,0 +1,77 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2014, 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.jbws2307;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import junit.framework.Test;
+
+import org.jboss.ws.common.IOUtils;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestHelper;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ *
+ *
+ * @author alessio.soldano(a)jboss.com
+ */
+public class WebServiceRefMTOMTestCase extends JBossWSTest
+{
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(WebServiceRefMTOMTestCase.class, DeploymentArchives.SERVER, true);
+ }
+
+ public void testUsingClientArchive3() throws Exception
+ {
+ try {
+ JBossWSTestHelper.deploy(DeploymentArchives.CLIENT_3);
+ assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + getServerHost() + ":8080/jaxws-jbws2307-client-3/jbws2307?mtom=true").openStream()));
+ HttpURLConnection con = (HttpURLConnection)new URL("http://" + getServerHost() + ":8080/jaxws-jbws2307-client-3/jbws2307").openConnection();
+ BufferedReader isr = new BufferedReader(new InputStreamReader(con.getInputStream()));
+ assertEquals("true", isr.readLine());
+ } finally {
+ JBossWSTestHelper.undeploy(DeploymentArchives.CLIENT_3);
+ }
+ }
+
+ public void testUsingClientArchive2() throws Exception
+ {
+ try {
+ JBossWSTestHelper.deploy(DeploymentArchives.CLIENT_2);
+ URL url = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2307-client-2/jbws2307?mtom=true");
+ final HttpURLConnection c = (HttpURLConnection)url.openConnection();
+ c.connect();
+ assertEquals(500, c.getResponseCode());
+ String error = IOUtils.readAndCloseStream(c.getErrorStream());
+ c.disconnect();
+ assertTrue(error.contains("Could not instantiate ClientServlet2"));
+ } finally {
+ JBossWSTestHelper.undeploy(DeploymentArchives.CLIENT_2);
+ }
+ }
+}
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/web2.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/web2.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/web2.xml 2014-08-25 10:37:34 UTC (rev 18861)
@@ -0,0 +1,23 @@
+<?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/javaee/web-app_2_5.xsd">
+ <display-name>jbws2307_testcase_client</display-name>
+ <servlet>
+ <servlet-name>ClientServlet2</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws2307.ClientServlet2</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>ClientServlet2</servlet-name>
+ <url-pattern>/jbws2307</url-pattern>
+ </servlet-mapping>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
+ <service-ref>
+ <service-ref-name>service/jbws2307service</service-ref-name>
+ <service-interface>javax.xml.ws.Service</service-interface>
+ <wsdl-file>WEB-INF/wsdl/HelloService.wsdl</wsdl-file>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxws.jbws2307.Hello</service-endpoint-interface>
+ </port-component-ref>
+ </service-ref>
+</web-app>
\ No newline at end of file
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/web2.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/web3.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/web3.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/web3.xml 2014-08-25 10:37:34 UTC (rev 18861)
@@ -0,0 +1,23 @@
+<?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/javaee/web-app_2_5.xsd">
+ <display-name>jbws2307_testcase_client</display-name>
+ <servlet>
+ <servlet-name>ClientServlet3</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws2307.ClientServlet3</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>ClientServlet3</servlet-name>
+ <url-pattern>/jbws2307</url-pattern>
+ </servlet-mapping>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
+ <service-ref>
+ <service-ref-name>service/jbws2307service</service-ref-name>
+ <service-interface>javax.xml.ws.Service</service-interface>
+ <wsdl-file>WEB-INF/wsdl/HelloService.wsdl</wsdl-file>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxws.jbws2307.Hello</service-endpoint-interface>
+ </port-component-ref>
+ </service-ref>
+</web-app>
\ No newline at end of file
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/web3.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
10 years, 4 months
- 1
- 0
JBossWS SVN: r18860 - in stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf: client/serviceref and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-08-25 06:35:56 -0400 (Mon, 25 Aug 2014)
New Revision: 18860
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/AbstractServiceObjectFactoryJAXWS.java
Log:
[JBWS-3820] Throw meaningfull exception when JAX-WS 2.2 Service constructors are required
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java 2014-08-23 15:15:44 UTC (rev 18859)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java 2014-08-25 10:35:56 UTC (rev 18860)
@@ -33,6 +33,7 @@
import org.jboss.logging.Cause;
import org.jboss.logging.Message;
import org.jboss.logging.MessageBundle;
+import org.jboss.wsf.spi.WSFException;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.WSFDeploymentException;
@@ -221,4 +222,6 @@
@Message(id = 24101, value = "Could not find endpoint config name: %s")
WSFDeploymentException couldNotFindEndpointConfigName(String name);
+ @Message(id = 24104, value = "Service class %s is missing required JAX-WS 2.2 additional constructors")
+ WSFException missingJAXWS22ServiceConstructor(String className, @Cause Throwable cause);
}
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/AbstractServiceObjectFactoryJAXWS.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/AbstractServiceObjectFactoryJAXWS.java 2014-08-23 15:15:44 UTC (rev 18859)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/AbstractServiceObjectFactoryJAXWS.java 2014-08-25 10:35:56 UTC (rev 18860)
@@ -250,7 +250,7 @@
}
private Service instantiateService(final UnifiedServiceRefMetaData serviceRefMD, final Class<?> serviceClass)
- throws NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException
+ throws NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException, WSFException
{
final WebServiceFeature[] features = getFeatures(serviceRefMD);
final QName serviceQName = this.getServiceQName(serviceRefMD, serviceClass);
@@ -297,10 +297,12 @@
{
if (features != null)
{
- Constructor<?> ctor = serviceClass.getConstructor(new Class[]
- {URL.class, QName.class, WebServiceFeature[].class});
- target = (Service) ctor.newInstance(new Object[]
- {wsdlURL, serviceQName, features});
+ try {
+ Constructor<?> ctor = serviceClass.getConstructor(new Class[] {URL.class, QName.class, WebServiceFeature[].class});
+ target = (Service) ctor.newInstance(new Object[] {wsdlURL, serviceQName, features});
+ } catch (NoSuchMethodException nsme) {
+ throw org.jboss.wsf.stack.cxf.Messages.MESSAGES.missingJAXWS22ServiceConstructor(serviceClass.getName(), nsme);
+ }
}
else
{
@@ -314,10 +316,12 @@
{
if (features != null)
{
- Constructor<?> ctor = serviceClass.getConstructor(new Class[]
- {WebServiceFeature[].class});
- target = (Service) ctor.newInstance(new Object[]
- {features});
+ try {
+ Constructor<?> ctor = serviceClass.getConstructor(new Class[] {WebServiceFeature[].class});
+ target = (Service) ctor.newInstance(new Object[] {features});
+ } catch (NoSuchMethodException nsme) {
+ throw org.jboss.wsf.stack.cxf.Messages.MESSAGES.missingJAXWS22ServiceConstructor(serviceClass.getName(), nsme);
+ }
}
else
{
10 years, 4 months
- 1
- 0
JBossWS SVN: r18859 - in container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices: metadata/model and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-08-23 11:15:44 -0400 (Sat, 23 Aug 2014)
New Revision: 18859
Added:
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebContextAnnotationInfo.java
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebContextAnnotationInformationFactory.java
Modified:
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSIntegrationProcessorJAXWS_POJO.java
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebServiceAnnotationProcessor.java
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/metadata/model/AbstractDeployment.java
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/util/ASHelper.java
Log:
[JBWS-3809] integration of fix from wfly9
Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSIntegrationProcessorJAXWS_POJO.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSIntegrationProcessorJAXWS_POJO.java 2014-08-22 09:48:45 UTC (rev 18858)
+++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSIntegrationProcessorJAXWS_POJO.java 2014-08-23 15:15:44 UTC (rev 18859)
@@ -26,8 +26,10 @@
import static org.jboss.as.webservices.util.ASHelper.getEndpointName;
import static org.jboss.as.webservices.util.ASHelper.getJBossWebMetaData;
import static org.jboss.as.webservices.util.ASHelper.getJaxwsDeployment;
+import static org.jboss.as.webservices.util.ASHelper.getJBossWebserviceMetaDataPortComponent;
import static org.jboss.as.webservices.util.ASHelper.getRequiredAttachment;
import static org.jboss.as.webservices.util.ASHelper.isJaxwsEndpoint;
+import static org.jboss.as.webservices.util.ASHelper.getWebserviceMetadataEJBEndpoint;
import static org.jboss.as.webservices.util.WSAttachmentKeys.JMS_ENDPOINT_METADATA_KEY;
import static org.jboss.as.webservices.util.WebMetaDataHelper.getServlets;
@@ -49,6 +51,7 @@
import org.jboss.as.server.deployment.DeploymentUnit;
import org.jboss.as.server.deployment.DeploymentUnitProcessingException;
import org.jboss.as.server.deployment.annotation.CompositeIndex;
+import org.jboss.as.webservices.metadata.model.EJBEndpoint;
import org.jboss.as.webservices.metadata.model.JAXWSDeployment;
import org.jboss.as.webservices.metadata.model.POJOEndpoint;
import org.jboss.jandex.ClassInfo;
@@ -56,8 +59,10 @@
import org.jboss.metadata.web.spec.ServletMappingMetaData;
import org.jboss.metadata.web.spec.ServletMetaData;
import org.jboss.msc.service.ServiceName;
+import org.jboss.ws.api.annotation.WebContext;
import org.jboss.wsf.spi.metadata.jms.JMSEndpointMetaData;
import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData;
+import org.jboss.ws.common.utils.UrlPatternUtils;
/**
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
@@ -119,28 +124,62 @@
for (EEModuleClassDescription classDescription : classDescriptionMap.values()) {
ClassInfo classInfo = null;
String serviceName = null;
- final ClassAnnotationInformation<WebService, WebServiceAnnotationInfo> annotationInfo = classDescription
+ String urlPattern = null;
+
+ // #1 Override serviceName with the explicit urlPattern from port-component/port-component-uri in jboss-webservices.xml
+ EJBEndpoint ejbEndpoint = getWebserviceMetadataEJBEndpoint(jaxwsDeployment, classDescription.getClassName());
+ if (ejbEndpoint != null) {
+ urlPattern = UrlPatternUtils.getUrlPatternByPortComponentURI(
+ getJBossWebserviceMetaDataPortComponent(unit, ejbEndpoint.getName()));
+ }
+
+ // #2 Override serviceName with @WebContext.urlPattern
+ if (urlPattern == null) {
+ final ClassAnnotationInformation<WebContext, WebContextAnnotationInfo> annotationWebContext =
+ classDescription.getAnnotationInformation(WebContext.class);
+ if (annotationWebContext != null) {
+ WebContextAnnotationInfo wsInfo = annotationWebContext.getClassLevelAnnotations().get(0);
+ if (wsInfo != null && wsInfo.getUrlPattern().length() > 0) {
+ urlPattern = wsInfo.getUrlPattern();
+ }
+ }
+ }
+
+ // #3 use serviceName declared in a class annotation
+ if (urlPattern == null) {
+ final ClassAnnotationInformation<WebService, WebServiceAnnotationInfo> annotationInfo = classDescription
.getAnnotationInformation(WebService.class);
- if (annotationInfo != null) {
- WebServiceAnnotationInfo wsInfo = annotationInfo.getClassLevelAnnotations().get(0);
- serviceName = wsInfo.getServiceName();
- classInfo = (ClassInfo)wsInfo.getTarget();
+ if (annotationInfo != null) {
+ WebServiceAnnotationInfo wsInfo = annotationInfo.getClassLevelAnnotations().get(0);
+ serviceName = wsInfo.getServiceName();
+ classInfo = (ClassInfo)wsInfo.getTarget();
+
+ urlPattern = UrlPatternUtils.getUrlPattern(classInfo.name().local(), serviceName);
+ if (jaxwsDeployment.contains(urlPattern)){
+ urlPattern = UrlPatternUtils.getUrlPattern(classInfo.name().local(), serviceName, wsInfo.getName());
+ }
+ }
+
+ final ClassAnnotationInformation<WebServiceProvider, WebServiceProviderAnnotationInfo> annotationProviderInfo = classDescription
+ .getAnnotationInformation(WebServiceProvider.class);
+ if (annotationProviderInfo != null) {
+ WebServiceProviderAnnotationInfo wsInfo = annotationProviderInfo.getClassLevelAnnotations().get(0);
+ serviceName = wsInfo.getServiceName();
+ classInfo = (ClassInfo)wsInfo.getTarget();
+ }
}
- final ClassAnnotationInformation<WebServiceProvider, WebServiceProviderAnnotationInfo> annotationProviderInfo = classDescription
- .getAnnotationInformation(WebServiceProvider.class);
- if (annotationProviderInfo != null) {
- WebServiceProviderAnnotationInfo wsInfo = annotationProviderInfo.getClassLevelAnnotations().get(0);
- serviceName = wsInfo.getServiceName();
- classInfo = (ClassInfo)wsInfo.getTarget();
- }
+
if (classInfo != null) {
final String endpointClassName = classDescription.getClassName();
final ComponentDescription pojoComponent = createComponentDescription(unit, endpointClassName,
endpointClassName, endpointClassName);
final ServiceName pojoViewName = registerView(pojoComponent, endpointClassName);
+ if (urlPattern == null) {
+ urlPattern = UrlPatternUtils.getUrlPattern(classInfo.name().local(), serviceName);
+ }
// register POJO endpoint
- final String urlPattern = getUrlPattern(classInfo, serviceName);
- jaxwsDeployment.addEndpoint(new POJOEndpoint(endpointClassName, pojoViewName, urlPattern));
+ jaxwsDeployment.addEndpoint(new POJOEndpoint(endpointClassName,
+ pojoViewName, UrlPatternUtils.getUrlPattern(urlPattern)));
}
}
@@ -165,10 +204,6 @@
return false;
}
- private static String getUrlPattern(ClassInfo clazz, String serviceName) {
- return "/" + (!serviceName.equals("") ? serviceName : clazz.name().local());
- }
-
private static String getUrlPattern(final String servletName, final DeploymentUnit unit) {
final JBossWebMetaData jbossWebMD = getJBossWebMetaData(unit);
for (final ServletMappingMetaData servletMappingMD : jbossWebMD.getServletMappings()) {
Added: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebContextAnnotationInfo.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebContextAnnotationInfo.java (rev 0)
+++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebContextAnnotationInfo.java 2014-08-23 15:15:44 UTC (rev 18859)
@@ -0,0 +1,71 @@
+/*
+ * 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.as.webservices.deployers;
+
+/**
+ * User: rsearls
+ * Date: 7/17/14
+ */
+public class WebContextAnnotationInfo {
+ private final String authMethod;
+ private final String contextRoot;
+ private final boolean secureWSDLAccess;
+ private final String transportGuarantee;
+ private final String urlPattern;
+ private final String virtualHost;
+
+ public WebContextAnnotationInfo(final String authMethod, final String contextRoot, final boolean secureWSDLAccess, final String transportGuarantee, final String urlPattern, final String virtualHost) {
+
+ this.authMethod = authMethod;
+ this.contextRoot = contextRoot;
+ this.secureWSDLAccess = secureWSDLAccess;
+ this.transportGuarantee = transportGuarantee;
+ this.urlPattern = urlPattern;
+ this.virtualHost = virtualHost;
+
+ }
+
+ public String getAuthMethod() {
+ return authMethod;
+ }
+
+ public String getContextRoot() {
+ return contextRoot;
+ }
+
+ public boolean isSecureWSDLAccess() {
+ return secureWSDLAccess;
+ }
+
+ public String getTransportGuarantee() {
+ return transportGuarantee;
+ }
+
+ public String getUrlPattern() {
+ return urlPattern;
+ }
+
+ public String getVirtualHost() {
+ return virtualHost;
+ }
+
+}
Added: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebContextAnnotationInformationFactory.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebContextAnnotationInformationFactory.java (rev 0)
+++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebContextAnnotationInformationFactory.java 2014-08-23 15:15:44 UTC (rev 18859)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2014, Red Hat Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.as.webservices.deployers;
+
+import org.jboss.ws.api.annotation.WebContext;
+
+import org.jboss.as.ee.metadata.ClassAnnotationInformationFactory;
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationValue;
+import org.jboss.metadata.property.PropertyReplacer;
+
+/**
+ * User: rsearls
+ * Date: 7/17/14
+ */
+public class WebContextAnnotationInformationFactory extends
+ ClassAnnotationInformationFactory<WebContext, WebContextAnnotationInfo> {
+
+ protected WebContextAnnotationInformationFactory() {
+ super(org.jboss.ws.api.annotation.WebContext.class, null);
+ }
+
+ @Override
+ protected WebContextAnnotationInfo fromAnnotation(final AnnotationInstance annotationInstance, final boolean replacement) {
+ String authMethodValue = asString(annotationInstance, "authMethod");
+ String contextRootValue = asString(annotationInstance, "contextRoot");
+ boolean secureWSDLAccessValue = asBoolean(annotationInstance, "secureWSDLAccessValue");
+ String transportGuaranteeValue = asString(annotationInstance, "transportGuarantee");
+ String urlPatternValue = asString(annotationInstance, "urlPattern");
+ String virtualHostValue = asString(annotationInstance, "virtualHost");
+ return new WebContextAnnotationInfo(authMethodValue, contextRootValue,
+ secureWSDLAccessValue, transportGuaranteeValue, urlPatternValue, virtualHostValue);
+ }
+
+ private String asString(final AnnotationInstance annotation, String property) {
+ AnnotationValue value = annotation.value(property);
+ return value == null ? "" : value.asString();
+ }
+
+ private boolean asBoolean(final AnnotationInstance annotation, String property) {
+ AnnotationValue value = annotation.value(property);
+ return value == null ? false : Boolean.getBoolean(value.asString());
+ }
+}
Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebServiceAnnotationProcessor.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebServiceAnnotationProcessor.java 2014-08-22 09:48:45 UTC (rev 18858)
+++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebServiceAnnotationProcessor.java 2014-08-23 15:15:44 UTC (rev 18859)
@@ -36,6 +36,8 @@
import org.jboss.as.server.deployment.DeploymentUnitProcessingException;
import org.jboss.as.server.deployment.DeploymentUnitProcessor;
import org.jboss.as.server.deployment.annotation.CompositeIndex;
+import org.jboss.metadata.property.PropertyReplacers;
+
/**
* @author <a href="mailto:ema@redhat.com">Jim Ma</a>
*/
@@ -48,6 +50,7 @@
List<ClassAnnotationInformationFactory> factories = new ArrayList<ClassAnnotationInformationFactory>();
factories.add(new WebServiceAnnotationInformationFactory());
factories.add(new WebServiceProviderAnnotationInformationFactory());
+ factories.add(new WebContextAnnotationInformationFactory());
this.factories = Collections.unmodifiableList(factories);
}
@@ -56,12 +59,13 @@
final EEModuleDescription eeModuleDescription = deploymentUnit.getAttachment(Attachments.EE_MODULE_DESCRIPTION);
final CompositeIndex index = deploymentUnit.getAttachment(org.jboss.as.server.deployment.Attachments.COMPOSITE_ANNOTATION_INDEX);
+ final Boolean replacement = deploymentUnit.getAttachment(org.jboss.as.ee.structure.Attachments.ANNOTATION_PROPERTY_REPLACEMENT);
if (index == null || eeModuleDescription == null) {
return;
}
for (final ClassAnnotationInformationFactory factory : factories) {
- final Map<String, ClassAnnotationInformation<?, ?>> data = factory.createAnnotationInformation(index, false);
+ final Map<String, ClassAnnotationInformation<?, ?>> data = factory.createAnnotationInformation(index, replacement);
for (Map.Entry<String, ClassAnnotationInformation<?, ?>> entry : data.entrySet()) {
EEModuleClassDescription clazz = eeModuleDescription.addOrGetLocalClassDescription(entry.getKey());
clazz.addAnnotationInformation(entry.getValue());
Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/metadata/model/AbstractDeployment.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/metadata/model/AbstractDeployment.java 2014-08-22 09:48:45 UTC (rev 18858)
+++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/metadata/model/AbstractDeployment.java 2014-08-23 15:15:44 UTC (rev 18859)
@@ -64,4 +64,7 @@
}
}
+ public boolean contains(String urlPattern) {
+ return urlPatternToClassMapping.keySet().contains((urlPattern));
+ }
}
Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/util/ASHelper.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/util/ASHelper.java 2014-08-22 09:48:45 UTC (rev 18858)
+++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/util/ASHelper.java 2014-08-23 15:15:44 UTC (rev 18859)
@@ -28,6 +28,7 @@
import static org.jboss.as.webservices.util.DotNames.WEB_SERVICE_ANNOTATION;
import static org.jboss.as.webservices.util.DotNames.WEB_SERVICE_PROVIDER_ANNOTATION;
import static org.jboss.as.webservices.util.WSAttachmentKeys.JAXWS_ENDPOINTS_KEY;
+import static org.jboss.as.webservices.util.WSAttachmentKeys.JBOSS_WEBSERVICES_METADATA_KEY;
import java.lang.reflect.Modifier;
import java.util.Collections;
@@ -68,6 +69,8 @@
import org.jboss.msc.service.ServiceName;
import org.jboss.ws.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.webservices.JBossPortComponentMetaData;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
/**
* JBoss AS integration helper class.
@@ -297,6 +300,51 @@
}
/**
+ * Return a named port-component from the jboss-webservices.xml
+ * @param unit
+ * @param name
+ * @return
+ */
+ public static JBossPortComponentMetaData getJBossWebserviceMetaDataPortComponent(
+ final DeploymentUnit unit, final String name) {
+
+ if (name != null) {
+ final JBossWebservicesMetaData jbossWebserviceMetaData = unit.getAttachment(JBOSS_WEBSERVICES_METADATA_KEY);
+
+ if (jbossWebserviceMetaData != null) {
+ JBossPortComponentMetaData[] portComponent = jbossWebserviceMetaData.getPortComponents();
+
+ if (portComponent != null) {
+ for (JBossPortComponentMetaData component : portComponent) {
+ if (name.equals(component.getEjbName())) {
+ return component;
+ }
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Returns an EJBEndpoint based upon fully qualified classname.
+ * @param jaxwsDeployment
+ * @param className
+ * @return
+ */
+ public static EJBEndpoint getWebserviceMetadataEJBEndpoint(final JAXWSDeployment jaxwsDeployment,
+ final String className) {
+
+ java.util.List<EJBEndpoint> ejbEndpointList = jaxwsDeployment.getEjbEndpoints();
+ for (EJBEndpoint ejbEndpoint : ejbEndpointList) {
+ if (className.equals(ejbEndpoint.getClassName())) {
+ return ejbEndpoint;
+ }
+ }
+ return null;
+ }
+
+ /**
* Returns context root associated with webservice deployment.
*
* If there's application.xml descriptor provided defining nested web module, then context root defined there will be
10 years, 4 months
- 1
- 0
JBossWS SVN: r18858 - stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-08-22 05:48:45 -0400 (Fri, 22 Aug 2014)
New Revision: 18858
Modified:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java
Log:
[JBWS-3785] Improving JBWS2150TestCaseForked to cover uri scheme addition (as well as port/secure-port which were not covered yet)
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java 2014-08-22 09:47:18 UTC (rev 18857)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java 2014-08-22 09:48:45 UTC (rev 18858)
@@ -119,7 +119,10 @@
protected static Boolean modifySOAPAddress;
protected static String webServiceHost;
+ protected static int webServicePort;
+ protected static int webServiceSecurePort;
protected static String webServicePath;
+ protected static String webServiceUriScheme;
public JBWS2150TestSetup() {
super(JBWS2150TestCaseForked.class, null);
@@ -129,7 +132,10 @@
{
modifySOAPAddress = (Boolean)getServer().getAttribute(SERVER_CONFIG_OBJECT_NAME, "ModifySOAPAddress");
webServiceHost = (String)getServer().getAttribute(SERVER_CONFIG_OBJECT_NAME, "WebServiceHost");
+ webServicePort = (Integer)getServer().getAttribute(SERVER_CONFIG_OBJECT_NAME, "WebServicePort");
+ webServiceSecurePort = (Integer)getServer().getAttribute(SERVER_CONFIG_OBJECT_NAME, "WebServiceSecurePort");
webServicePath = (String)getServer().getAttribute(SERVER_CONFIG_OBJECT_NAME, "WebServicePathRewriteRule");
+ webServiceUriScheme = (String)getServer().getAttribute(SERVER_CONFIG_OBJECT_NAME, "WebServiceUriScheme");
super.setUp();
}
}
@@ -145,8 +151,14 @@
getServer().setAttribute(SERVER_CONFIG_OBJECT_NAME, attr);
attr = new Attribute("WebServiceHost", JBWS2150TestSetup.webServiceHost);
getServer().setAttribute(SERVER_CONFIG_OBJECT_NAME, attr);
+ attr = new Attribute("WebServicePort", JBWS2150TestSetup.webServicePort);
+ getServer().setAttribute(SERVER_CONFIG_OBJECT_NAME, attr);
+ attr = new Attribute("WebServiceSecurePort", JBWS2150TestSetup.webServiceSecurePort);
+ getServer().setAttribute(SERVER_CONFIG_OBJECT_NAME, attr);
attr = new Attribute("WebServicePathRewriteRule", JBWS2150TestSetup.webServicePath);
getServer().setAttribute(SERVER_CONFIG_OBJECT_NAME, attr);
+ attr = new Attribute("WebServiceUriScheme", JBWS2150TestSetup.webServiceUriScheme);
+ getServer().setAttribute(SERVER_CONFIG_OBJECT_NAME, attr);
}
private String getWebServiceHost() {
@@ -595,6 +607,31 @@
}
/**
+ * Test soap:address rewrite with rewrite engine on , the webServiceHost set to a (fake) load balancer host (code-first endpoint) and forced https scheme
+ *
+ * @throws Exception
+ */
+ public void testRewriteLoadBalancerCodeFirstForceHttps() throws Exception
+ {
+ setModifySOAPAddress(true);
+ final String testWebServiceHost = "myloadbalancer.com";
+ setWebServiceHost(testWebServiceHost);
+ setWebServiceSecurePort(443);
+ setWebServiceUriScheme("https");
+ deploy("jaxws-jbws2150-codefirst.war");
+ try
+ {
+ Definition definition = getWSDLDefinition("http://" + getServerHost() + ":8080/jaxws-jbws2150-codefirst/CodeFirstService?wsdl");
+ String address = getPortAddress(definition, "CodeFirstService", "CodeFirstPort");
+ assertEquals("https://" + testWebServiceHost + "/jaxws-jbws2150-codefirst/CodeFirstService", address);
+ }
+ finally
+ {
+ undeploy("jaxws-jbws2150-codefirst.war");
+ }
+ }
+
+ /**
* Basically the same as the test above; even if rewrite is off, we still get the loadbalancer address in the wsdl
* for code-first endpoint, as there's no user provided wsdl with a different address in it.
*
@@ -820,6 +857,342 @@
}
}
+ /**
+ * Test soap:address rewrite with rewrite engine on and forced https scheme and secure port
+ *
+ * @throws Exception
+ */
+ public void testRewriteForceHttpsSchemeAndPorts() throws Exception
+ {
+ setModifySOAPAddress(true);
+ setWebServiceUriScheme("https");
+ setWebServiceSecurePort(8192);
+ deploy("jaxws-jbws2150.war");
+ try
+ {
+ final Map<String, String> wsdlLocationsMap = new HashMap<String, String>();
+ final Map<String, String> importMap = new HashMap<String, String>();
+ final String serverHost = getServerHost();
+ wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", getWebServiceHost());
+ wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", getWebServiceHost());
+ wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", getWebServiceHost());
+ wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", getWebServiceHost());
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", "https://" + getWebServiceHost() + ":8192/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", "https://" + getWebServiceHost() + ":8192/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8192/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8192/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl");
+ if (isTestsuiteServerHostLocalhost()) {
+ wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", getWebServiceHost());
+ wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", getWebServiceHost());
+ wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", getWebServiceHost());
+ wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", getWebServiceHost());
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", "https://" + getWebServiceHost() + ":8192/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", "https://" + getWebServiceHost() + ":8192/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8192/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8192/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl");
+ }
+
+ for (Entry<String, String> entry : wsdlLocationsMap.entrySet()) {
+ String wsdlLocation = entry.getKey();
+ String host = entry.getValue();
+ Definition definition = getWSDLDefinition(wsdlLocation);
+ //avoid invoking on https endpoints as that would require getting the imported wsdl using https...
+
+ String address = getPortAddress(definition, "ValidURLService", "ValidURLPort");
+ assertEquals("https://" + host + ":8192/jaxws-jbws2150/ValidURL", address);
+
+ address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort");
+ assertEquals("https://" + host + ":8192/jaxws-jbws2150/InvalidURL", address);
+
+ address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort");
+ assertEquals("https://" + host + ":8192/jaxws-jbws2150/ValidSecureURL", address);
+
+ address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort");
+ assertEquals("https://" + host + ":8192/jaxws-jbws2150/InvalidSecureURL", address);
+
+ //check wsdl import address rewrite (we expect a rewritten version of the same base address used to fetch the wsdl)
+ assertEquals(importMap.get(wsdlLocation), getWsdlImportAddress(definition));
+ }
+ }
+ finally
+ {
+ undeploy("jaxws-jbws2150.war");
+ }
+ }
+
+ /**
+ * Test soap:address rewrite with rewrite engine on, the webServiceHost set to a (fake) load balancer host and forced https uri scheme
+ *
+ * @throws Exception
+ */
+ public void testRewriteLoadBalancerForceHttps() throws Exception
+ {
+ setModifySOAPAddress(true);
+ final String testWebServiceHost = "myloadbalancer.com";
+ setWebServiceHost(testWebServiceHost);
+ setWebServiceUriScheme("https");
+ deploy("jaxws-jbws2150.war");
+ try
+ {
+ final Map<String, String> wsdlLocationsMap = new HashMap<String, String>();
+ final Map<String, String> importMap = new HashMap<String, String>();
+ final String serverHost = getServerHost();
+ wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", testWebServiceHost);
+ wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", testWebServiceHost);
+ wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", testWebServiceHost);
+ wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", testWebServiceHost);
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl");
+ if (isTestsuiteServerHostLocalhost()) {
+ wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", testWebServiceHost);
+ wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", testWebServiceHost);
+ wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", testWebServiceHost);
+ wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", testWebServiceHost);
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl");
+ }
+
+ for (Entry<String, String> entry : wsdlLocationsMap.entrySet()) {
+ String wsdlLocation = entry.getKey();
+ String host = entry.getValue();
+ Definition definition = getWSDLDefinition(wsdlLocation);
+
+ String address = getPortAddress(definition, "ValidURLService", "ValidURLPort");
+ assertEquals("https://" + host + ":8443/jaxws-jbws2150/ValidURL", address);
+
+ address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort");
+ assertEquals("https://" + host + ":8443/jaxws-jbws2150/InvalidURL", address);
+
+ address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort");
+ assertEquals("https://" + host + ":8443/jaxws-jbws2150/ValidSecureURL", address);
+
+ address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort");
+ assertEquals("https://" + host + ":8443/jaxws-jbws2150/InvalidSecureURL", address);
+
+ //check wsdl import address rewrite (we expect a rewritten version of the same base address used to fetch the wsdl)
+ assertEquals(importMap.get(wsdlLocation), getWsdlImportAddress(definition));
+ }
+ }
+ finally
+ {
+ undeploy("jaxws-jbws2150.war");
+ }
+ }
+
+ /**
+ * Test soap:address rewrite with rewrite engine on, the webServiceHost set to jbossws.undefined.host and forced http uri scheme
+ *
+ * @throws Exception
+ */
+ public void testAutoRewriteForceHttp() throws Exception
+ {
+ setModifySOAPAddress(true);
+ setWebServiceHost(ServerConfig.UNDEFINED_HOSTNAME);
+ deploy("jaxws-jbws2150.war");
+ try
+ {
+ final Map<String, String> wsdlLocationsMap = new HashMap<String, String>();
+ final Map<String, String> importMap = new HashMap<String, String>();
+ final String serverHost = getServerHost();
+ wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", serverHost);
+ wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", serverHost);
+ wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", serverHost);
+ wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", serverHost);
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", "http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", "http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", "http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl");
+ if (isTestsuiteServerHostLocalhost()) {
+ wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", "127.0.0.1");
+ wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", "127.0.0.1");
+ wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", "127.0.0.1");
+ wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "127.0.0.1");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", "http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", "http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", "http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl");
+ }
+
+ for (Entry<String, String> entry : wsdlLocationsMap.entrySet()) {
+ String wsdlLocation = entry.getKey();
+ String host = entry.getValue();
+ Definition definition = getWSDLDefinition(wsdlLocation);
+
+ String address = getPortAddress(definition, "ValidURLService", "ValidURLPort");
+ assertEquals("http://" + host + ":8080/jaxws-jbws2150/ValidURL", address);
+
+ address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort");
+ assertEquals("http://" + host + ":8080/jaxws-jbws2150/InvalidURL", address);
+
+ address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort");
+ assertEquals("http://" + host + ":8080/jaxws-jbws2150/ValidSecureURL", address);
+
+ address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort");
+ assertEquals("http://" + host + ":8080/jaxws-jbws2150/InvalidSecureURL", address);
+
+ assertEquals(importMap.get(wsdlLocation), getWsdlImportAddress(definition));
+ }
+ }
+ finally
+ {
+ undeploy("jaxws-jbws2150.war");
+ }
+ }
+
+ /**
+ * Test soap:address URL rewrite according to transport guarantee is overridden by forced http uri scheme
+ *
+ * @throws Exception
+ */
+ public void testSecureRewriteOverriddenByForcedHttp() throws Exception
+ {
+ setModifySOAPAddress(true);
+ setWebServiceUriScheme("http");
+ setWebServicePort(80);
+ deploy("jaxws-jbws2150-sec.war");
+ try
+ {
+ final Map<String, String> wsdlLocationsSecMap = new HashMap<String, String>();
+ final Map<String, String> importMap = new HashMap<String, String>();
+ final String serverHost = getServerHost();
+ wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidURL?wsdl", getWebServiceHost());
+ wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidURL?wsdl", getWebServiceHost());
+ wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", getWebServiceHost());
+ wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", getWebServiceHost());
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidURL?wsdl", "http://" + getWebServiceHost() + "/jaxws-jbws2150-sec/ValidURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidURL?wsdl", "http://" + getWebServiceHost() + "/jaxws-jbws2150-sec/InvalidURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", "http://" + getWebServiceHost() + "/jaxws-jbws2150-sec/ValidSecureURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", "http://" + getWebServiceHost() + "/jaxws-jbws2150-sec/InvalidSecureURL?wsdl=inner.wsdl");
+ if (isTestsuiteServerHostLocalhost()) {
+ wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidURL?wsdl", getWebServiceHost());
+ wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidURL?wsdl", getWebServiceHost());
+ wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", getWebServiceHost());
+ wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", getWebServiceHost());
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidURL?wsdl", "http://" + getWebServiceHost() + "/jaxws-jbws2150-sec/ValidURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidURL?wsdl", "http://" + getWebServiceHost() + "/jaxws-jbws2150-sec/InvalidURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", "http://" + getWebServiceHost() + "/jaxws-jbws2150-sec/ValidSecureURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", "http://" + getWebServiceHost() + "/jaxws-jbws2150-sec/InvalidSecureURL?wsdl=inner.wsdl");
+ }
+
+ for (Entry<String, String> entry : wsdlLocationsSecMap.entrySet()) {
+ String wsdlLocationSec = entry.getKey();
+ String host = entry.getValue();
+ Definition definition = getWSDLDefinition(wsdlLocationSec);
+
+ String address = getPortAddress(definition, "ValidURLService", "ValidURLPort");
+ assertEquals("http://" + host + "/jaxws-jbws2150-sec/ValidURL", address);
+
+ address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort");
+ assertEquals("http://" + host + "/jaxws-jbws2150-sec/InvalidURL", address);
+
+ address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort");
+ assertEquals("http://" + host + "/jaxws-jbws2150-sec/ValidSecureURL", address);
+
+ address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort");
+ assertEquals("http://" + host + "/jaxws-jbws2150-sec/InvalidSecureURL", address);
+
+ //check wsdl import address rewrite (we expect a rewritten version of the same base address used to fetch the wsdl)
+ assertEquals(importMap.get(wsdlLocationSec), getWsdlImportAddress(definition));
+ }
+ }
+ finally
+ {
+ undeploy("jaxws-jbws2150-sec.war");
+ }
+ }
+
+ /**
+ * Test soap:address rewrite when a path rewrite rule is specified and https scheme is forced.
+ *
+ * @throws Exception
+ */
+ public void testRewriteWithPathRuleAndForcedHttps() throws Exception
+ {
+ setModifySOAPAddress(true);
+ final String expectedContext = "xx/jaxws-jbws2150";
+ final String sedCmd = "s/jaxws-jbws2150/xx\\/jaxws-jbws2150/g";
+ setWebServicePathRewriteRule(sedCmd);
+ setWebServiceUriScheme("https");
+ deploy("jaxws-jbws2150.war");
+ try
+ {
+ final String serverHost = getServerHost();
+ final List<String> wsdlLocations = new LinkedList<String>();
+ final Map<String, String> importMap = new HashMap<String, String>();
+ wsdlLocations.add("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl");
+ wsdlLocations.add("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl");
+ wsdlLocations.add("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl");
+ wsdlLocations.add("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", "https://" + serverHost + ":8443/" + expectedContext + "/ValidURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", "https://" + serverHost + ":8443/" + expectedContext + "/InvalidURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + serverHost + ":8443/" + expectedContext + "/ValidSecureURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + serverHost + ":8443/" + expectedContext + "/InvalidSecureURL?wsdl=inner.wsdl");
+
+ for (final String wsdlLocation : wsdlLocations)
+ {
+ Definition definition = getWSDLDefinition(wsdlLocation);
+
+ String address = getPortAddress(definition, "ValidURLService", "ValidURLPort");
+ assertEquals("https://" + serverHost + ":8443/" + expectedContext + "/ValidURL", address);
+
+ address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort");
+ assertEquals("https://" + serverHost + ":8443/" + expectedContext + "/InvalidURL", address);
+
+ address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort");
+ assertEquals("https://" + serverHost + ":8443/" + expectedContext + "/ValidSecureURL", address);
+
+ address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort");
+ assertEquals("https://" + serverHost + ":8443/" + expectedContext + "/InvalidSecureURL", address);
+
+ //check wsdl import address rewrite (we expect a rewritten version of the same base address used to fetch the wsdl)
+ assertEquals(importMap.get(wsdlLocation), getWsdlImportAddress(definition));
+ }
+ }
+ finally
+ {
+ undeploy("jaxws-jbws2150.war");
+ }
+ }
+
+ /**
+ * Test soap:address rewrite for code-first endpoints when a path rewrite rule is specified, auto-rewrite is on
+ * (wsdl host prop set to ServerConfig.UNDEFINED_HOSTNAME) and https scheme is forced
+ *
+ * @throws Exception
+ */
+ public void testAutoRewriteCodeFirstPathRuleAndForcedHttps() throws Exception
+ {
+ setModifySOAPAddress(true);
+ final String expectedContext = "xx/jaxws-jbws2150-codefirst";
+ final String sedCmd = "s/jaxws-jbws2150-codefirst/xx\\/jaxws-jbws2150-codefirst/g";
+ setWebServicePathRewriteRule(sedCmd);
+ setWebServiceHost(ServerConfig.UNDEFINED_HOSTNAME);
+ setWebServiceUriScheme("https");
+ deploy("jaxws-jbws2150-codefirst.war");
+ try
+ {
+ String serverHost = getServerHost();
+ final String wsdlLocation = "http://" + serverHost + ":8080/jaxws-jbws2150-codefirst/CodeFirstService?wsdl";
+
+ Definition definition = getWSDLDefinition(wsdlLocation);
+ String address = getPortAddress(definition, "CodeFirstService", "CodeFirstPort");
+ assertEquals("https://" + serverHost + ":8443/" + expectedContext +"/CodeFirstService", address);
+ if (isTestsuiteServerHostLocalhost()) {
+ definition = getWSDLDefinition("http://127.0.0.1:8080/jaxws-jbws2150-codefirst/CodeFirstService?wsdl");
+ address = getPortAddress(definition, "CodeFirstService", "CodeFirstPort");
+ assertEquals("https://127.0.0.1:8443/" + expectedContext +"/CodeFirstService", address);
+ }
+ }
+ finally
+ {
+ undeploy("jaxws-jbws2150-codefirst.war");
+ }
+ }
+
private void checkWsdlAndInvokeCodeFirstEndpoint(String testHost, String expectedWsdlHost, boolean setTargetAddress) throws Exception {
final String addr = "http://" + testHost + ":8080/jaxws-jbws2150-codefirst/CodeFirstService";
final String wsdlLocation = addr + "?wsdl";
@@ -851,12 +1224,30 @@
getServer().setAttribute(SERVER_CONFIG_OBJECT_NAME, attr);
}
- public void setWebServicePathRewriteRule(String value) throws Exception
+ private void setWebServicePort(int value) throws Exception
{
+ Attribute attr = new Attribute("WebServicePort", value);
+ getServer().setAttribute(SERVER_CONFIG_OBJECT_NAME, attr);
+ }
+
+ private void setWebServiceSecurePort(int value) throws Exception
+ {
+ Attribute attr = new Attribute("WebServiceSecurePort", value);
+ getServer().setAttribute(SERVER_CONFIG_OBJECT_NAME, attr);
+ }
+
+ private void setWebServicePathRewriteRule(String value) throws Exception
+ {
Attribute attr = new Attribute("WebServicePathRewriteRule", value);
getServer().setAttribute(SERVER_CONFIG_OBJECT_NAME, attr);
}
+ private void setWebServiceUriScheme(String value) throws Exception
+ {
+ Attribute attr = new Attribute("WebServiceUriScheme", value);
+ getServer().setAttribute(SERVER_CONFIG_OBJECT_NAME, attr);
+ }
+
private ServiceIface getEndpoint(String wsdlLocation, String serviceName) throws Exception
{
List<WebServiceFeature> features = new LinkedList<WebServiceFeature>();
10 years, 4 months
- 1
- 0
JBossWS SVN: r18857 - common/trunk/src/main/java/org/jboss/ws/common/management.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-08-22 05:47:18 -0400 (Fri, 22 Aug 2014)
New Revision: 18857
Modified:
common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfigMBean.java
Log:
[JBWS-3785] Also update MBean view
Modified: common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfigMBean.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfigMBean.java 2014-08-22 07:56:34 UTC (rev 18856)
+++ common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfigMBean.java 2014-08-22 09:47:18 UTC (rev 18857)
@@ -62,4 +62,8 @@
String getWebServicePathRewriteRule();
void setWebServicePathRewriteRule(String path);
+
+ String getWebServiceUriScheme();
+
+ void setWebServiceUriScheme(String scheme);
}
10 years, 4 months
- 1
- 0
JBossWS SVN: r18856 - in stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809: dups and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-08-22 03:56:34 -0400 (Fri, 22 Aug 2014)
New Revision: 18856
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/BasicEjb.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/EjbPortComponentUri.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/EjbWebContext.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/EjbWebServiceDupServicename.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/EjbWebServiceNoServicename.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/EjbWebServiceProvider.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/EjbWebServiceServicename.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/JBWS3809TestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/dups/EjbWebServiceNoServicename.java
Log:
[JBWS-3809] Adding missing source headers
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/BasicEjb.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/BasicEjb.java 2014-08-21 15:03:42 UTC (rev 18855)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/BasicEjb.java 2014-08-22 07:56:34 UTC (rev 18856)
@@ -1,6 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2014, 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.jbws3809;
-import javax.jws.WebParam;
import javax.jws.WebService;
/**
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/EjbPortComponentUri.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/EjbPortComponentUri.java 2014-08-21 15:03:42 UTC (rev 18855)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/EjbPortComponentUri.java 2014-08-22 07:56:34 UTC (rev 18856)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2014, 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.jbws3809;
import javax.jws.WebMethod;
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/EjbWebContext.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/EjbWebContext.java 2014-08-21 15:03:42 UTC (rev 18855)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/EjbWebContext.java 2014-08-22 07:56:34 UTC (rev 18856)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2014, 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.jbws3809;
import org.jboss.ws.api.annotation.WebContext;
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/EjbWebServiceDupServicename.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/EjbWebServiceDupServicename.java 2014-08-21 15:03:42 UTC (rev 18855)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/EjbWebServiceDupServicename.java 2014-08-22 07:56:34 UTC (rev 18856)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2014, 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.jbws3809;
import javax.jws.WebMethod;
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/EjbWebServiceNoServicename.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/EjbWebServiceNoServicename.java 2014-08-21 15:03:42 UTC (rev 18855)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/EjbWebServiceNoServicename.java 2014-08-22 07:56:34 UTC (rev 18856)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2014, 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.jbws3809;
import javax.jws.WebMethod;
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/EjbWebServiceProvider.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/EjbWebServiceProvider.java 2014-08-21 15:03:42 UTC (rev 18855)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/EjbWebServiceProvider.java 2014-08-22 07:56:34 UTC (rev 18856)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2014, 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.jbws3809;
import javax.jws.WebMethod;
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/EjbWebServiceServicename.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/EjbWebServiceServicename.java 2014-08-21 15:03:42 UTC (rev 18855)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/EjbWebServiceServicename.java 2014-08-22 07:56:34 UTC (rev 18856)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2014, 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.jbws3809;
import javax.jws.WebMethod;
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/JBWS3809TestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/JBWS3809TestCase.java 2014-08-21 15:03:42 UTC (rev 18855)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/JBWS3809TestCase.java 2014-08-22 07:56:34 UTC (rev 18856)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2014, 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.jbws3809;
import junit.framework.Test;
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/dups/EjbWebServiceNoServicename.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/dups/EjbWebServiceNoServicename.java 2014-08-21 15:03:42 UTC (rev 18855)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/dups/EjbWebServiceNoServicename.java 2014-08-22 07:56:34 UTC (rev 18856)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2014, 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.jbws3809.dups;
import org.jboss.test.ws.jaxws.cxf.jbws3809.BasicEjb;
10 years, 4 months
- 1
- 0
JBossWS SVN: r18855 - stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-08-21 11:03:42 -0400 (Thu, 21 Aug 2014)
New Revision: 18855
Modified:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java
Log:
Further improving test
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java 2014-08-21 13:33:05 UTC (rev 18854)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java 2014-08-21 15:03:42 UTC (rev 18855)
@@ -335,7 +335,7 @@
//check wsdl import address rewrite (we expect a rewritten version of the same base address used to fetch the wsdl)
if (!wsdlLocation.contains("Secure")) {
assertEquals(importMap.get(wsdlLocation), getWsdlImportAddress(definition));
- }
+ }
}
}
finally
@@ -658,10 +658,15 @@
{
final String serverHost = getServerHost();
final List<String> wsdlLocations = new LinkedList<String>();
+ final Map<String, String> importMap = new HashMap<String, String>();
wsdlLocations.add("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl");
wsdlLocations.add("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl");
wsdlLocations.add("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl");
wsdlLocations.add("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", "http://" + serverHost + ":8080/" + expectedContext + "/ValidURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", "http://" + serverHost + ":8080/" + expectedContext + "/InvalidURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + serverHost + ":8443/" + expectedContext + "/ValidSecureURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + serverHost + ":8443/" + expectedContext + "/InvalidSecureURL?wsdl=inner.wsdl");
for (final String wsdlLocation : wsdlLocations)
{
@@ -679,8 +684,8 @@
address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort");
assertEquals("https://" + serverHost + ":8443/" + expectedContext + "/InvalidSecureURL", address);
- //check wsdl import (which is bound to the endpoint currently serving the wsdl)
- assertTrue(getWsdlImportAddress(definition).contains(expectedContext));
+ //check wsdl import address rewrite (we expect a rewritten version of the same base address used to fetch the wsdl)
+ assertEquals(importMap.get(wsdlLocation), getWsdlImportAddress(definition));
}
}
finally
@@ -766,16 +771,25 @@
try
{
final Map<String, String> wsdlLocationsMap = new HashMap<String, String>();
+ final Map<String, String> importMap = new HashMap<String, String>();
final String serverHost = getServerHost();
wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", serverHost);
wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", serverHost);
wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", serverHost);
wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", serverHost);
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", "http://" + serverHost + ":8080/" + expectedContext + "/ValidURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", "http://" + serverHost + ":8080/" + expectedContext + "/InvalidURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + serverHost + ":8443/" + expectedContext + "/ValidSecureURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + serverHost + ":8443/" + expectedContext + "/InvalidSecureURL?wsdl=inner.wsdl");
if (isTestsuiteServerHostLocalhost()) {
wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", "127.0.0.1");
wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", "127.0.0.1");
wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", "127.0.0.1");
wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "127.0.0.1");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", "http://127.0.0.1:8080/" + expectedContext + "/ValidURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", "http://127.0.0.1:8080/" + expectedContext + "/InvalidURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://127.0.0.1:8443/" + expectedContext + "/ValidSecureURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://127.0.0.1:8443/" + expectedContext + "/InvalidSecureURL?wsdl=inner.wsdl");
}
for (Entry<String, String> entry : wsdlLocationsMap.entrySet()) {
String wsdlLocation = entry.getKey();
@@ -794,8 +808,10 @@
address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort");
assertEquals("http://" + host + ":8080/" + expectedContext + "/InvalidSecureURL", address);
- //check wsdl import (which is bound to the endpoint currently serving the wsdl)
- assertTrue(getWsdlImportAddress(definition).contains(expectedContext));
+ //check wsdl import address rewrite (we expect a rewritten version of the same base address used to fetch the wsdl)
+ if (!wsdlLocation.contains("Secure")) {
+ assertEquals(importMap.get(wsdlLocation), getWsdlImportAddress(definition));
+ }
}
}
finally
10 years, 4 months
- 1
- 0
JBossWS SVN: r18854 - stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-08-21 09:33:05 -0400 (Thu, 21 Aug 2014)
New Revision: 18854
Modified:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java
Log:
Improving test
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java 2014-08-20 16:16:39 UTC (rev 18853)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java 2014-08-21 13:33:05 UTC (rev 18854)
@@ -165,16 +165,25 @@
try
{
final Map<String, String> wsdlLocationsMap = new HashMap<String, String>();
+ final Map<String, String> importMap = new HashMap<String, String>();
final String serverHost = getServerHost();
wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", getWebServiceHost());
wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", getWebServiceHost());
wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", getWebServiceHost());
wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", getWebServiceHost());
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", "http://" + getWebServiceHost() + ":8080/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", "http://" + getWebServiceHost() + ":8080/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8443/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8443/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl");
if (isTestsuiteServerHostLocalhost()) {
wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", getWebServiceHost());
wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", getWebServiceHost());
wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", getWebServiceHost());
wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", getWebServiceHost());
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", "http://" + getWebServiceHost() + ":8080/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", "http://" + getWebServiceHost() + ":8080/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8443/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8443/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl");
}
for (Entry<String, String> entry : wsdlLocationsMap.entrySet()) {
@@ -202,6 +211,9 @@
address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort");
assertEquals("https://" + host + ":8443/jaxws-jbws2150/InvalidSecureURL", address);
+
+ //check wsdl import address rewrite (we expect a rewritten version of the same base address used to fetch the wsdl)
+ assertEquals(importMap.get(wsdlLocation), getWsdlImportAddress(definition));
}
}
finally
@@ -224,16 +236,25 @@
try
{
final Map<String, String> wsdlLocationsMap = new HashMap<String, String>();
+ final Map<String, String> importMap = new HashMap<String, String>();
final String serverHost = getServerHost();
wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", testWebServiceHost);
wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", testWebServiceHost);
wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", testWebServiceHost);
wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", testWebServiceHost);
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", "http://" + testWebServiceHost + ":8080/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", "http://" + testWebServiceHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl");
if (isTestsuiteServerHostLocalhost()) {
wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", testWebServiceHost);
wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", testWebServiceHost);
wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", testWebServiceHost);
wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", testWebServiceHost);
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", "http://" + testWebServiceHost + ":8080/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", "http://" + testWebServiceHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl");
}
for (Entry<String, String> entry : wsdlLocationsMap.entrySet()) {
@@ -253,8 +274,8 @@
address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort");
assertEquals("https://" + host + ":8443/jaxws-jbws2150/InvalidSecureURL", address);
- //check wsdl import (which is bound to the endpoint currently serving the wsdl)
- assertTrue(getWsdlImportAddress(definition).contains(host));
+ //check wsdl import address rewrite (we expect a rewritten version of the same base address used to fetch the wsdl)
+ assertEquals(importMap.get(wsdlLocation), getWsdlImportAddress(definition));
}
}
finally
@@ -276,16 +297,25 @@
try
{
final Map<String, String> wsdlLocationsMap = new HashMap<String, String>();
+ final Map<String, String> importMap = new HashMap<String, String>();
final String serverHost = getServerHost();
wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", serverHost);
wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", serverHost);
wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", serverHost);
wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", serverHost);
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", "http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", "http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + serverHost + ":8443/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + serverHost + ":8443/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl");
if (isTestsuiteServerHostLocalhost()) {
wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", "127.0.0.1");
wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", "127.0.0.1");
wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", "127.0.0.1");
wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "127.0.0.1");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", "http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", "http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://127.0.0.1:8443/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://127.0.0.1:8443/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl");
}
for (Entry<String, String> entry : wsdlLocationsMap.entrySet()) {
@@ -301,6 +331,11 @@
//no further checks on the ports forcing https even when getting the wsdl over http
//as there's no way to tell which port to use for the secure access given the invoked wsdl address (on http)
+
+ //check wsdl import address rewrite (we expect a rewritten version of the same base address used to fetch the wsdl)
+ if (!wsdlLocation.contains("Secure")) {
+ assertEquals(importMap.get(wsdlLocation), getWsdlImportAddress(definition));
+ }
}
}
finally
@@ -321,16 +356,25 @@
try
{
final Map<String, String> wsdlLocationsSecMap = new HashMap<String, String>();
+ final Map<String, String> importMap = new HashMap<String, String>();
final String serverHost = getServerHost();
wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidURL?wsdl", getWebServiceHost());
wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidURL?wsdl", getWebServiceHost());
wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", getWebServiceHost());
wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", getWebServiceHost());
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidURL?wsdl", "https://" + getWebServiceHost() + ":8443/jaxws-jbws2150-sec/ValidURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidURL?wsdl", "https://" + getWebServiceHost() + ":8443/jaxws-jbws2150-sec/InvalidURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8443/jaxws-jbws2150-sec/ValidSecureURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8443/jaxws-jbws2150-sec/InvalidSecureURL?wsdl=inner.wsdl");
if (isTestsuiteServerHostLocalhost()) {
wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidURL?wsdl", getWebServiceHost());
wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidURL?wsdl", getWebServiceHost());
wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", getWebServiceHost());
wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", getWebServiceHost());
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidURL?wsdl", "https://" + getWebServiceHost() + ":8443/jaxws-jbws2150-sec/ValidURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidURL?wsdl", "https://" + getWebServiceHost() + ":8443/jaxws-jbws2150-sec/InvalidURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8443/jaxws-jbws2150-sec/ValidSecureURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8443/jaxws-jbws2150-sec/InvalidSecureURL?wsdl=inner.wsdl");
}
for (Entry<String, String> entry : wsdlLocationsSecMap.entrySet()) {
@@ -349,6 +393,9 @@
address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort");
assertEquals("https://" + host + ":8443/jaxws-jbws2150-sec/InvalidSecureURL", address);
+
+ //check wsdl import address rewrite (we expect a rewritten version of the same base address used to fetch the wsdl)
+ assertEquals(importMap.get(wsdlLocationSec), getWsdlImportAddress(definition));
}
}
finally
@@ -371,16 +418,25 @@
try
{
final Map<String, String> wsdlLocationsSecMap = new HashMap<String, String>();
+ final Map<String, String> importMap = new HashMap<String, String>();
final String serverHost = getServerHost();
wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidURL?wsdl", testWebServiceHost);
wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidURL?wsdl", testWebServiceHost);
wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", testWebServiceHost);
wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", testWebServiceHost);
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150-sec/ValidURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150-sec/InvalidURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150-sec/ValidSecureURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150-sec/InvalidSecureURL?wsdl=inner.wsdl");
if (isTestsuiteServerHostLocalhost()) {
wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidURL?wsdl", testWebServiceHost);
wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidURL?wsdl", testWebServiceHost);
wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", testWebServiceHost);
wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", testWebServiceHost);
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150-sec/ValidURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150-sec/InvalidURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150-sec/ValidSecureURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150-sec/InvalidSecureURL?wsdl=inner.wsdl");
}
for (Entry<String, String> entry : wsdlLocationsSecMap.entrySet()) {
@@ -400,8 +456,8 @@
address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort");
assertEquals("https://" + host + ":8443/jaxws-jbws2150-sec/InvalidSecureURL", address);
- //check wsdl import (which is bound to the endpoint currently serving the wsdl)
- assertTrue(getWsdlImportAddress(definition).contains(host));
+ //check wsdl import address rewrite (we expect a rewritten version of the same base address used to fetch the wsdl)
+ assertEquals(importMap.get(wsdlLocationSec), getWsdlImportAddress(definition));
}
}
finally
@@ -422,16 +478,25 @@
try
{
final Map<String, String> wsdlLocationsMap = new HashMap<String, String>();
+ final Map<String, String> importMap = new HashMap<String, String>();
final String serverHost = getServerHost();
wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", getWebServiceHost());
wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", getWebServiceHost());
wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", getWebServiceHost());
wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", getWebServiceHost());
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", "http://somehost:80/somepath?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", "http://" + getWebServiceHost() + ":8080/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://somehost:443/some-secure-path?wsdl=inner.wsdl");
+ importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8443/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl");
if (isTestsuiteServerHostLocalhost()) {
wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", getWebServiceHost());
wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", getWebServiceHost());
wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", getWebServiceHost());
wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", getWebServiceHost());
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", "http://somehost:80/somepath?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", "http://" + getWebServiceHost() + ":8080/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://somehost:443/some-secure-path?wsdl=inner.wsdl");
+ importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8443/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl");
}
for (Entry<String, String> entry : wsdlLocationsMap.entrySet()) {
@@ -450,6 +515,9 @@
address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort");
assertEquals("https://" + host + ":8443/jaxws-jbws2150/InvalidSecureURL", address);
+
+ //check wsdl import address rewrite; here we expect an address using the same base as the one for the port corresponding to the address used to fetch the wsdl
+ assertEquals(importMap.get(wsdlLocation), getWsdlImportAddress(definition));
}
}
finally
10 years, 4 months
- 1
- 0
JBossWS SVN: r18853 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-08-20 12:16:39 -0400 (Wed, 20 Aug 2014)
New Revision: 18853
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java
Log:
[JBWS-3785] Fixing regression
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java 2014-08-20 16:15:57 UTC (rev 18852)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java 2014-08-20 16:16:39 UTC (rev 18853)
@@ -24,6 +24,7 @@
import java.io.IOException;
import java.security.AccessController;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -201,7 +202,8 @@
} else {
//- wsdl-first handling
if (ei.getAddress().contains(ServerConfig.UNDEFINED_HOSTNAME)){
- String epurl = SoapAddressRewriteHelper.getRewrittenPublishedEndpointUrl(ei.getAddress(), servConfig, null); //TODO [JBWS-3805]
+ Map<String, String> props = Collections.emptyMap();
+ String epurl = SoapAddressRewriteHelper.getRewrittenPublishedEndpointUrl(ei.getAddress(), servConfig, props); //TODO [JBWS-3805]
ei.setAddress(epurl);
}
}
10 years, 4 months
- 1
- 0