Author: alessio.soldano(a)jboss.com Date: 2010-04-07 05:58:04 -0400 (Wed, 07 Apr 2010) New Revision: 11948 Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/SupportServlet.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java Modified: framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml framework/trunk/testsuite/test/resources/jaxws/samples/eardeployment/WEB-INF/web.xml Log: [JBWS-2971] Adding testcase Modified: framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml 2010-04-07 02:33:24 UTC (rev 11947) +++ framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml 2010-04-07 09:58:04 UTC (rev 11948) @@ -58,6 +58,7 @@ <war warfile="${tests.output.dir}/test-libs/jaxws-samples-eardeployment-pojo.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/eardeployment/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.class"/> + <include name="org/jboss/test/ws/jaxws/samples/eardeployment/SupportServlet.class"/> </classes> <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/eardeployment/WEB-INF"> <include name="jboss-web.xml"/> Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/SupportServlet.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/SupportServlet.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/SupportServlet.java 2010-04-07 09:58:04 UTC (rev 11948) @@ -0,0 +1,67 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.eardeployment; + +import java.io.File; +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; + +/** + * A servlet for returning the current data dir from the server config; + * this is required for WSDLPublishTestCase. + * + * @author alessio.soldano(a)jboss.com + * @since 07-Apr-2010 + * + */ +public class SupportServlet extends HttpServlet +{ + private static final long serialVersionUID = 1L; + + private File dataDir; + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException + { + res.getWriter().print(getDataDir().getAbsolutePath()); + } + + private File getDataDir() + { + if (dataDir == null) + { + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig(); + dataDir = serverConfig.getServerDataDir(); + } + return dataDir; + } +} Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/SupportServlet.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java 2010-04-07 09:58:04 UTC (rev 11948) @@ -0,0 +1,114 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, 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.samples.eardeployment; + +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Test the wsdl is published to local filesystem; this test assumes + * client and server share the filesystem. + * + * @author alessio.soldano(a)jboss.com + */ +public class WSDLPublishTestCase extends JBossWSTest +{ + private File wsdlFileDir; + private static long testStart; + + public static Test suite() + { + testStart = System.currentTimeMillis(); + return new JBossWSTestSetup(WSDLPublishTestCase.class, "jaxws-samples-eardeployment.ear"); + } + + public void testEJB3Endpoint() throws Exception + { + String soapAddress = "http://" + getServerHost() + ":8080/earejb3/Endpoint"; + QName serviceName = new QName("http://eardeployment.jaxws/", "EndpointService"); + + File file = new File(getWsdlFileDir().getAbsolutePath() + File.separator + "jaxws-samples-eardeployment.ear" + File.separator + + "jaxws-samples-eardeployment-ejb3.jar" + File.separator + "Endpoint.wsdl"); + + assertTrue("Wsdl file not found", file.exists()); + assertTrue("Stale wsdl file found", file.lastModified() > testStart - 1000); + + URL wsdlUrl = file.toURI().toURL(); + + Service service = Service.create(wsdlUrl, serviceName); + Endpoint port = service.getPort(Endpoint.class); + + BindingProvider bp = (BindingProvider)port; + bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, soapAddress); + + String helloWorld = "Hello world!"; + String retObj = port.echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + public void testJSEEndpoint() throws Exception + { + String soapAddress = "http://" + getServerHost() + ":8080/earjse/JSEBean"; + QName serviceName = new QName("http://eardeployment.jaxws/", "EndpointService"); + + File file = new File(getWsdlFileDir().getAbsolutePath() + File.separator + "jaxws-samples-eardeployment.ear" + File.separator + + "jaxws-samples-eardeployment-pojo.war" + File.separator + "Endpoint.wsdl"); + + assertTrue("Wsdl file not found", file.exists()); + assertTrue("Stale wsdl file found", file.lastModified() > testStart - 1000); + + URL wsdlUrl = file.toURI().toURL(); + + Service service = Service.create(wsdlUrl, serviceName); + Endpoint port = service.getPort(Endpoint.class); + + BindingProvider bp = (BindingProvider)port; + bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, soapAddress); + + String helloWorld = "Hello world!"; + String retObj = port.echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + private File getWsdlFileDir() throws IOException + { + if (wsdlFileDir == null) + { + URL url = new URL("http://" + getServerHost() + ":8080/earjse/support"); + BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); + wsdlFileDir = new File(br.readLine(), "wsdl"); + } + return wsdlFileDir; + } +} Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: framework/trunk/testsuite/test/resources/jaxws/samples/eardeployment/WEB-INF/web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/eardeployment/WEB-INF/web.xml 2010-04-07 02:33:24 UTC (rev 11947) +++ framework/trunk/testsuite/test/resources/jaxws/samples/eardeployment/WEB-INF/web.xml 2010-04-07 09:58:04 UTC (rev 11948) @@ -14,6 +14,16 @@ <servlet-name>TestService</servlet-name> <url-pattern>/JSEBean/*</url-pattern> </servlet-mapping> + + <servlet> + <servlet-name>SupportServlet</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.samples.eardeployment.SupportServlet</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>SupportServlet</servlet-name> + <url-pattern>/support/*</url-pattern> + </servlet-mapping> </web-app>