[jbossws-commits] JBossWS SVN: r1345 - in branches/jbossws-1.0/src: main/java/org/jboss/ws/deployment main/java/org/jboss/ws/integration/jboss main/java/org/jboss/ws/integration/tomcat main/resources/jbossws.war/Tomcat/WEB-INF test/ant test/java/org/jboss/test/ws/jaxrpc test/java/org/jboss/test/ws/jaxrpc/jbws1093 test/resources/jaxrpc test/resources/jaxrpc/jbws1093 test/resources/jaxrpc/jbws1093/META-INF test/resources/jaxrpc/jbws1093/WEB-INF test/resources/jaxrpc/jbws1093/WEB-INF/wsdl

Author: darran.lofthouse(a)jboss.com Date: 2006-11-02 13:19:31 -0500 (Thu, 02 Nov 2006) New Revision: 1345 Added: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/DeploymentLoader.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.java branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/META-INF/ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/META-INF/application-client.xml branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/jaxrpc-mapping.xml branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/web.xml branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/webservices.xml branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl/ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/wstools-config.xml Removed: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.java branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/META-INF/ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/META-INF/application-client.xml branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/jaxrpc-mapping.xml branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/web.xml branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/webservices.xml branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl/ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/wstools-config.xml Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/ServiceEndpointPublisher.java branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/DeployerInterceptorJSE.java branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/JBossServiceEndpointPublisher.java branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointPublisher.java branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/wspublish.java branches/jbossws-1.0/src/main/resources/jbossws.war/Tomcat/WEB-INF/log4j.xml branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml Log: JBWS-1093 - Refactoring of deployment to allow correct identification of servlets and web services. Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java 2006-11-02 16:50:38 UTC (rev 1344) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java 2006-11-02 18:19:31 UTC (rev 1345) @@ -37,7 +37,7 @@ import org.jboss.ws.server.WSDLFilePublisher; /** - * The POJO deployer for web service endpoints + * The deployer for web service endpoints * * @author Thomas.Diesler(a)jboss.org * @since 12-May-2006 Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/ServiceEndpointPublisher.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/ServiceEndpointPublisher.java 2006-11-02 16:50:38 UTC (rev 1344) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/ServiceEndpointPublisher.java 2006-11-02 18:19:31 UTC (rev 1345) @@ -24,12 +24,12 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.net.URL; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Set; import org.jboss.logging.Logger; import org.jboss.ws.utils.DOMUtils; @@ -78,22 +78,20 @@ { this.servletName = servletName; } - - public abstract String publishServiceEndpoint(URL warURL) throws Exception; - - public abstract String destroyServiceEndpoint(URL warURL) throws Exception; - + public abstract String publishServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception; public abstract String destroyServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception; - public Map<String, String> rewriteWebXML(URL warURL) + public abstract Set<String> getWebServiceServletLinks(UnifiedDeploymentInfo udi) throws Exception; + + public Map<String, String> rewriteWebXML(UnifiedDeploymentInfo udi) { - File warFile = new File(warURL.getFile()); + File warFile = new File(udi.localUrl.getFile()); if (warFile.isDirectory() == false) - throw new WSException("Expected a war directory: " + warURL); + throw new WSException("Expected a war directory: " + udi.localUrl); - File webXML = new File(warURL.getFile() + "/WEB-INF/web.xml"); + File webXML = new File(udi.localUrl.getFile() + "/WEB-INF/web.xml"); if (webXML.isFile() == false) throw new WSException("Cannot find web.xml: " + webXML); @@ -102,7 +100,8 @@ Element root = DOMUtils.parse(new FileInputStream(webXML)); String warName = warFile.getName(); - Map<String, String> sepTargetMap = modifyServletConfig(root, warName); + Set<String> wsServletLinks = getWebServiceServletLinks(udi); + Map<String, String> sepTargetMap = modifyServletConfig(root, warName, wsServletLinks); // After redeployment there might be a stale copy of the original web.xml.org, we delete it File orgWebXML = new File(webXML.getCanonicalPath() + ".org"); @@ -128,7 +127,7 @@ } } - private Map<String, String> modifyServletConfig(Element root, String warName) + private Map<String, String> modifyServletConfig(Element root, String warName, Set<String> webServiceServlets) { Map<String, String> sepTargetMap = new HashMap<String, String>(); @@ -151,12 +150,12 @@ // Nothing to do if we have an <init-param> if (isAlreadyModified(servletElement) == false) { - // Check if it is a real servlet that we can ignore - if (servletClassName.endsWith("Servlet")) + // Check if the servlet is a known web service + if (webServiceServlets.contains(linkName) == false) { - log.info("Ignore <servlet-class> that ends with 'Servlet': " + servletClassName); + log.info("Ignore servlet, not a known web service: " + linkName); continue; - } + } // build a list of detached elements that come after <servlet-class> boolean startDetach = false; Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/DeployerInterceptorJSE.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/DeployerInterceptorJSE.java 2006-11-02 16:50:38 UTC (rev 1344) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/DeployerInterceptorJSE.java 2006-11-02 18:19:31 UTC (rev 1345) @@ -86,12 +86,12 @@ if (udi != null) { ServiceEndpointPublisher endpointPublisher = getServiceEndpointPublisher(); - Map<String, String> sepTargetMap = endpointPublisher.rewriteWebXML(udi.localUrl); + Map<String, String> sepTargetMap = endpointPublisher.rewriteWebXML(udi); updateServiceEndpointTargetBeans(udi, sepTargetMap); } return retn; } - + private void updateServiceEndpointTargetBeans(UnifiedDeploymentInfo udi, Map<String, String> sepTargetMap) { UnifiedMetaData wsMetaData = getServiceEndpointDeployer().getUnifiedMetaData(udi); Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/JBossServiceEndpointPublisher.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/JBossServiceEndpointPublisher.java 2006-11-02 16:50:38 UTC (rev 1344) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/JBossServiceEndpointPublisher.java 2006-11-02 18:19:31 UTC (rev 1345) @@ -24,6 +24,8 @@ // $Id: WebServiceDeployer.java 312 2006-05-11 10:49:22Z thomas.diesler(a)jboss.com $ import java.net.URL; +import java.util.HashSet; +import java.util.Set; import javax.management.MBeanServer; @@ -34,6 +36,10 @@ import org.jboss.mx.util.MBeanServerLocator; import org.jboss.ws.deployment.ServiceEndpointPublisher; import org.jboss.ws.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.metadata.EndpointMetaData; +import org.jboss.ws.metadata.ServerEndpointMetaData; +import org.jboss.ws.metadata.ServiceMetaData; +import org.jboss.ws.metadata.UnifiedMetaData; /** * Publish the HTTP service endpoint to Tomcat @@ -44,19 +50,6 @@ public class JBossServiceEndpointPublisher extends ServiceEndpointPublisher { - public String publishServiceEndpoint(URL warURL) throws Exception - { - rewriteWebXML(warURL); - getMainDeployer().deploy(warURL); - return "OK"; - } - - public String destroyServiceEndpoint(URL warURL) throws Exception - { - getMainDeployer().undeploy(warURL); - return "OK"; - } - public String publishServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception { URL warURL = udi.localUrl; @@ -64,7 +57,7 @@ if (di == null) throw new IllegalStateException("Cannot obtain DeploymentInfo from context"); - rewriteWebXML(warURL); + rewriteWebXML(udi); // Preserve the repository config DeploymentInfo auxdi = new DeploymentInfo(warURL, null, MBeanServerLocator.locateJBoss()); @@ -75,9 +68,29 @@ public String destroyServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception { - return destroyServiceEndpoint(udi.localUrl); + getMainDeployer().undeploy(udi.localUrl); + return "OK"; } + + public Set<String> getWebServiceServletLinks(UnifiedDeploymentInfo udi) + { + Set<String> links = new HashSet<String>(); + + UnifiedMetaData wsMetaData = getServiceEndpointDeployer().getUnifiedMetaData(udi); + for (ServiceMetaData serviceMetaData : wsMetaData.getServices()) + { + for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints()) + { + ServerEndpointMetaData sepMetaData = (ServerEndpointMetaData)epMetaData; + links.add(sepMetaData.getLinkName()); + + } + } + + return links; + } + private MainDeployerMBean getMainDeployer() throws MBeanProxyCreationException { MBeanServer server = MBeanServerLocator.locateJBoss(); Added: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/DeploymentLoader.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/DeploymentLoader.java 2006-11-02 16:50:38 UTC (rev 1344) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/DeploymentLoader.java 2006-11-02 18:19:31 UTC (rev 1345) @@ -0,0 +1,81 @@ +/* + * 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.ws.integration.tomcat; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; + +/** + * A classloader to be used during deployment to load servlet + * classes to allow them to be tested for annotations. + * + * @author darran.lofthouse(a)jboss.com + * @since Nov 2, 2006 + */ +public class DeploymentLoader extends URLClassLoader +{ + + public DeploymentLoader(ClassLoader parent) + { + super(new URL[] {}, parent); + } + + + public static DeploymentLoader newInstance(URL warUrl) + { + DeploymentLoader loader = new DeploymentLoader(Thread.currentThread().getContextClassLoader()); + + File classesDir = new File(warUrl.getFile() + "/WEB-INF/classes"); + if (classesDir.exists()) + { + loader.addURL(toURL(classesDir)); + } + + File libDir = new File(warUrl.getFile() + "/WEB-INF/lib"); + if (libDir.exists() && libDir.isDirectory()) + { + File[] files = libDir.listFiles(); + for (int i = 0; i < files.length; i++) + { + File file = files[i]; + loader.addURL(toURL(file)); + } + } + + return loader; + } + + private static URL toURL(File file) + { + try + { + return file.toURL(); + } + catch (MalformedURLException e) + { + // ignore + return null; + } + } +} Property changes on: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/DeploymentLoader.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointPublisher.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointPublisher.java 2006-11-02 16:50:38 UTC (rev 1344) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointPublisher.java 2006-11-02 18:19:31 UTC (rev 1345) @@ -24,16 +24,28 @@ // $Id$ import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; import java.net.URL; import java.util.Arrays; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Set; import org.jboss.logging.Logger; -import org.jboss.util.NotImplementedException; +import org.jboss.ws.WSException; import org.jboss.ws.deployment.ServiceEndpointPublisher; import org.jboss.ws.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.metadata.jsr109.PortComponentMetaData; +import org.jboss.ws.metadata.jsr109.WebserviceDescriptionMetaData; +import org.jboss.ws.metadata.jsr109.WebservicesFactory; +import org.jboss.ws.metadata.jsr109.WebservicesMetaData; +import org.jboss.ws.utils.DOMUtils; +import org.jboss.xb.binding.ObjectModelFactory; +import org.jboss.xb.binding.Unmarshaller; +import org.jboss.xb.binding.UnmarshallerFactory; +import org.w3c.dom.Element; /** * Publish the HTTP service endpoint to Tomcat @@ -45,7 +57,7 @@ { // logging support private static Logger log = Logger.getLogger(TomcatServiceEndpointPublisher.class); - + private boolean isRunning; private File targetDir; private File deployDir; @@ -67,7 +79,7 @@ { this.targetDir = new File(dirName); if (targetDir.isDirectory() == false) - throw new IllegalArgumentException ("Target dir does not exist: " + targetDir); + throw new IllegalArgumentException("Target dir does not exist: " + targetDir); } public void setInterval(long interval) @@ -75,35 +87,143 @@ this.interval = interval; } - public String publishServiceEndpoint(URL warURL) throws Exception + public String publishServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception { - new wspublish().process(warURL, targetDir, servletName); + new wspublish().process(udi.url, targetDir, servletName); return "OK"; } - public String destroyServiceEndpoint(URL warURL) throws Exception + public String destroyServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception { - File targetFile = new File(targetDir.getAbsolutePath() + "/" + new File(warURL.getFile()).getName()); + File targetFile = new File(targetDir.getAbsolutePath() + "/" + new File(udi.url.getFile()).getName()); if (targetFile.delete()) return "OK"; + else return "NOT FOUND"; + } + + public Set<String> getWebServiceServletLinks(UnifiedDeploymentInfo udi) throws Exception + { + File warDir = new File(udi.localUrl.getFile()); + + if (warDir.exists() == false || warDir.isDirectory() == false) + { + throw new IllegalArgumentException("Invalid localUrl " + udi.localUrl); + } + + File webServicesXml = new File(warDir.getCanonicalPath() + "/WEB-INF/webservices.xml"); + if (webServicesXml.exists()) + { + return readWebservicesXmlLinks(webServicesXml.toURL()); + } else - return "NOT FOUND"; + { + return testAnnotatedServices(udi); + } } - public String publishServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception + private Set<String> readWebservicesXmlLinks(URL webServicesXml) { - throw new NotImplementedException(); + HashSet<String> links = new HashSet<String>(); + + try + { + InputStream is = webServicesXml.openStream(); + try + { + Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); + ObjectModelFactory factory = new WebservicesFactory(webServicesXml); + WebservicesMetaData jsr109MetaData = (WebservicesMetaData)unmarshaller.unmarshal(is, factory, null); + + for (WebserviceDescriptionMetaData currentWebService : jsr109MetaData.getWebserviceDescriptions()) + { + for (PortComponentMetaData currentPort : currentWebService.getPortComponents()) + { + String servletLink = currentPort.getServletLink(); + if (servletLink != null && servletLink.length() > 0) + { + links.add(servletLink); + } + } + } + } + finally + { + is.close(); + } + } + catch (RuntimeException e) + { + throw e; + } + catch (Exception e) + { + throw new WSException(e); + } + + return links; } - public String destroyServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception + private Set<String> testAnnotatedServices(UnifiedDeploymentInfo udi) { - throw new NotImplementedException(); + HashSet<String> links = new HashSet<String>(); + + try + { + ClassLoader warClassLoader = DeploymentLoader.newInstance(udi.localUrl); + File webXML = new File(udi.localUrl.getFile() + "/WEB-INF/web.xml"); + Element root = DOMUtils.parse(new FileInputStream(webXML)); + + Iterator itServlets = DOMUtils.getChildElements(root, "servlet"); + + while (itServlets.hasNext()) + { + Element servletElement = (Element)itServlets.next(); + String linkName = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(servletElement, "servlet-name")); + + // find the servlet-class + Element classElement = DOMUtils.getFirstChildElement(servletElement, "servlet-class"); + if (classElement == null) + throw new WSException("Cannot find <servlet-class> for servlet-name: " + linkName); + String servletClassName = DOMUtils.getTextContent(classElement); + + log.debug("Testing '" + linkName + "', '" + servletClassName + "'"); + + try + { + Class servletClass = warClassLoader.loadClass(servletClassName); + + if (servletClass.isAnnotationPresent(javax.jws.WebService.class)) + { + links.add(linkName); + } + else + { + log.debug("Servlet for '" + linkName + "' not annotated with javax.jws.WebService, assuming normal servlet"); + } + } + catch (ClassNotFoundException e) + { + log.warn("Unable to load class '" + servletClassName + "' for servlet '" + linkName + "'", e); + } + + } + } + catch (RuntimeException e) + { + throw e; + } + catch (Exception e) + { + throw new WSException(e); + } + + return links; } - + private void scanDeployDir() { List<File> fileList = Arrays.asList(deployDir.listFiles()); - + // deploy new files for (File file : fileList) { @@ -113,7 +233,7 @@ deployedFiles.add(file); } } - + // undeploy files for (File file : deployedFiles) { @@ -132,8 +252,10 @@ if (new File(targetDir.getAbsolutePath() + "/" + file.getName()).exists() == false) { System.out.println("Deploy file: " + file); - publishServiceEndpoint(file.toURL()); - } + UnifiedDeploymentInfo udi = new UnifiedDeploymentInfo(null); + udi.url = file.toURL(); + publishServiceEndpoint(udi); + } else { System.out.println("Ignore file: " + file); @@ -142,7 +264,7 @@ catch (Exception ex) { log.error("Cannot deploy file: " + file, ex); - } + } } private void undeployFile(File file) @@ -152,8 +274,10 @@ if (new File(targetDir.getAbsolutePath() + "/" + file.getName()).exists()) { System.out.println("Undeploy file: " + file); - destroyServiceEndpoint(file.toURL()); - } + UnifiedDeploymentInfo udi = new UnifiedDeploymentInfo(null); + udi.url = file.toURL(); + destroyServiceEndpoint(udi); + } else { System.out.println("Ignore file: " + file); @@ -162,7 +286,7 @@ catch (Exception ex) { log.error("Cannot undeploy file: " + file, ex); - } + } } // bean lifecycle start Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/wspublish.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/wspublish.java 2006-11-02 16:50:38 UTC (rev 1344) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/wspublish.java 2006-11-02 18:19:31 UTC (rev 1345) @@ -32,6 +32,7 @@ import org.jboss.logging.Logger; import org.jboss.util.file.JarUtils; +import org.jboss.ws.deployment.UnifiedDeploymentInfo; /** * Publish a standard portable J2EE web service endpoint @@ -69,7 +70,9 @@ TomcatServiceEndpointPublisher publisher = new TomcatServiceEndpointPublisher(); publisher.setServiceEndpointServlet(servletName); - publisher.rewriteWebXML(tmpDir.toURL()); + UnifiedDeploymentInfo udi = new UnifiedDeploymentInfo(null); + udi.localUrl = tmpDir.toURL(); + publisher.rewriteWebXML(udi); File outFile = new File(destDir.getCanonicalPath() + "/" + warName); outFile.getParentFile().mkdirs(); Modified: branches/jbossws-1.0/src/main/resources/jbossws.war/Tomcat/WEB-INF/log4j.xml =================================================================== --- branches/jbossws-1.0/src/main/resources/jbossws.war/Tomcat/WEB-INF/log4j.xml 2006-11-02 16:50:38 UTC (rev 1344) +++ branches/jbossws-1.0/src/main/resources/jbossws.war/Tomcat/WEB-INF/log4j.xml 2006-11-02 18:19:31 UTC (rev 1345) @@ -22,7 +22,7 @@ <!-- A time/date based rolling appender --> <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender"> - <param name="File" value="/usr/java/tomcat/logs/jbossws.log"/> + <param name="File" value="../logs/jbossws.log"/> <param name="Append" value="false"/> <!-- Rollover at midnight each day --> Modified: branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml =================================================================== --- branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml 2006-11-02 16:50:38 UTC (rev 1344) +++ branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml 2006-11-02 18:19:31 UTC (rev 1345) @@ -565,6 +565,33 @@ </metainf> </jar> + <!-- jbossws-jbws1093 --> + <war warfile="${build.test.dir}/libs/jaxrpc-jbws1093.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1093/WEB-INF/web.xml"> + <classes dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.class"/> + </classes> + <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1093/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${build.test.dir}/libs/jaxrpc-jbws1093-client.jar"> + <fileset dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jbws1093/TestEndpoint.class"/> + </fileset> + <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1093/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1093/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <!-- jaxrpc-jbws1107 --> <war warfile="${build.test.dir}/libs/jaxrpc-jbws1107.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1107/WEB-INF/web.xml"> <classes dir="${build.test.dir}/classes"> Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093 (from rev 1249, branches/dlofthouse/JBWS-1093/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093) Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java =================================================================== --- branches/dlofthouse/JBWS-1093/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2006-10-17 22:00:26 UTC (rev 1249) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2006-11-02 18:19:31 UTC (rev 1345) @@ -1,99 +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.jaxrpc.jbws1093; - -import java.io.BufferedReader; -import java.io.File; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.URL; - -import javax.naming.InitialContext; -import javax.xml.namespace.QName; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.jaxrpc.ServiceFactoryImpl; - -/** - * Test case to test that when a deployment contains both an endpoint and a - * servlet both are deployed correctly and can be accessed. - * - * @author darran.lofthouse(a)jboss.com - * @since 17-October-2006 - */ -public class JBWS1093TestCase extends JBossWSTest -{ - - private static TestEndpoint port; - - public static Test suite() throws Exception - { - return JBossWSTestSetup.newTestSetup(JBWS1093TestCase.class, "jaxrpc-jbws1093.war, jaxrpc-jbws1093-client.jar"); - } - - public void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - if (isTargetServerJBoss()) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - port = (TestEndpoint)service.getPort(TestEndpoint.class); - } - else - { - ServiceFactoryImpl factory = new ServiceFactoryImpl(); - URL wsdlURL = new File("resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/jbws1093/WEB-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.test.ws/jbws1093", "TestService"); - Service service = factory.createService(wsdlURL, qname, mappingURL); - port = (TestEndpoint)service.getPort(TestEndpoint.class); - } - } - } - - public void testAccessServlet() throws Exception - { - String host = System.getProperty("jbosstest.host.name"); - URL servletURL = new URL("http://" + host + ":8080" + "/jaxrpc-jbws1093/ServletTest"); - - InputStream is = servletURL.openStream(); - InputStreamReader isr = new InputStreamReader(is); - BufferedReader br = new BufferedReader(isr); - - String line = br.readLine(); - - assertEquals(ServletTest.MESSAGE, line); - } - - public void testAccessEnpoint() throws Exception - { - assertEquals(ServletTest.MESSAGE, port.echoString(ServletTest.MESSAGE)); - } - -} Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java (from rev 1249, branches/dlofthouse/JBWS-1093/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java) Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java =================================================================== --- branches/dlofthouse/JBWS-1093/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java 2006-10-17 22:00:26 UTC (rev 1249) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java 2006-11-02 18:19:31 UTC (rev 1345) @@ -1,53 +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.jaxrpc.jbws1093; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * JBWS-1093 - This servlet is called ServletTest to check that we are - * not identifying servlets by the classname ending in 'Servlet'. - * - * @author darran.lofthouse(a)jboss.com - * @since 17-October-2006 - */ -public class ServletTest extends HttpServlet -{ - - private static final long serialVersionUID = 8465532467878198647L; - - public static final String MESSAGE = "Success!!"; - - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException - { - ServletOutputStream sos = response.getOutputStream(); - sos.println(MESSAGE); - } - -} Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java (from rev 1249, branches/dlofthouse/JBWS-1093/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java) Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.java =================================================================== --- branches/dlofthouse/JBWS-1093/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.java 2006-10-17 22:00:26 UTC (rev 1249) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.java 2006-11-02 18:19:31 UTC (rev 1345) @@ -1,36 +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.jaxrpc.jbws1093; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -/** - * @author darran.lofthouse(a)jboss.com - * @since 17-October-2006 - */ -public interface TestEndpoint extends Remote -{ - - public String echoString(final String message) throws RemoteException; - -} Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.java (from rev 1249, branches/dlofthouse/JBWS-1093/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.java) Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.java =================================================================== --- branches/dlofthouse/JBWS-1093/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.java 2006-10-17 22:00:26 UTC (rev 1249) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.java 2006-11-02 18:19:31 UTC (rev 1345) @@ -1,38 +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.jaxrpc.jbws1093; - -import java.rmi.RemoteException; - -/** - * @author darran.lofthouse(a)jboss.com - * @since 17-October-2006 - */ -public class TestEndpointImpl implements TestEndpoint -{ - - public String echoString(String message) throws RemoteException - { - return message; - } - -} Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.java (from rev 1249, branches/dlofthouse/JBWS-1093/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.java) Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093 (from rev 1249, branches/dlofthouse/JBWS-1093/src/test/resources/jaxrpc/jbws1093) Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/META-INF (from rev 1249, branches/dlofthouse/JBWS-1093/src/test/resources/jaxrpc/jbws1093/META-INF) Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/META-INF/application-client.xml =================================================================== --- branches/dlofthouse/JBWS-1093/src/test/resources/jaxrpc/jbws1093/META-INF/application-client.xml 2006-10-17 22:00:26 UTC (rev 1249) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/META-INF/application-client.xml 2006-11-02 18:19:31 UTC (rev 1345) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<application-client 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/application-client_1_4.xsd" - version="1.4"> - - <display-name>TestService</display-name> - - <service-ref> - <service-ref-name>service/TestService</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1093.TestEndpoint</service-endpoint-interface> - </port-component-ref> - </service-ref> - -</application-client> - Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/META-INF/application-client.xml (from rev 1249, branches/dlofthouse/JBWS-1093/src/test/resources/jaxrpc/jbws1093/META-INF/application-client.xml) Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml =================================================================== --- branches/dlofthouse/JBWS-1093/src/test/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml 2006-10-17 22:00:26 UTC (rev 1249) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml 2006-11-02 18:19:31 UTC (rev 1345) @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC - "-//JBoss//DTD Application Client 4.0//EN" - "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> - - <service-ref> - <service-ref-name>service/TestService</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws1093/TestEndpoint?wsdl</wsdl-override> - </service-ref> - -</jboss-client> Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml (from rev 1249, branches/dlofthouse/JBWS-1093/src/test/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml) Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF (from rev 1249, branches/dlofthouse/JBWS-1093/src/test/resources/jaxrpc/jbws1093/WEB-INF) Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1093/src/test/resources/jaxrpc/jbws1093/WEB-INF/jaxrpc-mapping.xml 2006-10-17 22:00:26 UTC (rev 1249) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/jaxrpc-mapping.xml 2006-11-02 18:19:31 UTC (rev 1345) @@ -1,37 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' 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://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.jbws1093</package-type> - <namespaceURI>http://org.jboss.test.ws/jbws1093/types</namespaceURI> - </package-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.jbws1093.TestService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1093'>serviceNS:TestService</wsdl-service-name> - <port-mapping> - <port-name>TestEndpointPort</port-name> - <java-port-name>TestEndpointPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1093.TestEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1093'>portTypeNS:TestEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1093'>bindingNS:TestEndpointBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>echoString</java-method-name> - <wsdl-operation>echoString</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1093'>wsdlMsgNS:TestEndpoint_echoString</wsdl-message> - <wsdl-message-part-name>String_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1093'>wsdlMsgNS:TestEndpoint_echoStringResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/jaxrpc-mapping.xml (from rev 1249, branches/dlofthouse/JBWS-1093/src/test/resources/jaxrpc/jbws1093/WEB-INF/jaxrpc-mapping.xml) Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/web.xml =================================================================== --- branches/dlofthouse/JBWS-1093/src/test/resources/jaxrpc/jbws1093/WEB-INF/web.xml 2006-10-17 22:00:26 UTC (rev 1249) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/web.xml 2006-11-02 18:19:31 UTC (rev 1345) @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <servlet> - <servlet-name>ServletTest</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws1093.ServletTest</servlet-class> - </servlet> - - <servlet> - <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws1093.TestEndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>ServletTest</servlet-name> - <url-pattern>/ServletTest</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/TestEndpoint</url-pattern> - </servlet-mapping> - -</web-app> - Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/web.xml (from rev 1249, branches/dlofthouse/JBWS-1093/src/test/resources/jaxrpc/jbws1093/WEB-INF/web.xml) Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/webservices.xml =================================================================== --- branches/dlofthouse/JBWS-1093/src/test/resources/jaxrpc/jbws1093/WEB-INF/webservices.xml 2006-10-17 22:00:26 UTC (rev 1249) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/webservices.xml 2006-11-02 18:19:31 UTC (rev 1345) @@ -1,15 +0,0 @@ -<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1093' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> - <webservice-description> - <webservice-description-name>TestService</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>TestEndpointPort</port-component-name> - <wsdl-port>impl:TestEndpointPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1093.TestEndpoint</service-endpoint-interface> - <service-impl-bean> - <servlet-link>TestEndpoint</servlet-link> - </service-impl-bean> - </port-component> - </webservice-description> -</webservices> \ No newline at end of file Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/webservices.xml (from rev 1249, branches/dlofthouse/JBWS-1093/src/test/resources/jaxrpc/jbws1093/WEB-INF/webservices.xml) Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl (from rev 1249, branches/dlofthouse/JBWS-1093/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl) Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl =================================================================== --- branches/dlofthouse/JBWS-1093/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl 2006-10-17 22:00:26 UTC (rev 1249) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl 2006-11-02 18:19:31 UTC (rev 1345) @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1093' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1093' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types/> - <message name='TestEndpoint_echoString'> - <part name='String_1' type='xsd:string'/> - </message> - <message name='TestEndpoint_echoStringResponse'> - <part name='result' type='xsd:string'/> - </message> - <portType name='TestEndpoint'> - <operation name='echoString' parameterOrder='String_1'> - <input message='tns:TestEndpoint_echoString'/> - <output message='tns:TestEndpoint_echoStringResponse'/> - </operation> - </portType> - <binding name='TestEndpointBinding' type='tns:TestEndpoint'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echoString'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.test.ws/jbws1093' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.test.ws/jbws1093' use='literal'/> - </output> - </operation> - </binding> - <service name='TestService'> - <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='http://localhost:8080//jbossws-jbws1093/TestEndpoint?wsdl'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl (from rev 1249, branches/dlofthouse/JBWS-1093/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl) =================================================================== --- branches/dlofthouse/JBWS-1093/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl 2006-10-17 22:00:26 UTC (rev 1249) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl 2006-11-02 18:19:31 UTC (rev 1345) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1093' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1093' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types/> + <message name='TestEndpoint_echoString'> + <part name='String_1' type='xsd:string'/> + </message> + <message name='TestEndpoint_echoStringResponse'> + <part name='result' type='xsd:string'/> + </message> + <portType name='TestEndpoint'> + <operation name='echoString' parameterOrder='String_1'> + <input message='tns:TestEndpoint_echoString'/> + <output message='tns:TestEndpoint_echoStringResponse'/> + </operation> + </portType> + <binding name='TestEndpointBinding' type='tns:TestEndpoint'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echoString'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.test.ws/jbws1093' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.test.ws/jbws1093' use='literal'/> + </output> + </operation> + </binding> + <service name='TestService'> + <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> + <soap:address location='http://localhost:8080//jaxrpc-jbws1093/TestEndpoint?wsdl'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1093/src/test/resources/jaxrpc/jbws1093/wstools-config.xml 2006-10-17 22:00:26 UTC (rev 1249) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/wstools-config.xml 2006-11-02 18:19:31 UTC (rev 1345) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml ---> - -<!-- Set the soap:address location to 'http://localhost:8080//jbossws-jbws1093/TestEndpoint?wsdl' to run with Tomcat --> - -<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - <java-wsdl> - <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1093.TestEndpoint" style="rpc"> - </service> - <namespaces target-namespace="http://org.jboss.test.ws/jbws1093" type-namespace="http://org.jboss.test.ws/jbws1093/types"/> - <mapping file="jaxrpc-mapping.xml"/> - <webservices servlet-link="TestEndpoint"/> - </java-wsdl> -</configuration> Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/wstools-config.xml (from rev 1249, branches/dlofthouse/JBWS-1093/src/test/resources/jaxrpc/jbws1093/wstools-config.xml)