Author: thomas.diesler(a)jboss.com Date: 2006-12-05 19:50:19 -0500 (Tue, 05 Dec 2006) New Revision: 1562 Added: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointPublisher.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/JAXWSDeployment.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java Removed: branches/tdiesler/trunk/src/main/java/org/jboss/ws/binding/ branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/ Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInfo.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractEJBDeployer.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdaptor.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerJSE.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerEJB3.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB3.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointPublisher.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointPublisher.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceReferenceable.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientDeployment.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCDeployment.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSEndpointMetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB21.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java Log: partial commit Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointPublisher.java (from rev 1560, branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/AbstractServiceEndpointPublisher.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/AbstractServiceEndpointPublisher.java 2006-12-06 00:32:54 UTC (rev 1560) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointPublisher.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -0,0 +1,250 @@ +/* + * 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.core.server; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.InputStream; +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 javax.servlet.Servlet; + +import org.jboss.logging.Logger; +import org.jboss.ws.WSException; +import org.jboss.ws.utils.DOMUtils; +import org.jboss.ws.utils.DOMWriter; +import org.jboss.ws.utils.IOUtils; +import org.jboss.ws.utils.JavaUtils; +import org.w3c.dom.Element; + +/** + * The publisher for web service endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-May-2006 + */ +public abstract class AbstractServiceEndpointPublisher +{ + // default bean name + public static final String BEAN_NAME = "ServiceEndpointPublisher"; + + // The servlet init param in web.xml that is the service endpoint class + public static final String INIT_PARAM_SERVICE_ENDPOINT_IMPL = "ServiceEndpointImpl"; + + // logging support + private static Logger log = Logger.getLogger(AbstractServiceEndpointPublisher.class); + + // The configured service endpoint servlet + protected String servletName; + + public String getServiceEndpointServlet() + { + return servletName; + } + + public void setServiceEndpointServlet(String servletName) + { + this.servletName = servletName; + } + + public abstract String publishServiceEndpoint(URL warURL) throws Exception; + + public abstract String destroyServiceEndpoint(URL warURL) throws Exception; + + public URL rewriteWarWebXml(URL warURL) + { + File warFile = new File(warURL.getFile()); + if (warFile.isDirectory() == false) + throw new WSException("Expected a war directory: " + warURL); + + File webXML = new File(warURL.getFile() + "/WEB-INF/web.xml"); + if (webXML.isFile() == false) + throw new WSException("Cannot find web.xml: " + webXML); + + try + { + // After redeployment there might be a stale copy of the original web.xml.org, we delete it + File orgWebXML = new File(webXML.getCanonicalPath() + ".org"); + orgWebXML.delete(); + + // Rename the web.xml + if (webXML.renameTo(orgWebXML) == false) + throw new WSException("Cannot rename web.xml: " + orgWebXML); + + FileInputStream stream = new FileInputStream(orgWebXML); + return rewriteWebXml(stream, webXML, null).toURL(); + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception e) + { + throw new WSException(e); + } + } + + public File rewriteWebXml(InputStream source, File dest, ClassLoader loader) throws Exception + { + if (dest == null) + { + dest = File.createTempFile("jbossws-alt-web", "xml", IOUtils.createTempDirectory()); + dest.deleteOnExit(); + } + + Element root = DOMUtils.parse(source); + modifyServletConfig(root, loader); + + FileOutputStream fos = new FileOutputStream(dest); + new DOMWriter(fos).setPrettyprint(true).print(root); + fos.flush(); + fos.close(); + + return dest; + } + + private Map<String, String> modifyServletConfig(Element root, ClassLoader loader) throws ClassNotFoundException + { + Map<String, String> sepTargetMap = new HashMap<String, String>(); + + 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"); + + // JSP + if (classElement == null) + continue; + + // Get the servlet class + String servletClassName = DOMUtils.getTextContent(classElement).trim(); + Class servletClass = (loader != null ? loader.loadClass(servletClassName) : null); + + String targetBeanName = null; + + // 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 (servletClass != null && JavaUtils.isAssignableFrom(Servlet.class, servletClass)) + { + log.info("Ignore servlet: " + servletClassName); + continue; + } + else if (servletClassName.endsWith("Servlet")) + { + log.info("Ignore <servlet-class> that ends with 'Servlet': " + servletClassName); + continue; + } + + // build a list of detached elements that come after <servlet-class> + boolean startDetach = false; + List<Element> detachedElements = new ArrayList<Element>(); + Iterator itDetached = DOMUtils.getChildElements(servletElement); + while (itDetached.hasNext()) + { + Element el = (Element)itDetached.next(); + if (startDetach == true) + { + detachedElements.add(el); + servletElement.removeChild(el); + } + if (el.equals(classElement)) + { + servletElement.removeChild(el); + startDetach = true; + } + } + + // replace the class name + classElement = (Element)DOMUtils.createElement("servlet-class"); + classElement.appendChild(DOMUtils.createTextNode(servletName)); + classElement = (Element)servletElement.getOwnerDocument().importNode(classElement, true); + servletElement.appendChild(classElement); + + // add additional init params + if (servletClassName.equals(servletName) == false) + { + Element paramElement = DOMUtils.createElement("init-param"); + paramElement.appendChild(DOMUtils.createElement("param-name")).appendChild(DOMUtils.createTextNode(INIT_PARAM_SERVICE_ENDPOINT_IMPL)); + paramElement.appendChild(DOMUtils.createElement("param-value")).appendChild(DOMUtils.createTextNode(servletClassName)); + paramElement = (Element)servletElement.getOwnerDocument().importNode(paramElement, true); + servletElement.appendChild(paramElement); + targetBeanName = servletClassName; + } + + // reattach the elements + itDetached = detachedElements.iterator(); + while (itDetached.hasNext()) + { + Element el = (Element)itDetached.next(); + servletElement.appendChild(el); + } + } + else + { + Iterator itParams = DOMUtils.getChildElements(servletElement, "init-param"); + while (itParams.hasNext()) + { + Element elParam = (Element)itParams.next(); + Element elParamName = DOMUtils.getFirstChildElement(elParam, "param-name"); + Element elParamValue = DOMUtils.getFirstChildElement(elParam, "param-value"); + if (INIT_PARAM_SERVICE_ENDPOINT_IMPL.equals(DOMUtils.getTextContent(elParamName))) + { + targetBeanName = DOMUtils.getTextContent(elParamValue); + } + } + } + + if (targetBeanName == null) + throw new IllegalStateException("Cannot obtain service endpoint bean for: " + linkName); + + sepTargetMap.put(linkName, targetBeanName.trim()); + } + + return sepTargetMap; + } + + // Return true if the web.xml is already modified + private boolean isAlreadyModified(Element servletElement) + { + Iterator itParams = DOMUtils.getChildElements(servletElement, "init-param"); + while (itParams.hasNext()) + { + Element elParam = (Element)itParams.next(); + Element elParamName = DOMUtils.getFirstChildElement(elParam, "param-name"); + if (INIT_PARAM_SERVICE_ENDPOINT_IMPL.equals(DOMUtils.getTextContent(elParamName))) + return true; + } + return false; + } +} \ No newline at end of file Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/JAXWSDeployment.java (from rev 1560, branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JAXWSDeployment.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JAXWSDeployment.java 2006-12-06 00:32:54 UTC (rev 1560) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/JAXWSDeployment.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -0,0 +1,41 @@ +/* + * 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.core.server; + +import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; + + +// $Id$ + +/** + * The container independent deployment info. + * + * @author Thomas.Diesler(a)jboss.org + * @since 29-Jun-2006 + */ +public class JAXWSDeployment extends UnifiedDeploymentInfo +{ + public JAXWSDeployment(DeploymentType type) + { + super(type); + } +} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java (from rev 1561, branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java 2006-12-06 00:44:31 UTC (rev 1561) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -0,0 +1,229 @@ +/* + * 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.core.server; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import javax.management.ObjectName; + +import org.jboss.logging.Logger; +import org.jboss.ws.WSException; +import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; +import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCDeployment; +import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCServerMetaDataBuilder; +import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilderEJB3; +import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilderJSE; +import org.jboss.ws.metadata.umdm.EndpointMetaData; +import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; +import org.jboss.ws.metadata.umdm.ServiceMetaData; +import org.jboss.ws.metadata.umdm.UnifiedMetaData; + +/** + * The POJO deployer for web service endpoints. This Deployer is already decoupled from the target + * container (i.e. JBoss, Tomcat). The containers deployer architecture should be used to populate + * the UnifiedDeploymentInfo object. + * + * @deprecated + * This functionality should be handled by the ServiceEndpointManager + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-May-2006 + */ +public class ServiceEndpointDeployer +{ + // logging support + private static Logger log = Logger.getLogger(ServiceEndpointDeployer.class); + + // default bean name + public static final String BEAN_NAME = "ServiceEndpointDeployer"; + + // The servlet init param in web.xml that is the service endpoint class + public static final String INIT_PARAM_SERVICE_ENDPOINT_IMPL = "ServiceEndpointImpl"; + + // The ServiceEndpointManger injected by the kernel + private ServiceEndpointManager epManager; + + // Maps the deployment url to UMDM + private Map<String, UnifiedMetaData> metaDataMap = new ConcurrentHashMap<String, UnifiedMetaData>(); + + // Injected by the Microkernel + public void setServiceEndpointManager(ServiceEndpointManager epManager) + { + this.epManager = epManager; + } + + public void create(UnifiedDeploymentInfo udi) + { + log.debug("create: " + udi.url); + try + { + UnifiedMetaData wsMetaData; + if (udi.type == UnifiedDeploymentInfo.DeploymentType.JAXRPC_JSE) + { + JAXRPCServerMetaDataBuilder builder = new JAXRPCServerMetaDataBuilder(); + wsMetaData = builder.buildMetaData((JAXRPCDeployment)udi); + } + else if (udi.type == UnifiedDeploymentInfo.DeploymentType.JAXRPC_EJB21) + { + JAXRPCServerMetaDataBuilder builder = new JAXRPCServerMetaDataBuilder(); + wsMetaData = builder.buildMetaData((JAXRPCDeployment)udi); + } + else if (udi.type == UnifiedDeploymentInfo.DeploymentType.JAXWS_JSE) + { + JAXWSMetaDataBuilderJSE builder = new JAXWSMetaDataBuilderJSE(); + wsMetaData = builder.buildMetaData(udi); + } + else if (udi.type == UnifiedDeploymentInfo.DeploymentType.JAXWS_EJB3) + { + JAXWSMetaDataBuilderEJB3 builder = new JAXWSMetaDataBuilderEJB3(); + wsMetaData = builder.buildMetaData(udi); + } + else + { + throw new IllegalStateException("Invalid type: " + udi.type); + } + + metaDataMap.put(udi.url.toExternalForm(), wsMetaData); + + for (ServiceMetaData serviceMetaData : wsMetaData.getServices()) + { + for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints()) + { + ServiceEndpointInfo seInfo = new ServiceEndpointInfo(udi, (ServerEndpointMetaData)epMetaData); + epManager.createServiceEndpoint(seInfo); + } + } + } + catch (Exception ex) + { + log.error("Cannot create service endpoint", ex); + if (ex instanceof RuntimeException) + throw (RuntimeException)ex; + + throw new WSException(ex); + } + } + + public void start(UnifiedDeploymentInfo udi) + { + log.debug("start: " + udi.url); + try + { + UnifiedMetaData wsMetaData = getUnifiedMetaData(udi); + if (wsMetaData != null) + { + // late initialization of the web context loader + if (wsMetaData.getClassLoader() != udi.classLoader) + wsMetaData.setClassLoader(udi.classLoader); + + // Publish the WSDL file + WSDLFilePublisher wsdlfp = new WSDLFilePublisher(udi); + wsdlfp.publishWsdlFiles(wsMetaData); + for (ServiceMetaData serviceMetaData : wsMetaData.getServices()) + { + for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints()) + { + ObjectName sepID = ((ServerEndpointMetaData)epMetaData).getServiceEndpointID(); + epManager.startServiceEndpoint(sepID); + } + } + } + } + catch (Exception ex) + { + log.error("Cannot start service endpoint", ex); + if (ex instanceof RuntimeException) + throw (RuntimeException)ex; + + throw new WSException(ex); + } + } + + public void stop(UnifiedDeploymentInfo udi) + { + log.debug("stop: " + udi.url); + try + { + UnifiedMetaData wsMetaData = getUnifiedMetaData(udi); + if (wsMetaData != null) + { + // Stop the service endpoints + for (ServiceMetaData serviceMetaData : wsMetaData.getServices()) + { + for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints()) + { + ObjectName sepID = ((ServerEndpointMetaData)epMetaData).getServiceEndpointID(); + epManager.stopServiceEndpoint(sepID); + } + } + + // Unpublish the WSDL file + WSDLFilePublisher wsdlfp = new WSDLFilePublisher(udi); + wsdlfp.unpublishWsdlFiles(); + } + } + catch (Exception ex) + { + log.error("Cannot stop service endpoint", ex); + if (ex instanceof RuntimeException) + throw (RuntimeException)ex; + + throw new WSException(ex); + } + } + + public void destroy(UnifiedDeploymentInfo udi) + { + log.debug("destroy: " + udi.url); + try + { + UnifiedMetaData wsMetaData = getUnifiedMetaData(udi); + if (wsMetaData != null) + { + // Destroy the service endpoints + for (ServiceMetaData serviceMetaData : wsMetaData.getServices()) + { + for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints()) + { + ObjectName sepID = ((ServerEndpointMetaData)epMetaData).getServiceEndpointID(); + epManager.destroyServiceEndpoint(sepID); + } + } + } + } + catch (Exception ex) + { + log.error("Cannot destroy service endpoint", ex); + if (ex instanceof RuntimeException) + throw (RuntimeException)ex; + + throw new WSException(ex); + } + } + + public UnifiedMetaData getUnifiedMetaData(UnifiedDeploymentInfo udi) + { + UnifiedMetaData wsMetaData = metaDataMap.get(udi.url.toExternalForm()); + return wsMetaData; + } +} \ No newline at end of file Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInfo.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInfo.java 2006-12-06 00:44:31 UTC (rev 1561) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInfo.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -26,8 +26,7 @@ import javax.management.ObjectName; import org.jboss.ws.WSException; -import org.jboss.ws.deployment.UnifiedDeploymentInfo; -import org.jboss.ws.deployment.UnifiedDeploymentInfo.DeploymentType; +import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; import org.jboss.ws.metadata.j2ee.UnifiedMessageDrivenMetaData; Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java (from rev 1560, branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/UnifiedDeploymentInfo.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/UnifiedDeploymentInfo.java 2006-12-06 00:32:54 UTC (rev 1560) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -0,0 +1,84 @@ +/* + * 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.core.server; + +// $Id$ + +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + +/** + * The container independent deployment info. + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class UnifiedDeploymentInfo +{ + public enum DeploymentType + { + JAXRPC_Client, JAXRPC_JSE, JAXRPC_EJB21, JAXRPC_EJB3, JAXWS_JSE, JAXWS_EJB21, JAXWS_EJB3 + }; + + public UnifiedDeploymentInfo(DeploymentType type) + { + this.type = type; + } + + /** The type of this deployment */ + public DeploymentType type; + /** Sub deployments have a parent */ + public UnifiedDeploymentInfo parent; + /** The suffix of the deployment url */ + public String shortName; + /** The URL identifing this deployment **/ + public URL url; + /** The URL to the expanded webapp **/ + public URL expandedWebApp; + /** We can hold "typed" metadata */ + public Object metaData; + /** The deployment classloader **/ + public ClassLoader classLoader; + /** An arbitrary map of state associated with the deployment */ + public Map<String, Object> context = new HashMap<String, Object>(); + + /** The sortName concatenated with the canonical names of all parents. */ + public String getCanonicalName() + { + String name = shortName; + if (parent != null) + name = parent.getCanonicalName() + "/" + name; + return name; + } + + public String toString() + { + StringBuilder builder = new StringBuilder(); + builder.append("["); + builder.append("type=" + type); + builder.append(",shortName=" + shortName); + builder.append(",url=" + url); + builder.append("]"); + return builder.toString(); + } +} Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java 2006-12-06 00:44:31 UTC (rev 1561) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -44,7 +44,6 @@ import org.jboss.ws.utils.DOMUtils; import org.jboss.ws.Constants; import org.jboss.ws.WSException; -import org.jboss.ws.deployment.UnifiedDeploymentInfo; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java 2006-12-06 00:44:31 UTC (rev 1561) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -28,11 +28,11 @@ import org.jboss.deployers.spi.deployer.DeploymentUnit; import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.kernel.spi.registry.KernelRegistryEntry; +import org.jboss.ws.core.server.AbstractServiceEndpointPublisher; import org.jboss.ws.core.server.KernelLocator; -import org.jboss.ws.deployment.AbstractServiceEndpointPublisher; -import org.jboss.ws.deployment.ServiceEndpointDeployer; -import org.jboss.ws.deployment.UnifiedDeploymentInfo; -import org.jboss.ws.deployment.UnifiedDeploymentInfo.DeploymentType; +import org.jboss.ws.core.server.ServiceEndpointDeployer; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; +import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; /** * An abstract web service deployer Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractEJBDeployer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractEJBDeployer.java 2006-12-06 00:44:31 UTC (rev 1561) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractEJBDeployer.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -27,7 +27,7 @@ import org.jboss.deployers.spi.DeploymentException; import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.ws.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.metadata.umdm.UnifiedMetaData; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java 2006-12-06 00:44:31 UTC (rev 1561) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -45,7 +45,7 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.server.ServerConfig; import org.jboss.ws.core.server.ServerConfigFactory; -import org.jboss.ws.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.utils.IOUtils; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdaptor.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdaptor.java 2006-12-06 00:44:31 UTC (rev 1561) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdaptor.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -29,7 +29,7 @@ import org.jboss.ejb3.Ejb3Deployment; import org.jboss.logging.Logger; import org.jboss.metadata.WebMetaData; -import org.jboss.ws.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; // $Id$ Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerJSE.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerJSE.java 2006-12-06 00:44:31 UTC (rev 1561) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerJSE.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -29,8 +29,8 @@ import org.jboss.deployers.spi.deployer.DeploymentUnit; import org.jboss.metadata.WebMetaData; import org.jboss.virtual.VirtualFile; -import org.jboss.ws.deployment.UnifiedDeploymentInfo; -import org.jboss.ws.deployment.UnifiedDeploymentInfo.DeploymentType; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; +import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCDeployment; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerEJB3.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerEJB3.java 2006-12-06 00:44:31 UTC (rev 1561) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerEJB3.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -32,9 +32,9 @@ import org.jboss.ejb3.EJBContainer; import org.jboss.ejb3.Ejb3Deployment; import org.jboss.ejb3.stateless.StatelessContainer; -import org.jboss.ws.deployment.JAXWSDeployment; -import org.jboss.ws.deployment.UnifiedDeploymentInfo; -import org.jboss.ws.deployment.UnifiedDeploymentInfo.DeploymentType; +import org.jboss.ws.core.server.JAXWSDeployment; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; +import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; /** * A deployer JAXWS EJB3 Endpoints Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java 2006-12-06 00:44:31 UTC (rev 1561) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -32,9 +32,9 @@ import org.jboss.deployers.spi.deployer.DeploymentUnit; import org.jboss.metadata.WebMetaData; import org.jboss.metadata.web.Servlet; -import org.jboss.ws.deployment.JAXWSDeployment; -import org.jboss.ws.deployment.UnifiedDeploymentInfo; -import org.jboss.ws.deployment.UnifiedDeploymentInfo.DeploymentType; +import org.jboss.ws.core.server.JAXWSDeployment; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; +import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; /** * A deployer JAXWS JSE Endpoints Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB3.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB3.java 2006-12-06 00:44:31 UTC (rev 1561) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB3.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -36,7 +36,7 @@ import org.jboss.ws.core.server.AbstractServiceEndpointInvoker; import org.jboss.ws.core.server.ServiceEndpointInfo; import org.jboss.ws.core.server.ServiceEndpointInvoker; -import org.jboss.ws.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.utils.ObjectNameFactory; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java 2006-12-06 00:44:31 UTC (rev 1561) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -32,8 +32,8 @@ import org.jboss.kernel.spi.registry.KernelRegistryEntry; import org.jboss.metadata.WebMetaData; import org.jboss.ws.core.server.KernelLocator; -import org.jboss.ws.deployment.ServiceEndpointDeployer; -import org.jboss.ws.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.core.server.ServiceEndpointDeployer; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.metadata.umdm.UnifiedMetaData; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointPublisher.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointPublisher.java 2006-12-06 00:44:31 UTC (rev 1561) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointPublisher.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -34,8 +34,8 @@ import org.jboss.logging.Logger; import org.jboss.virtual.VFS; import org.jboss.virtual.VirtualFile; -import org.jboss.ws.deployment.AbstractServiceEndpointPublisher; -import org.jboss.ws.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.core.server.AbstractServiceEndpointPublisher; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; /** * Publish the HTTP service endpoint to Tomcat Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java 2006-12-06 00:44:31 UTC (rev 1561) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -38,8 +38,8 @@ import org.jboss.ws.utils.DOMUtils; import org.jboss.ws.WSException; -import org.jboss.ws.deployment.UnifiedDeploymentInfo; -import org.jboss.ws.deployment.AbstractServiceEndpointPublisher; +import org.jboss.ws.core.server.AbstractServiceEndpointPublisher; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData; import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointPublisher.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointPublisher.java 2006-12-06 00:44:31 UTC (rev 1561) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointPublisher.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -32,8 +32,8 @@ import org.jboss.logging.Logger; import org.jboss.util.NotImplementedException; -import org.jboss.ws.deployment.AbstractServiceEndpointPublisher; -import org.jboss.ws.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.core.server.AbstractServiceEndpointPublisher; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; /** * Publish the HTTP service endpoint to Tomcat Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java 2006-12-06 00:44:31 UTC (rev 1561) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -39,10 +39,10 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.core.server.AbstractServiceEndpointServlet; +import org.jboss.ws.core.server.JAXWSDeployment; import org.jboss.ws.core.server.KernelLocator; -import org.jboss.ws.deployment.JAXWSDeployment; -import org.jboss.ws.deployment.ServiceEndpointDeployer; -import org.jboss.ws.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.core.server.ServiceEndpointDeployer; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCDeployment; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceReferenceable.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceReferenceable.java 2006-12-06 00:44:31 UTC (rev 1561) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceReferenceable.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -37,7 +37,7 @@ import org.jboss.ws.core.server.ServiceEndpointManager; import org.jboss.ws.core.server.ServiceEndpointManagerFactory; -import org.jboss.ws.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.metadata.j2ee.UnifiedPortComponentRefMetaData; import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2006-12-06 00:44:31 UTC (rev 1561) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -48,7 +48,7 @@ import org.jboss.ws.core.CommonSOAPBinding; import org.jboss.ws.core.server.ServiceEndpointManager; import org.jboss.ws.core.server.ServiceEndpointManagerFactory; -import org.jboss.ws.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.jaxrpc.Use; import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientDeployment.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientDeployment.java 2006-12-06 00:44:31 UTC (rev 1561) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientDeployment.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -21,8 +21,8 @@ */ package org.jboss.ws.metadata.builder.jaxrpc; -import org.jboss.ws.deployment.UnifiedDeploymentInfo; -import org.jboss.ws.deployment.UnifiedDeploymentInfo.DeploymentType; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; +import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; // $Id$ Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCDeployment.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCDeployment.java 2006-12-06 00:44:31 UTC (rev 1561) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCDeployment.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -24,8 +24,8 @@ import java.io.InputStream; import java.net.URL; -import org.jboss.ws.deployment.UnifiedDeploymentInfo; -import org.jboss.ws.deployment.UnifiedDeploymentInfo.DeploymentType; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; +import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; import org.jboss.ws.metadata.jsr109.WebservicesFactory; import org.jboss.ws.metadata.jsr109.WebservicesMetaData; import org.jboss.xb.binding.ObjectModelFactory; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2006-12-06 00:44:31 UTC (rev 1561) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -32,7 +32,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.ws.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.metadata.config.jaxrpc.WSEndpointConfigJAXRPC; import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSEndpointMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSEndpointMetaDataBuilder.java 2006-12-06 00:44:31 UTC (rev 1561) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSEndpointMetaDataBuilder.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -25,8 +25,8 @@ import org.jboss.logging.Logger; import org.jboss.ws.annotation.PortComponent; -import org.jboss.ws.deployment.UnifiedDeploymentInfo; -import org.jboss.ws.deployment.UnifiedDeploymentInfo.DeploymentType; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; +import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB21.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB21.java 2006-12-06 00:44:31 UTC (rev 1561) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB21.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -28,8 +28,8 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.ws.deployment.JAXWSDeployment; -import org.jboss.ws.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.core.server.JAXWSDeployment; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2006-12-06 00:44:31 UTC (rev 1561) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -29,8 +29,8 @@ import org.jboss.annotation.security.SecurityDomain; import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.ws.deployment.JAXWSDeployment; -import org.jboss.ws.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.core.server.JAXWSDeployment; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2006-12-06 00:44:31 UTC (rev 1561) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -26,7 +26,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.ws.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2006-12-06 00:44:31 UTC (rev 1561) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -36,7 +36,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.Constants; -import org.jboss.ws.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.jaxrpc.Style; import org.jboss.ws.metadata.builder.MetaDataBuilder; import org.jboss.ws.metadata.umdm.OperationMetaData; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2006-12-06 00:44:31 UTC (rev 1561) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -27,8 +27,8 @@ import javax.xml.ws.WebServiceProvider; import org.jboss.logging.Logger; -import org.jboss.ws.deployment.JAXWSDeployment; -import org.jboss.ws.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.core.server.JAXWSDeployment; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.metadata.umdm.UnifiedMetaData; /** An abstract annotation meta data builder. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2006-12-06 00:44:31 UTC (rev 1561) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2006-12-06 00:50:19 UTC (rev 1562) @@ -61,7 +61,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; -import org.jboss.ws.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.extras.addressing.AddressingPropertiesImpl; import org.jboss.ws.extras.addressing.metadata.AddressingOpMetaExt; import org.jboss.ws.jaxrpc.Style;