[jbossws-commits] JBossWS SVN: r2874 - in branches/dlofthouse/JBWS-1133: jbossws-tests/ant-import and 5 other directories.

Author: darran.lofthouse(a)jboss.com Date: 2007-04-15 11:49:49 -0400 (Sun, 15 Apr 2007) New Revision: 2874 Added: branches/dlofthouse/JBWS-1133/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ServletParamReader.java branches/dlofthouse/JBWS-1133/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1133/ branches/dlofthouse/JBWS-1133/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1133/JBWS1133TestCase.java branches/dlofthouse/JBWS-1133/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1133/TestEndpoint.java branches/dlofthouse/JBWS-1133/jbossws-tests/src/resources/jaxws/jbws1133/ branches/dlofthouse/JBWS-1133/jbossws-tests/src/resources/jaxws/jbws1133/WEB-INF/ branches/dlofthouse/JBWS-1133/jbossws-tests/src/resources/jaxws/jbws1133/WEB-INF/web.xml Removed: branches/dlofthouse/JBWS-1133/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1133/JBWS1133TestCase.java branches/dlofthouse/JBWS-1133/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1133/TestEndpoint.java branches/dlofthouse/JBWS-1133/jbossws-tests/src/resources/jaxws/jbws1133/WEB-INF/ branches/dlofthouse/JBWS-1133/jbossws-tests/src/resources/jaxws/jbws1133/WEB-INF/web.xml Modified: branches/dlofthouse/JBWS-1133/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java branches/dlofthouse/JBWS-1133/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdapter.java branches/dlofthouse/JBWS-1133/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/WebMetaDataAdapter.java branches/dlofthouse/JBWS-1133/jbossws-tests/ant-import/build-jars-jaxws.xml Log: Re-implementation for the JBoss 4.0.x and 4.2.x integration layer. Modified: branches/dlofthouse/JBWS-1133/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java =================================================================== --- branches/dlofthouse/JBWS-1133/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java 2007-04-15 15:30:53 UTC (rev 2873) +++ branches/dlofthouse/JBWS-1133/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java 2007-04-15 15:49:49 UTC (rev 2874) @@ -34,10 +34,12 @@ import org.jboss.metadata.WebMetaData; import org.jboss.ws.WSException; import org.jboss.ws.core.server.AbstractServiceEndpointPublisher; +import org.jboss.ws.core.server.AbstractServiceEndpointServlet; import org.jboss.ws.core.server.JAXWSDeployment; import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.core.server.AbstractServiceEndpointPublisher.RewriteResults; import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; +import org.jboss.ws.core.utils.JavaUtils; import org.jboss.ws.integration.ResourceLoaderAdapter; import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCDeployment; @@ -82,7 +84,8 @@ try { Class servletClass = di.annotationsCl.loadClass(servletClassName); - if (servletClass.isAnnotationPresent(WebService.class) || servletClass.isAnnotationPresent(WebServiceProvider.class)) + if (servletClass.isAnnotationPresent(WebService.class) || servletClass.isAnnotationPresent(WebServiceProvider.class) + || JavaUtils.isAssignableFrom(AbstractServiceEndpointServlet.class, servletClass)) { di.context.put("UnifiedDeploymentInfo.Type", UnifiedDeploymentInfo.DeploymentType.JAXWS_JSE); isWebserviceDeployment = true; @@ -102,7 +105,7 @@ protected UnifiedDeploymentInfo createUnifiedDeploymentInfo(DeploymentInfo di) throws Exception { UnifiedDeploymentInfo udi; - + DeploymentType type = (DeploymentType)di.context.get("UnifiedDeploymentInfo.Type"); if (type == UnifiedDeploymentInfo.DeploymentType.JAXRPC_JSE) { @@ -115,11 +118,11 @@ udi = new JAXWSDeployment(UnifiedDeploymentInfo.DeploymentType.JAXWS_JSE); DeploymentInfoAdapterFactory.newInstance().buildDeploymentInfo(udi, di); } - else + else { throw new WSException("Unexpected type: " + type); } - + return udi; } @@ -138,7 +141,7 @@ updateServiceEndpointTargetBeans(udi, results); } } - + private void updateServiceEndpointTargetBeans(UnifiedDeploymentInfo udi, RewriteResults results) { UnifiedMetaData wsMetaData = getServiceEndpointDeployer().getUnifiedMetaData(udi); @@ -154,7 +157,7 @@ } } } - + private UnifiedVirtualFile getWebservicesFile(DeploymentInfo di) { UnifiedVirtualFile vfsRoot = new ResourceLoaderAdapter(di.localCl); Modified: branches/dlofthouse/JBWS-1133/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdapter.java =================================================================== --- branches/dlofthouse/JBWS-1133/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdapter.java 2007-04-15 15:30:53 UTC (rev 2873) +++ branches/dlofthouse/JBWS-1133/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdapter.java 2007-04-15 15:49:49 UTC (rev 2874) @@ -43,7 +43,7 @@ { private WebMetaDataAdapter webMetaDataAdapter; private AbstractApplicationMetaDataAdapter applicationMetaDataAdapter; - + public void setApplicationMetaDataAdapter(AbstractApplicationMetaDataAdapter applicationMetaDataAdapter) { this.applicationMetaDataAdapter = applicationMetaDataAdapter; @@ -61,16 +61,16 @@ udi.parent = new UnifiedDeploymentInfo(null); buildDeploymentInfo(udi.parent, di.parent); } - + udi.vfRoot = new ResourceLoaderAdapter(di.localCl); udi.name = di.getCanonicalName(); udi.simpleName = di.shortName; udi.url = getDeploymentURL(di); udi.classLoader = di.annotationsCl; udi.deployedObject = di.deployedObject; - - buildMetaData(udi, di.metaData); + buildMetaData(udi, di); + return udi; } @@ -88,16 +88,16 @@ return deploymentURL; } - private void buildMetaData(UnifiedDeploymentInfo udi, Object metaData) + private void buildMetaData(UnifiedDeploymentInfo udi, DeploymentInfo di) { - if (metaData instanceof WebMetaData) + if (di.metaData instanceof WebMetaData) { - udi.metaData = webMetaDataAdapter.buildUnifiedWebMetaData((WebMetaData)metaData); + udi.metaData = webMetaDataAdapter.buildUnifiedWebMetaData(di); udi.webappURL = udi.url; } - else if (metaData instanceof ApplicationMetaData) + else if (di.metaData instanceof ApplicationMetaData) { - udi.metaData = applicationMetaDataAdapter.buildUnifiedApplicationMetaData((ApplicationMetaData)metaData); + udi.metaData = applicationMetaDataAdapter.buildUnifiedApplicationMetaData((ApplicationMetaData)di.metaData); } } } Added: branches/dlofthouse/JBWS-1133/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ServletParamReader.java =================================================================== --- branches/dlofthouse/JBWS-1133/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ServletParamReader.java (rev 0) +++ branches/dlofthouse/JBWS-1133/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ServletParamReader.java 2007-04-15 15:49:49 UTC (rev 2874) @@ -0,0 +1,87 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, JBoss 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.ws.integration.jboss42; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.net.URL; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +import org.jboss.ws.WSException; +import org.jboss.ws.core.utils.DOMUtils; +import org.w3c.dom.Element; + +/** + * Utility class to read the init-params for servlets within the + * web.xml so the class name of the SEI can be obtained an a previously + * modified web.xml. + * + * @author darran.lofthouse(a)jboss.com + * @since 15 Apr 2007 + */ +public class ServletParamReader +{ + + public static Map<String, String> getServletInitParam(final URL warUlr, final String requiredParameter) + { + HashMap<String, String> params = new HashMap<String, String>(); + File webXml = new File(warUlr.getFile() + "/WEB-INF/web.xml"); + + if (webXml.isFile() == false) + throw new WSException("Unable to find web.xml: " + webXml); + + try + { + Element rootElement = DOMUtils.parse(new FileInputStream(webXml)); + + Iterator servletElements = DOMUtils.getChildElements(rootElement, "servlet"); + while (servletElements.hasNext()) + { + Element currentServlet = (Element)servletElements.next(); + String servletName = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(currentServlet, "servlet-name")); + Iterator initParams = DOMUtils.getChildElements(currentServlet, "init-param"); + while (initParams.hasNext()) + { + Element currentParam = (Element)initParams.next(); + String paramName = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(currentParam, "param-name")); + if (requiredParameter.equals(paramName)) + { + String paramValue = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(currentParam, "param-value")); + params.put(servletName, paramValue); + } + + } + } + + } + catch (IOException e) + { + throw new WSException("Unable to read web.xml", e); + } + + return params; + } + +} Property changes on: branches/dlofthouse/JBWS-1133/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ServletParamReader.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/dlofthouse/JBWS-1133/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/WebMetaDataAdapter.java =================================================================== --- branches/dlofthouse/JBWS-1133/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/WebMetaDataAdapter.java 2007-04-15 15:30:53 UTC (rev 2873) +++ branches/dlofthouse/JBWS-1133/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/WebMetaDataAdapter.java 2007-04-15 15:49:49 UTC (rev 2874) @@ -30,9 +30,13 @@ import java.util.Map; import java.util.Map.Entry; +import org.jboss.deployment.DeploymentInfo; +import org.jboss.logging.Logger; import org.jboss.metadata.WebMetaData; import org.jboss.metadata.WebSecurityMetaData; import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection; +import org.jboss.ws.core.server.AbstractServiceEndpointServlet; +import org.jboss.ws.core.utils.JavaUtils; import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData; import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter; @@ -46,12 +50,16 @@ */ public class WebMetaDataAdapter { - public UnifiedWebMetaData buildUnifiedWebMetaData(WebMetaData wmd) + + private static Logger log = Logger.getLogger(WebMetaDataAdapter.class); + + public UnifiedWebMetaData buildUnifiedWebMetaData(DeploymentInfo di) { + WebMetaData wmd = (WebMetaData)di.metaData; UnifiedWebMetaData umd = new UnifiedWebMetaData(); umd.setContextRoot(wmd.getContextRoot()); umd.setServletMappings(wmd.getServletMappings()); - umd.setServletClassNames(getServletClassMap(wmd)); + umd.setServletClassNames(getServletClassMap(di)); umd.setConfigName(wmd.getConfigName()); umd.setConfigFile(wmd.getConfigFile()); umd.setSecurityDomain(wmd.getSecurityDomain()); @@ -63,8 +71,7 @@ private PublishLocationAdapter getPublishLocationAdpater(final WebMetaData wmd) { - return new PublishLocationAdapter () - { + return new PublishLocationAdapter() { public String getWsdlPublishLocationByName(String name) { return wmd.getWsdlPublishLocationByName(name); @@ -101,18 +108,42 @@ return unifiedsecurityMetaData; } - private Map<String, String> getServletClassMap(WebMetaData wmd) + private Map<String, String> getServletClassMap(DeploymentInfo di) { + WebMetaData wmd = (WebMetaData)di.metaData; Map<String, String> mappings = new HashMap<String, String>(); + Map<String, String> paramSEIImpl = ServletParamReader.getServletInitParam(di.localUrl, ServiceEndpointPublisher.INIT_PARAM_SERVICE_ENDPOINT_IMPL); + Iterator it = wmd.getServletClassMap().entrySet().iterator(); - while(it.hasNext()) + while (it.hasNext()) { Map.Entry entry = (Entry)it.next(); String servletName = (String)entry.getKey(); - String servletClass = (String)entry.getValue(); + String servletClassName = (String)entry.getValue(); + // Skip JSPs - if (servletClass != null) - mappings.put(servletName, servletClass); + if (servletClassName != null) + { + try + { + Class servletClass = di.annotationsCl.loadClass(servletClassName); + if (JavaUtils.isAssignableFrom(AbstractServiceEndpointServlet.class, servletClass)) + { + servletClassName = paramSEIImpl.get(servletName); + } + + } + catch (ClassNotFoundException e) + { + log.warn("Unable to load class:" + servletClassName); + } + + } + + if (servletClassName != null) + { + mappings.put(servletName, servletClassName); + } } return mappings; } Modified: branches/dlofthouse/JBWS-1133/jbossws-tests/ant-import/build-jars-jaxws.xml =================================================================== --- branches/dlofthouse/JBWS-1133/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-04-15 15:30:53 UTC (rev 2873) +++ branches/dlofthouse/JBWS-1133/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-04-15 15:49:49 UTC (rev 2874) @@ -199,6 +199,18 @@ </fileset> </jar> + <!-- jaxws-jbws1133 --> + <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1133.war"/> + <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1133.war/WEB-INF"/> + <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1133.war/WEB-INF/classes"/> + <copy tofile="${tests.output.dir}/libs/jaxws-jbws1133.war/WEB-INF/original-web.xml" + file="${tests.output.dir}/resources/jaxws/jbws1133/WEB-INF/web.xml"/> + <copy todir="${tests.output.dir}/libs/jaxws-jbws1133.war/WEB-INF/classes"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1133/TestEndpoint.class"/> + </fileset> + </copy> + <!-- jaxws-jbws1178 --> <war destfile="${tests.output.dir}/libs/jaxws-jbws1178.war" webxml="${tests.output.dir}/resources/jaxws/jbws1178/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Copied: branches/dlofthouse/JBWS-1133/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1133 (from rev 1390, branches/dlofthouse/JBWS-1133/src/test/java/org/jboss/test/ws/jaxws/jbws1133) Deleted: branches/dlofthouse/JBWS-1133/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1133/JBWS1133TestCase.java =================================================================== --- branches/dlofthouse/JBWS-1133/src/test/java/org/jboss/test/ws/jaxws/jbws1133/JBWS1133TestCase.java 2006-11-05 15:43:59 UTC (rev 1390) +++ branches/dlofthouse/JBWS-1133/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1133/JBWS1133TestCase.java 2007-04-15 15:49:49 UTC (rev 2874) @@ -1,80 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss 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.test.ws.jaxws.jbws1133; - -import java.io.File; -import java.io.InputStream; -import java.net.URL; - -import org.apache.tools.ant.util.FileUtils; -import org.jboss.test.ws.JBossWSTest; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 16-October-2006 - */ -public class JBWS1133TestCase extends JBossWSTest -{ - - private final String TARGET_WSDL = "http://" + getServerHost() + ":8080/jaxws-jbws1133?wsdl"; - - public void testRedeployExploded() throws Exception - { - cleanWebXML(); - - try - { - deploy("jaxws-jbws1133.war"); - - checkWSDL(); - - undeploy("jaxws-jbws1133.war"); - deploy("jaxws-jbws1133.war"); - - checkWSDL(); - } - finally - { - undeploy("jaxws-jbws1133.war"); - } - } - - private void cleanWebXML() throws Exception - { - File webXML = new File("libs/jaxws-jbws1133.war/WEB-INF/web.xml"); - if (webXML.exists()) - { - webXML.delete(); - } - File originalWebXML = new File("libs/jaxws-jbws1133.war/WEB-INF/original-web.xml"); - FileUtils.getFileUtils().copyFile(originalWebXML, webXML); - } - - private void checkWSDL() throws Exception - { - URL wsdlURL = new URL(TARGET_WSDL); - InputStream is = wsdlURL.openStream(); - assertNotNull(is); - } - -} \ No newline at end of file Copied: branches/dlofthouse/JBWS-1133/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1133/JBWS1133TestCase.java (from rev 1390, branches/dlofthouse/JBWS-1133/src/test/java/org/jboss/test/ws/jaxws/jbws1133/JBWS1133TestCase.java) =================================================================== --- branches/dlofthouse/JBWS-1133/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1133/JBWS1133TestCase.java (rev 0) +++ branches/dlofthouse/JBWS-1133/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1133/JBWS1133TestCase.java 2007-04-15 15:49:49 UTC (rev 2874) @@ -0,0 +1,91 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss 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.test.ws.jaxws.jbws1133; + +import java.io.BufferedReader; +import java.io.File; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.URL; + +import org.apache.tools.ant.util.FileUtils; +import org.jboss.test.ws.JBossWSTest; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 16-October-2006 + */ +public class JBWS1133TestCase extends JBossWSTest +{ + + private final String TARGET_WSDL = "http://" + getServerHost() + ":8080/jaxws-jbws1133?wsdl"; + + public void testRedeployExploded() throws Exception + { + cleanWebXML(); + + try + { + deploy("jaxws-jbws1133.war"); + + checkWSDL(); + + undeploy("jaxws-jbws1133.war"); + deploy("jaxws-jbws1133.war"); + + checkWSDL(); + } + finally + { + undeploy("jaxws-jbws1133.war"); + } + } + + private void cleanWebXML() throws Exception + { + File webXML = new File("libs/jaxws-jbws1133.war/WEB-INF/web.xml"); + if (webXML.exists()) + { + webXML.delete(); + } + File originalWebXML = new File("libs/jaxws-jbws1133.war/WEB-INF/original-web.xml"); + FileUtils.getFileUtils().copyFile(originalWebXML, webXML); + } + + private void checkWSDL() throws Exception + { + URL wsdlURL = new URL(TARGET_WSDL); + InputStream is = wsdlURL.openStream(); + InputStreamReader isr = new InputStreamReader(is); + BufferedReader br = new BufferedReader(isr); + + String line = br.readLine(); + while (line != null) + { + line = br.readLine(); + } + + assertNotNull(is); + } + +} \ No newline at end of file Deleted: branches/dlofthouse/JBWS-1133/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1133/TestEndpoint.java =================================================================== --- branches/dlofthouse/JBWS-1133/src/test/java/org/jboss/test/ws/jaxws/jbws1133/TestEndpoint.java 2006-11-05 15:43:59 UTC (rev 1390) +++ branches/dlofthouse/JBWS-1133/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1133/TestEndpoint.java 2007-04-15 15:49:49 UTC (rev 2874) @@ -1,44 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss 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.test.ws.jaxws.jbws1133; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 16-October-2006 - */ -@WebService(targetNamespace = "http://org.jboss/test/ws/jbws1133") -@SOAPBinding(style = SOAPBinding.Style.DOCUMENT) -public class TestEndpoint -{ - - @WebMethod - public String echo(final String message) - { - return message; - } - -} Copied: branches/dlofthouse/JBWS-1133/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1133/TestEndpoint.java (from rev 1390, branches/dlofthouse/JBWS-1133/src/test/java/org/jboss/test/ws/jaxws/jbws1133/TestEndpoint.java) =================================================================== --- branches/dlofthouse/JBWS-1133/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1133/TestEndpoint.java (rev 0) +++ branches/dlofthouse/JBWS-1133/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1133/TestEndpoint.java 2007-04-15 15:49:49 UTC (rev 2874) @@ -0,0 +1,44 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss 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.test.ws.jaxws.jbws1133; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 16-October-2006 + */ +@WebService(targetNamespace = "http://org.jboss/test/ws/jbws1133") +@SOAPBinding(style = SOAPBinding.Style.DOCUMENT) +public class TestEndpoint +{ + + @WebMethod + public String echo(final String message) + { + return message; + } + +} Copied: branches/dlofthouse/JBWS-1133/jbossws-tests/src/resources/jaxws/jbws1133 (from rev 1390, branches/dlofthouse/JBWS-1133/src/test/resources/jaxws/jbws1133) Copied: branches/dlofthouse/JBWS-1133/jbossws-tests/src/resources/jaxws/jbws1133/WEB-INF (from rev 1390, branches/dlofthouse/JBWS-1133/src/test/resources/jaxws/jbws1133/WEB-INF) Deleted: branches/dlofthouse/JBWS-1133/jbossws-tests/src/resources/jaxws/jbws1133/WEB-INF/web.xml =================================================================== --- branches/dlofthouse/JBWS-1133/src/test/resources/jaxws/jbws1133/WEB-INF/web.xml 2006-11-05 15:43:59 UTC (rev 1390) +++ branches/dlofthouse/JBWS-1133/jbossws-tests/src/resources/jaxws/jbws1133/WEB-INF/web.xml 2007-04-15 15:49:49 UTC (rev 2874) @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> - - <servlet> - <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jbws1133.TestEndpoint</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> -</web-app> \ No newline at end of file Copied: branches/dlofthouse/JBWS-1133/jbossws-tests/src/resources/jaxws/jbws1133/WEB-INF/web.xml (from rev 1390, branches/dlofthouse/JBWS-1133/src/test/resources/jaxws/jbws1133/WEB-INF/web.xml) =================================================================== --- branches/dlofthouse/JBWS-1133/jbossws-tests/src/resources/jaxws/jbws1133/WEB-INF/web.xml (rev 0) +++ branches/dlofthouse/JBWS-1133/jbossws-tests/src/resources/jaxws/jbws1133/WEB-INF/web.xml 2007-04-15 15:49:49 UTC (rev 2874) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + + <servlet> + <servlet-name>TestEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws1133.TestEndpoint</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestEndpoint</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> \ No newline at end of file