jbossws-commits May 2007

jbossws-commits@lists.jboss.org

1 participants
395 discussions

JBossWS SVN: r3147 - in trunk: integration/jboss42 and 16 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-19 11:35:46 -0400 (Sat, 19 May 2007) New Revision: 3147 Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ContextRootDeployer.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointNameDeployer.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/URLPatternDeployer.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppGeneratorDeployer.java Removed: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointNameDeployer.java trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/WebAppGeneratorDeployer.java Modified: trunk/build/version.properties trunk/integration/jboss42/.classpath trunk/integration/jboss42/ant-import/build-thirdparty.xml trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ClassLoaderInjectionDeployer.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeployer.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityRolesHandlerEJB21.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityRolesHandlerEJB3.java trunk/integration/jboss50/.classpath trunk/integration/jboss50/ant-import/build-thirdparty.xml trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ClassLoaderInjectionDeployer.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityRolesHandlerEJB21.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityRolesHandlerEJB3.java trunk/integration/jbws/src/main/resources/jbossws-jbws42.sar/jbossws.beans/META-INF/jboss-beans.xml trunk/integration/jbws/src/main/resources/jbossws-jbws50.sar/META-INF/jbossws-beans.xml trunk/integration/spi/.classpath trunk/integration/spi/ant-import/build-thirdparty.xml trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeploymentContext.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicService.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentContext.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/SecurityRolesHandler.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Service.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerJSE.java trunk/integration/sunri/.classpath trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ModifyWebMetaDataDeployer.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeployer.java trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataAssociationDeployer.java Log: Add support for Service.contextRoot, Endpoint.urlPattern Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/build/version.properties 2007-05-19 15:35:46 UTC (rev 3147) @@ -14,6 +14,7 @@ implementation.vendor.id=http://www.jboss.org # Thirdparty library versions +dom4j=1.6.1 jboss-common-core=2.0.2.GA jboss-common-logging-log4j=2.0.2.GA jboss-common-logging-spi=2.0.2.GA Modified: trunk/integration/jboss42/.classpath =================================================================== --- trunk/integration/jboss42/.classpath 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/jboss42/.classpath 2007-05-19 15:35:46 UTC (rev 3147) @@ -8,5 +8,6 @@ <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxws-api.jar"/> <classpathentry kind="lib" path="/integration-spi/thirdparty/jsr181-api.jar"/> <classpathentry kind="lib" path="/integration-spi/thirdparty/saaj-api.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/dom4j.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/integration/jboss42/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/jboss42/ant-import/build-thirdparty.xml 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/jboss42/ant-import/build-thirdparty.xml 2007-05-19 15:35:46 UTC (rev 3147) @@ -41,6 +41,7 @@ <pathelement location="${jboss42.lib}/jboss-jmx.jar"/> <pathelement location="${jboss42.lib}/jboss-system.jar"/> <pathelement location="${jboss42.lib}/jboss-xml-binding.jar"/> + <pathelement location="${jboss42.server.lib}/dom4j.jar"/> <pathelement location="${jboss42.server.lib}/jboss.jar"/> <pathelement location="${jboss42.server.lib}/jboss-j2ee.jar"/> <pathelement location="${jboss42.server.lib}/jboss-ejb3x.jar"/> Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ClassLoaderInjectionDeployer.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ClassLoaderInjectionDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ClassLoaderInjectionDeployer.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -27,8 +27,6 @@ import org.jboss.metadata.WebMetaData; import org.jboss.wsf.spi.deployment.AbstractDeployer; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.WSDeploymentException; /** * A deployer that injects the correct classloader into the UMDM @@ -55,27 +53,5 @@ } dep.setClassLoader(classLoader); - - // Reload target beans with the updated class loader - for (Endpoint ep : dep.getService().getEndpoints()) - { - Class targetBean = ep.getTargetBean(); - if (targetBean != null) - { - String beanName = targetBean.getName(); - if (targetBean.getClassLoader() != classLoader) - { - try - { - targetBean = classLoader.loadClass(beanName); - ep.setTargetBean(targetBean); - } - catch (ClassNotFoundException e) - { - throw new WSDeploymentException("Cannot reload target bean: " + beanName); - } - } - } - } } } \ No newline at end of file Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -33,7 +33,6 @@ import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; -import org.jboss.wsf.spi.utils.ObjectNameFactory; /** * A deployer JAXRPC EJB21 Endpoints @@ -84,25 +83,14 @@ throw new IllegalStateException("Cannot obtain bean meta data for: " + ejbLink); String ejbClass = beanMetaData.getEjbClass(); - try - { - ClassLoader loader = unit.ucl; - Class<?> epBean = loader.loadClass(ejbClass.trim()); + + // Create the endpoint + Endpoint ep = createEndpoint(); + ep.setShortName(ejbLink); + ep.setService(service); + ep.setTargetBean(ejbClass); - // Create the endpoint - Endpoint ep = createEndpoint(); - ep.setService(service); - ep.setTargetBean(epBean); - - String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbLink; - ep.setName(ObjectNameFactory.create(nameStr)); - - service.addEndpoint(ep); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load servlet class: " + ejbClass); - } + service.addEndpoint(ep); } } return dep; Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -36,7 +36,6 @@ import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; -import org.jboss.wsf.spi.utils.ObjectNameFactory; /** * A deployer JAXRPC JSE Endpoints @@ -95,24 +94,20 @@ // If this is a servlet we defer the the bean creation if (javax.servlet.Servlet.class.isAssignableFrom(epBean)) - { - epBean = null; - } - - // Create the endpoint - Endpoint ep = createEndpoint(); - ep.setService(service); - ep.setTargetBean(epBean); - - String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletLink; - ep.setName(ObjectNameFactory.create(nameStr)); - - service.addEndpoint(ep); + servletClass = null; } catch (ClassNotFoundException ex) { log.warn("Cannot load servlet class: " + servletClass); } + + // Create the endpoint + Endpoint ep = createEndpoint(); + ep.setShortName(servletLink); + ep.setService(service); + ep.setTargetBean(servletClass); + + service.addEndpoint(ep); } } Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -34,7 +34,6 @@ import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsf.spi.utils.ObjectNameFactory; /** * A deployer JAXWS EJB3 Endpoints @@ -69,16 +68,14 @@ if (isWebServiceBean(container)) { String ejbName = container.getEjbName(); - Class epBean = container.getBeanClass(); + String epBean = container.getBeanClassName(); // Create the endpoint Endpoint ep = createEndpoint(); + ep.setShortName(ejbName); ep.setService(service); ep.setTargetBean(epBean); - String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbName; - ep.setName(ObjectNameFactory.create(nameStr)); - service.addEndpoint(ep); } } Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -38,7 +38,6 @@ import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsf.spi.utils.ObjectNameFactory; /** * A deployer JAXWS JSE Endpoints @@ -77,26 +76,13 @@ String servletName = servlet.getServletName(); String servletClass = servlet.getServletClass(); - try - { - ClassLoader loader = unit.annotationsCl; - Class<?> epBean = loader.loadClass(servletClass.trim()); + // Create the endpoint + Endpoint ep = createEndpoint(); + ep.setShortName(servletName); + ep.setService(service); + ep.setTargetBean(servletClass); - // Create the endpoint - Endpoint ep = createEndpoint(); - ep.setService(service); - ep.setTargetBean(epBean); - - String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName; - ep.setName(ObjectNameFactory.create(nameStr)); - - service.addEndpoint(ep); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load servlet class: " + servletClass); - continue; - } + service.addEndpoint(ep); } return dep; Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeployer.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeployer.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -60,20 +60,11 @@ if (ep.getTargetBean() == null) { String servletName = ep.getName().getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); - String beanName = results.sepTargetMap.get(servletName); - if (beanName == null) + String beanClassName = results.sepTargetMap.get(servletName); + if (beanClassName == null) throw new IllegalStateException("Cannot obtain target bean for: " + servletName); - try - { - ClassLoader loader = dep.getClassLoader(); - Class<?> epBean = loader.loadClass(beanName); - ep.setTargetBean(epBean); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load target bean: " + beanName); - } + ep.setTargetBean(beanClassName); } } } Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityRolesHandlerEJB21.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityRolesHandlerEJB21.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityRolesHandlerEJB21.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -26,13 +26,12 @@ import java.util.Iterator; import java.util.Map; +import org.dom4j.Element; import org.jboss.logging.Logger; import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.AssemblyDescriptorMetaData; import org.jboss.wsf.spi.deployment.SecurityRolesHandler; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.w3c.dom.Element; /** * Generate a service endpoint deployment for EJB endpoints @@ -60,9 +59,7 @@ Iterator it = securityRoles.keySet().iterator(); while (it.hasNext()) { - Element securityRole = (Element)webApp.appendChild(DOMUtils.createElement("security-role")); - Element roleName = (Element)securityRole.appendChild(DOMUtils.createElement("role-name")); - roleName.appendChild(DOMUtils.createTextNode((String)it.next())); + webApp.addElement("security-role").addElement("role-name").addText((String)it.next()); } } } Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityRolesHandlerEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityRolesHandlerEJB3.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityRolesHandlerEJB3.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -27,6 +27,7 @@ import javax.management.MBeanServer; import javax.management.ObjectName; +import org.dom4j.Element; import org.jboss.ejb3.Ejb3ModuleMBean; import org.jboss.ejb3.stateless.StatelessContainer; import org.jboss.logging.Logger; @@ -36,8 +37,6 @@ import org.jboss.wsf.spi.deployment.SecurityRolesHandler; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.deployment.WSDeploymentException; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.w3c.dom.Element; /** * Generate a service endpoint deployment for EJB endpoints @@ -67,9 +66,7 @@ { for (String role : anRolesAllowed.value()) { - Element securityRole = (Element)webApp.appendChild(DOMUtils.createElement("security-role")); - Element roleName = (Element)securityRole.appendChild(DOMUtils.createElement("role-name")); - roleName.appendChild(DOMUtils.createTextNode(role)); + webApp.addElement("security-role").addElement("role-name").addText(role); } } } Modified: trunk/integration/jboss50/.classpath =================================================================== --- trunk/integration/jboss50/.classpath 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/jboss50/.classpath 2007-05-19 15:35:46 UTC (rev 3147) @@ -8,5 +8,6 @@ <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxws-api.jar"/> <classpathentry kind="lib" path="/integration-spi/thirdparty/jsr181-api.jar"/> <classpathentry kind="lib" path="/integration-spi/thirdparty/saaj-api.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/dom4j.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/integration/jboss50/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-05-19 15:35:46 UTC (rev 3147) @@ -37,6 +37,7 @@ <pathelement location="${spi.dir}/thirdparty/jaxrpc-api.jar"/> <pathelement location="${spi.dir}/thirdparty/jsr181-api.jar"/> <pathelement location="${spi.dir}/thirdparty/saaj-api.jar"/> + <pathelement location="${jboss50.lib}/dom4j.jar"/> <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> <pathelement location="${jboss50.lib}/jboss-common-core.jar"/> <pathelement location="${jboss50.lib}/jboss-deployers.jar"/> Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ClassLoaderInjectionDeployer.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ClassLoaderInjectionDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ClassLoaderInjectionDeployer.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -27,8 +27,6 @@ import org.jboss.metadata.WebMetaData; import org.jboss.wsf.spi.deployment.AbstractDeployer; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.WSDeploymentException; /** * A deployer that injects the correct classloader into the Deployment @@ -55,27 +53,5 @@ } dep.setClassLoader(classLoader); - - // Reload target beans with the updated class loader - for (Endpoint ep : dep.getService().getEndpoints()) - { - Class targetBean = ep.getTargetBean(); - if (targetBean != null) - { - String beanName = targetBean.getName(); - if (targetBean.getClassLoader() != classLoader) - { - try - { - targetBean = classLoader.loadClass(beanName); - ep.setTargetBean(targetBean); - } - catch (ClassNotFoundException e) - { - throw new WSDeploymentException("Cannot reload target bean: " + beanName); - } - } - } - } } } \ No newline at end of file Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -33,7 +33,6 @@ import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; -import org.jboss.wsf.spi.utils.ObjectNameFactory; /** * A deployer JAXRPC EJB21 Endpoints @@ -84,25 +83,14 @@ throw new IllegalStateException("Cannot obtain bean meta data for: " + ejbLink); String ejbClass = beanMetaData.getEjbClass(); - try - { - ClassLoader loader = unit.getClassLoader(); - Class<?> epBean = loader.loadClass(ejbClass.trim()); - - // Create the endpoint - Endpoint ep = createEndpoint(); - ep.setService(service); - ep.setTargetBean(epBean); - - String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbLink; - ep.setName(ObjectNameFactory.create(nameStr)); - service.addEndpoint(ep); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load servlet class: " + ejbClass); - } + // Create the endpoint + Endpoint ep = createEndpoint(); + ep.setShortName(ejbLink); + ep.setService(service); + ep.setTargetBean(ejbClass); + + service.addEndpoint(ep); } } return dep; Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -26,8 +26,6 @@ import org.jboss.deployers.spi.deployer.DeploymentUnit; import org.jboss.metadata.WebMetaData; import org.jboss.metadata.web.Servlet; -import org.jboss.wsf.spi.deployment.BasicDeployment; -import org.jboss.wsf.spi.deployment.BasicEndpoint; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; @@ -35,7 +33,6 @@ import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; -import org.jboss.wsf.spi.utils.ObjectNameFactory; /** * A deployer JAXRPC JSE Endpoints @@ -87,25 +84,13 @@ Servlet servlet = getServletForName(webMetaData, servletLink); String servletClass = servlet.getServletClass(); - try - { - ClassLoader loader = unit.getClassLoader(); - Class<?> epBean = loader.loadClass(servletClass.trim()); + // Create the endpoint + Endpoint ep = createEndpoint(); + ep.setShortName(servletLink); + ep.setService(service); + ep.setTargetBean(servletClass); - // Create the endpoint - Endpoint ep = createEndpoint(); - ep.setService(service); - ep.setTargetBean(epBean); - - String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletLink; - ep.setName(ObjectNameFactory.create(nameStr)); - - service.addEndpoint(ep); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load servlet class: " + servletClass); - } + service.addEndpoint(ep); } } Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -32,13 +32,10 @@ import org.jboss.ejb3.EJBContainer; import org.jboss.ejb3.Ejb3Deployment; import org.jboss.ejb3.stateless.StatelessContainer; -import org.jboss.wsf.spi.deployment.BasicDeployment; -import org.jboss.wsf.spi.deployment.BasicEndpoint; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsf.spi.utils.ObjectNameFactory; /** * A deployer JAXWS EJB3 Endpoints @@ -78,15 +75,13 @@ if (isWebServiceBean(container)) { String ejbName = container.getEjbName(); - Class epBean = container.getBeanClass(); + String epBean = container.getBeanClassName(); // Create the endpoint Endpoint ep = createEndpoint(); + ep.setShortName(ejbName); ep.setService(service); ep.setTargetBean(epBean); - - String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbName; - ep.setName(ObjectNameFactory.create(nameStr)); service.addEndpoint(ep); } Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -32,13 +32,10 @@ import org.jboss.deployers.spi.deployer.DeploymentUnit; import org.jboss.metadata.WebMetaData; import org.jboss.metadata.web.Servlet; -import org.jboss.wsf.spi.deployment.BasicDeployment; -import org.jboss.wsf.spi.deployment.BasicEndpoint; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsf.spi.utils.ObjectNameFactory; /** * A deployer JAXWS JSE Endpoints @@ -77,26 +74,13 @@ String servletName = servlet.getName(); String servletClass = servlet.getServletClass(); - try - { - ClassLoader loader = unit.getClassLoader(); - Class<?> epBean = loader.loadClass(servletClass.trim()); + // Create the endpoint + Endpoint ep = createEndpoint(); + ep.setShortName(servletName); + ep.setService(service); + ep.setTargetBean(servletClass); - // Create the endpoint - Endpoint ep = createEndpoint(); - ep.setService(service); - ep.setTargetBean(epBean); - - String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName; - ep.setName(ObjectNameFactory.create(nameStr)); - - service.addEndpoint(ep); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load servlet class: " + servletClass); - continue; - } + service.addEndpoint(ep); } return dep; Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityRolesHandlerEJB21.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityRolesHandlerEJB21.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityRolesHandlerEJB21.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -26,12 +26,11 @@ import java.util.Iterator; import java.util.Map; +import org.dom4j.Element; import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.AssemblyDescriptorMetaData; import org.jboss.wsf.spi.deployment.SecurityRolesHandler; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.w3c.dom.Element; /** * Generate a service endpoint deployment for EJB endpoints @@ -56,9 +55,7 @@ Iterator it = securityRoles.keySet().iterator(); while (it.hasNext()) { - Element securityRole = (Element)webApp.appendChild(DOMUtils.createElement("security-role")); - Element roleName = (Element)securityRole.appendChild(DOMUtils.createElement("role-name")); - roleName.appendChild(DOMUtils.createTextNode((String)it.next())); + webApp.addElement("security-role").addElement("role-name").addText((String)it.next()); } } } Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityRolesHandlerEJB3.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityRolesHandlerEJB3.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityRolesHandlerEJB3.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -27,12 +27,11 @@ import javax.annotation.security.RolesAllowed; +import org.dom4j.Element; import org.jboss.ejb3.EJBContainer; import org.jboss.ejb3.Ejb3Deployment; import org.jboss.wsf.spi.deployment.SecurityRolesHandler; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.w3c.dom.Element; /** * Generate a service endpoint deployment for EJB endpoints @@ -58,9 +57,7 @@ { for (String role : anRolesAllowed.value()) { - Element securityRole = (Element)webApp.appendChild(DOMUtils.createElement("security-role")); - Element roleName = (Element)securityRole.appendChild(DOMUtils.createElement("role-name")); - roleName.appendChild(DOMUtils.createTextNode(role)); + webApp.addElement("security-role").addElement("role-name").addText((String)it.next()); } } } Modified: trunk/integration/jbws/src/main/resources/jbossws-jbws42.sar/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- trunk/integration/jbws/src/main/resources/jbossws-jbws42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/jbws/src/main/resources/jbossws-jbws42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-05-19 15:35:46 UTC (rev 3147) @@ -80,6 +80,8 @@ <property name="deployers"> <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer"> <inject bean="WSUnifiedDeploymentInfoDeployer"/> + <inject bean="WSContextRootDeployer"/> + <inject bean="WSURLPatternDeployer"/> <inject bean="WSUnifiedMetaDataDeployer"/> <inject bean="WSUnifiedMetaDataAssociationDeployer"/> <inject bean="WSModifyWebMetaDataDeployer"/> @@ -90,6 +92,8 @@ <property name="deployers"> <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer"> <inject bean="WSUnifiedDeploymentInfoDeployer"/> + <inject bean="WSContextRootDeployer"/> + <inject bean="WSURLPatternDeployer"/> <inject bean="WSUnifiedMetaDataDeployer"/> <inject bean="WSUnifiedMetaDataAssociationDeployer"/> <inject bean="WSWebAppGeneratorDeployer"/> @@ -118,6 +122,7 @@ Each handles a single aspect of web service deployment --> <bean name="WSClassLoaderInjectionDeployer" class="org.jboss.wsf.container.jboss42.ClassLoaderInjectionDeployer"/> + <bean name="WSContextRootDeployer" class="org.jboss.wsf.spi.deployment.ContextRootDeployer"/> <bean name="WSEagerInitializeDeployer" class="org.jboss.wsf.stack.jbws.EagerInitializeDeployer"/> <bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer"> <property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property> @@ -145,6 +150,7 @@ </bean> <bean name="WSUnifiedMetaDataAssociationDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataAssociationDeployer"/> <bean name="WSUnifiedMetaDataDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployer"/> + <bean name="WSURLPatternDeployer" class="org.jboss.wsf.spi.deployment.URLPatternDeployer"/> <bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.stack.jbws.WebAppGeneratorDeployer"/> <bean name="WSWebAppDeployerDeployer" class="org.jboss.wsf.container.jboss42.WebAppDeployerDeployer"> <property name="serviceEndpointPublisher"><inject bean="WSServiceEndpointPublisher"/></property> Modified: trunk/integration/jbws/src/main/resources/jbossws-jbws50.sar/META-INF/jbossws-beans.xml =================================================================== --- trunk/integration/jbws/src/main/resources/jbossws-jbws50.sar/META-INF/jbossws-beans.xml 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/jbws/src/main/resources/jbossws-jbws50.sar/META-INF/jbossws-beans.xml 2007-05-19 15:35:46 UTC (rev 3147) @@ -92,6 +92,8 @@ <property name="deployers"> <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer"> <inject bean="WSUnifiedDeploymentInfoDeployer"/> + <inject bean="WSContextRootDeployer"/> + <inject bean="WSURLPatternDeployer"/> <inject bean="WSUnifiedMetaDataDeployer"/> <inject bean="WSUnifiedMetaDataAssociationDeployer"/> <inject bean="WSModifyWebMetaDataDeployer"/> @@ -102,6 +104,8 @@ <property name="deployers"> <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer"> <inject bean="WSUnifiedDeploymentInfoDeployer"/> + <inject bean="WSContextRootDeployer"/> + <inject bean="WSURLPatternDeployer"/> <inject bean="WSUnifiedMetaDataDeployer"/> <inject bean="WSUnifiedMetaDataAssociationDeployer"/> <inject bean="WSWebAppGeneratorDeployer"/> @@ -130,6 +134,7 @@ Each handles a single aspect of web service deployment --> <bean name="WSClassLoaderInjectionDeployer" class="org.jboss.wsf.container.jboss50.ClassLoaderInjectionDeployer"/> + <bean name="WSContextRootDeployer" class="org.jboss.wsf.spi.deployment.ContextRootDeployer"/> <bean name="WSEagerInitializeDeployer" class="org.jboss.wsf.stack.jbws.EagerInitializeDeployer"/> <bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer"> <property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property> @@ -138,7 +143,7 @@ <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry> <entry><key>JAXRPC_EJB21</key><value>org.jboss.wsf.container.jboss50.InvocationHandlerEJB21</value></entry> - <entry><key>JAXWS_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry> + <entry><key>JAXWS_JSE</key><value>org.jboss.wsf.spi.invocation.InvocationHandlerJSE</value></entry> <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss50.InvocationHandlerEJB3</value></entry> </map> </property> @@ -155,6 +160,7 @@ <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss50.UnifiedDeploymentInfoDeployer"/> <bean name="WSUnifiedMetaDataAssociationDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataAssociationDeployer"/> <bean name="WSUnifiedMetaDataDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployer"/> + <bean name="WSURLPatternDeployer" class="org.jboss.wsf.spi.deployment.URLPatternDeployer"/> <bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.stack.jbws.WebAppGeneratorDeployer"> <property name="securityRolesHandlerEJB21"><inject bean="WSSecurityRolesHandlerEJB21"/></property> <property name="securityRolesHandlerEJB3"><inject bean="WSSecurityRolesHandlerEJB3"/></property> Modified: trunk/integration/spi/.classpath =================================================================== --- trunk/integration/spi/.classpath 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/spi/.classpath 2007-05-19 15:35:46 UTC (rev 3147) @@ -18,5 +18,6 @@ <classpathentry kind="lib" path="thirdparty/activation.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-javaee.jar"/> <classpathentry kind="lib" path="thirdparty/jaxrpc-api.jar"/> + <classpathentry kind="lib" path="thirdparty/dom4j.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/integration/spi/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/spi/ant-import/build-thirdparty.xml 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/spi/ant-import/build-thirdparty.xml 2007-05-19 15:35:46 UTC (rev 3147) @@ -37,6 +37,7 @@ description="Gets the thirdparty libraries"> <mkdir dir="${thirdparty.dir}"/> + <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/> @@ -67,6 +68,7 @@  <path id="thirdparty.classpath"> <pathelement location="${thirdparty.dir}/activation.jar"/> + <pathelement location="${thirdparty.dir}/dom4j.jar"/> <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/> <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/> <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/> Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeploymentContext.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeploymentContext.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeploymentContext.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -25,6 +25,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.Set; /** * A general web service deployment context. @@ -35,6 +36,7 @@ public class BasicDeploymentContext implements DeploymentContext { private Map<Class, Object> attachments = new HashMap<Class, Object>(); + private Map<String, Object> properties = new HashMap<String, Object>(); public <T> T getAttachment(Class<T> clazz) { @@ -45,4 +47,29 @@ { return (T)attachments.put(clazz, obj); } + + public <T> T removeAttachment(Class<T> key) + { + return (T)attachments.remove(key); + } + + public Set<String> getProperties() + { + return properties.keySet(); + } + + public Object getProperty(String key) + { + return properties.get(key); + } + + public void removeProperty(String key) + { + properties.remove(key); + } + + public void setProperty(String key, Object value) + { + properties.put(key, value); + } } Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -23,6 +23,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.Set; import javax.management.ObjectName; @@ -39,12 +40,15 @@ { private Service service; private ObjectName name; - private Class targetBean; + private String shortName; + private String urlPattern; + private String targetBean; private EndpointState state; private RequestHandler requestHandler; private InvocationHandler invocationHandler; private LifecycleHandler lifecycleHandler; - private Map<Class, Object> metaData = new HashMap<Class, Object>(); + private Map<Class, Object> attachments = new HashMap<Class, Object>(); + private Map<String, Object> properties = new HashMap<String, Object>(); public BasicEndpoint() { @@ -61,26 +65,36 @@ this.service = service; } - public Class getTargetBean() + public String getTargetBean() { return targetBean; } - public void setTargetBean(Class targetBean) + public void setTargetBean(String targetBean) { this.targetBean = targetBean; } - public EndpointState getState() + public Class getTargetBeanClass() { - return state; + if (targetBean == null) + throw new IllegalStateException("Target bean not set"); + + ClassLoader classLoader = service.getDeployment().getClassLoader(); + if (classLoader == null) + throw new IllegalStateException("Deployment classloader not set"); + + Class beanClass; + try + { + beanClass = classLoader.loadClass(targetBean); + } + catch (ClassNotFoundException ex) + { + throw new WSDeploymentException(ex); + } + return beanClass; } - - public void setState(EndpointState state) - { - this.state = state; - } - public ObjectName getName() { return name; @@ -91,6 +105,36 @@ this.name = name; } + public String getShortName() + { + return shortName; + } + + public void setShortName(String shortName) + { + this.shortName = shortName; + } + + public String getURLPattern() + { + return urlPattern; + } + + public void setURLPattern(String urlPattern) + { + this.urlPattern = urlPattern; + } + + public EndpointState getState() + { + return state; + } + + public void setState(EndpointState state) + { + this.state = state; + } + public RequestHandler getRequestHandler() { return requestHandler; @@ -123,16 +167,36 @@ public <T> T addAttachment(Class<T> key, Object value) { - return (T)metaData.put(key, value); + return (T)attachments.put(key, value); } public <T> T getAttachment(Class<T> key) { - return (T)metaData.get(key); + return (T)attachments.get(key); } public <T> T removeAttachment(Class<T> key) { - return (T)metaData.get(key); + return (T)attachments.get(key); } + + public Set<String> getProperties() + { + return properties.keySet(); + } + + public Object getProperty(String key) + { + return properties.get(key); + } + + public void removeProperty(String key) + { + properties.remove(key); + } + + public void setProperty(String key, Object value) + { + properties.put(key, value); + } } Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicService.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicService.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicService.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -39,6 +39,7 @@ { private Deployment dep; private List<Endpoint> endpoints = new LinkedList<Endpoint>(); + private String contextRoot; public BasicService(Deployment dep) { @@ -65,4 +66,14 @@ { return endpoints; } + + public String getContextRoot() + { + return contextRoot; + } + + public void setContextRoot(String contextRoot) + { + this.contextRoot = contextRoot; + } } Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ContextRootDeployer.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ContextRootDeployer.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ContextRootDeployer.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -0,0 +1,82 @@ +/* + * 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.wsf.spi.deployment; + +//$Id$ + +import org.jboss.wsf.spi.annotation.WebContext; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; + +/** + * A deployer that assigns the context root to the service + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class ContextRootDeployer extends AbstractDeployer +{ + @Override + public void create(Deployment dep) + { + String contextRoot = null; + + // #1 Use the explicit context root from the web meta data + UnifiedWebMetaData webMetaData = dep.getContext().getAttachment(UnifiedWebMetaData.class); + if (webMetaData != null) + contextRoot = webMetaData.getContextRoot(); + + // #2 Use the explicit context root from @WebContext.contextRoot + if (contextRoot == null) + { + for (Endpoint ep : dep.getService().getEndpoints()) + { + Class implClass = ep.getTargetBeanClass(); + WebContext anWebContext = (WebContext)implClass.getAnnotation(WebContext.class); + if (anWebContext != null && anWebContext.contextRoot().length() > 0) + { + if (contextRoot != null && contextRoot.equals(anWebContext.contextRoot())) + throw new IllegalStateException("Context root must be the same for all deployed endpoints"); + + contextRoot = anWebContext.contextRoot(); + } + } + } + + // #3 Use the implicit context root derived from the deployment name + if (contextRoot == null) + { + UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); + String name = udi.simpleName; + contextRoot = name.substring(0, name.length() - 4); + if (udi.parent != null) + { + name = udi.parent.simpleName; + contextRoot = name.substring(0, name.length() - 4) + "-" + contextRoot; + } + } + + if (contextRoot.startsWith("/")) + contextRoot = contextRoot.substring(1); + + dep.getService().setContextRoot(contextRoot); + } +} \ No newline at end of file Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ContextRootDeployer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -21,6 +21,7 @@ */ package org.jboss.wsf.spi.deployment; + // $Id$ @@ -44,23 +45,33 @@ UNDEFINED, CREATED, STARTED, STOPED, DESTROYED }; + /** Get the class loader for this deployment */ ClassLoader getClassLoader(); + /** Set the class loader for this deployment */ void setClassLoader(ClassLoader loader); + /** Get the deployment context */ DeploymentContext getContext(); + /** Set the deployment context */ void setContext(DeploymentContext context); + /** Get the deployment type */ DeploymentType getType(); + /** Set the deployment type */ void setType(DeploymentType type); + /** Get the current deployment state */ DeploymentState getState(); + /** Set the current deployment state */ void setState(DeploymentState type); + /** Get the service assiated with this deployment */ Service getService(); + /** Set the service assiated with this deployment */ void setService(Service service); } \ No newline at end of file Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentContext.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentContext.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentContext.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -1,8 +1,50 @@ +/* + * 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.wsf.spi.deployment; +// $Id$ + +import java.util.Set; + public interface DeploymentContext { - <T> T getAttachment(Class<T> clazz); + /** Add arbitrary attachments */ + <T> T addAttachment(Class<T> key, Object value); + + /** Get arbitrary attachments */ + <T> T getAttachment(Class<T> key); + + /** Remove arbitrary attachments */ + <T> T removeAttachment(Class<T> key); - <T> T addAttachment(Class<T> clazz, Object obj); + /** Get an context property */ + Object getProperty(String key); + + /** Set an context property */ + void setProperty(String key, Object value); + + /** Remove an context property */ + void removeProperty(String key); + + /** Get the set of context property names */ + Set<String> getProperties(); } \ No newline at end of file Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -21,6 +21,10 @@ */ package org.jboss.wsf.spi.deployment; +// $Id$ + +import java.util.Set; + import javax.management.ObjectName; import org.jboss.wsf.spi.invocation.InvocationHandler; @@ -57,6 +61,12 @@ /** Set the unique identifier for this endpoint */ void setName(ObjectName epName); + /** Get the short name for this endpoint */ + String getShortName(); + + /** Set the short name for this endpoint */ + void setShortName(String shortName); + /** Get the current state for this endpoint */ EndpointState getState(); @@ -64,10 +74,19 @@ void setState(EndpointState state); /** Get the endpoint implementation bean */ - Class getTargetBean(); + String getTargetBean(); /** Set the endpoint implementation bean */ - void setTargetBean(Class epImpl); + void setTargetBean(String epImpl); + + /** Use the deployment classloader to load the bean */ + Class getTargetBeanClass(); + + /** Get the URL pattern for this endpoint */ + String getURLPattern(); + + /** Set the URL pattern for this endpoint */ + void setURLPattern(String urlPattern); /** Set the request handler for this endpoint */ void setRequestHandler(RequestHandler handler); @@ -92,7 +111,19 @@ /** Get arbitrary attachments */ <T> T getAttachment(Class<T> key); - + /** Remove arbitrary attachments */ <T> T removeAttachment(Class<T> key); + + /** Get an endpoint property */ + Object getProperty(String key); + + /** Set an endpoint property */ + void setProperty(String key, Object value); + + /** Remove an endpoint property */ + void removeProperty(String key); + + /** Get the set of endpoint property names */ + Set<String> getProperties(); } Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointNameDeployer.java (from rev 3146, trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointNameDeployer.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointNameDeployer.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointNameDeployer.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -0,0 +1,50 @@ +/* + * 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.wsf.spi.deployment; + +//$Id$ + +import org.jboss.wsf.spi.utils.ObjectNameFactory; + +/** + * A deployer that assigns the complete name to the Endpoint + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class EndpointNameDeployer extends AbstractDeployer +{ + @Override + public void create(Deployment dep) + { + String contextRoot = dep.getService().getContextRoot(); + + for (Endpoint ep : dep.getService().getEndpoints()) + { + StringBuilder name = new StringBuilder(Endpoint.SEPID_DOMAIN + ":"); + name.append(Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextRoot + ","); + name.append(Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ep.getShortName()); + + ep.setName(ObjectNameFactory.create(name.toString())); + } + } +} \ No newline at end of file Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/SecurityRolesHandler.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/SecurityRolesHandler.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/SecurityRolesHandler.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -1,7 +1,8 @@ package org.jboss.wsf.spi.deployment; -import org.w3c.dom.Element; +import org.dom4j.Element; + public interface SecurityRolesHandler { /** Add the roles from ejb-jar.xml to the security roles Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Service.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Service.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Service.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -47,4 +47,10 @@ /** Get the list of endpoints */ List<Endpoint> getEndpoints(); + + /** Get the context root for this service */ + String getContextRoot(); + + /** Set the context root for this service */ + void setContextRoot(String contextRoot); } Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/URLPatternDeployer.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/URLPatternDeployer.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/URLPatternDeployer.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -0,0 +1,78 @@ +/* + * 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.wsf.spi.deployment; + +//$Id$ + +import org.jboss.wsf.spi.annotation.WebContext; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; + +/** + * A deployer that assigns the URLPattern to endpoints. + * + * @author Thomas.Diesler(a)jboss.org + * @since 19-May-2007 + */ +public class URLPatternDeployer extends AbstractDeployer +{ + @Override + public void create(Deployment dep) + { + for (Endpoint ep : dep.getService().getEndpoints()) + { + String urlPattern = getUrlPattern(dep, ep); + ep.setURLPattern(urlPattern); + } + } + + private String getUrlPattern(Deployment dep, Endpoint ep) + { + String urlPattern = null; + + // #1 For JSE lookup the url-pattern from the servlet mappings + UnifiedWebMetaData webMetaData = dep.getContext().getAttachment(UnifiedWebMetaData.class); + if (webMetaData != null) + { + String epName = ep.getShortName(); + urlPattern = webMetaData.getServletMappings().get(epName); + if (urlPattern == null) + throw new IllegalStateException("Cannot obtain servlet mapping for: " + epName); + } + + // #2 For EJB use @WebContext.urlPattern + if (urlPattern == null) + { + Class beanClass = ep.getTargetBeanClass(); + WebContext anWebContext = (WebContext)beanClass.getAnnotation(WebContext.class); + if (anWebContext != null && anWebContext.urlPattern().length() > 0) + urlPattern = anWebContext.urlPattern(); + } + + // #3 Fallback to the ejb-name + if (urlPattern == null) + { + urlPattern = "/" + ep.getShortName(); + } + + return urlPattern; + } +} \ No newline at end of file Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/URLPatternDeployer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppGeneratorDeployer.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppGeneratorDeployer.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppGeneratorDeployer.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -0,0 +1,255 @@ +/* + * 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.wsf.spi.deployment; + +//$Id$ + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.net.URL; +import java.util.ArrayList; + +import org.dom4j.Document; +import org.dom4j.DocumentHelper; +import org.dom4j.Element; +import org.dom4j.io.OutputFormat; +import org.dom4j.io.XMLWriter; +import org.jboss.wsf.spi.annotation.WebContext; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; + +/** + * A deployer that generates a webapp for an EJB endpoint + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class WebAppGeneratorDeployer extends AbstractDeployer +{ + private SecurityRolesHandler securityRolesHandlerEJB21; + private SecurityRolesHandler securityRolesHandlerEJB3; + + public void setSecurityRolesHandlerEJB21(SecurityRolesHandler securityRolesHandlerEJB21) + { + this.securityRolesHandlerEJB21 = securityRolesHandlerEJB21; + } + + public void setSecurityRolesHandlerEJB3(SecurityRolesHandler securityRolesHandlerEJB3) + { + this.securityRolesHandlerEJB3 = securityRolesHandlerEJB3; + } + + @Override + public void create(Deployment dep) + { + UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); + if (udi == null) + throw new IllegalStateException("Cannot obtain unified deployement info"); + + if (dep.getType().toString().endsWith("EJB21")) + { + udi.webappURL = generatWebDeployment(dep, securityRolesHandlerEJB21); + } + else if (dep.getType().toString().endsWith("EJB3")) + { + udi.webappURL = generatWebDeployment(dep, securityRolesHandlerEJB3); + } + } + + private URL generatWebDeployment(Deployment dep, SecurityRolesHandler securityHandler) + { + Document webDoc = createWebAppDescriptor(dep, securityHandler); + Document jbossDoc = createJBossWebAppDescriptor(dep); + + File tmpWar = null; + try + { + ServerConfig config = ServerConfigFactory.getInstance().getServerConfig(); + File tmpdir = new File(config.getServerTempDir().getCanonicalPath() + "/deploy"); + + UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); + String deploymentName = udi.getCanonicalName().replace('/', '-'); + tmpWar = File.createTempFile(deploymentName, ".war", tmpdir); + tmpWar.delete(); + + File webInf = new File(tmpWar, "WEB-INF"); + webInf.mkdirs(); + + File webXml = new File(webInf, "web.xml"); + FileWriter fw = new FileWriter(webXml); + OutputFormat format = OutputFormat.createPrettyPrint(); + XMLWriter writer = new XMLWriter(fw, format); + writer.write(webDoc); + writer.close(); + + File jbossWebXml = new File(webInf, "jboss-web.xml"); + fw = new FileWriter(jbossWebXml); + writer = new XMLWriter(fw, format); + writer.write(jbossDoc); + writer.close(); + + return tmpWar.toURL(); + } + catch (IOException e) + { + throw new WSDeploymentException("Failed to create webservice.war", e); + } + } + + private Document createWebAppDescriptor(Deployment dep, SecurityRolesHandler securityHandler) + { + UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); + + Document document = DocumentHelper.createDocument(); + Element webApp = document.addElement("web-app"); + + /* + <servlet> + <servlet-name> + <servlet-class> + </servlet> + */ + for (Endpoint ep : dep.getService().getEndpoints()) + { + Element servlet = webApp.addElement("servlet"); + servlet.addElement("servlet-name").addText(ep.getShortName()); + servlet.addElement("servlet-class").addText(ep.getTargetBean()); + } + + /* + <servlet-mapping> + <servlet-name> + <url-pattern> + </servlet-mapping> + */ + ArrayList urlPatters = new ArrayList(); + for (Endpoint ep : dep.getService().getEndpoints()) + { + Element servletMapping = webApp.addElement("servlet-mapping"); + servletMapping.addElement("servlet-name").addText(ep.getShortName()); + servletMapping.addElement("url-pattern").addText(ep.getURLPattern()); + } + + String authMethod = null; + + // Add web-app/security-constraint for each port component + for (Endpoint ep : dep.getService().getEndpoints()) + { + Class targetBean = ep.getTargetBeanClass(); + boolean secureWSDLAccess = false; + String transportGuarantee = null; + String beanAuthMethod = null; + + WebContext anWebContext = (WebContext)targetBean.getAnnotation(WebContext.class); + if (anWebContext != null && anWebContext.authMethod().length() > 0) + beanAuthMethod = anWebContext.authMethod(); + if (anWebContext != null && anWebContext.transportGuarantee().length() > 0) + transportGuarantee = anWebContext.transportGuarantee(); + if (anWebContext != null && anWebContext.secureWSDLAccess()) + secureWSDLAccess = anWebContext.secureWSDLAccess(); + + String ejbName = ep.getShortName(); + if (beanAuthMethod != null || transportGuarantee != null) + { + /* + <security-constraint> + <web-resource-collection> + <web-resource-name>TestUnAuthPort</web-resource-name> + <url-pattern>/HSTestRoot/TestUnAuth/*</url-pattern> + </web-resource-collection> + <auth-constraint> + <role-name>*</role-name> + </auth-constraint> + <user-data-constraint> + <transport-guarantee>NONE</transport-guarantee> + </user-data-constraint> + </security-constraint> + */ + Element securityConstraint = webApp.addElement("security-constraint"); + Element wrc = securityConstraint.addElement("web-resource-collection"); + wrc.addElement("web-resource-name").addText(ejbName); + wrc.addElement("url-pattern").addText(ep.getURLPattern()); + if (secureWSDLAccess) + { + wrc.addElement("http-method").addText("GET"); + } + wrc.addElement("http-method").addText("POST"); + + // Optional auth-constraint + if (beanAuthMethod != null) + { + // Only the first auth-method gives the war login-config/auth-method + if (authMethod == null) + authMethod = beanAuthMethod; + + Element authConstraint = securityConstraint.addElement("auth-constraint").addElement("role-name").addText("*"); + } + // Optional user-data-constraint + if (transportGuarantee != null) + { + Element userData = securityConstraint.addElement("user-data-constraint"); + userData.addElement("transport-guarantee").addText(transportGuarantee); + } + } + } + + // Optional login-config/auth-method + if (authMethod != null) + { + Element loginConfig = webApp.addElement("login-config"); + loginConfig.addElement("auth-method").addText(authMethod); + loginConfig.addElement("realm-name").addText("EJBServiceEndpointServlet Realm"); + + securityHandler.addSecurityRoles(webApp, udi); + } + + return document; + } + + private Document createJBossWebAppDescriptor(Deployment dep) + { + Document document = DocumentHelper.createDocument(); + + /* Create a jboss-web + <jboss-web> + <security-domain>java:/jaas/cts</security-domain> + <context-root>/ws/ejbN/</context-root> + <virtual-host>some.domain.com</virtual-host> + </jboss-web> + */ + Element jbossWeb = document.addElement("jboss-web"); + + String securityDomain = (String)dep.getContext().getProperty("security-domain"); + if (securityDomain != null) + jbossWeb.addElement("security-domain").addText("java:/jaas/" + securityDomain); + + // Get the context root for this deployment + String contextRoot = dep.getService().getContextRoot(); + if (contextRoot == null) + throw new WSDeploymentException("Cannot obtain context root"); + + jbossWeb.addElement("context-root").addText(contextRoot); + + return document; + } +} \ No newline at end of file Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppGeneratorDeployer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerJSE.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerJSE.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerJSE.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -39,7 +39,7 @@ { protected Object getBeanInstance(Endpoint ep) throws InstantiationException, IllegalAccessException { - Class epImpl = ep.getTargetBean(); + Class epImpl = ep.getTargetBeanClass(); Object targetBean = epImpl.newInstance(); return targetBean; } Modified: trunk/integration/sunri/.classpath =================================================================== --- trunk/integration/sunri/.classpath 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/sunri/.classpath 2007-05-19 15:35:46 UTC (rev 3147) @@ -21,5 +21,6 @@ <classpathentry kind="lib" path="thirdparty/streambuffer.jar"/> <classpathentry kind="lib" path="thirdparty/servlet-api.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/integration-spi"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/dom4j.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Deleted: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointNameDeployer.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointNameDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointNameDeployer.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -1,69 +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.wsf.stack.sunri; - -//$Id$ - -import org.jboss.metadata.WebMetaData; -import org.jboss.wsf.spi.annotation.WebContext; -import org.jboss.wsf.spi.deployment.AbstractDeployer; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.utils.ObjectNameFactory; - -/** - * A deployer that assigns the complete name to the Endpoint - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class EndpointNameDeployer extends AbstractDeployer -{ - @Override - public void create(Deployment dep) - { - String contextRoot = null; - WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); - if (webMetaData != null) - contextRoot = webMetaData.getContextRoot(); - - for (Endpoint ep : dep.getService().getEndpoints()) - { - Class implClass = ep.getTargetBean(); - WebContext anWebContext = (WebContext)implClass.getAnnotation(WebContext.class); - if (anWebContext != null && anWebContext.contextRoot().length() > 0) - contextRoot = anWebContext.contextRoot(); - - if (contextRoot == null) - throw new IllegalStateException("Cannot obtain context root"); - - if (contextRoot.startsWith("/")) - contextRoot = contextRoot.substring(1); - - StringBuilder name = new StringBuilder(ep.getName().getCanonicalName()); - if (ep.getName().getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT) == null) - name.append("," + Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextRoot); - - ep.setName(ObjectNameFactory.create(name.toString())); - } - } -} \ No newline at end of file Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ModifyWebMetaDataDeployer.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ModifyWebMetaDataDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ModifyWebMetaDataDeployer.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -43,11 +43,21 @@ private String listenerClass; private String servletClass; + public String getListenerClass() + { + return listenerClass; + } + public void setListenerClass(String listenerClass) { this.listenerClass = listenerClass; } + public String getServletClass() + { + return servletClass; + } + public void setServletClass(String servletClass) { this.servletClass = servletClass; Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeployer.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeployer.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -50,10 +50,10 @@ for (Endpoint ep : dep.getService().getEndpoints()) { String name = getName(dep, ep); - String implementation = ep.getTargetBean().getName(); + String implBean = ep.getTargetBean(); String urlPattern = getUrlPattern(dep, ep); - DDEndpoint ddep = new DDEndpoint(name, implementation, urlPattern); + DDEndpoint ddep = new DDEndpoint(name, implBean, urlPattern); log.info("Add " + ddep); dd.addEndpoint(ddep); } @@ -63,14 +63,14 @@ private String getName(Deployment dep, Endpoint ep) { String name = null; - String impl = ep.getTargetBean().getName(); + String implBean = ep.getTargetBean(); WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); if (webMetaData != null) { for (Servlet servlet : webMetaData.getServlets()) { String servletClass = servlet.getServletClass(); - if (impl.equals(servletClass)) + if (implBean.equals(servletClass)) { name = servlet.getName(); } @@ -82,7 +82,7 @@ private String getUrlPattern(Deployment dep, Endpoint ep) { String urlPattern = null; - String impl = ep.getTargetBean().getName(); + String targetBean = ep.getTargetBean(); WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); if (webMetaData != null) { @@ -90,7 +90,7 @@ { String name = servlet.getName(); String servletClass = servlet.getServletClass(); - if (impl.equals(servletClass)) + if (targetBean.equals(servletClass)) { ServletMapping mapping = getServletMapping(webMetaData, name); ArrayList<String> urlPatterns = mapping.getUrlPatterns(); Modified: trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml =================================================================== --- trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml 2007-05-19 15:35:46 UTC (rev 3147) @@ -89,6 +89,8 @@ <property name="deployers"> <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer"> <inject bean="WSUnifiedDeploymentInfoDeployer"/> + <inject bean="WSContextRootDeployer"/> + <inject bean="WSURLPatternDeployer"/> <inject bean="WSSunJaxwsDeployer"/> <inject bean="WSModifyWebMetaDataDeployer"/> </list> @@ -98,6 +100,10 @@ <property name="deployers"> <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer"> <inject bean="WSUnifiedDeploymentInfoDeployer"/> + <inject bean="WSContextRootDeployer"/> + <inject bean="WSURLPatternDeployer"/> + <inject bean="WSWebAppGeneratorDeployer"/> + <inject bean="WSWebAppDeployerDeployer"/> </list> </property> </bean> @@ -116,6 +122,7 @@ The Deployers Each handles a single aspect of web service deployment --> + <bean name="WSContextRootDeployer" class="org.jboss.wsf.spi.deployment.ContextRootDeployer"/> <bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer"> <property name="requestHandler">org.jboss.wsf.stack.sunri.RequestHandlerImpl</property> <property name="lifecycleHandler">org.jboss.wsf.stack.sunri.LifecycleHandlerImpl</property> @@ -127,15 +134,30 @@ </property> </bean> <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/> - <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.stack.sunri.EndpointNameDeployer"/> + <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/> <bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/> <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.stack.sunri.ModifyWebMetaDataDeployer"> <property name="listenerClass">org.jboss.wsf.stack.sunri.WSServletContextListenerJBWS</property> <property name="servletClass">org.jboss.wsf.stack.sunri.WSEndpointServletJBWS</property> </bean> <bean name="WSSunJaxwsDeployer" class="org.jboss.wsf.stack.sunri.SunJaxwsDeployer"/> + <bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.spi.deployment.WebAppGeneratorDeployer"> + <property name="securityRolesHandlerEJB3"><inject bean="WSSecurityRolesHandlerEJB3"/></property> + </bean> + <bean name="WSWebAppDeployerDeployer" class="org.jboss.wsf.container.jboss50.WebAppDeployerDeployer"> + <property name="serviceEndpointPublisher"><inject bean="WSServiceEndpointPublisher"/></property> + <property name="mainDeployer"><inject bean="MainDeployer"/></property> + </bean> <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss50.UnifiedDeploymentInfoDeployer"/> + <bean name="WSURLPatternDeployer" class="org.jboss.wsf.spi.deployment.URLPatternDeployer"/> +  + <bean name="WSSecurityRolesHandlerEJB21" class="org.jboss.wsf.container.jboss50.SecurityRolesHandlerEJB21"/> + <bean name="WSSecurityRolesHandlerEJB3" class="org.jboss.wsf.container.jboss50.SecurityRolesHandlerEJB3"/> + <bean name="WSServiceEndpointPublisher" class="org.jboss.wsf.spi.deployment.ServiceEndpointPublisher"> + <property name="servletClass"><inject bean="WSModifyWebMetaDataDeployer" property="servletClass"/></property> + </bean> +  Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -289,7 +289,7 @@ { invContext.addAttachment(javax.xml.rpc.handler.MessageContext.class, msgContext); } - if (ServiceLifecycle.class.isAssignableFrom(ep.getTargetBean()) && invContext instanceof ServletRequestContext) + if (ServiceLifecycle.class.isAssignableFrom(ep.getTargetBeanClass()) && invContext instanceof ServletRequestContext) { ServletEndpointContext servletEndpointContext = new ServletEndpointContextImpl((ServletRequestContext)invContext); invContext.addAttachment(ServletEndpointContext.class, servletEndpointContext); @@ -304,7 +304,7 @@ protected Method getImplMethod(Endpoint endpoint, ServiceEndpointInvocation sepInv) throws ClassNotFoundException, NoSuchMethodException { - Class implClass = endpoint.getTargetBean(); + Class implClass = endpoint.getTargetBeanClass(); Method seiMethod = sepInv.getJavaMethod(); String methodName = seiMethod.getName(); Modified: trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataAssociationDeployer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataAssociationDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataAssociationDeployer.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -23,8 +23,6 @@ //$Id$ -import javax.management.ObjectName; - import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; @@ -53,27 +51,27 @@ ServerEndpointMetaData sepMetaData = ep.getAttachment(ServerEndpointMetaData.class); if (sepMetaData == null) { - sepMetaData = getEndpointMetaData(umd, ep.getName()); + sepMetaData = getEndpointMetaData(umd, ep); ep.addAttachment(ServerEndpointMetaData.class, sepMetaData); - - Class targetBean = ep.getTargetBean(); + + String targetBean = ep.getTargetBean(); if (targetBean != null) - sepMetaData.setServiceEndpointImplName(targetBean.getName()); + sepMetaData.setServiceEndpointImplName(targetBean); } } } - private ServerEndpointMetaData getEndpointMetaData(UnifiedMetaData umd, ObjectName epName) + private ServerEndpointMetaData getEndpointMetaData(UnifiedMetaData umd, Endpoint ep) { - String propEndpoint = epName.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); - + String epName = ep.getShortName(); + ServerEndpointMetaData epMetaData = null; for (ServiceMetaData serviceMetaData : umd.getServices()) { for (EndpointMetaData aux : serviceMetaData.getEndpoints()) { String linkName = ((ServerEndpointMetaData)aux).getLinkName(); - if (propEndpoint.equals(linkName)) + if (epName.equals(linkName)) { epMetaData = (ServerEndpointMetaData)aux; break; Deleted: trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/WebAppGeneratorDeployer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/WebAppGeneratorDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) +++ trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/WebAppGeneratorDeployer.java 2007-05-19 15:35:46 UTC (rev 3147) @@ -1,336 +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.wsf.stack.jbws; - -//$Id$ - -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.net.URL; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.jboss.ws.WSException; -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; -import org.jboss.wsf.spi.deployment.AbstractDeployer; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.SecurityRolesHandler; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsf.spi.management.ServerConfig; -import org.jboss.wsf.spi.management.ServerConfigFactory; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; -import org.w3c.dom.Element; - -/** - * A deployer that generates a webapp for an EJB endpoint - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class WebAppGeneratorDeployer extends AbstractDeployer -{ - private SecurityRolesHandler securityRolesHandlerEJB21; - private SecurityRolesHandler securityRolesHandlerEJB3; - - public void setSecurityRolesHandlerEJB21(SecurityRolesHandler securityRolesHandlerEJB21) - { - this.securityRolesHandlerEJB21 = securityRolesHandlerEJB21; - } - - public void setSecurityRolesHandlerEJB3(SecurityRolesHandler securityRolesHandlerEJB3) - { - this.securityRolesHandlerEJB3 = securityRolesHandlerEJB3; - } - - @Override - public void create(Deployment dep) - { - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - if (udi == null) - throw new IllegalStateException("Cannot obtain unified deployement info"); - - UnifiedMetaData umd = dep.getContext().getAttachment(UnifiedMetaData.class); - if (umd == null) - throw new IllegalStateException("Cannot obtain unified meta data"); - - if (dep.getType().toString().endsWith("EJB21")) - { - udi.webappURL = generatWebDeployment(umd, udi, securityRolesHandlerEJB21); - } - else if (dep.getType().toString().endsWith("EJB3")) - { - udi.webappURL = generatWebDeployment(umd, udi, securityRolesHandlerEJB3); - } - } - - private URL generatWebDeployment(UnifiedMetaData wsMetaData, UnifiedDeploymentInfo udi, SecurityRolesHandler securityHandler) - { - // Collect the list of ServerEndpointMetaData - List<ServerEndpointMetaData> sepMetaDataList = new ArrayList<ServerEndpointMetaData>(); - for (ServiceMetaData serviceMetaData : wsMetaData.getServices()) - { - for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints()) - { - sepMetaDataList.add((ServerEndpointMetaData)epMetaData); - } - } - - Element webDoc = createWebAppDescriptor(sepMetaDataList, udi, securityHandler); - Element jbossDoc = createJBossWebAppDescriptor(sepMetaDataList); - - File tmpWar = null; - try - { - ServerConfig config = ServerConfigFactory.getInstance().getServerConfig(); - File tmpdir = new File(config.getServerTempDir().getCanonicalPath() + "/deploy"); - - String deploymentName = wsMetaData.getDeploymentName().replace('/', '-'); - tmpWar = File.createTempFile(deploymentName, ".war", tmpdir); - tmpWar.delete(); - - File webInf = new File(tmpWar, "WEB-INF"); - webInf.mkdirs(); - - File webXml = new File(webInf, "web.xml"); - FileWriter fw = new FileWriter(webXml); - new DOMWriter(fw).setPrettyprint(true).print(webDoc); - fw.close(); - - File jbossWebXml = new File(webInf, "jboss-web.xml"); - fw = new FileWriter(jbossWebXml); - new DOMWriter(fw).setPrettyprint(true).print(jbossDoc); - fw.close(); - - return tmpWar.toURL(); - } - catch (IOException e) - { - throw new WSException("Failed to create webservice.war", e); - } - } - - private Element createWebAppDescriptor(List<ServerEndpointMetaData> sepMetaDataList, UnifiedDeploymentInfo udi, SecurityRolesHandler securityHandler) - { - Element webApp = DOMUtils.createElement("web-app"); - - /* - <servlet> - <servlet-name> - <servlet-class> - </servlet> - */ - for (ServerEndpointMetaData sepMetaData : sepMetaDataList) - { - String ejbName = sepMetaData.getLinkName(); - Element servlet = (Element)webApp.appendChild(DOMUtils.createElement("servlet")); - Element servletName = (Element)servlet.appendChild(DOMUtils.createElement("servlet-name")); - servletName.appendChild(DOMUtils.createTextNode(ejbName)); - - Element servletClass = (Element)servlet.appendChild(DOMUtils.createElement("servlet-class")); - String implName = sepMetaData.getServiceEndpointImplName(); - String seiName = sepMetaData.getServiceEndpointInterfaceName(); - String endpointTarget = (implName != null ? implName : seiName); - servletClass.appendChild(DOMUtils.createTextNode(endpointTarget)); - } - - /* - <servlet-mapping> - <servlet-name> - <url-pattern> - </servlet-mapping> - */ - ArrayList urlPatters = new ArrayList(); - for (ServerEndpointMetaData sepMetaData : sepMetaDataList) - { - String ejbName = sepMetaData.getLinkName(); - Element servletMapping = (Element)webApp.appendChild(DOMUtils.createElement("servlet-mapping")); - Element servletName = (Element)servletMapping.appendChild(DOMUtils.createElement("servlet-name")); - servletName.appendChild(DOMUtils.createTextNode(ejbName)); - Element urlPatternElement = (Element)servletMapping.appendChild(DOMUtils.createElement("url-pattern")); - - String urlPattern = "/*"; - if (sepMetaData.getURLPattern() != null) - { - urlPattern = sepMetaData.getURLPattern(); - } - - if (urlPatters.contains(urlPattern)) - throw new IllegalArgumentException("Cannot use the same url-pattern with different endpoints, check your <port-component-uri> in jboss.xml"); - - urlPatternElement.appendChild(DOMUtils.createTextNode(urlPattern)); - urlPatters.add(urlPattern); - } - - String authMethod = null; - - // Add web-app/security-constraint for each port component - for (ServerEndpointMetaData sepMetaData : sepMetaDataList) - { - String ejbName = sepMetaData.getLinkName(); - if (sepMetaData.getAuthMethod() != null || sepMetaData.getTransportGuarantee() != null) - { - /* - <security-constraint> - <web-resource-collection> - <web-resource-name>TestUnAuthPort</web-resource-name> - <url-pattern>/HSTestRoot/TestUnAuth/*</url-pattern> - </web-resource-collection> - <auth-constraint> - <role-name>*</role-name> - </auth-constraint> - <user-data-constraint> - <transport-guarantee>NONE</transport-guarantee> - </user-data-constraint> - </security-constraint> - */ - Element securityConstraint = (Element)webApp.appendChild(DOMUtils.createElement("security-constraint")); - Element wrc = (Element)securityConstraint.appendChild(DOMUtils.createElement("web-resource-collection")); - Element wrName = (Element)wrc.appendChild(DOMUtils.createElement("web-resource-name")); - wrName.appendChild(DOMUtils.createTextNode(ejbName)); - Element pattern = (Element)wrc.appendChild(DOMUtils.createElement("url-pattern")); - String uri = sepMetaData.getURLPattern(); - pattern.appendChild(DOMUtils.createTextNode(uri)); - if (sepMetaData.isSecureWSDLAccess()) - { - Element method = (Element)wrc.appendChild(DOMUtils.createElement("http-method")); - method.appendChild(DOMUtils.createTextNode("GET")); - } - Element method = (Element)wrc.appendChild(DOMUtils.createElement("http-method")); - method.appendChild(DOMUtils.createTextNode("POST")); - - // Optional auth-constraint - if (sepMetaData.getAuthMethod() != null) - { - // Only the first auth-method gives the war login-config/auth-method - if (authMethod == null) - authMethod = sepMetaData.getAuthMethod(); - - Element authConstraint = (Element)securityConstraint.appendChild(DOMUtils.createElement("auth-constraint")); - Element roleName = (Element)authConstraint.appendChild(DOMUtils.createElement("role-name")); - roleName.appendChild(DOMUtils.createTextNode("*")); - } - // Optional user-data-constraint - if (sepMetaData.getTransportGuarantee() != null) - { - Element userData = (Element)securityConstraint.appendChild(DOMUtils.createElement("user-data-constraint")); - Element transport = (Element)userData.appendChild(DOMUtils.createElement("transport-guarantee")); - transport.appendChild(DOMUtils.createTextNode(sepMetaData.getTransportGuarantee())); - } - } - } - - // Optional login-config/auth-method - if (authMethod != null) - { - Element loginConfig = (Element)webApp.appendChild(DOMUtils.createElement("login-config")); - Element method = (Element)loginConfig.appendChild(DOMUtils.createElement("auth-method")); - method.appendChild(DOMUtils.createTextNode(authMethod)); - Element realm = (Element)loginConfig.appendChild(DOMUtils.createElement("realm-name")); - realm.appendChild(DOMUtils.createTextNode("EJBServiceEndpointServlet Realm")); - - securityHandler.addSecurityRoles(webApp, udi); - } - - return webApp; - } - - private Element createJBossWebAppDescriptor(List<ServerEndpointMetaData> sepMetaDataList) - { - /* Create a jboss-web - <jboss-web> - <security-domain>java:/jaas/cts</security-domain> - <context-root>/ws/ejbN/</context-root> - <virtual-host>some.domain.com</virtual-host> - </jboss-web> - */ - Element jbossWeb = DOMUtils.createElement("jboss-web"); - - UnifiedMetaData wsMetaData = sepMetaDataList.get(0).getServiceMetaData().getUnifiedMetaData(); - String securityDomain = wsMetaData.getSecurityDomain(); - if (securityDomain != null) - { - Element secDomain = (Element)jbossWeb.appendChild(DOMUtils.createElement("security-domain")); - secDomain.appendChild(DOMUtils.createTextNode("java:/jaas/" + securityDomain)); - } - - // Get the context root for this deployment - String contextRoot = null; - for (ServerEndpointMetaData sepMetaData : sepMetaDataList) - { - String next = sepMetaData.getContextRoot(); - if (next != null) - { - if (contextRoot == null) - { - contextRoot = next; - } - else if (contextRoot.equals(next) == false) - { - throw new WSException("Multiple context root not supported"); - } - } - } - if (contextRoot == null) - throw new WSException("Cannot obtain context root"); - - Element root = (Element)jbossWeb.appendChild(DOMUtils.createElement("context-root")); - root.appendChild(DOMUtils.createTextNode(contextRoot)); - - String[] virtualHosts = null; - for (ServerEndpointMetaData sepMetaData : sepMetaDataList) - { - String[] next = sepMetaData.getVirtualHosts(); - if (next != null && next.length > 0) - { - Arrays.sort(next); - if (virtualHosts == null) - { - virtualHosts = next; - } - else - { - if (Arrays.equals(virtualHosts, next) == false) - { - throw new WSException("All endpoints must define the same virtual hosts"); - } - } - } - } - - if (virtualHosts != null) - { - for (String current : virtualHosts) - { - Element virtualHost = (Element)jbossWeb.appendChild(DOMUtils.createElement("virtual-host")); - virtualHost.appendChild(DOMUtils.createTextNode(current)); - } - } - - return jbossWeb; - } -} \ No newline at end of file

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3146 - in trunk: integration/jboss42/src/main/java/org/jboss and 149 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-18 18:55:26 -0400 (Fri, 18 May 2007) New Revision: 3146 Added: trunk/integration/jboss42/src/main/java/org/jboss/wsf/ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookJSE.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapter.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ClassLoaderInjectionDeployer.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerHook.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptor.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB21.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB21MBean.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB3.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB3MBean.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorJSE.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorJSEMBean.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorMBean.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapterFactory.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/MainDeployerHook.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ManagedServerConfig.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ManagedServerConfigMBean.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeployer.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityRolesHandlerEJB21.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityRolesHandlerEJB3.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ServiceEndpointInterceptor.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeployer.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeployerDeployer.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/jms/ trunk/integration/jboss50/src/main/java/org/jboss/wsf/ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ trunk/integration/spi/src/main/java/org/jboss/wsf/ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/annotation/ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedApplicationMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedBeanMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedEjbPortComponentMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedMessageDrivenMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedSessionMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedWebMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedWebSecurityMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices/ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/ trunk/integration/sunri/src/main/java/org/jboss/wsf/ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/DeploymentDescriptorParserExt.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/DeploymentDescriptorParserJBWS.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointAssociation.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointNameDeployer.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerJSE.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/LifecycleHandlerImpl.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ManagedEndpointRegistry.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ManagedEndpointRegistryMBean.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ModifyWebMetaDataDeployer.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ServletResourceLoader.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeployer.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/VirtualFileResourceLoader.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSEndpointServletJBWS.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerExt.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerJBWS.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/metadata/ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/metadata/sunjaxws/ trunk/jbossws-core/src/main/java/org/jboss/wsf/ trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/ trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/ trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/LifecycleHandlerImpl.java trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistry.java trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistryMBean.java trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/ServiceLifecycleInvocationHandler.java Removed: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/AbstractApplicationMetaDataAdapter.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/AbstractDeployerHook.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/AbstractDeployerHookEJB.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/AbstractDeployerHookJSE.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ApplicationMetaDataAdapter.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ArchiveDeployerHook.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ClassLoaderInjectionDeployer.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerHook.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptor.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorEJB21.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorEJB21MBean.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorEJB3.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorEJB3MBean.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorJSE.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorJSEMBean.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorMBean.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeploymentInfoAdapter.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeploymentInfoAdapterFactory.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/InvocationHandlerEJB21.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/InvocationHandlerEJB3.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/JAXRPCDeployerHookEJB21.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/JAXRPCDeployerHookJSE.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/JAXWSDeployerHookEJB3.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/JAXWSDeployerHookJSE.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/MainDeployerHook.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ManagedServerConfig.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ManagedServerConfigMBean.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ModifyWebMetaDataDeployer.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/SecurityRolesHandlerEJB21.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/SecurityRolesHandlerEJB3.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ServiceEndpointInterceptor.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/UnifiedDeploymentInfoDeployer.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/WebAppDeployerDeployer.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/WebMetaDataAdapter.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/jms/ trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/ trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/annotation/ trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/ trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/ trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/management/ trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/ trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/webservices/ trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/utils/ trunk/integration/sunri/src/main/java/org/jboss/wsintegration/ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceLifecycleInvocationHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/LifecycleHandlerImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ManagedEndpointRegistry.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ManagedEndpointRegistryMBean.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/RequestHandlerImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointServlet.java trunk/jbossws-core/src/main/java/org/jboss/wsintegration/ Modified: trunk/integration/jboss42/.classpath trunk/integration/jboss42/build.xml trunk/integration/jboss50/build.xml trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHookEJB.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHookJSE.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdaptor.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdaptorEJB3.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ClassLoaderInjectionDeployer.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeployerHook.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ManagedServerConfig.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ManagedServerConfigMBean.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeployer.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityRolesHandlerEJB21.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityRolesHandlerEJB3.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ServiceEndpointInterceptor.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeployer.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/VirtualFileAdaptor.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployerDeployer.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdaptor.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebServiceDeployerEJB.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebServiceDeployerJSE.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebServiceMainDeployer.java trunk/integration/jbws/ant-import/build-deploy.xml trunk/integration/jbws/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml trunk/integration/jbws/src/main/resources/jbossws-jbws42.sar/META-INF/jboss-service.xml trunk/integration/jbws/src/main/resources/jbossws-jbws42.sar/jbossws.beans/META-INF/jboss-beans.xml trunk/integration/jbws/src/main/resources/jbossws-jbws50.sar/META-INF/jbossws-beans.xml trunk/integration/spi/build.xml trunk/integration/spi/src/main/java/org/jboss/wsf/spi/annotation/WebContext.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/AbstractDeployer.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeployerManager.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeployment.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeploymentContext.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicLifecycleHandler.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicService.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployer.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeployerManager.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentContext.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointLifecycleDeployer.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointRegistryDeployer.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXRPCClientDeployment.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXRPCDeployment.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXWSDeployment.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandler.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/SecurityRolesHandler.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Service.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ServiceEndpointPublisher.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WSDeploymentException.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/AbstractInvocationHandler.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/AbstractWebServiceContext.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicEndpointInvocation.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationContext.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationHandler.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointInvocation.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/HandlerCallback.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationContext.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerJSE.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/RequestHandler.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/SecurityAssociationAdaptor.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextEJB.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextInjector.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextJSE.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/BasicEndpointRegistry.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/BasicServerConfig.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistryFactory.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfigFactory.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/HandlerChainsObjectFactory.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedCallPropertyMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedStubPropertyMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebserviceDescriptionMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/DOMUtils.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/DOMWriter.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/IOUtils.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/JavaUtils.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/ObjectNameFactory.java trunk/integration/sunri/build.xml trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/metadata/sunjaxws/DDEndpoint.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/metadata/sunjaxws/DDEndpoints.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/metadata/sunjaxws/DDHandler.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/metadata/sunjaxws/DDHandlerChain.java trunk/integration/sunri/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml trunk/jbossws-core/build.xml trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/MessageTrace.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/ServiceEndpointInvocation.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/client/ServiceObjectFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/client/ServiceRefObjectFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SerializationContextJAXRPC.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Deserializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamResult.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementDeserializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementSerializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexSerializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameDeserializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementDeserializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementSerializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SerializerSupport.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBMarshallerImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/PortProxy.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceRefHandlerJAXRPC.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/ServerHandlerChain.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingExt.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPMessageMarshaller.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP11BindingJAXWS.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP12BindingJAXWS.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactoryJAXWS.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceRefHandlerJAXWS.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceReferenceable.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerChainExecutor.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointServlet.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ContextServlet.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentLinkServlet.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServerHandlerDelegate.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerEJB21.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServletRequestContext.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/DetailImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/HRefInlineHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/ObjectContent.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementMessage.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPDocument.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementWriter.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPFaultImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPHeaderElementImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLContent.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLFragment.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/AttachmentPartImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/ByteArrayContentHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/SwapableMemoryDataSource.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/XmlDataContentHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/HolderUtils.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/MimeUtils.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/EndpointReferenceImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/jaxws/AbstractSubscriptionManagerEndpoint.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/NotificationFailure.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/Subscription.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/Policy.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/PolicyAlternative.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/PolicyAssertion.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/PolicyFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxrpc/JBossXBContentAdapter.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/CommonConfig.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXRPC.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/jaxrpc/CommonConfigJAXRPC.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/jaxws/CommonConfigJAXWS.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/jaxws/HandlerChainsConfigJAXWS.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXRPC.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXWS.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/WSSchemaUtils.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToWSDL.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/ToolsUtils.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WebservicesXMLCreatorImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ReformatXML.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/command/wsprovide.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WSContractProviderImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLWriter.java trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeployer.java trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/EndpointNameDeployer.java trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeployer.java trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeployer.java trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeployer.java trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataAssociationDeployer.java trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeployer.java trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeployment.java trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/WebAppGeneratorDeployer.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTest.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayMarshallerTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayUnmarshallerTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayMarshallerTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayUnmarshallerTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayMarshallerTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayUnmarshallerTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeMarshallerTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleMarshallerTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeMarshallerTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeUnmarshallerTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPEnvelopeTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/XMLFragmentTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/JavaUtilsTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLWithAnonTypesTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/InteropClientConfig.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/InteropConfigFactory.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/JavaBean.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/ValueType.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/ServerHandler.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws955/JBWS955TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestServiceBean.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/EmployeeRecordsImpl.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SunInteropTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointNoInjectEJB.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/oneway/JSR181OneWayTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationBean.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtBean.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webmethod/JSR181WebMethodTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointImpl.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestWSDDParser.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventSinkServlet.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/SubscriptionManagerTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/SchemaGeneratorTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaModelTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaTypesCreatorTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1170/JBWS1170TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/AnonTypesTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/NillableTypesTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardArraysTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardDoubleArraysTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/JavaWsdlMappingMetaDataTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTest.java trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestHelper.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EJB3Bean.java Log: Rename wsintegration to wsf Modified: trunk/integration/jboss42/.classpath =================================================================== --- trunk/integration/jboss42/.classpath 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/.classpath 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry excluding="org/jboss/wsintegration/container/jboss42/jms/" kind="src" path="src/main/java"/> + <classpathentry excluding="org/jboss/wsf/container/jboss42/jms/" kind="src" path="src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.2.x"/> <classpathentry combineaccessrules="false" kind="src" path="/integration-spi"/> Modified: trunk/integration/jboss42/build.xml =================================================================== --- trunk/integration/jboss42/build.xml 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/build.xml 2007-05-18 22:55:26 UTC (rev 3146) @@ -59,8 +59,8 @@ <mkdir dir="${jbws42.output.classes.dir}"/> <javac srcdir="${jbws42.java.dir}" sourcepath="" destdir="${jbws42.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <include name="org/jboss/wsintegration/container/jboss42/**"/> - <exclude name="org/jboss/wsintegration/container/jboss42/jms/**"/> + <include name="org/jboss/wsf/container/jboss42/**"/> + <exclude name="org/jboss/wsf/container/jboss42/jms/**"/> <classpath refid="jbws42.integration.classpath"/> </javac> </target> @@ -101,7 +101,7 @@ <mkdir dir="${jbws42.output.lib.dir}"/> <jar jarfile="${jbws42.output.lib.dir}/jbossws-jboss42.jar" manifest="${jbws42.output.etc.dir}/default.mf"> <fileset dir="${jbws42.output.classes.dir}"> - <include name="org/jboss/wsintegration/container/jboss42/**"/> + <include name="org/jboss/wsf/container/jboss42/**"/> </fileset> <metainf dir="${jbws42.resources.dir}/jbossws-jboss42.jar/META-INF"/> </jar> Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/AbstractApplicationMetaDataAdapter.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,87 @@ +/* + * 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.wsf.container.jboss42; + +// $Id$ + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.jboss.metadata.ApplicationMetaData; +import org.jboss.metadata.BeanMetaData; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter; + +/** + * Build container independent application meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public abstract class AbstractApplicationMetaDataAdapter +{ + public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(UnifiedDeploymentInfo udi, ApplicationMetaData apmd) + { + udi.addAttachment(ApplicationMetaData.class, apmd); + + UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData(); + buildUnifiedBeanMetaData(umd, apmd); + umd.setConfigName(apmd.getConfigName()); + umd.setConfigFile(apmd.getConfigFile()); + umd.setWebServiceContextRoot(apmd.getWebServiceContextRoot()); + umd.setSecurityDomain(apmd.getSecurityDomain()); + umd.setPublishLocationAdapter(getPublishLocationAdpater(apmd)); + return umd; + } + + protected PublishLocationAdapter getPublishLocationAdpater(final ApplicationMetaData apmd) + { + return new PublishLocationAdapter () + { + public String getWsdlPublishLocationByName(String name) + { + return apmd.getWsdlPublishLocationByName(name); + } + }; + } + + protected void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData metaData) + { + List<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>(); + Iterator it = metaData.getEnterpriseBeans(); + while (it.hasNext()) + { + BeanMetaData bmd = (BeanMetaData)it.next(); + UnifiedBeanMetaData ubmd = buildUnifiedBeanMetaData(bmd); + if (ubmd != null) + { + beans.add(ubmd); + } + } + umd.setEnterpriseBeans(beans); + } + + protected abstract UnifiedBeanMetaData buildUnifiedBeanMetaData(BeanMetaData bmd); +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/AbstractDeployerHook.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,202 @@ +/* + * 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.wsf.container.jboss42; + +//$Id$ + +import java.util.List; + +import javax.management.MBeanServer; +import javax.management.ObjectName; + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.logging.Logger; +import org.jboss.mx.util.MBeanProxy; +import org.jboss.mx.util.MBeanProxyCreationException; +import org.jboss.mx.util.MBeanServerLocator; +import org.jboss.wsf.container.jboss42.DeployerHook; +import org.jboss.wsf.container.jboss42.DeployerInterceptorMBean; +import org.jboss.wsf.spi.deployment.DeployerManager; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Service; +import org.jboss.wsf.spi.deployment.WSDeploymentException; + +/** + * An abstract web service deployer. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public abstract class AbstractDeployerHook implements DeployerHook +{ + // provide logging + protected final Logger log = Logger.getLogger(getClass()); + + protected DeployerManager deployerManager; + private List<ObjectName> phaseOneInterceptors; + private List<ObjectName> phaseTwoInterceptors; + private String deploymentClass; + private String serviceClass; + private String endpointClass; + + public void setDeployerManager(DeployerManager deploymentManager) + { + this.deployerManager = deploymentManager; + } + + public void setDeploymentClass(String deploymentClass) + { + this.deploymentClass = deploymentClass; + } + + public void setEndpointClass(String endpointClass) + { + this.endpointClass = endpointClass; + } + + public void setServiceClass(String serviceClass) + { + this.serviceClass = serviceClass; + } + + public Deployment createDeployment() + { + try + { + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + Class<?> clazz = loader.loadClass(deploymentClass); + return (Deployment)clazz.newInstance(); + } + catch (Exception ex) + { + throw new WSDeploymentException("Cannot load Deployment class: " + deploymentClass); + } + } + + public Service createService() + { + try + { + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + Class<?> clazz = loader.loadClass(serviceClass); + return (Service)clazz.newInstance(); + } + catch (Exception ex) + { + throw new WSDeploymentException("Cannot load Service class: " + serviceClass); + } + } + + public Endpoint createEndpoint() + { + try + { + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + Class<?> clazz = loader.loadClass(endpointClass); + return (Endpoint)clazz.newInstance(); + } + catch (Exception ex) + { + throw new WSDeploymentException("Cannot load Endpoint class: " + endpointClass); + } + } + + public void setPhaseOneInterceptors(List<ObjectName> phaseOneInterceptors) + { + this.phaseOneInterceptors = phaseOneInterceptors; + } + + public void setPhaseTwoInterceptors(List<ObjectName> phaseTwoInterceptors) + { + this.phaseTwoInterceptors = phaseTwoInterceptors; + } + + /** Return true if this deployment should be ignored + */ + public boolean ignoreDeployment(DeploymentInfo unit) + { + return false; + } + + /** Add the hooks to the interceptors + */ + public void start() + { + MBeanServer server = MBeanServerLocator.locateJBoss(); + try + { + if (phaseOneInterceptors != null) + { + for (ObjectName oname : phaseOneInterceptors) + { + DeployerInterceptorMBean interceptor = (DeployerInterceptorMBean)MBeanProxy.get(DeployerInterceptorMBean.class, oname, server); + interceptor.addPhaseOneHook(this); + } + } + + if (phaseTwoInterceptors != null) + { + for (ObjectName oname : phaseTwoInterceptors) + { + DeployerInterceptorMBean interceptor = (DeployerInterceptorMBean)MBeanProxy.get(DeployerInterceptorMBean.class, oname, server); + interceptor.addPhaseTwoHook(this); + } + } + } + catch (MBeanProxyCreationException e) + { + throw new WSDeploymentException(e); + } + } + + /** Add the hooks to the interceptors + */ + public void stop() + { + MBeanServer server = MBeanServerLocator.locateJBoss(); + try + { + if (phaseOneInterceptors != null) + { + for (ObjectName oname : phaseOneInterceptors) + { + DeployerInterceptorMBean interceptor = (DeployerInterceptorMBean)MBeanProxy.get(DeployerInterceptorMBean.class, oname, server); + interceptor.removePhaseOneHook(this); + } + } + + if (phaseTwoInterceptors != null) + { + for (ObjectName oname : phaseTwoInterceptors) + { + DeployerInterceptorMBean interceptor = (DeployerInterceptorMBean)MBeanProxy.get(DeployerInterceptorMBean.class, oname, server); + interceptor.removePhaseTwoHook(this); + } + } + } + catch (MBeanProxyCreationException e) + { + throw new WSDeploymentException(e); + } + } +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/AbstractDeployerHookEJB.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,34 @@ +/* + * 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.wsf.container.jboss42; + +//$Id$ + +/** + * An abstract deployer for EJB Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public abstract class AbstractDeployerHookEJB extends ArchiveDeployerHook +{ +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookJSE.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/AbstractDeployerHookJSE.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookJSE.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookJSE.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,63 @@ +/* + * 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.wsf.container.jboss42; + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.metadata.WebMetaData; + +//$Id$ + +/** + * An abstract deployer for JSE Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public abstract class AbstractDeployerHookJSE extends ArchiveDeployerHook +{ + public boolean isWebServiceDeployment(DeploymentInfo unit) + { + if ((unit.metaData instanceof WebMetaData) == false) + return false; + + return true; + } + + static class Servlet + { + String servletName; + String servletClass; + public Servlet(String servletName, String servletClass) + { + this.servletName = servletName; + this.servletClass = servletClass; + } + public String getServletClass() + { + return servletClass; + } + public String getServletName() + { + return servletName; + } + } +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapter.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ApplicationMetaDataAdapter.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapter.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapter.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,80 @@ +/* + * 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.wsf.container.jboss42; + +// $Id$ + +import org.jboss.metadata.BeanMetaData; +import org.jboss.metadata.EjbPortComponentMetaData; +import org.jboss.metadata.MessageDrivenMetaData; +import org.jboss.metadata.SessionMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedMessageDrivenMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedSessionMetaData; + +/** + * Build container independent application meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class ApplicationMetaDataAdapter extends AbstractApplicationMetaDataAdapter +{ + protected UnifiedBeanMetaData buildUnifiedBeanMetaData(BeanMetaData bmd) + { + UnifiedBeanMetaData ubmd = null; + if (bmd instanceof SessionMetaData) + { + ubmd = new UnifiedSessionMetaData(); + } + else if (bmd instanceof MessageDrivenMetaData) + { + ubmd = new UnifiedMessageDrivenMetaData(); + ((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessageDrivenMetaData)bmd).getDestinationJndiName()); + } + + if (ubmd != null) + { + ubmd.setEjbName(bmd.getEjbName()); + ubmd.setEjbClass(bmd.getEjbClass()); + ubmd.setServiceEndpointInterface(bmd.getServiceEndpoint()); + ubmd.setHome(bmd.getHome()); + ubmd.setLocalHome(bmd.getLocalHome()); + ubmd.setJndiName(bmd.getJndiName()); + ubmd.setLocalJndiName(bmd.getLocalJndiName()); + + EjbPortComponentMetaData pcmd = bmd.getPortComponent(); + if (pcmd != null) + { + UnifiedEjbPortComponentMetaData upcmd = new UnifiedEjbPortComponentMetaData(); + upcmd.setPortComponentName(pcmd.getPortComponentName()); + upcmd.setPortComponentURI(pcmd.getPortComponentURI()); + upcmd.setAuthMethod(pcmd.getAuthMethod()); + upcmd.setTransportGuarantee(pcmd.getTransportGuarantee()); + upcmd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess()); + ubmd.setPortComponent(upcmd); + } + } + return ubmd; + } +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ArchiveDeployerHook.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,157 @@ +/* + * 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.wsf.container.jboss42; + +//$Id$ + +import java.io.IOException; +import java.net.URL; + +import org.jboss.deployment.DeploymentException; +import org.jboss.deployment.DeploymentInfo; +import org.jboss.ws.integration.ResourceLoaderAdapter; +import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.WSDeploymentException; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; +import org.jboss.wsf.spi.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; + +/** + * An abstract web service deployer. + * + * deploy(unit) + * if(isWebServiceDeployment) + * dep = createDeployment(unit) + * deploy(dep) + * + * undeploy(unit) + * dep = getDeployment(unit) + * undeploy(dep) + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public abstract class ArchiveDeployerHook extends AbstractDeployerHook +{ + /** Get the deployemnt type this deployer can handle + */ + public abstract DeploymentType getDeploymentType(); + + /** Depending on the type of deployment, this method should return true + * if the deployment contains web service endpoints. + */ + public abstract boolean isWebServiceDeployment(DeploymentInfo unit); + + /** Create the Deployment for a given DeploymentInfo + */ + public abstract Deployment createDeployment(DeploymentInfo unit); + + /** Get the Deployment for a given DeploymentInfo + */ + public Deployment getDeployment(DeploymentInfo unit) + { + Deployment dep = (Deployment)unit.context.get(Deployment.class); + return (dep != null && dep.getType() == getDeploymentType() ? dep : null); + } + + public void deploy(DeploymentInfo unit) throws DeploymentException + { + if (ignoreDeployment(unit)) + return; + + if (isWebServiceDeployment(unit)) + { + log.debug("deploy: " + unit.shortName); + Deployment dep = getDeployment(unit); + if (dep == null) + { + dep = createDeployment(unit); + dep.getContext().addAttachment(DeploymentInfo.class, unit); + } + + deployerManager.deploy(dep); + unit.context.put(Deployment.class, dep); + } + } + + public void undeploy(DeploymentInfo unit) + { + if (ignoreDeployment(unit)) + return; + + Deployment dep = getDeployment(unit); + if (dep != null) + { + log.debug("undeploy: " + unit.shortName); + deployerManager.undeploy(dep); + unit.context.remove(Deployment.class); + } + } + + /** Unmrashall the webservices.xml if there is one + */ + protected WebservicesMetaData getWebservicesMetaData(DeploymentInfo unit, String wsFile) + { + WebservicesMetaData wsMetaData = (WebservicesMetaData)unit.context.get(WebservicesMetaData.class); + UnifiedVirtualFile vfWebservices = getWebservicesFile(unit, wsFile); + if (wsMetaData == null && vfWebservices != null) + { + try + { + URL wsURL = vfWebservices.toURL(); + Element root = DOMUtils.parse(wsURL.openStream()); + String namespaceURI = root.getNamespaceURI(); + if (namespaceURI.equals("http://java.sun.com/xml/ns/j2ee")) + { + Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); + ObjectModelFactory factory = new WebservicesFactory(wsURL); + wsMetaData = (WebservicesMetaData)unmarshaller.unmarshal(wsURL.openStream(), factory, null); + unit.context.put(WebservicesMetaData.class, wsMetaData); + } + } + catch (Exception ex) + { + throw new WSDeploymentException(ex); + } + } + return wsMetaData; + } + + private UnifiedVirtualFile getWebservicesFile(DeploymentInfo unit, String wsFile) + { + try + { + UnifiedVirtualFile vfsRoot = new ResourceLoaderAdapter(unit.localCl); + return (wsFile != null ? vfsRoot.findChild(wsFile) : null); + } + catch (IOException e) + { + return null; + } + } +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ClassLoaderInjectionDeployer.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ClassLoaderInjectionDeployer.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ClassLoaderInjectionDeployer.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ClassLoaderInjectionDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -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.wsf.container.jboss42; + +//$Id$ + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.metadata.WebMetaData; +import org.jboss.wsf.spi.deployment.AbstractDeployer; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.WSDeploymentException; + +/** + * A deployer that injects the correct classloader into the UMDM + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class ClassLoaderInjectionDeployer extends AbstractDeployer +{ + @Override + public void create(Deployment dep) + { + DeploymentInfo unit = dep.getContext().getAttachment(DeploymentInfo.class); + if (unit == null) + throw new IllegalStateException("Cannot obtain deployement unit"); + + ClassLoader classLoader = unit.ucl; + + // Get the webapp context classloader and use it as the deploymet class loader + WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); + if (webMetaData != null) + { + classLoader = webMetaData.getContextLoader(); + } + + dep.setClassLoader(classLoader); + + // Reload target beans with the updated class loader + for (Endpoint ep : dep.getService().getEndpoints()) + { + Class targetBean = ep.getTargetBean(); + if (targetBean != null) + { + String beanName = targetBean.getName(); + if (targetBean.getClassLoader() != classLoader) + { + try + { + targetBean = classLoader.loadClass(beanName); + ep.setTargetBean(targetBean); + } + catch (ClassNotFoundException e) + { + throw new WSDeploymentException("Cannot reload target bean: " + beanName); + } + } + } + } + } +} \ No newline at end of file Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerHook.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerHook.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerHook.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerHook.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -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.wsf.container.jboss42; + +import org.jboss.deployment.DeploymentException; +import org.jboss.deployment.DeploymentInfo; + +//$Id$ + + +/** + * An interface for all web service deployer hooks + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Apr-2007 + */ +public interface DeployerHook +{ + void deploy(DeploymentInfo unit) throws DeploymentException; + + void undeploy(DeploymentInfo unit); +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptor.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptor.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptor.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptor.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,153 @@ +/* + * 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.wsf.container.jboss42; + +//$Id$ + +import java.util.LinkedList; +import java.util.List; + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.deployment.MainDeployerMBean; +import org.jboss.deployment.SubDeployerInterceptorSupport; +import org.jboss.mx.server.Invocation; +import org.jboss.mx.util.MBeanProxy; + +/** + * A deployer service that manages WS4EE compliant Web Services + * + * @author Thomas.Diesler(a)jboss.org + * @since 03-May-2007 + */ +public abstract class DeployerInterceptor extends SubDeployerInterceptorSupport implements DeployerInterceptorMBean +{ + // The main deployer + private MainDeployerMBean mainDeployer; + + private List<DeployerHook> phaseOneHooks = new LinkedList<DeployerHook>(); + private List<DeployerHook> phaseTwoHooks = new LinkedList<DeployerHook>(); + + public void addPhaseOneHook(DeployerHook hook) + { + log.debug("Add phase-one deployer hook: " + hook); + phaseOneHooks.add(hook); + } + + public void removePhaseOneHook(DeployerHook hook) + { + log.debug("Remove phase-one deployer hook: " + hook); + phaseOneHooks.remove(hook); + } + + public void addPhaseTwoHook(DeployerHook hook) + { + log.debug("Add phase-two deployer hook: " + hook); + phaseTwoHooks.add(hook); + } + + public void removePhaseTwoHook(DeployerHook hook) + { + log.debug("Remove phase-two deployer hook: " + hook); + phaseTwoHooks.remove(hook); + } + + @Override + protected final Object create(Invocation invocation, DeploymentInfo unit) throws Throwable + { + Object retn = invokeNext(invocation); + + for (DeployerHook deployer : phaseOneHooks) + deployer.deploy(unit); + + return retn; + } + + @Override + protected final Object start(Invocation invocation, DeploymentInfo unit) throws Throwable + { + Object retn = invokeNext(invocation); + + for (DeployerHook deployer : phaseTwoHooks) + deployer.deploy(unit); + + return retn; + } + + @Override + protected final Object stop(Invocation invocation, DeploymentInfo unit) throws Throwable + { + Object retn = invokeNext(invocation); + + for (DeployerHook deployer : phaseTwoHooks) + deployer.undeploy(unit); + + return retn; + } + + @Override + protected final Object destroy(Invocation invocation, DeploymentInfo unit) throws Throwable + { + Object retn = invokeNext(invocation); + + for (DeployerHook deployer : phaseOneHooks) + deployer.undeploy(unit); + + return retn; + } + + /** Create the deployer service + */ + protected void createService() throws Exception + { + mainDeployer = (MainDeployerMBean)MBeanProxy.get(MainDeployerMBean.class, MainDeployerMBean.OBJECT_NAME, server); + super.attach(); + } + + /** Destroy the deployer service + */ + protected void destroyService() + { + super.detach(); + } + + /** + * Handle all webservice deployment exceptions. + * You can either simply log the problem and keep the EJB/WAR module + * alive or undeploy properly. + */ + protected void handleStartupException(DeploymentInfo di, Throwable th) + { + log.error("Cannot startup webservice for: " + di.shortName, th); + mainDeployer.undeploy(di); + } + + /** + * Handle all webservice deployment exceptions. + * + * You can either simply logs the problem and keep the EJB/WAR module + * alive or undeploy properly. + */ + protected void handleShutdownException(String moduleName, Throwable th) + { + log.error("Cannot shutdown webservice for: " + moduleName, th); + } +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB21.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorEJB21.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB21.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB21.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,35 @@ +/* + * 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.wsf.container.jboss42; + +//$Id$ + +/** + * A deployer service that manages WS4EE compliant Web-Services for EJB-2.1 Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 15-Jan-2005 + */ +public class DeployerInterceptorEJB21 extends DeployerInterceptor implements DeployerInterceptorEJB21MBean +{ + +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB21MBean.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorEJB21MBean.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB21MBean.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB21MBean.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,36 @@ +/* + * 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.wsf.container.jboss42; + +import javax.management.ObjectName; + +import org.jboss.wsf.spi.utils.ObjectNameFactory; + +/** + * MBean interface. + * @since 19-Jan-2005 + */ +public interface DeployerInterceptorEJB21MBean extends DeployerInterceptorMBean +{ + //default object name + public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceDeployerEJB21"); +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB3.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorEJB3.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB3.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB3.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,34 @@ +/* + * 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.wsf.container.jboss42; + +// $Id$ + +/** + * A deployer service that manages WS4EE compliant Web-Services for EJB3 Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2005 + */ +public class DeployerInterceptorEJB3 extends DeployerInterceptor implements DeployerInterceptorEJB3MBean +{ +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB3MBean.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorEJB3MBean.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB3MBean.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB3MBean.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,36 @@ +/* + * 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.wsf.container.jboss42; + +import javax.management.ObjectName; + +import org.jboss.wsf.spi.utils.ObjectNameFactory; + +/** + * MBean interface. + * @since 19-Jan-2005 + */ +public interface DeployerInterceptorEJB3MBean extends DeployerInterceptorMBean +{ + //default object name + public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceDeployerEJB3"); +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorJSE.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorJSE.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorJSE.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorJSE.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,34 @@ +/* + * 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.wsf.container.jboss42; + +// $Id$ + +/** + * A deployer service that manages WS4EE compliant Web Services for WAR + * + * @author Thomas.Diesler(a)jboss.org + * @since 15-Jan-2005 + */ +public class DeployerInterceptorJSE extends DeployerInterceptor implements DeployerInterceptorJSEMBean +{ +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorJSEMBean.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorJSEMBean.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorJSEMBean.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorJSEMBean.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,36 @@ +/* +* 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.wsf.container.jboss42; + +import javax.management.ObjectName; + +import org.jboss.wsf.spi.utils.ObjectNameFactory; + +/** + * MBean interface. + * @since 19-Jan-2005 + */ +public interface DeployerInterceptorJSEMBean extends DeployerInterceptorMBean +{ + //default object name + public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceDeployerJSE"); +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorMBean.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorMBean.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorMBean.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorMBean.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,39 @@ +/* + * 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.wsf.container.jboss42; + +import org.jboss.deployment.SubDeployerInterceptorMBean; + +/** + * MBean interface. + * @since 19-Jan-2005 + */ +public interface DeployerInterceptorMBean extends SubDeployerInterceptorMBean +{ + void addPhaseOneHook(DeployerHook deployer); + + void removePhaseOneHook(DeployerHook deployer); + + void addPhaseTwoHook(DeployerHook deployer); + + void removePhaseTwoHook(DeployerHook deployer); +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeploymentInfoAdapter.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,168 @@ +/* + * 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.wsf.container.jboss42; + +// $Id$ + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; + +import javax.management.MBeanServer; +import javax.management.ObjectName; + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.ejb3.Ejb3ModuleMBean; +import org.jboss.ejb3.stateless.StatelessContainer; +import org.jboss.logging.Logger; +import org.jboss.metadata.ApplicationMetaData; +import org.jboss.metadata.WebMetaData; +import org.jboss.mx.util.MBeanProxy; +import org.jboss.mx.util.MBeanProxyCreationException; +import org.jboss.mx.util.MBeanServerLocator; +import org.jboss.ws.integration.ResourceLoaderAdapter; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.deployment.WSDeploymentException; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; + +/** + * Build container independent deployment info. + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class DeploymentInfoAdapter +{ + // logging support + private static Logger log = Logger.getLogger(DeploymentInfoAdapter.class); + + private WebMetaDataAdapter webMetaDataAdapter; + private AbstractApplicationMetaDataAdapter appMetaDataAdapter; + + public void setAppMetaDataAdapter(AbstractApplicationMetaDataAdapter applicationMetaDataAdapter) + { + this.appMetaDataAdapter = applicationMetaDataAdapter; + } + + public void setWebMetaDataAdapter(WebMetaDataAdapter webMetaDataAdapter) + { + this.webMetaDataAdapter = webMetaDataAdapter; + } + + public UnifiedDeploymentInfo buildDeploymentInfo(UnifiedDeploymentInfo udi, DeploymentInfo di) + { + udi.addAttachment(DeploymentInfo.class, di); + + if (di.parent != null) + { + udi.parent = new UnifiedDeploymentInfo(null); + buildDeploymentInfo(udi.parent, di.parent); + } + + udi.vfRoot = new ResourceLoaderAdapter(di.localCl); + udi.name = di.getCanonicalName(); + udi.simpleName = di.shortName; + udi.url = getDeploymentURL(di); + udi.classLoader = di.annotationsCl; + udi.deployedObject = di.deployedObject; + + buildMetaData(udi, di.metaData); + + log.debug("UnifiedDeploymentInfo:\n" + udi); + return udi; + } + + private URL getDeploymentURL(DeploymentInfo di) + { + URL deploymentURL = (di.localUrl != null ? di.localUrl : di.url); + if ("file".equals(deploymentURL.getProtocol())) + { + String path = deploymentURL.getPath(); + if (new File(path).isFile()) + { + try + { + deploymentURL = new URL("jar:file:" + path + "!/"); + } + catch (MalformedURLException e) + { + // ignore + } + } + } + return deploymentURL; + } + + private void buildMetaData(UnifiedDeploymentInfo udi, Object metaData) + { + if (metaData instanceof WebMetaData) + { + udi.metaData = webMetaDataAdapter.buildUnifiedWebMetaData(udi, (WebMetaData)metaData); + udi.webappURL = udi.url; + } + else if (metaData instanceof ApplicationMetaData) + { + udi.metaData = appMetaDataAdapter.buildUnifiedApplicationMetaData(udi, (ApplicationMetaData)metaData); + } + else if (udi.deployedObject != null) + { + Ejb3ModuleMBean ejb3Module = getEJB3Module(udi.deployedObject); + + ArrayList<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>(); + for (Object container : ejb3Module.getContainers().values()) + { + if (container instanceof StatelessContainer) + { + StatelessContainer slc = (StatelessContainer)container; + UnifiedBeanMetaData uslc = new UnifiedBeanMetaData(); + uslc.setEjbName(slc.getEjbName()); + uslc.setEjbClass(slc.getBeanClassName()); + beans.add(uslc); + } + } + + UnifiedApplicationMetaData appMetaData = new UnifiedApplicationMetaData(); + appMetaData.setEnterpriseBeans(beans); + udi.metaData = appMetaData; + } + } + + public static Ejb3ModuleMBean getEJB3Module(ObjectName objectName) + { + Ejb3ModuleMBean ejb3Module; + try + { + MBeanServer server = MBeanServerLocator.locateJBoss(); + ejb3Module = (Ejb3ModuleMBean)MBeanProxy.get(Ejb3ModuleMBean.class, objectName, server); + if (ejb3Module == null) + throw new WSDeploymentException("Cannot obtain EJB3 module: " + objectName); + + return ejb3Module; + } + catch (MBeanProxyCreationException ex) + { + throw new WSDeploymentException("Cannot obtain proxy to EJB3 module"); + } + } +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapterFactory.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeploymentInfoAdapterFactory.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapterFactory.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapterFactory.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,47 @@ +/* + * 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.wsf.container.jboss42; + +// $Id$ + +import org.jboss.kernel.spi.registry.KernelRegistry; +import org.jboss.kernel.spi.registry.KernelRegistryEntry; +import org.jboss.ws.integration.KernelLocator; + +/** + * @author Thomas.Diesler(a)jboss.org + * @since 10-Mar-2007 + */ +public class DeploymentInfoAdapterFactory +{ + // Hide ctor + private DeploymentInfoAdapterFactory() + { + } + + public static DeploymentInfoAdapter newInstance() + { + KernelRegistry registry = KernelLocator.getKernel().getRegistry(); + KernelRegistryEntry entry = registry.getEntry("WSDeploymentInfoAdapter"); + return (DeploymentInfoAdapter)entry.getTarget(); + } +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/InvocationHandlerEJB21.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,166 @@ +/* + * 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.wsf.container.jboss42; + +// $Id$ + +import java.lang.reflect.Method; +import java.security.Principal; + +import javax.management.MBeanServer; +import javax.management.ObjectName; +import javax.xml.rpc.handler.MessageContext; +import javax.xml.rpc.handler.soap.SOAPMessageContext; +import javax.xml.ws.WebServiceException; + +import org.jboss.ejb.EjbModule; +import org.jboss.ejb.Interceptor; +import org.jboss.ejb.StatelessSessionContainer; +import org.jboss.invocation.Invocation; +import org.jboss.invocation.InvocationKey; +import org.jboss.invocation.InvocationType; +import org.jboss.invocation.PayloadKey; +import org.jboss.logging.Logger; +import org.jboss.mx.util.MBeanServerLocator; +import org.jboss.security.SecurityAssociation; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.invocation.AbstractInvocationHandler; +import org.jboss.wsf.spi.invocation.EndpointInvocation; +import org.jboss.wsf.spi.invocation.HandlerCallback; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; +import org.jboss.wsf.spi.utils.ObjectNameFactory; + +/** + * Handles invocations on EJB3 endpoints. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class InvocationHandlerEJB21 extends AbstractInvocationHandler +{ + // provide logging + private static final Logger log = Logger.getLogger(InvocationHandlerEJB21.class); + + private String jndiName; + private MBeanServer server; + private ObjectName objectName; + + public void create(Endpoint ep) + { + super.create(ep); + + ObjectName epName = ep.getName(); + String ejbName = epName.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); + if (ejbName == null) + throw new WebServiceException("Cannot obtain ejb-link from port component"); + + UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class); + UnifiedApplicationMetaData applMetaData = (UnifiedApplicationMetaData)udi.metaData; + UnifiedBeanMetaData beanMetaData = (UnifiedBeanMetaData)applMetaData.getBeanByEjbName(ejbName); + if (beanMetaData == null) + throw new WebServiceException("Cannot obtain ejb meta data for: " + ejbName); + + // get the bean's JNDI name + jndiName = beanMetaData.getContainerObjectNameJndiName(); + if (jndiName == null) + throw new WebServiceException("Cannot obtain JNDI name for: " + ejbName); + + server = MBeanServerLocator.locateJBoss(); + objectName = ObjectNameFactory.create("jboss.j2ee:jndiName=" + jndiName + ",service=EJB"); + if (server.isRegistered(objectName) == false) + throw new WebServiceException("Cannot find service endpoint target: " + objectName); + + // Dynamically add the service endpoint interceptor + // http://jira.jboss.org/jira/browse/JBWS-758 + try + { + EjbModule ejbModule = (EjbModule)server.getAttribute(objectName, "EjbModule"); + StatelessSessionContainer container = (StatelessSessionContainer)ejbModule.getContainer(ejbName); + + boolean injectionPointFound = false; + Interceptor prev = container.getInterceptor(); + while (prev != null && prev.getNext() != null) + { + Interceptor next = prev.getNext(); + if (next.getNext() == null) + { + log.debug("Inject service endpoint interceptor after: " + prev.getClass().getName()); + ServiceEndpointInterceptor sepInterceptor = new ServiceEndpointInterceptor(); + prev.setNext(sepInterceptor); + sepInterceptor.setNext(next); + injectionPointFound = true; + } + prev = next; + } + if (injectionPointFound == false) + log.warn("Cannot service endpoint interceptor injection point"); + } + catch (Exception ex) + { + log.warn("Cannot add service endpoint interceptor", ex); + } + + } + + public void invoke(Endpoint ep, Object beanInstance, org.jboss.wsf.spi.invocation.EndpointInvocation epInv) throws Exception + { + log.debug("Invoke: " + epInv.getJavaMethod().getName()); + + // these are provided by the ServerLoginHandler + Principal principal = SecurityAssociation.getPrincipal(); + Object credential = SecurityAssociation.getCredential(); + + // invoke on the container + try + { + // setup the invocation + Method method = epInv.getJavaMethod(); + Object[] args = epInv.getArgs(); + Invocation inv = new Invocation(null, method, args, null, principal, credential); + + // EJB2.1 endpoints will only get an JAXRPC context + MessageContext msgContext = epInv.getInvocationContext().getAttachment(MessageContext.class); + if (msgContext == null) + throw new IllegalStateException("Cannot obtain MessageContext"); + + HandlerCallback callback = epInv.getInvocationContext().getAttachment(HandlerCallback.class); + if (callback == null) + throw new IllegalStateException("Cannot obtain HandlerCallback"); + + inv.setValue(InvocationKey.SOAP_MESSAGE_CONTEXT, msgContext); + inv.setValue(InvocationKey.SOAP_MESSAGE, ((SOAPMessageContext)msgContext).getMessage()); + inv.setType(InvocationType.SERVICE_ENDPOINT); + inv.setValue(HandlerCallback.class.getName(), callback, PayloadKey.TRANSIENT); + inv.setValue(EndpointInvocation.class.getName(), epInv, PayloadKey.TRANSIENT); + + String[] sig = { org.jboss.invocation.Invocation.class.getName() }; + Object retObj = server.invoke(objectName, "invoke", new Object[] { inv }, sig); + epInv.setReturnValue(retObj); + } + catch (Exception e) + { + handleInvocationException(e); + } + } +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/InvocationHandlerEJB3.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,145 @@ +/* + * 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.wsf.container.jboss42; + +// $Id$ + +import java.lang.reflect.Method; + +import javax.ejb.EJBContext; +import javax.management.ObjectName; +import javax.xml.ws.WebServiceException; + +import org.jboss.aop.Dispatcher; +import org.jboss.aop.MethodInfo; +import org.jboss.ejb3.BeanContext; +import org.jboss.ejb3.BeanContextLifecycleCallback; +import org.jboss.ejb3.EJBContainerInvocation; +import org.jboss.ejb3.stateless.StatelessBeanContext; +import org.jboss.ejb3.stateless.StatelessContainer; +import org.jboss.injection.lang.reflect.BeanProperty; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.invocation.AbstractInvocationHandler; +import org.jboss.wsf.spi.invocation.EndpointInvocation; +import org.jboss.wsf.spi.invocation.WebServiceContextEJB; +import org.jboss.wsf.spi.utils.ObjectNameFactory; + +/** + * Handles invocations on EJB3 endpoints. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class InvocationHandlerEJB3 extends AbstractInvocationHandler +{ + private ObjectName objectName; + + public void create(Endpoint ep) + { + super.create(ep); + + String ejbName = ep.getName().getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); + if (ejbName == null) + throw new WebServiceException("Cannot obtain ejb-link"); + + UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class); + String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + udi.simpleName; + if (udi.parent != null) + { + nameStr += ",ear=" + udi.parent.simpleName; + } + + objectName = ObjectNameFactory.create(nameStr.toString()); + } + + public void start(Endpoint ep) + { + super.start(ep); + + Dispatcher dispatcher = Dispatcher.singleton; + if (dispatcher.getRegistered(objectName.getCanonicalName()) == null) + throw new WebServiceException("Cannot find service endpoint target: " + objectName); + } + + public void invoke(Endpoint ep, Object beanInstance, EndpointInvocation epInv) throws Exception + { + try + { + Dispatcher dispatcher = Dispatcher.singleton; + StatelessContainer container = (StatelessContainer)dispatcher.getRegistered(objectName.getCanonicalName()); + Class beanClass = container.getBeanClass(); + + Method method = getImplMethod(beanClass, epInv.getJavaMethod()); + Object[] args = epInv.getArgs(); + + MethodInfo info = container.getMethodInfo(method); + EJBContainerInvocation<StatelessContainer, StatelessBeanContext> ejb3Inv = new EJBContainerInvocation<StatelessContainer, StatelessBeanContext>(info); + ejb3Inv.setAdvisor(container); + ejb3Inv.setArguments(args); + ejb3Inv.setContextCallback(new CallbackImpl(epInv)); + + Object retObj = ejb3Inv.invokeNext(); + + epInv.setReturnValue(retObj); + } + catch (Throwable th) + { + handleInvocationException(th); + } + } + + static class CallbackImpl implements BeanContextLifecycleCallback + { + private javax.xml.ws.handler.MessageContext jaxwsMessageContext; + private javax.xml.rpc.handler.MessageContext jaxrpcMessageContext; + + public CallbackImpl(EndpointInvocation epInv) + { + jaxrpcMessageContext = epInv.getInvocationContext().getAttachment(javax.xml.rpc.handler.MessageContext.class); + jaxwsMessageContext = epInv.getInvocationContext().getAttachment(javax.xml.ws.handler.MessageContext.class); + } + + public void attached(BeanContext beanCtx) + { + StatelessBeanContext sbc = (StatelessBeanContext)beanCtx; + sbc.setMessageContextJAXRPC(jaxrpcMessageContext); + + BeanProperty beanProp = sbc.getWebServiceContextProperty(); + if (beanProp != null) + { + EJBContext ejbCtx = beanCtx.getEJBContext(); + beanProp.set(beanCtx.getInstance(), new WebServiceContextEJB(jaxwsMessageContext, ejbCtx)); + } + } + + public void released(BeanContext beanCtx) + { + StatelessBeanContext sbc = (StatelessBeanContext)beanCtx; + sbc.setMessageContextJAXRPC(null); + + BeanProperty beanProp = sbc.getWebServiceContextProperty(); + if (beanProp != null) + beanProp.set(beanCtx.getInstance(), null); + } + } +} \ No newline at end of file Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/JAXRPCDeployerHookEJB21.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,120 @@ +/* + * 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.wsf.container.jboss42; + +//$Id$ + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.metadata.ApplicationMetaData; +import org.jboss.metadata.BeanMetaData; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Service; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; +import org.jboss.wsf.spi.utils.ObjectNameFactory; + +/** + * A deployer JAXRPC EJB21 Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXRPCDeployerHookEJB21 extends AbstractDeployerHookEJB +{ + /** Get the deployemnt type this deployer can handle + */ + public DeploymentType getDeploymentType() + { + return DeploymentType.JAXRPC_EJB21; + } + + @Override + public Deployment createDeployment(DeploymentInfo unit) + { + Deployment dep = createDeployment(); + dep.setType(getDeploymentType()); + dep.setClassLoader(unit.ucl); + + Service service = dep.getService(); + + ApplicationMetaData appmd = (ApplicationMetaData)unit.metaData; + if (appmd == null) + throw new IllegalStateException("Deployment unit does not contain application meta data"); + + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, null); + if (wsMetaData == null) + throw new IllegalStateException("Deployment unit does not contain webservices meta data"); + + // Copy the attachments + dep.getContext().addAttachment(WebservicesMetaData.class, wsMetaData); + dep.getContext().addAttachment(ApplicationMetaData.class, appmd); + + for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) + { + for (PortComponentMetaData pcmd : wsd.getPortComponents()) + { + String ejbLink = pcmd.getEjbLink(); + if (ejbLink == null) + throw new IllegalStateException("ejb-link cannot be null"); + + BeanMetaData beanMetaData = appmd.getBeanByEjbName(ejbLink); + if (beanMetaData == null) + throw new IllegalStateException("Cannot obtain bean meta data for: " + ejbLink); + + String ejbClass = beanMetaData.getEjbClass(); + try + { + ClassLoader loader = unit.ucl; + Class<?> epBean = loader.loadClass(ejbClass.trim()); + + // Create the endpoint + Endpoint ep = createEndpoint(); + ep.setService(service); + ep.setTargetBean(epBean); + + String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbLink; + ep.setName(ObjectNameFactory.create(nameStr)); + + service.addEndpoint(ep); + } + catch (ClassNotFoundException ex) + { + log.warn("Cannot load servlet class: " + ejbClass); + } + } + } + return dep; + } + + @Override + public boolean isWebServiceDeployment(DeploymentInfo unit) + { + if ((unit.metaData instanceof ApplicationMetaData) == false) + return false; + + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "META-INF/webservices.xml"); + return wsMetaData != null; + } +} \ No newline at end of file Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/JAXRPCDeployerHookJSE.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,147 @@ +/* + * 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.wsf.container.jboss42; + +//$Id$ + +import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.metadata.WebMetaData; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Service; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; +import org.jboss.wsf.spi.utils.ObjectNameFactory; + +/** + * A deployer JAXRPC JSE Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXRPCDeployerHookJSE extends AbstractDeployerHookJSE +{ + /** Get the deployemnt type this deployer can handle + */ + public DeploymentType getDeploymentType() + { + return DeploymentType.JAXRPC_JSE; + } + + /** + * Create an endpoint for every servlet-link in webservices.xml + */ + @Override + public Deployment createDeployment(DeploymentInfo unit) + { + Deployment dep = createDeployment(); + dep.setType(getDeploymentType()); + dep.setClassLoader(unit.annotationsCl); + + Service service = dep.getService(); + + WebMetaData webMetaData = (WebMetaData)unit.metaData; + if (webMetaData == null) + throw new IllegalStateException("Deployment unit does not contain web meta data"); + + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "WEB-INF/webservices.xml"); + if (wsMetaData == null) + throw new IllegalStateException("Deployment unit does not contain webservices meta data"); + + // Copy the attachments + dep.getContext().addAttachment(WebservicesMetaData.class, wsMetaData); + dep.getContext().addAttachment(WebMetaData.class, webMetaData); + + for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) + { + for (PortComponentMetaData pcmd : wsd.getPortComponents()) + { + String servletLink = pcmd.getServletLink(); + if (servletLink == null) + throw new IllegalStateException("servlet-link cannot be null"); + + Servlet servlet = getServletForName(webMetaData, servletLink); + String servletClass = servlet.getServletClass(); + + try + { + ClassLoader loader = dep.getClassLoader(); + Class<?> epBean = loader.loadClass(servletClass.trim()); + + // If this is a servlet we defer the the bean creation + if (javax.servlet.Servlet.class.isAssignableFrom(epBean)) + { + epBean = null; + } + + // Create the endpoint + Endpoint ep = createEndpoint(); + ep.setService(service); + ep.setTargetBean(epBean); + + String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletLink; + ep.setName(ObjectNameFactory.create(nameStr)); + + service.addEndpoint(ep); + } + catch (ClassNotFoundException ex) + { + log.warn("Cannot load servlet class: " + servletClass); + } + } + } + + return dep; + } + + private Servlet getServletForName(WebMetaData wmd, String servletLink) + { + Iterator it = wmd.getServletClassMap().entrySet().iterator(); + while (it.hasNext()) + { + Map.Entry entry = (Entry)it.next(); + String servletName = (String)entry.getKey(); + String servletClass = (String)entry.getValue(); + if (servletLink.equals(servletName)) + { + return new Servlet(servletName, servletClass); + } + } + throw new IllegalStateException("Cannot find servlet for link: " + servletLink); + } + + @Override + public boolean isWebServiceDeployment(DeploymentInfo unit) + { + if (super.isWebServiceDeployment(unit) == false) + return false; + + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "WEB-INF/webservices.xml"); + return wsMetaData != null; + } +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/JAXWSDeployerHookEJB3.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,124 @@ +/* + * 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.wsf.container.jboss42; + +//$Id$ + +import javax.jws.WebService; +import javax.xml.ws.WebServiceProvider; + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.ejb3.EJBContainer; +import org.jboss.ejb3.Ejb3ModuleMBean; +import org.jboss.ejb3.stateless.StatelessContainer; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Service; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.utils.ObjectNameFactory; + +/** + * A deployer JAXWS EJB3 Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXWSDeployerHookEJB3 extends AbstractDeployerHookEJB +{ + /** Get the deployemnt type this deployer can handle + */ + public DeploymentType getDeploymentType() + { + return DeploymentType.JAXWS_EJB3; + } + + @Override + public Deployment createDeployment(DeploymentInfo unit) + { + Deployment dep = createDeployment(); + dep.setType(getDeploymentType()); + dep.setClassLoader(unit.ucl); + + Service service = dep.getService(); + + Ejb3ModuleMBean ejb3Module = DeploymentInfoAdapter.getEJB3Module(unit.deployedObject); + for (Object manager : ejb3Module.getContainers().values()) + { + if (manager instanceof EJBContainer) + { + EJBContainer container = (EJBContainer)manager; + if (isWebServiceBean(container)) + { + String ejbName = container.getEjbName(); + Class epBean = container.getBeanClass(); + + // Create the endpoint + Endpoint ep = createEndpoint(); + ep.setService(service); + ep.setTargetBean(epBean); + + String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbName; + ep.setName(ObjectNameFactory.create(nameStr)); + + service.addEndpoint(ep); + } + } + } + + return dep; + } + + @Override + public boolean isWebServiceDeployment(DeploymentInfo unit) + { + boolean isWebserviceDeployment = false; + + // Check if the ejb3 contains annotated endpoints + Ejb3ModuleMBean ejb3Module = DeploymentInfoAdapter.getEJB3Module(unit.deployedObject); + for (Object manager : ejb3Module.getContainers().values()) + { + if (manager instanceof EJBContainer) + { + EJBContainer container = (EJBContainer)manager; + if (isWebServiceBean(container)) + { + isWebserviceDeployment = true; + break; + } + } + } + + return isWebserviceDeployment; + } + + private boolean isWebServiceBean(EJBContainer container) + { + boolean isWebServiceBean = false; + if (container instanceof StatelessContainer) + { + boolean isWebService = container.resolveAnnotation(WebService.class) != null; + boolean isWebServiceProvider = container.resolveAnnotation(WebServiceProvider.class) != null; + isWebServiceBean = isWebService || isWebServiceProvider; + } + return isWebServiceBean; + } +} \ No newline at end of file Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/JAXWSDeployerHookJSE.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,156 @@ +/* + * 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.wsf.container.jboss42; + +//$Id$ + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import javax.jws.WebService; +import javax.xml.ws.WebServiceProvider; + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.metadata.WebMetaData; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Service; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.utils.ObjectNameFactory; + +/** + * A deployer JAXWS JSE Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXWSDeployerHookJSE extends AbstractDeployerHookJSE +{ + /** Get the deployemnt type this deployer can handle + */ + public DeploymentType getDeploymentType() + { + return DeploymentType.JAXWS_JSE; + } + + @Override + public Deployment createDeployment(DeploymentInfo unit) + { + Deployment dep = createDeployment(); + dep.setType(getDeploymentType()); + dep.setClassLoader(unit.annotationsCl); + + Service service = dep.getService(); + + WebMetaData webMetaData = (WebMetaData)unit.metaData; + if (webMetaData == null) + throw new IllegalStateException("Deployment unit does not contain web meta data"); + + // Copy the attachments + dep.getContext().addAttachment(WebMetaData.class, webMetaData); + + List<Servlet> servlets = getRelevantServlets(webMetaData, unit.annotationsCl); + for (Servlet servlet : servlets) + { + String servletName = servlet.getServletName(); + String servletClass = servlet.getServletClass(); + + try + { + ClassLoader loader = unit.annotationsCl; + Class<?> epBean = loader.loadClass(servletClass.trim()); + + // Create the endpoint + Endpoint ep = createEndpoint(); + ep.setService(service); + ep.setTargetBean(epBean); + + String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName; + ep.setName(ObjectNameFactory.create(nameStr)); + + service.addEndpoint(ep); + } + catch (ClassNotFoundException ex) + { + log.warn("Cannot load servlet class: " + servletClass); + continue; + } + } + + return dep; + } + + @Override + public boolean isWebServiceDeployment(DeploymentInfo unit) + { + if (super.isWebServiceDeployment(unit) == false) + return false; + + boolean isWebServiceDeployment = false; + try + { + WebMetaData webMetaData = (WebMetaData)unit.metaData; + List<Servlet> servlets = getRelevantServlets(webMetaData, unit.annotationsCl); + isWebServiceDeployment = servlets.size() > 0; + } + catch (Exception ex) + { + log.error("Cannot process web deployment", ex); + } + + return isWebServiceDeployment; + } + + private List<Servlet> getRelevantServlets(WebMetaData webMetaData, ClassLoader loader) + { + List<Servlet> servlets = new ArrayList<Servlet>(); + Iterator it = webMetaData.getServletClassMap().entrySet().iterator(); + while (it.hasNext()) + { + Map.Entry entry = (Entry)it.next(); + String servletName = (String)entry.getKey(); + String servletClassName = (String)entry.getValue(); + + // Skip JSPs + if (servletClassName == null || servletClassName.length() == 0) + continue; + + try + { + Class<?> servletClass = loader.loadClass(servletClassName.trim()); + boolean isWebService = servletClass.isAnnotationPresent(WebService.class); + boolean isWebServiceProvider = servletClass.isAnnotationPresent(WebServiceProvider.class); + if (isWebService || isWebServiceProvider) + servlets.add(new Servlet(servletName, servletClassName)); + } + catch (ClassNotFoundException ex) + { + log.warn("Cannot load servlet class: " + servletClassName); + continue; + } + } + return servlets; + } +} \ No newline at end of file Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/MainDeployerHook.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/MainDeployerHook.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/MainDeployerHook.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/MainDeployerHook.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,61 @@ +/* + * 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.wsf.container.jboss42; + +//$Id$ + +import org.jboss.deployment.DeploymentException; +import org.jboss.deployment.DeploymentInfo; +import org.jboss.wsf.spi.deployment.Deployment; + +/** + * A basic hook that delegates a deployment manger. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class MainDeployerHook extends AbstractDeployerHook +{ + public void deploy(DeploymentInfo unit) throws DeploymentException + { + if (ignoreDeployment(unit)) + return; + + Deployment dep = (Deployment)unit.context.get(Deployment.class); + if (dep != null) + { + deployerManager.deploy(dep); + } + } + + public void undeploy(DeploymentInfo unit) + { + if (ignoreDeployment(unit)) + return; + + Deployment dep = (Deployment)unit.context.get(Deployment.class); + if (dep != null) + { + deployerManager.undeploy(dep); + } + } +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ManagedServerConfig.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ManagedServerConfig.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ManagedServerConfig.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ManagedServerConfig.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,76 @@ +/* + * 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.wsf.container.jboss42; + +// $Id$ + +import java.util.ArrayList; + +import javax.management.MBeanServer; +import javax.management.MBeanServerFactory; + +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.management.BasicServerConfig; + +/** + * A Service Endpoint Registry + * + * @author Thomas.Diesler(a)jboss.org + * @since 04-May-2007 + */ +public class ManagedServerConfig extends BasicServerConfig implements ManagedServerConfigMBean +{ + // provide logging + private static final Logger log = Logger.getLogger(ManagedServerConfig.class); + + public void create() throws Exception + { + log.debug("WebServiceHost: " + getWebServiceHost()); + log.debug("WebServicePort: " + getWebServicePort()); + log.debug("WebServiceSecurePort: " + getWebServiceSecurePort()); + MBeanServer server = getMBeanServer(); + if (server != null) + { + server.registerMBean(this, OBJECT_NAME); + } + } + + public void destroy() throws Exception + { + MBeanServer server = getMBeanServer(); + if (server != null) + { + server.unregisterMBean(OBJECT_NAME); + } + } + + private MBeanServer getMBeanServer() + { + MBeanServer server = null; + ArrayList servers = MBeanServerFactory.findMBeanServer(null); + if (servers.size() > 0) + { + server = (MBeanServer)servers.get(0); + } + return server; + } +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ManagedServerConfigMBean.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ManagedServerConfigMBean.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ManagedServerConfigMBean.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ManagedServerConfigMBean.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,32 @@ +/* + * 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.wsf.container.jboss42; + +import org.jboss.wsf.spi.management.ServerConfig; + +/** + * MBean interface. + * @since 15-April-2004 + */ +public interface ManagedServerConfigMBean extends ServerConfig +{ +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeployer.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ModifyWebMetaDataDeployer.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeployer.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,80 @@ +/* + * 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.wsf.container.jboss42; + +//$Id$ + +import org.jboss.wsf.spi.deployment.AbstractDeployer; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.ServiceEndpointPublisher; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.deployment.ServiceEndpointPublisher.RewriteResults; + +/** + * A deployer that modifies the web.xml meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class ModifyWebMetaDataDeployer extends AbstractDeployer +{ + private ServiceEndpointPublisher serviceEndpointPublisher; + + public void setServiceEndpointPublisher(ServiceEndpointPublisher serviceEndpointPublisher) + { + this.serviceEndpointPublisher = serviceEndpointPublisher; + } + + public void create(Deployment dep) + { + UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); + if (udi == null) + throw new IllegalStateException("Cannot obtain unified deployement info"); + + RewriteResults results = serviceEndpointPublisher.rewriteWebXml(udi); + + // The endpoint may not have a target bean when + // <servlet-class> originally contained a javax.servlet.Servlet + for (Endpoint ep : dep.getService().getEndpoints()) + { + if (ep.getTargetBean() == null) + { + String servletName = ep.getName().getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); + String beanName = results.sepTargetMap.get(servletName); + if (beanName == null) + throw new IllegalStateException("Cannot obtain target bean for: " + servletName); + + try + { + ClassLoader loader = dep.getClassLoader(); + Class<?> epBean = loader.loadClass(beanName); + ep.setTargetBean(epBean); + } + catch (ClassNotFoundException ex) + { + log.warn("Cannot load target bean: " + beanName); + } + } + } + } +} \ No newline at end of file Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityRolesHandlerEJB21.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/SecurityRolesHandlerEJB21.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityRolesHandlerEJB21.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityRolesHandlerEJB21.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,70 @@ +/* + * 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.wsf.container.jboss42; + +//$Id$ + +import java.util.Iterator; +import java.util.Map; + +import org.jboss.logging.Logger; +import org.jboss.metadata.ApplicationMetaData; +import org.jboss.metadata.AssemblyDescriptorMetaData; +import org.jboss.wsf.spi.deployment.SecurityRolesHandler; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.w3c.dom.Element; + +/** + * Generate a service endpoint deployment for EJB endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-May-2006 + */ +public class SecurityRolesHandlerEJB21 implements SecurityRolesHandler +{ + // logging support + protected Logger log = Logger.getLogger(SecurityRolesHandlerEJB21.class); + + /** Add the roles from ejb-jar.xml to the security roles + */ + public void addSecurityRoles(Element webApp, UnifiedDeploymentInfo udi) + { + // Fix: http://jira.jboss.org/jira/browse/JBWS-309 + ApplicationMetaData applMetaData = (ApplicationMetaData)udi.getAttachment(ApplicationMetaData.class); + AssemblyDescriptorMetaData assemblyDescriptor = applMetaData.getAssemblyDescriptor(); + if (assemblyDescriptor != null) + { + Map securityRoles = assemblyDescriptor.getSecurityRoles(); + if (securityRoles != null) + { + Iterator it = securityRoles.keySet().iterator(); + while (it.hasNext()) + { + Element securityRole = (Element)webApp.appendChild(DOMUtils.createElement("security-role")); + Element roleName = (Element)securityRole.appendChild(DOMUtils.createElement("role-name")); + roleName.appendChild(DOMUtils.createTextNode((String)it.next())); + } + } + } + } +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityRolesHandlerEJB3.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/SecurityRolesHandlerEJB3.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityRolesHandlerEJB3.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityRolesHandlerEJB3.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,96 @@ +/* + * 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.wsf.container.jboss42; + +//$Id$ + +import javax.annotation.security.RolesAllowed; +import javax.management.MBeanServer; +import javax.management.ObjectName; + +import org.jboss.ejb3.Ejb3ModuleMBean; +import org.jboss.ejb3.stateless.StatelessContainer; +import org.jboss.logging.Logger; +import org.jboss.mx.util.MBeanProxy; +import org.jboss.mx.util.MBeanProxyCreationException; +import org.jboss.mx.util.MBeanServerLocator; +import org.jboss.wsf.spi.deployment.SecurityRolesHandler; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.deployment.WSDeploymentException; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.w3c.dom.Element; + +/** + * Generate a service endpoint deployment for EJB endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-May-2006 + */ +public class SecurityRolesHandlerEJB3 implements SecurityRolesHandler +{ + // logging support + protected Logger log = Logger.getLogger(SecurityRolesHandlerEJB3.class); + + /** Add the roles from ejb-jar.xml to the security roles + */ + public void addSecurityRoles(Element webApp, UnifiedDeploymentInfo udi) + { + // The container objects below provide access to all of the ejb metadata + Ejb3ModuleMBean ejb3Module = getEJB3Module(udi.deployedObject); + for (Object manager : ejb3Module.getContainers().values()) + { + if (manager instanceof StatelessContainer) + { + StatelessContainer container = (StatelessContainer)manager; + + RolesAllowed anRolesAllowed = (RolesAllowed)container.resolveAnnotation(RolesAllowed.class); + if (anRolesAllowed != null) + { + for (String role : anRolesAllowed.value()) + { + Element securityRole = (Element)webApp.appendChild(DOMUtils.createElement("security-role")); + Element roleName = (Element)securityRole.appendChild(DOMUtils.createElement("role-name")); + roleName.appendChild(DOMUtils.createTextNode(role)); + } + } + } + } + } + + private Ejb3ModuleMBean getEJB3Module(ObjectName objectName) + { + Ejb3ModuleMBean ejb3Module; + try + { + MBeanServer server = MBeanServerLocator.locateJBoss(); + ejb3Module = (Ejb3ModuleMBean)MBeanProxy.get(Ejb3ModuleMBean.class, objectName, server); + if (ejb3Module == null) + throw new WSDeploymentException("Cannot obtain EJB3 module: " + objectName); + + return ejb3Module; + } + catch (MBeanProxyCreationException ex) + { + throw new WSDeploymentException("Cannot obtain proxy to EJB3 module"); + } + } +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ServiceEndpointInterceptor.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ServiceEndpointInterceptor.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ServiceEndpointInterceptor.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ServiceEndpointInterceptor.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,127 @@ +/* + * 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.wsf.container.jboss42; + +// $Id$ + +import javax.xml.rpc.handler.soap.SOAPMessageContext; + +import org.jboss.ejb.plugins.AbstractInterceptor; +import org.jboss.invocation.Invocation; +import org.jboss.invocation.InvocationKey; +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.invocation.HandlerCallback; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; + +/** + * This Interceptor does the ws4ee handler processing. + * + * According to the ws4ee spec the handler logic must be invoked after the container + * applied method level security to the invocation. + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-Sep-2005 + */ +public class ServiceEndpointInterceptor extends AbstractInterceptor +{ + // provide logging + private static Logger log = Logger.getLogger(ServiceEndpointInterceptor.class); + + // Interceptor implementation -------------------------------------- + + /** Before and after we call the service endpoint bean, we process the handler chains. + */ + public Object invoke(final Invocation mi) throws Exception + { + // If no msgContext, it's not for us + SOAPMessageContext msgContext = (SOAPMessageContext)mi.getPayloadValue(InvocationKey.SOAP_MESSAGE_CONTEXT); + if (msgContext == null) + { + return getNext().invoke(mi); + } + + // Get the endpoint invocation + org.jboss.wsf.spi.invocation.EndpointInvocation epInv = (org.jboss.wsf.spi.invocation.EndpointInvocation)mi + .getValue(org.jboss.wsf.spi.invocation.EndpointInvocation.class.getName()); + + // Get the handler callback + HandlerCallback callback = (HandlerCallback)mi.getValue(HandlerCallback.class.getName()); + + // Handlers need to be Tx. Therefore we must invoke the handler chain after the TransactionInterceptor. + if (callback != null && epInv != null) + { + try + { + // call the request handlers + boolean handlersPass = callback.callRequestHandlerChain(HandlerType.ENDPOINT); + handlersPass = handlersPass && callback.callRequestHandlerChain(HandlerType.POST); + + // Call the next interceptor in the chain + if (handlersPass) + { + // The SOAPContentElements stored in the EndpointInvocation might have changed after + // handler processing. Get the updated request payload. This should be a noop if request + // handlers did not modify the incomming SOAP message. + Object[] reqParams = epInv.getArgs(); + mi.setArguments(reqParams); + Object resObj = getNext().invoke(mi); + + // Setting the message to null should trigger binding of the response message + msgContext.setMessage(null); + epInv.setReturnValue(resObj); + } + + // call the response handlers + handlersPass = callback.callResponseHandlerChain(HandlerType.POST); + handlersPass = handlersPass && callback.callResponseHandlerChain(HandlerType.ENDPOINT); + + // update the return value after response handler processing + Object resObj = epInv.getReturnValue(); + + return resObj; + } + catch (Exception ex) + { + try + { + // call the fault handlers + boolean handlersPass = callback.callFaultHandlerChain(HandlerType.POST, ex); + handlersPass = handlersPass && callback.callFaultHandlerChain(HandlerType.ENDPOINT, ex); + } + catch (Exception subEx) + { + log.warn("Cannot process handlerChain.handleFault, ignoring: ", subEx); + } + throw ex; + } + finally + { + // do nothing + } + } + else + { + log.warn("Handler callback not available"); + return getNext().invoke(mi); + } + } +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeployer.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/UnifiedDeploymentInfoDeployer.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeployer.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,76 @@ +/* + * 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.wsf.container.jboss42; + +//$Id$ + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.wsf.spi.deployment.AbstractDeployer; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.JAXRPCDeployment; +import org.jboss.wsf.spi.deployment.JAXWSDeployment; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; + +/** + * A deployer that builds the UnifiedDeploymentInfo + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class UnifiedDeploymentInfoDeployer extends AbstractDeployer +{ + private DeploymentInfoAdapter deploymentInfoAdapter; + + public void setDeploymentInfoAdapter(DeploymentInfoAdapter deploymentInfoAdapter) + { + this.deploymentInfoAdapter = deploymentInfoAdapter; + } + + @Override + public void create(Deployment dep) + { + UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); + if (udi == null) + { + DeploymentInfo unit = dep.getContext().getAttachment(DeploymentInfo.class); + if (unit == null) + throw new IllegalStateException("Cannot obtain deployment unit"); + + DeploymentType type = dep.getType(); + if (type.toString().startsWith("JAXWS")) + { + udi = new JAXWSDeployment(type); + deploymentInfoAdapter.buildDeploymentInfo(udi, unit); + } + else + { + WebservicesMetaData wsMetaData = dep.getContext().getAttachment(WebservicesMetaData.class); + udi = new JAXRPCDeployment(type, wsMetaData); + deploymentInfoAdapter.buildDeploymentInfo(udi, unit); + } + + dep.getContext().addAttachment(UnifiedDeploymentInfo.class, udi); + } + } +} \ No newline at end of file Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeployerDeployer.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/WebAppDeployerDeployer.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeployerDeployer.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeployerDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,118 @@ +/* + * 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.wsf.container.jboss42; + +// $Id$ + +import java.net.URL; + +import javax.management.MBeanServer; + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.deployment.MainDeployerMBean; +import org.jboss.logging.Logger; +import org.jboss.mx.util.MBeanProxy; +import org.jboss.mx.util.MBeanProxyCreationException; +import org.jboss.mx.util.MBeanServerLocator; +import org.jboss.wsf.spi.deployment.AbstractDeployer; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.ServiceEndpointPublisher; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.deployment.WSDeploymentException; + +/** + * Publish the HTTP service endpoint to Tomcat + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-May-2006 + */ +public class WebAppDeployerDeployer extends AbstractDeployer +{ + // provide logging + private static Logger log = Logger.getLogger(WebAppDeployerDeployer.class); + + private ServiceEndpointPublisher serviceEndpointPublisher; + + public void setServiceEndpointPublisher(ServiceEndpointPublisher serviceEndpointPublisher) + { + this.serviceEndpointPublisher = serviceEndpointPublisher; + } + + public void create(Deployment dep) + { + UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); + if (udi == null) + throw new IllegalStateException("Cannot obtain unified deployement info"); + + URL warURL = udi.webappURL; + + log.debug("publishServiceEndpoint: " + warURL); + try + { + DeploymentInfo di = udi.getAttachment(DeploymentInfo.class); + if (di == null) + throw new IllegalStateException("Cannot obtain DeploymentInfo from context"); + + serviceEndpointPublisher.rewriteWebXml(udi); + + // Preserve the repository config + DeploymentInfo auxdi = new DeploymentInfo(warURL, null, MBeanServerLocator.locateJBoss()); + auxdi.repositoryConfig = di.getTopRepositoryConfig(); + getMainDeployer().deploy(auxdi); + } + catch (Exception ex) + { + WSDeploymentException.rethrow(ex); + } + } + + public void destroy(Deployment dep) + { + UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); + if (udi == null) + throw new IllegalStateException("Cannot obtain unified deployement info"); + + URL warURL = udi.webappURL; + if (warURL == null) + { + log.error("Cannot obtain warURL for: " + udi.name); + return; + } + + log.debug("destroyServiceEndpoint: " + warURL); + try + { + getMainDeployer().undeploy(warURL); + } + catch (Exception ex) + { + WSDeploymentException.rethrow(ex); + } + } + + private MainDeployerMBean getMainDeployer() throws MBeanProxyCreationException + { + MBeanServer server = MBeanServerLocator.locateJBoss(); + MainDeployerMBean mainDeployer = (MainDeployerMBean)MBeanProxy.get(MainDeployerMBean.class, MainDeployerMBean.OBJECT_NAME, server); + return mainDeployer; + } +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/WebMetaDataAdapter.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,122 @@ +/* + * 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.wsf.container.jboss42; + +// $Id$ + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.WebSecurityMetaData; +import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; + +/** + * Build container independent web meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class WebMetaDataAdapter +{ + public UnifiedWebMetaData buildUnifiedWebMetaData(UnifiedDeploymentInfo udi, WebMetaData webMetaData) + { + udi.addAttachment(WebMetaData.class, webMetaData); + + UnifiedWebMetaData umd = new UnifiedWebMetaData(); + umd.setContextRoot(webMetaData.getContextRoot()); + umd.setServletMappings(webMetaData.getServletMappings()); + umd.setServletClassNames(getServletClassMap(webMetaData)); + umd.setConfigName(webMetaData.getConfigName()); + umd.setConfigFile(webMetaData.getConfigFile()); + umd.setSecurityDomain(webMetaData.getSecurityDomain()); + umd.setPublishLocationAdapter(getPublishLocationAdpater(webMetaData)); + umd.setSecurityMetaData(getSecurityMetaData(webMetaData.getSecurityContraints())); + + return umd; + } + + private PublishLocationAdapter getPublishLocationAdpater(final WebMetaData wmd) + { + return new PublishLocationAdapter() + { + public String getWsdlPublishLocationByName(String name) + { + return wmd.getWsdlPublishLocationByName(name); + } + }; + } + + private List<UnifiedWebSecurityMetaData> getSecurityMetaData(final Iterator securityConstraints) + { + ArrayList<UnifiedWebSecurityMetaData> unifiedsecurityMetaData = new ArrayList<UnifiedWebSecurityMetaData>(); + + while (securityConstraints.hasNext()) + { + WebSecurityMetaData securityMetaData = (WebSecurityMetaData)securityConstraints.next(); + + UnifiedWebSecurityMetaData current = new UnifiedWebSecurityMetaData(); + unifiedsecurityMetaData.add(current); + + current.setTransportGuarantee(securityMetaData.getTransportGuarantee()); + + HashMap resources = securityMetaData.getWebResources(); + for (Object webResourceObj : resources.values()) + { + WebResourceCollection webResource = (WebResourceCollection)webResourceObj; + UnifiedWebResourceCollection currentResource = current.addWebResource(webResource.getName()); + for (String currentPattern : webResource.getUrlPatterns()) + { + currentResource.addPattern(currentPattern); + } + } + + } + + return unifiedsecurityMetaData; + } + + private Map<String, String> getServletClassMap(WebMetaData wmd) + { + Map<String, String> mappings = new HashMap<String, String>(); + Iterator it = wmd.getServletClassMap().entrySet().iterator(); + while (it.hasNext()) + { + Map.Entry entry = (Entry)it.next(); + String servletName = (String)entry.getKey(); + String servletClass = (String)entry.getValue(); + // Skip JSPs + if (servletClass != null) + mappings.put(servletName, servletClass); + } + return mappings; + } +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/jms (from rev 3145, trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/jms) Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/AbstractApplicationMetaDataAdapter.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/AbstractApplicationMetaDataAdapter.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/AbstractApplicationMetaDataAdapter.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,87 +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.wsintegration.container.jboss42; - -// $Id$ - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.jboss.metadata.ApplicationMetaData; -import org.jboss.metadata.BeanMetaData; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter; - -/** - * Build container independent application meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public abstract class AbstractApplicationMetaDataAdapter -{ - public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(UnifiedDeploymentInfo udi, ApplicationMetaData apmd) - { - udi.addAttachment(ApplicationMetaData.class, apmd); - - UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData(); - buildUnifiedBeanMetaData(umd, apmd); - umd.setConfigName(apmd.getConfigName()); - umd.setConfigFile(apmd.getConfigFile()); - umd.setWebServiceContextRoot(apmd.getWebServiceContextRoot()); - umd.setSecurityDomain(apmd.getSecurityDomain()); - umd.setPublishLocationAdapter(getPublishLocationAdpater(apmd)); - return umd; - } - - protected PublishLocationAdapter getPublishLocationAdpater(final ApplicationMetaData apmd) - { - return new PublishLocationAdapter () - { - public String getWsdlPublishLocationByName(String name) - { - return apmd.getWsdlPublishLocationByName(name); - } - }; - } - - protected void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData metaData) - { - List<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>(); - Iterator it = metaData.getEnterpriseBeans(); - while (it.hasNext()) - { - BeanMetaData bmd = (BeanMetaData)it.next(); - UnifiedBeanMetaData ubmd = buildUnifiedBeanMetaData(bmd); - if (ubmd != null) - { - beans.add(ubmd); - } - } - umd.setEnterpriseBeans(beans); - } - - protected abstract UnifiedBeanMetaData buildUnifiedBeanMetaData(BeanMetaData bmd); -} Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/AbstractDeployerHook.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/AbstractDeployerHook.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/AbstractDeployerHook.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,202 +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.wsintegration.container.jboss42; - -//$Id$ - -import java.util.List; - -import javax.management.MBeanServer; -import javax.management.ObjectName; - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.logging.Logger; -import org.jboss.mx.util.MBeanProxy; -import org.jboss.mx.util.MBeanProxyCreationException; -import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.wsintegration.container.jboss42.DeployerHook; -import org.jboss.wsintegration.container.jboss42.DeployerInterceptorMBean; -import org.jboss.wsintegration.spi.deployment.DeployerManager; -import org.jboss.wsintegration.spi.deployment.Deployment; -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.deployment.Service; -import org.jboss.wsintegration.spi.deployment.WSDeploymentException; - -/** - * An abstract web service deployer. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public abstract class AbstractDeployerHook implements DeployerHook -{ - // provide logging - protected final Logger log = Logger.getLogger(getClass()); - - protected DeployerManager deployerManager; - private List<ObjectName> phaseOneInterceptors; - private List<ObjectName> phaseTwoInterceptors; - private String deploymentClass; - private String serviceClass; - private String endpointClass; - - public void setDeployerManager(DeployerManager deploymentManager) - { - this.deployerManager = deploymentManager; - } - - public void setDeploymentClass(String deploymentClass) - { - this.deploymentClass = deploymentClass; - } - - public void setEndpointClass(String endpointClass) - { - this.endpointClass = endpointClass; - } - - public void setServiceClass(String serviceClass) - { - this.serviceClass = serviceClass; - } - - public Deployment createDeployment() - { - try - { - ClassLoader loader = Thread.currentThread().getContextClassLoader(); - Class<?> clazz = loader.loadClass(deploymentClass); - return (Deployment)clazz.newInstance(); - } - catch (Exception ex) - { - throw new WSDeploymentException("Cannot load Deployment class: " + deploymentClass); - } - } - - public Service createService() - { - try - { - ClassLoader loader = Thread.currentThread().getContextClassLoader(); - Class<?> clazz = loader.loadClass(serviceClass); - return (Service)clazz.newInstance(); - } - catch (Exception ex) - { - throw new WSDeploymentException("Cannot load Service class: " + serviceClass); - } - } - - public Endpoint createEndpoint() - { - try - { - ClassLoader loader = Thread.currentThread().getContextClassLoader(); - Class<?> clazz = loader.loadClass(endpointClass); - return (Endpoint)clazz.newInstance(); - } - catch (Exception ex) - { - throw new WSDeploymentException("Cannot load Endpoint class: " + endpointClass); - } - } - - public void setPhaseOneInterceptors(List<ObjectName> phaseOneInterceptors) - { - this.phaseOneInterceptors = phaseOneInterceptors; - } - - public void setPhaseTwoInterceptors(List<ObjectName> phaseTwoInterceptors) - { - this.phaseTwoInterceptors = phaseTwoInterceptors; - } - - /** Return true if this deployment should be ignored - */ - public boolean ignoreDeployment(DeploymentInfo unit) - { - return false; - } - - /** Add the hooks to the interceptors - */ - public void start() - { - MBeanServer server = MBeanServerLocator.locateJBoss(); - try - { - if (phaseOneInterceptors != null) - { - for (ObjectName oname : phaseOneInterceptors) - { - DeployerInterceptorMBean interceptor = (DeployerInterceptorMBean)MBeanProxy.get(DeployerInterceptorMBean.class, oname, server); - interceptor.addPhaseOneHook(this); - } - } - - if (phaseTwoInterceptors != null) - { - for (ObjectName oname : phaseTwoInterceptors) - { - DeployerInterceptorMBean interceptor = (DeployerInterceptorMBean)MBeanProxy.get(DeployerInterceptorMBean.class, oname, server); - interceptor.addPhaseTwoHook(this); - } - } - } - catch (MBeanProxyCreationException e) - { - throw new WSDeploymentException(e); - } - } - - /** Add the hooks to the interceptors - */ - public void stop() - { - MBeanServer server = MBeanServerLocator.locateJBoss(); - try - { - if (phaseOneInterceptors != null) - { - for (ObjectName oname : phaseOneInterceptors) - { - DeployerInterceptorMBean interceptor = (DeployerInterceptorMBean)MBeanProxy.get(DeployerInterceptorMBean.class, oname, server); - interceptor.removePhaseOneHook(this); - } - } - - if (phaseTwoInterceptors != null) - { - for (ObjectName oname : phaseTwoInterceptors) - { - DeployerInterceptorMBean interceptor = (DeployerInterceptorMBean)MBeanProxy.get(DeployerInterceptorMBean.class, oname, server); - interceptor.removePhaseTwoHook(this); - } - } - } - catch (MBeanProxyCreationException e) - { - throw new WSDeploymentException(e); - } - } -} Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/AbstractDeployerHookEJB.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/AbstractDeployerHookEJB.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/AbstractDeployerHookEJB.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,34 +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.wsintegration.container.jboss42; - -//$Id$ - -/** - * An abstract deployer for EJB Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public abstract class AbstractDeployerHookEJB extends ArchiveDeployerHook -{ -} Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/AbstractDeployerHookJSE.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/AbstractDeployerHookJSE.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/AbstractDeployerHookJSE.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,63 +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.wsintegration.container.jboss42; - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.metadata.WebMetaData; - -//$Id$ - -/** - * An abstract deployer for JSE Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public abstract class AbstractDeployerHookJSE extends ArchiveDeployerHook -{ - public boolean isWebServiceDeployment(DeploymentInfo unit) - { - if ((unit.metaData instanceof WebMetaData) == false) - return false; - - return true; - } - - static class Servlet - { - String servletName; - String servletClass; - public Servlet(String servletName, String servletClass) - { - this.servletName = servletName; - this.servletClass = servletClass; - } - public String getServletClass() - { - return servletClass; - } - public String getServletName() - { - return servletName; - } - } -} Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ApplicationMetaDataAdapter.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ApplicationMetaDataAdapter.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ApplicationMetaDataAdapter.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,80 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsintegration.container.jboss42; - -// $Id$ - -import org.jboss.metadata.BeanMetaData; -import org.jboss.metadata.EjbPortComponentMetaData; -import org.jboss.metadata.MessageDrivenMetaData; -import org.jboss.metadata.SessionMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedMessageDrivenMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedSessionMetaData; - -/** - * Build container independent application meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class ApplicationMetaDataAdapter extends AbstractApplicationMetaDataAdapter -{ - protected UnifiedBeanMetaData buildUnifiedBeanMetaData(BeanMetaData bmd) - { - UnifiedBeanMetaData ubmd = null; - if (bmd instanceof SessionMetaData) - { - ubmd = new UnifiedSessionMetaData(); - } - else if (bmd instanceof MessageDrivenMetaData) - { - ubmd = new UnifiedMessageDrivenMetaData(); - ((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessageDrivenMetaData)bmd).getDestinationJndiName()); - } - - if (ubmd != null) - { - ubmd.setEjbName(bmd.getEjbName()); - ubmd.setEjbClass(bmd.getEjbClass()); - ubmd.setServiceEndpointInterface(bmd.getServiceEndpoint()); - ubmd.setHome(bmd.getHome()); - ubmd.setLocalHome(bmd.getLocalHome()); - ubmd.setJndiName(bmd.getJndiName()); - ubmd.setLocalJndiName(bmd.getLocalJndiName()); - - EjbPortComponentMetaData pcmd = bmd.getPortComponent(); - if (pcmd != null) - { - UnifiedEjbPortComponentMetaData upcmd = new UnifiedEjbPortComponentMetaData(); - upcmd.setPortComponentName(pcmd.getPortComponentName()); - upcmd.setPortComponentURI(pcmd.getPortComponentURI()); - upcmd.setAuthMethod(pcmd.getAuthMethod()); - upcmd.setTransportGuarantee(pcmd.getTransportGuarantee()); - upcmd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess()); - ubmd.setPortComponent(upcmd); - } - } - return ubmd; - } -} Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ArchiveDeployerHook.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ArchiveDeployerHook.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ArchiveDeployerHook.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,157 +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.wsintegration.container.jboss42; - -//$Id$ - -import java.io.IOException; -import java.net.URL; - -import org.jboss.deployment.DeploymentException; -import org.jboss.deployment.DeploymentInfo; -import org.jboss.ws.integration.ResourceLoaderAdapter; -import org.jboss.ws.integration.UnifiedVirtualFile; -import org.jboss.wsintegration.spi.deployment.Deployment; -import org.jboss.wsintegration.spi.deployment.WSDeploymentException; -import org.jboss.wsintegration.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsintegration.spi.metadata.webservices.WebservicesFactory; -import org.jboss.wsintegration.spi.metadata.webservices.WebservicesMetaData; -import org.jboss.wsintegration.spi.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; - -/** - * An abstract web service deployer. - * - * deploy(unit) - * if(isWebServiceDeployment) - * dep = createDeployment(unit) - * deploy(dep) - * - * undeploy(unit) - * dep = getDeployment(unit) - * undeploy(dep) - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public abstract class ArchiveDeployerHook extends AbstractDeployerHook -{ - /** Get the deployemnt type this deployer can handle - */ - public abstract DeploymentType getDeploymentType(); - - /** Depending on the type of deployment, this method should return true - * if the deployment contains web service endpoints. - */ - public abstract boolean isWebServiceDeployment(DeploymentInfo unit); - - /** Create the Deployment for a given DeploymentInfo - */ - public abstract Deployment createDeployment(DeploymentInfo unit); - - /** Get the Deployment for a given DeploymentInfo - */ - public Deployment getDeployment(DeploymentInfo unit) - { - Deployment dep = (Deployment)unit.context.get(Deployment.class); - return (dep != null && dep.getType() == getDeploymentType() ? dep : null); - } - - public void deploy(DeploymentInfo unit) throws DeploymentException - { - if (ignoreDeployment(unit)) - return; - - if (isWebServiceDeployment(unit)) - { - log.debug("deploy: " + unit.shortName); - Deployment dep = getDeployment(unit); - if (dep == null) - { - dep = createDeployment(unit); - dep.getContext().addAttachment(DeploymentInfo.class, unit); - } - - deployerManager.deploy(dep); - unit.context.put(Deployment.class, dep); - } - } - - public void undeploy(DeploymentInfo unit) - { - if (ignoreDeployment(unit)) - return; - - Deployment dep = getDeployment(unit); - if (dep != null) - { - log.debug("undeploy: " + unit.shortName); - deployerManager.undeploy(dep); - unit.context.remove(Deployment.class); - } - } - - /** Unmrashall the webservices.xml if there is one - */ - protected WebservicesMetaData getWebservicesMetaData(DeploymentInfo unit, String wsFile) - { - WebservicesMetaData wsMetaData = (WebservicesMetaData)unit.context.get(WebservicesMetaData.class); - UnifiedVirtualFile vfWebservices = getWebservicesFile(unit, wsFile); - if (wsMetaData == null && vfWebservices != null) - { - try - { - URL wsURL = vfWebservices.toURL(); - Element root = DOMUtils.parse(wsURL.openStream()); - String namespaceURI = root.getNamespaceURI(); - if (namespaceURI.equals("http://java.sun.com/xml/ns/j2ee")) - { - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - ObjectModelFactory factory = new WebservicesFactory(wsURL); - wsMetaData = (WebservicesMetaData)unmarshaller.unmarshal(wsURL.openStream(), factory, null); - unit.context.put(WebservicesMetaData.class, wsMetaData); - } - } - catch (Exception ex) - { - throw new WSDeploymentException(ex); - } - } - return wsMetaData; - } - - private UnifiedVirtualFile getWebservicesFile(DeploymentInfo unit, String wsFile) - { - try - { - UnifiedVirtualFile vfsRoot = new ResourceLoaderAdapter(unit.localCl); - return (wsFile != null ? vfsRoot.findChild(wsFile) : null); - } - catch (IOException e) - { - return null; - } - } -} Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ClassLoaderInjectionDeployer.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ClassLoaderInjectionDeployer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ClassLoaderInjectionDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,81 +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.wsintegration.container.jboss42; - -//$Id$ - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.metadata.WebMetaData; -import org.jboss.wsintegration.spi.deployment.AbstractDeployer; -import org.jboss.wsintegration.spi.deployment.Deployment; -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.deployment.WSDeploymentException; - -/** - * A deployer that injects the correct classloader into the UMDM - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class ClassLoaderInjectionDeployer extends AbstractDeployer -{ - @Override - public void create(Deployment dep) - { - DeploymentInfo unit = dep.getContext().getAttachment(DeploymentInfo.class); - if (unit == null) - throw new IllegalStateException("Cannot obtain deployement unit"); - - ClassLoader classLoader = unit.ucl; - - // Get the webapp context classloader and use it as the deploymet class loader - WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); - if (webMetaData != null) - { - classLoader = webMetaData.getContextLoader(); - } - - dep.setClassLoader(classLoader); - - // Reload target beans with the updated class loader - for (Endpoint ep : dep.getService().getEndpoints()) - { - Class targetBean = ep.getTargetBean(); - if (targetBean != null) - { - String beanName = targetBean.getName(); - if (targetBean.getClassLoader() != classLoader) - { - try - { - targetBean = classLoader.loadClass(beanName); - ep.setTargetBean(targetBean); - } - catch (ClassNotFoundException e) - { - throw new WSDeploymentException("Cannot reload target bean: " + beanName); - } - } - } - } - } -} \ No newline at end of file Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerHook.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerHook.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerHook.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,41 +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.wsintegration.container.jboss42; - -import org.jboss.deployment.DeploymentException; -import org.jboss.deployment.DeploymentInfo; - -//$Id$ - - -/** - * An interface for all web service deployer hooks - * - * @author Thomas.Diesler(a)jboss.org - * @since 24-Apr-2007 - */ -public interface DeployerHook -{ - void deploy(DeploymentInfo unit) throws DeploymentException; - - void undeploy(DeploymentInfo unit); -} Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptor.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptor.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptor.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,153 +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.wsintegration.container.jboss42; - -//$Id$ - -import java.util.LinkedList; -import java.util.List; - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.deployment.MainDeployerMBean; -import org.jboss.deployment.SubDeployerInterceptorSupport; -import org.jboss.mx.server.Invocation; -import org.jboss.mx.util.MBeanProxy; - -/** - * A deployer service that manages WS4EE compliant Web Services - * - * @author Thomas.Diesler(a)jboss.org - * @since 03-May-2007 - */ -public abstract class DeployerInterceptor extends SubDeployerInterceptorSupport implements DeployerInterceptorMBean -{ - // The main deployer - private MainDeployerMBean mainDeployer; - - private List<DeployerHook> phaseOneHooks = new LinkedList<DeployerHook>(); - private List<DeployerHook> phaseTwoHooks = new LinkedList<DeployerHook>(); - - public void addPhaseOneHook(DeployerHook hook) - { - log.debug("Add phase-one deployer hook: " + hook); - phaseOneHooks.add(hook); - } - - public void removePhaseOneHook(DeployerHook hook) - { - log.debug("Remove phase-one deployer hook: " + hook); - phaseOneHooks.remove(hook); - } - - public void addPhaseTwoHook(DeployerHook hook) - { - log.debug("Add phase-two deployer hook: " + hook); - phaseTwoHooks.add(hook); - } - - public void removePhaseTwoHook(DeployerHook hook) - { - log.debug("Remove phase-two deployer hook: " + hook); - phaseTwoHooks.remove(hook); - } - - @Override - protected final Object create(Invocation invocation, DeploymentInfo unit) throws Throwable - { - Object retn = invokeNext(invocation); - - for (DeployerHook deployer : phaseOneHooks) - deployer.deploy(unit); - - return retn; - } - - @Override - protected final Object start(Invocation invocation, DeploymentInfo unit) throws Throwable - { - Object retn = invokeNext(invocation); - - for (DeployerHook deployer : phaseTwoHooks) - deployer.deploy(unit); - - return retn; - } - - @Override - protected final Object stop(Invocation invocation, DeploymentInfo unit) throws Throwable - { - Object retn = invokeNext(invocation); - - for (DeployerHook deployer : phaseTwoHooks) - deployer.undeploy(unit); - - return retn; - } - - @Override - protected final Object destroy(Invocation invocation, DeploymentInfo unit) throws Throwable - { - Object retn = invokeNext(invocation); - - for (DeployerHook deployer : phaseOneHooks) - deployer.undeploy(unit); - - return retn; - } - - /** Create the deployer service - */ - protected void createService() throws Exception - { - mainDeployer = (MainDeployerMBean)MBeanProxy.get(MainDeployerMBean.class, MainDeployerMBean.OBJECT_NAME, server); - super.attach(); - } - - /** Destroy the deployer service - */ - protected void destroyService() - { - super.detach(); - } - - /** - * Handle all webservice deployment exceptions. - * You can either simply log the problem and keep the EJB/WAR module - * alive or undeploy properly. - */ - protected void handleStartupException(DeploymentInfo di, Throwable th) - { - log.error("Cannot startup webservice for: " + di.shortName, th); - mainDeployer.undeploy(di); - } - - /** - * Handle all webservice deployment exceptions. - * - * You can either simply logs the problem and keep the EJB/WAR module - * alive or undeploy properly. - */ - protected void handleShutdownException(String moduleName, Throwable th) - { - log.error("Cannot shutdown webservice for: " + moduleName, th); - } -} Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorEJB21.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorEJB21.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorEJB21.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,35 +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.wsintegration.container.jboss42; - -//$Id$ - -/** - * A deployer service that manages WS4EE compliant Web-Services for EJB-2.1 Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 15-Jan-2005 - */ -public class DeployerInterceptorEJB21 extends DeployerInterceptor implements DeployerInterceptorEJB21MBean -{ - -} Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorEJB21MBean.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorEJB21MBean.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorEJB21MBean.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -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.wsintegration.container.jboss42; - -import javax.management.ObjectName; - -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; - -/** - * MBean interface. - * @since 19-Jan-2005 - */ -public interface DeployerInterceptorEJB21MBean extends DeployerInterceptorMBean -{ - //default object name - public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceDeployerEJB21"); -} Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorEJB3.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorEJB3.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,34 +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.wsintegration.container.jboss42; - -// $Id$ - -/** - * A deployer service that manages WS4EE compliant Web-Services for EJB3 Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 10-May-2005 - */ -public class DeployerInterceptorEJB3 extends DeployerInterceptor implements DeployerInterceptorEJB3MBean -{ -} Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorEJB3MBean.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorEJB3MBean.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorEJB3MBean.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -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.wsintegration.container.jboss42; - -import javax.management.ObjectName; - -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; - -/** - * MBean interface. - * @since 19-Jan-2005 - */ -public interface DeployerInterceptorEJB3MBean extends DeployerInterceptorMBean -{ - //default object name - public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceDeployerEJB3"); -} Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorJSE.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorJSE.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorJSE.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,34 +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.wsintegration.container.jboss42; - -// $Id$ - -/** - * A deployer service that manages WS4EE compliant Web Services for WAR - * - * @author Thomas.Diesler(a)jboss.org - * @since 15-Jan-2005 - */ -public class DeployerInterceptorJSE extends DeployerInterceptor implements DeployerInterceptorJSEMBean -{ -} Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorJSEMBean.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorJSEMBean.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorJSEMBean.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -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.wsintegration.container.jboss42; - -import javax.management.ObjectName; - -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; - -/** - * MBean interface. - * @since 19-Jan-2005 - */ -public interface DeployerInterceptorJSEMBean extends DeployerInterceptorMBean -{ - //default object name - public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceDeployerJSE"); -} Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorMBean.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorMBean.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeployerInterceptorMBean.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,39 +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.wsintegration.container.jboss42; - -import org.jboss.deployment.SubDeployerInterceptorMBean; - -/** - * MBean interface. - * @since 19-Jan-2005 - */ -public interface DeployerInterceptorMBean extends SubDeployerInterceptorMBean -{ - void addPhaseOneHook(DeployerHook deployer); - - void removePhaseOneHook(DeployerHook deployer); - - void addPhaseTwoHook(DeployerHook deployer); - - void removePhaseTwoHook(DeployerHook deployer); -} Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeploymentInfoAdapter.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeploymentInfoAdapter.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeploymentInfoAdapter.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,168 +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.wsintegration.container.jboss42; - -// $Id$ - -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; - -import javax.management.MBeanServer; -import javax.management.ObjectName; - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.ejb3.Ejb3ModuleMBean; -import org.jboss.ejb3.stateless.StatelessContainer; -import org.jboss.logging.Logger; -import org.jboss.metadata.ApplicationMetaData; -import org.jboss.metadata.WebMetaData; -import org.jboss.mx.util.MBeanProxy; -import org.jboss.mx.util.MBeanProxyCreationException; -import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.ws.integration.ResourceLoaderAdapter; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.deployment.WSDeploymentException; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedBeanMetaData; - -/** - * Build container independent deployment info. - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class DeploymentInfoAdapter -{ - // logging support - private static Logger log = Logger.getLogger(DeploymentInfoAdapter.class); - - private WebMetaDataAdapter webMetaDataAdapter; - private AbstractApplicationMetaDataAdapter appMetaDataAdapter; - - public void setAppMetaDataAdapter(AbstractApplicationMetaDataAdapter applicationMetaDataAdapter) - { - this.appMetaDataAdapter = applicationMetaDataAdapter; - } - - public void setWebMetaDataAdapter(WebMetaDataAdapter webMetaDataAdapter) - { - this.webMetaDataAdapter = webMetaDataAdapter; - } - - public UnifiedDeploymentInfo buildDeploymentInfo(UnifiedDeploymentInfo udi, DeploymentInfo di) - { - udi.addAttachment(DeploymentInfo.class, di); - - if (di.parent != null) - { - udi.parent = new UnifiedDeploymentInfo(null); - buildDeploymentInfo(udi.parent, di.parent); - } - - udi.vfRoot = new ResourceLoaderAdapter(di.localCl); - udi.name = di.getCanonicalName(); - udi.simpleName = di.shortName; - udi.url = getDeploymentURL(di); - udi.classLoader = di.annotationsCl; - udi.deployedObject = di.deployedObject; - - buildMetaData(udi, di.metaData); - - log.debug("UnifiedDeploymentInfo:\n" + udi); - return udi; - } - - private URL getDeploymentURL(DeploymentInfo di) - { - URL deploymentURL = (di.localUrl != null ? di.localUrl : di.url); - if ("file".equals(deploymentURL.getProtocol())) - { - String path = deploymentURL.getPath(); - if (new File(path).isFile()) - { - try - { - deploymentURL = new URL("jar:file:" + path + "!/"); - } - catch (MalformedURLException e) - { - // ignore - } - } - } - return deploymentURL; - } - - private void buildMetaData(UnifiedDeploymentInfo udi, Object metaData) - { - if (metaData instanceof WebMetaData) - { - udi.metaData = webMetaDataAdapter.buildUnifiedWebMetaData(udi, (WebMetaData)metaData); - udi.webappURL = udi.url; - } - else if (metaData instanceof ApplicationMetaData) - { - udi.metaData = appMetaDataAdapter.buildUnifiedApplicationMetaData(udi, (ApplicationMetaData)metaData); - } - else if (udi.deployedObject != null) - { - Ejb3ModuleMBean ejb3Module = getEJB3Module(udi.deployedObject); - - ArrayList<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>(); - for (Object container : ejb3Module.getContainers().values()) - { - if (container instanceof StatelessContainer) - { - StatelessContainer slc = (StatelessContainer)container; - UnifiedBeanMetaData uslc = new UnifiedBeanMetaData(); - uslc.setEjbName(slc.getEjbName()); - uslc.setEjbClass(slc.getBeanClassName()); - beans.add(uslc); - } - } - - UnifiedApplicationMetaData appMetaData = new UnifiedApplicationMetaData(); - appMetaData.setEnterpriseBeans(beans); - udi.metaData = appMetaData; - } - } - - public static Ejb3ModuleMBean getEJB3Module(ObjectName objectName) - { - Ejb3ModuleMBean ejb3Module; - try - { - MBeanServer server = MBeanServerLocator.locateJBoss(); - ejb3Module = (Ejb3ModuleMBean)MBeanProxy.get(Ejb3ModuleMBean.class, objectName, server); - if (ejb3Module == null) - throw new WSDeploymentException("Cannot obtain EJB3 module: " + objectName); - - return ejb3Module; - } - catch (MBeanProxyCreationException ex) - { - throw new WSDeploymentException("Cannot obtain proxy to EJB3 module"); - } - } -} Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeploymentInfoAdapterFactory.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeploymentInfoAdapterFactory.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeploymentInfoAdapterFactory.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,47 +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.wsintegration.container.jboss42; - -// $Id$ - -import org.jboss.kernel.spi.registry.KernelRegistry; -import org.jboss.kernel.spi.registry.KernelRegistryEntry; -import org.jboss.ws.integration.KernelLocator; - -/** - * @author Thomas.Diesler(a)jboss.org - * @since 10-Mar-2007 - */ -public class DeploymentInfoAdapterFactory -{ - // Hide ctor - private DeploymentInfoAdapterFactory() - { - } - - public static DeploymentInfoAdapter newInstance() - { - KernelRegistry registry = KernelLocator.getKernel().getRegistry(); - KernelRegistryEntry entry = registry.getEntry("WSDeploymentInfoAdapter"); - return (DeploymentInfoAdapter)entry.getTarget(); - } -} Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/InvocationHandlerEJB21.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/InvocationHandlerEJB21.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/InvocationHandlerEJB21.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,166 +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.wsintegration.container.jboss42; - -// $Id$ - -import java.lang.reflect.Method; -import java.security.Principal; - -import javax.management.MBeanServer; -import javax.management.ObjectName; -import javax.xml.rpc.handler.MessageContext; -import javax.xml.rpc.handler.soap.SOAPMessageContext; -import javax.xml.ws.WebServiceException; - -import org.jboss.ejb.EjbModule; -import org.jboss.ejb.Interceptor; -import org.jboss.ejb.StatelessSessionContainer; -import org.jboss.invocation.Invocation; -import org.jboss.invocation.InvocationKey; -import org.jboss.invocation.InvocationType; -import org.jboss.invocation.PayloadKey; -import org.jboss.logging.Logger; -import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.security.SecurityAssociation; -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.invocation.AbstractInvocationHandler; -import org.jboss.wsintegration.spi.invocation.EndpointInvocation; -import org.jboss.wsintegration.spi.invocation.HandlerCallback; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; - -/** - * Handles invocations on EJB3 endpoints. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class InvocationHandlerEJB21 extends AbstractInvocationHandler -{ - // provide logging - private static final Logger log = Logger.getLogger(InvocationHandlerEJB21.class); - - private String jndiName; - private MBeanServer server; - private ObjectName objectName; - - public void create(Endpoint ep) - { - super.create(ep); - - ObjectName epName = ep.getName(); - String ejbName = epName.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); - if (ejbName == null) - throw new WebServiceException("Cannot obtain ejb-link from port component"); - - UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class); - UnifiedApplicationMetaData applMetaData = (UnifiedApplicationMetaData)udi.metaData; - UnifiedBeanMetaData beanMetaData = (UnifiedBeanMetaData)applMetaData.getBeanByEjbName(ejbName); - if (beanMetaData == null) - throw new WebServiceException("Cannot obtain ejb meta data for: " + ejbName); - - // get the bean's JNDI name - jndiName = beanMetaData.getContainerObjectNameJndiName(); - if (jndiName == null) - throw new WebServiceException("Cannot obtain JNDI name for: " + ejbName); - - server = MBeanServerLocator.locateJBoss(); - objectName = ObjectNameFactory.create("jboss.j2ee:jndiName=" + jndiName + ",service=EJB"); - if (server.isRegistered(objectName) == false) - throw new WebServiceException("Cannot find service endpoint target: " + objectName); - - // Dynamically add the service endpoint interceptor - // http://jira.jboss.org/jira/browse/JBWS-758 - try - { - EjbModule ejbModule = (EjbModule)server.getAttribute(objectName, "EjbModule"); - StatelessSessionContainer container = (StatelessSessionContainer)ejbModule.getContainer(ejbName); - - boolean injectionPointFound = false; - Interceptor prev = container.getInterceptor(); - while (prev != null && prev.getNext() != null) - { - Interceptor next = prev.getNext(); - if (next.getNext() == null) - { - log.debug("Inject service endpoint interceptor after: " + prev.getClass().getName()); - ServiceEndpointInterceptor sepInterceptor = new ServiceEndpointInterceptor(); - prev.setNext(sepInterceptor); - sepInterceptor.setNext(next); - injectionPointFound = true; - } - prev = next; - } - if (injectionPointFound == false) - log.warn("Cannot service endpoint interceptor injection point"); - } - catch (Exception ex) - { - log.warn("Cannot add service endpoint interceptor", ex); - } - - } - - public void invoke(Endpoint ep, Object beanInstance, EndpointInvocation epInv) throws Exception - { - log.debug("Invoke: " + epInv.getJavaMethod().getName()); - - // these are provided by the ServerLoginHandler - Principal principal = SecurityAssociation.getPrincipal(); - Object credential = SecurityAssociation.getCredential(); - - // invoke on the container - try - { - // setup the invocation - Method method = epInv.getJavaMethod(); - Object[] args = epInv.getArgs(); - Invocation inv = new Invocation(null, method, args, null, principal, credential); - - // EJB2.1 endpoints will only get an JAXRPC context - MessageContext msgContext = epInv.getInvocationContext().getAttachment(MessageContext.class); - if (msgContext == null) - throw new IllegalStateException("Cannot obtain MessageContext"); - - HandlerCallback callback = epInv.getInvocationContext().getAttachment(HandlerCallback.class); - if (callback == null) - throw new IllegalStateException("Cannot obtain HandlerCallback"); - - inv.setValue(InvocationKey.SOAP_MESSAGE_CONTEXT, msgContext); - inv.setValue(InvocationKey.SOAP_MESSAGE, ((SOAPMessageContext)msgContext).getMessage()); - inv.setType(InvocationType.SERVICE_ENDPOINT); - inv.setValue(HandlerCallback.class.getName(), callback, PayloadKey.TRANSIENT); - inv.setValue(EndpointInvocation.class.getName(), epInv, PayloadKey.TRANSIENT); - - String[] sig = { org.jboss.invocation.Invocation.class.getName() }; - Object retObj = server.invoke(objectName, "invoke", new Object[] { inv }, sig); - epInv.setReturnValue(retObj); - } - catch (Exception e) - { - handleInvocationException(e); - } - } -} Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/InvocationHandlerEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/InvocationHandlerEJB3.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/InvocationHandlerEJB3.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,145 +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.wsintegration.container.jboss42; - -// $Id$ - -import java.lang.reflect.Method; - -import javax.ejb.EJBContext; -import javax.management.ObjectName; -import javax.xml.ws.WebServiceException; - -import org.jboss.aop.Dispatcher; -import org.jboss.aop.MethodInfo; -import org.jboss.ejb3.BeanContext; -import org.jboss.ejb3.BeanContextLifecycleCallback; -import org.jboss.ejb3.EJBContainerInvocation; -import org.jboss.ejb3.stateless.StatelessBeanContext; -import org.jboss.ejb3.stateless.StatelessContainer; -import org.jboss.injection.lang.reflect.BeanProperty; -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.invocation.AbstractInvocationHandler; -import org.jboss.wsintegration.spi.invocation.EndpointInvocation; -import org.jboss.wsintegration.spi.invocation.WebServiceContextEJB; -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; - -/** - * Handles invocations on EJB3 endpoints. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class InvocationHandlerEJB3 extends AbstractInvocationHandler -{ - private ObjectName objectName; - - public void create(Endpoint ep) - { - super.create(ep); - - String ejbName = ep.getName().getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); - if (ejbName == null) - throw new WebServiceException("Cannot obtain ejb-link"); - - UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class); - String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + udi.simpleName; - if (udi.parent != null) - { - nameStr += ",ear=" + udi.parent.simpleName; - } - - objectName = ObjectNameFactory.create(nameStr.toString()); - } - - public void start(Endpoint ep) - { - super.start(ep); - - Dispatcher dispatcher = Dispatcher.singleton; - if (dispatcher.getRegistered(objectName.getCanonicalName()) == null) - throw new WebServiceException("Cannot find service endpoint target: " + objectName); - } - - public void invoke(Endpoint ep, Object beanInstance, EndpointInvocation epInv) throws Exception - { - try - { - Dispatcher dispatcher = Dispatcher.singleton; - StatelessContainer container = (StatelessContainer)dispatcher.getRegistered(objectName.getCanonicalName()); - Class beanClass = container.getBeanClass(); - - Method method = getImplMethod(beanClass, epInv.getJavaMethod()); - Object[] args = epInv.getArgs(); - - MethodInfo info = container.getMethodInfo(method); - EJBContainerInvocation<StatelessContainer, StatelessBeanContext> ejb3Inv = new EJBContainerInvocation<StatelessContainer, StatelessBeanContext>(info); - ejb3Inv.setAdvisor(container); - ejb3Inv.setArguments(args); - ejb3Inv.setContextCallback(new CallbackImpl(epInv)); - - Object retObj = ejb3Inv.invokeNext(); - - epInv.setReturnValue(retObj); - } - catch (Throwable th) - { - handleInvocationException(th); - } - } - - static class CallbackImpl implements BeanContextLifecycleCallback - { - private javax.xml.ws.handler.MessageContext jaxwsMessageContext; - private javax.xml.rpc.handler.MessageContext jaxrpcMessageContext; - - public CallbackImpl(EndpointInvocation epInv) - { - jaxrpcMessageContext = epInv.getInvocationContext().getAttachment(javax.xml.rpc.handler.MessageContext.class); - jaxwsMessageContext = epInv.getInvocationContext().getAttachment(javax.xml.ws.handler.MessageContext.class); - } - - public void attached(BeanContext beanCtx) - { - StatelessBeanContext sbc = (StatelessBeanContext)beanCtx; - sbc.setMessageContextJAXRPC(jaxrpcMessageContext); - - BeanProperty beanProp = sbc.getWebServiceContextProperty(); - if (beanProp != null) - { - EJBContext ejbCtx = beanCtx.getEJBContext(); - beanProp.set(beanCtx.getInstance(), new WebServiceContextEJB(jaxwsMessageContext, ejbCtx)); - } - } - - public void released(BeanContext beanCtx) - { - StatelessBeanContext sbc = (StatelessBeanContext)beanCtx; - sbc.setMessageContextJAXRPC(null); - - BeanProperty beanProp = sbc.getWebServiceContextProperty(); - if (beanProp != null) - beanProp.set(beanCtx.getInstance(), null); - } - } -} \ No newline at end of file Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/JAXRPCDeployerHookEJB21.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,120 +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.wsintegration.container.jboss42; - -//$Id$ - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.metadata.ApplicationMetaData; -import org.jboss.metadata.BeanMetaData; -import org.jboss.wsintegration.spi.deployment.Deployment; -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.deployment.Service; -import org.jboss.wsintegration.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsintegration.spi.metadata.webservices.PortComponentMetaData; -import org.jboss.wsintegration.spi.metadata.webservices.WebserviceDescriptionMetaData; -import org.jboss.wsintegration.spi.metadata.webservices.WebservicesMetaData; -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; - -/** - * A deployer JAXRPC EJB21 Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class JAXRPCDeployerHookEJB21 extends AbstractDeployerHookEJB -{ - /** Get the deployemnt type this deployer can handle - */ - public DeploymentType getDeploymentType() - { - return DeploymentType.JAXRPC_EJB21; - } - - @Override - public Deployment createDeployment(DeploymentInfo unit) - { - Deployment dep = createDeployment(); - dep.setType(getDeploymentType()); - dep.setClassLoader(unit.ucl); - - Service service = dep.getService(); - - ApplicationMetaData appmd = (ApplicationMetaData)unit.metaData; - if (appmd == null) - throw new IllegalStateException("Deployment unit does not contain application meta data"); - - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, null); - if (wsMetaData == null) - throw new IllegalStateException("Deployment unit does not contain webservices meta data"); - - // Copy the attachments - dep.getContext().addAttachment(WebservicesMetaData.class, wsMetaData); - dep.getContext().addAttachment(ApplicationMetaData.class, appmd); - - for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) - { - for (PortComponentMetaData pcmd : wsd.getPortComponents()) - { - String ejbLink = pcmd.getEjbLink(); - if (ejbLink == null) - throw new IllegalStateException("ejb-link cannot be null"); - - BeanMetaData beanMetaData = appmd.getBeanByEjbName(ejbLink); - if (beanMetaData == null) - throw new IllegalStateException("Cannot obtain bean meta data for: " + ejbLink); - - String ejbClass = beanMetaData.getEjbClass(); - try - { - ClassLoader loader = unit.ucl; - Class<?> epBean = loader.loadClass(ejbClass.trim()); - - // Create the endpoint - Endpoint ep = createEndpoint(); - ep.setService(service); - ep.setTargetBean(epBean); - - String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbLink; - ep.setName(ObjectNameFactory.create(nameStr)); - - service.addEndpoint(ep); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load servlet class: " + ejbClass); - } - } - } - return dep; - } - - @Override - public boolean isWebServiceDeployment(DeploymentInfo unit) - { - if ((unit.metaData instanceof ApplicationMetaData) == false) - return false; - - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "META-INF/webservices.xml"); - return wsMetaData != null; - } -} \ No newline at end of file Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/JAXRPCDeployerHookJSE.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/JAXRPCDeployerHookJSE.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/JAXRPCDeployerHookJSE.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,147 +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.wsintegration.container.jboss42; - -//$Id$ - -import java.util.Iterator; -import java.util.Map; -import java.util.Map.Entry; - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.metadata.WebMetaData; -import org.jboss.wsintegration.spi.deployment.Deployment; -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.deployment.Service; -import org.jboss.wsintegration.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsintegration.spi.metadata.webservices.PortComponentMetaData; -import org.jboss.wsintegration.spi.metadata.webservices.WebserviceDescriptionMetaData; -import org.jboss.wsintegration.spi.metadata.webservices.WebservicesMetaData; -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; - -/** - * A deployer JAXRPC JSE Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class JAXRPCDeployerHookJSE extends AbstractDeployerHookJSE -{ - /** Get the deployemnt type this deployer can handle - */ - public DeploymentType getDeploymentType() - { - return DeploymentType.JAXRPC_JSE; - } - - /** - * Create an endpoint for every servlet-link in webservices.xml - */ - @Override - public Deployment createDeployment(DeploymentInfo unit) - { - Deployment dep = createDeployment(); - dep.setType(getDeploymentType()); - dep.setClassLoader(unit.annotationsCl); - - Service service = dep.getService(); - - WebMetaData webMetaData = (WebMetaData)unit.metaData; - if (webMetaData == null) - throw new IllegalStateException("Deployment unit does not contain web meta data"); - - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "WEB-INF/webservices.xml"); - if (wsMetaData == null) - throw new IllegalStateException("Deployment unit does not contain webservices meta data"); - - // Copy the attachments - dep.getContext().addAttachment(WebservicesMetaData.class, wsMetaData); - dep.getContext().addAttachment(WebMetaData.class, webMetaData); - - for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) - { - for (PortComponentMetaData pcmd : wsd.getPortComponents()) - { - String servletLink = pcmd.getServletLink(); - if (servletLink == null) - throw new IllegalStateException("servlet-link cannot be null"); - - Servlet servlet = getServletForName(webMetaData, servletLink); - String servletClass = servlet.getServletClass(); - - try - { - ClassLoader loader = dep.getClassLoader(); - Class<?> epBean = loader.loadClass(servletClass.trim()); - - // If this is a servlet we defer the the bean creation - if (javax.servlet.Servlet.class.isAssignableFrom(epBean)) - { - epBean = null; - } - - // Create the endpoint - Endpoint ep = createEndpoint(); - ep.setService(service); - ep.setTargetBean(epBean); - - String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletLink; - ep.setName(ObjectNameFactory.create(nameStr)); - - service.addEndpoint(ep); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load servlet class: " + servletClass); - } - } - } - - return dep; - } - - private Servlet getServletForName(WebMetaData wmd, String servletLink) - { - Iterator it = wmd.getServletClassMap().entrySet().iterator(); - while (it.hasNext()) - { - Map.Entry entry = (Entry)it.next(); - String servletName = (String)entry.getKey(); - String servletClass = (String)entry.getValue(); - if (servletLink.equals(servletName)) - { - return new Servlet(servletName, servletClass); - } - } - throw new IllegalStateException("Cannot find servlet for link: " + servletLink); - } - - @Override - public boolean isWebServiceDeployment(DeploymentInfo unit) - { - if (super.isWebServiceDeployment(unit) == false) - return false; - - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "WEB-INF/webservices.xml"); - return wsMetaData != null; - } -} Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/JAXWSDeployerHookEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/JAXWSDeployerHookEJB3.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/JAXWSDeployerHookEJB3.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,124 +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.wsintegration.container.jboss42; - -//$Id$ - -import javax.jws.WebService; -import javax.xml.ws.WebServiceProvider; - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.ejb3.EJBContainer; -import org.jboss.ejb3.Ejb3ModuleMBean; -import org.jboss.ejb3.stateless.StatelessContainer; -import org.jboss.wsintegration.spi.deployment.Deployment; -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.deployment.Service; -import org.jboss.wsintegration.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; - -/** - * A deployer JAXWS EJB3 Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class JAXWSDeployerHookEJB3 extends AbstractDeployerHookEJB -{ - /** Get the deployemnt type this deployer can handle - */ - public DeploymentType getDeploymentType() - { - return DeploymentType.JAXWS_EJB3; - } - - @Override - public Deployment createDeployment(DeploymentInfo unit) - { - Deployment dep = createDeployment(); - dep.setType(getDeploymentType()); - dep.setClassLoader(unit.ucl); - - Service service = dep.getService(); - - Ejb3ModuleMBean ejb3Module = DeploymentInfoAdapter.getEJB3Module(unit.deployedObject); - for (Object manager : ejb3Module.getContainers().values()) - { - if (manager instanceof EJBContainer) - { - EJBContainer container = (EJBContainer)manager; - if (isWebServiceBean(container)) - { - String ejbName = container.getEjbName(); - Class epBean = container.getBeanClass(); - - // Create the endpoint - Endpoint ep = createEndpoint(); - ep.setService(service); - ep.setTargetBean(epBean); - - String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbName; - ep.setName(ObjectNameFactory.create(nameStr)); - - service.addEndpoint(ep); - } - } - } - - return dep; - } - - @Override - public boolean isWebServiceDeployment(DeploymentInfo unit) - { - boolean isWebserviceDeployment = false; - - // Check if the ejb3 contains annotated endpoints - Ejb3ModuleMBean ejb3Module = DeploymentInfoAdapter.getEJB3Module(unit.deployedObject); - for (Object manager : ejb3Module.getContainers().values()) - { - if (manager instanceof EJBContainer) - { - EJBContainer container = (EJBContainer)manager; - if (isWebServiceBean(container)) - { - isWebserviceDeployment = true; - break; - } - } - } - - return isWebserviceDeployment; - } - - private boolean isWebServiceBean(EJBContainer container) - { - boolean isWebServiceBean = false; - if (container instanceof StatelessContainer) - { - boolean isWebService = container.resolveAnnotation(WebService.class) != null; - boolean isWebServiceProvider = container.resolveAnnotation(WebServiceProvider.class) != null; - isWebServiceBean = isWebService || isWebServiceProvider; - } - return isWebServiceBean; - } -} \ No newline at end of file Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/JAXWSDeployerHookJSE.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/JAXWSDeployerHookJSE.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/JAXWSDeployerHookJSE.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,156 +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.wsintegration.container.jboss42; - -//$Id$ - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import javax.jws.WebService; -import javax.xml.ws.WebServiceProvider; - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.metadata.WebMetaData; -import org.jboss.wsintegration.spi.deployment.Deployment; -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.deployment.Service; -import org.jboss.wsintegration.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; - -/** - * A deployer JAXWS JSE Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class JAXWSDeployerHookJSE extends AbstractDeployerHookJSE -{ - /** Get the deployemnt type this deployer can handle - */ - public DeploymentType getDeploymentType() - { - return DeploymentType.JAXWS_JSE; - } - - @Override - public Deployment createDeployment(DeploymentInfo unit) - { - Deployment dep = createDeployment(); - dep.setType(getDeploymentType()); - dep.setClassLoader(unit.annotationsCl); - - Service service = dep.getService(); - - WebMetaData webMetaData = (WebMetaData)unit.metaData; - if (webMetaData == null) - throw new IllegalStateException("Deployment unit does not contain web meta data"); - - // Copy the attachments - dep.getContext().addAttachment(WebMetaData.class, webMetaData); - - List<Servlet> servlets = getRelevantServlets(webMetaData, unit.annotationsCl); - for (Servlet servlet : servlets) - { - String servletName = servlet.getServletName(); - String servletClass = servlet.getServletClass(); - - try - { - ClassLoader loader = unit.annotationsCl; - Class<?> epBean = loader.loadClass(servletClass.trim()); - - // Create the endpoint - Endpoint ep = createEndpoint(); - ep.setService(service); - ep.setTargetBean(epBean); - - String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName; - ep.setName(ObjectNameFactory.create(nameStr)); - - service.addEndpoint(ep); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load servlet class: " + servletClass); - continue; - } - } - - return dep; - } - - @Override - public boolean isWebServiceDeployment(DeploymentInfo unit) - { - if (super.isWebServiceDeployment(unit) == false) - return false; - - boolean isWebServiceDeployment = false; - try - { - WebMetaData webMetaData = (WebMetaData)unit.metaData; - List<Servlet> servlets = getRelevantServlets(webMetaData, unit.annotationsCl); - isWebServiceDeployment = servlets.size() > 0; - } - catch (Exception ex) - { - log.error("Cannot process web deployment", ex); - } - - return isWebServiceDeployment; - } - - private List<Servlet> getRelevantServlets(WebMetaData webMetaData, ClassLoader loader) - { - List<Servlet> servlets = new ArrayList<Servlet>(); - Iterator it = webMetaData.getServletClassMap().entrySet().iterator(); - while (it.hasNext()) - { - Map.Entry entry = (Entry)it.next(); - String servletName = (String)entry.getKey(); - String servletClassName = (String)entry.getValue(); - - // Skip JSPs - if (servletClassName == null || servletClassName.length() == 0) - continue; - - try - { - Class<?> servletClass = loader.loadClass(servletClassName.trim()); - boolean isWebService = servletClass.isAnnotationPresent(WebService.class); - boolean isWebServiceProvider = servletClass.isAnnotationPresent(WebServiceProvider.class); - if (isWebService || isWebServiceProvider) - servlets.add(new Servlet(servletName, servletClassName)); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load servlet class: " + servletClassName); - continue; - } - } - return servlets; - } -} \ No newline at end of file Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/MainDeployerHook.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/MainDeployerHook.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/MainDeployerHook.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,61 +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.wsintegration.container.jboss42; - -//$Id$ - -import org.jboss.deployment.DeploymentException; -import org.jboss.deployment.DeploymentInfo; -import org.jboss.wsintegration.spi.deployment.Deployment; - -/** - * A basic hook that delegates a deployment manger. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class MainDeployerHook extends AbstractDeployerHook -{ - public void deploy(DeploymentInfo unit) throws DeploymentException - { - if (ignoreDeployment(unit)) - return; - - Deployment dep = (Deployment)unit.context.get(Deployment.class); - if (dep != null) - { - deployerManager.deploy(dep); - } - } - - public void undeploy(DeploymentInfo unit) - { - if (ignoreDeployment(unit)) - return; - - Deployment dep = (Deployment)unit.context.get(Deployment.class); - if (dep != null) - { - deployerManager.undeploy(dep); - } - } -} Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ManagedServerConfig.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ManagedServerConfig.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ManagedServerConfig.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,76 +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.wsintegration.container.jboss42; - -// $Id$ - -import java.util.ArrayList; - -import javax.management.MBeanServer; -import javax.management.MBeanServerFactory; - -import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.management.BasicServerConfig; - -/** - * A Service Endpoint Registry - * - * @author Thomas.Diesler(a)jboss.org - * @since 04-May-2007 - */ -public class ManagedServerConfig extends BasicServerConfig implements ManagedServerConfigMBean -{ - // provide logging - private static final Logger log = Logger.getLogger(ManagedServerConfig.class); - - public void create() throws Exception - { - log.debug("WebServiceHost: " + getWebServiceHost()); - log.debug("WebServicePort: " + getWebServicePort()); - log.debug("WebServiceSecurePort: " + getWebServiceSecurePort()); - MBeanServer server = getMBeanServer(); - if (server != null) - { - server.registerMBean(this, OBJECT_NAME); - } - } - - public void destroy() throws Exception - { - MBeanServer server = getMBeanServer(); - if (server != null) - { - server.unregisterMBean(OBJECT_NAME); - } - } - - private MBeanServer getMBeanServer() - { - MBeanServer server = null; - ArrayList servers = MBeanServerFactory.findMBeanServer(null); - if (servers.size() > 0) - { - server = (MBeanServer)servers.get(0); - } - return server; - } -} Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ManagedServerConfigMBean.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ManagedServerConfigMBean.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ManagedServerConfigMBean.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,32 +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.wsintegration.container.jboss42; - -import org.jboss.wsintegration.spi.management.ServerConfig; - -/** - * MBean interface. - * @since 15-April-2004 - */ -public interface ManagedServerConfigMBean extends ServerConfig -{ -} Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ModifyWebMetaDataDeployer.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ModifyWebMetaDataDeployer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ModifyWebMetaDataDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,80 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsintegration.container.jboss42; - -//$Id$ - -import org.jboss.wsintegration.spi.deployment.AbstractDeployer; -import org.jboss.wsintegration.spi.deployment.Deployment; -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.deployment.ServiceEndpointPublisher; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.deployment.ServiceEndpointPublisher.RewriteResults; - -/** - * A deployer that modifies the web.xml meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class ModifyWebMetaDataDeployer extends AbstractDeployer -{ - private ServiceEndpointPublisher serviceEndpointPublisher; - - public void setServiceEndpointPublisher(ServiceEndpointPublisher serviceEndpointPublisher) - { - this.serviceEndpointPublisher = serviceEndpointPublisher; - } - - public void create(Deployment dep) - { - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - if (udi == null) - throw new IllegalStateException("Cannot obtain unified deployement info"); - - RewriteResults results = serviceEndpointPublisher.rewriteWebXml(udi); - - // The endpoint may not have a target bean when - // <servlet-class> originally contained a javax.servlet.Servlet - for (Endpoint ep : dep.getService().getEndpoints()) - { - if (ep.getTargetBean() == null) - { - String servletName = ep.getName().getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); - String beanName = results.sepTargetMap.get(servletName); - if (beanName == null) - throw new IllegalStateException("Cannot obtain target bean for: " + servletName); - - try - { - ClassLoader loader = dep.getClassLoader(); - Class<?> epBean = loader.loadClass(beanName); - ep.setTargetBean(epBean); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load target bean: " + beanName); - } - } - } - } -} \ No newline at end of file Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/SecurityRolesHandlerEJB21.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/SecurityRolesHandlerEJB21.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/SecurityRolesHandlerEJB21.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,70 +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.wsintegration.container.jboss42; - -//$Id$ - -import java.util.Iterator; -import java.util.Map; - -import org.jboss.logging.Logger; -import org.jboss.metadata.ApplicationMetaData; -import org.jboss.metadata.AssemblyDescriptorMetaData; -import org.jboss.wsintegration.spi.deployment.SecurityRolesHandler; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.w3c.dom.Element; - -/** - * Generate a service endpoint deployment for EJB endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-May-2006 - */ -public class SecurityRolesHandlerEJB21 implements SecurityRolesHandler -{ - // logging support - protected Logger log = Logger.getLogger(SecurityRolesHandlerEJB21.class); - - /** Add the roles from ejb-jar.xml to the security roles - */ - public void addSecurityRoles(Element webApp, UnifiedDeploymentInfo udi) - { - // Fix: http://jira.jboss.org/jira/browse/JBWS-309 - ApplicationMetaData applMetaData = (ApplicationMetaData)udi.getAttachment(ApplicationMetaData.class); - AssemblyDescriptorMetaData assemblyDescriptor = applMetaData.getAssemblyDescriptor(); - if (assemblyDescriptor != null) - { - Map securityRoles = assemblyDescriptor.getSecurityRoles(); - if (securityRoles != null) - { - Iterator it = securityRoles.keySet().iterator(); - while (it.hasNext()) - { - Element securityRole = (Element)webApp.appendChild(DOMUtils.createElement("security-role")); - Element roleName = (Element)securityRole.appendChild(DOMUtils.createElement("role-name")); - roleName.appendChild(DOMUtils.createTextNode((String)it.next())); - } - } - } - } -} Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/SecurityRolesHandlerEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/SecurityRolesHandlerEJB3.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/SecurityRolesHandlerEJB3.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,96 +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.wsintegration.container.jboss42; - -//$Id$ - -import javax.annotation.security.RolesAllowed; -import javax.management.MBeanServer; -import javax.management.ObjectName; - -import org.jboss.ejb3.Ejb3ModuleMBean; -import org.jboss.ejb3.stateless.StatelessContainer; -import org.jboss.logging.Logger; -import org.jboss.mx.util.MBeanProxy; -import org.jboss.mx.util.MBeanProxyCreationException; -import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.wsintegration.spi.deployment.SecurityRolesHandler; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.deployment.WSDeploymentException; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.w3c.dom.Element; - -/** - * Generate a service endpoint deployment for EJB endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-May-2006 - */ -public class SecurityRolesHandlerEJB3 implements SecurityRolesHandler -{ - // logging support - protected Logger log = Logger.getLogger(SecurityRolesHandlerEJB3.class); - - /** Add the roles from ejb-jar.xml to the security roles - */ - public void addSecurityRoles(Element webApp, UnifiedDeploymentInfo udi) - { - // The container objects below provide access to all of the ejb metadata - Ejb3ModuleMBean ejb3Module = getEJB3Module(udi.deployedObject); - for (Object manager : ejb3Module.getContainers().values()) - { - if (manager instanceof StatelessContainer) - { - StatelessContainer container = (StatelessContainer)manager; - - RolesAllowed anRolesAllowed = (RolesAllowed)container.resolveAnnotation(RolesAllowed.class); - if (anRolesAllowed != null) - { - for (String role : anRolesAllowed.value()) - { - Element securityRole = (Element)webApp.appendChild(DOMUtils.createElement("security-role")); - Element roleName = (Element)securityRole.appendChild(DOMUtils.createElement("role-name")); - roleName.appendChild(DOMUtils.createTextNode(role)); - } - } - } - } - } - - private Ejb3ModuleMBean getEJB3Module(ObjectName objectName) - { - Ejb3ModuleMBean ejb3Module; - try - { - MBeanServer server = MBeanServerLocator.locateJBoss(); - ejb3Module = (Ejb3ModuleMBean)MBeanProxy.get(Ejb3ModuleMBean.class, objectName, server); - if (ejb3Module == null) - throw new WSDeploymentException("Cannot obtain EJB3 module: " + objectName); - - return ejb3Module; - } - catch (MBeanProxyCreationException ex) - { - throw new WSDeploymentException("Cannot obtain proxy to EJB3 module"); - } - } -} Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ServiceEndpointInterceptor.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ServiceEndpointInterceptor.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ServiceEndpointInterceptor.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,127 +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.wsintegration.container.jboss42; - -// $Id$ - -import javax.xml.rpc.handler.soap.SOAPMessageContext; - -import org.jboss.ejb.plugins.AbstractInterceptor; -import org.jboss.invocation.Invocation; -import org.jboss.invocation.InvocationKey; -import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.invocation.HandlerCallback; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; - -/** - * This Interceptor does the ws4ee handler processing. - * - * According to the ws4ee spec the handler logic must be invoked after the container - * applied method level security to the invocation. - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-Sep-2005 - */ -public class ServiceEndpointInterceptor extends AbstractInterceptor -{ - // provide logging - private static Logger log = Logger.getLogger(ServiceEndpointInterceptor.class); - - // Interceptor implementation -------------------------------------- - - /** Before and after we call the service endpoint bean, we process the handler chains. - */ - public Object invoke(final Invocation mi) throws Exception - { - // If no msgContext, it's not for us - SOAPMessageContext msgContext = (SOAPMessageContext)mi.getPayloadValue(InvocationKey.SOAP_MESSAGE_CONTEXT); - if (msgContext == null) - { - return getNext().invoke(mi); - } - - // Get the endpoint invocation - org.jboss.wsintegration.spi.invocation.EndpointInvocation epInv = (org.jboss.wsintegration.spi.invocation.EndpointInvocation)mi - .getValue(org.jboss.wsintegration.spi.invocation.EndpointInvocation.class.getName()); - - // Get the handler callback - HandlerCallback callback = (HandlerCallback)mi.getValue(HandlerCallback.class.getName()); - - // Handlers need to be Tx. Therefore we must invoke the handler chain after the TransactionInterceptor. - if (callback != null && epInv != null) - { - try - { - // call the request handlers - boolean handlersPass = callback.callRequestHandlerChain(HandlerType.ENDPOINT); - handlersPass = handlersPass && callback.callRequestHandlerChain(HandlerType.POST); - - // Call the next interceptor in the chain - if (handlersPass) - { - // The SOAPContentElements stored in the EndpointInvocation might have changed after - // handler processing. Get the updated request payload. This should be a noop if request - // handlers did not modify the incomming SOAP message. - Object[] reqParams = epInv.getArgs(); - mi.setArguments(reqParams); - Object resObj = getNext().invoke(mi); - - // Setting the message to null should trigger binding of the response message - msgContext.setMessage(null); - epInv.setReturnValue(resObj); - } - - // call the response handlers - handlersPass = callback.callResponseHandlerChain(HandlerType.POST); - handlersPass = handlersPass && callback.callResponseHandlerChain(HandlerType.ENDPOINT); - - // update the return value after response handler processing - Object resObj = epInv.getReturnValue(); - - return resObj; - } - catch (Exception ex) - { - try - { - // call the fault handlers - boolean handlersPass = callback.callFaultHandlerChain(HandlerType.POST, ex); - handlersPass = handlersPass && callback.callFaultHandlerChain(HandlerType.ENDPOINT, ex); - } - catch (Exception subEx) - { - log.warn("Cannot process handlerChain.handleFault, ignoring: ", subEx); - } - throw ex; - } - finally - { - // do nothing - } - } - else - { - log.warn("Handler callback not available"); - return getNext().invoke(mi); - } - } -} Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/UnifiedDeploymentInfoDeployer.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/UnifiedDeploymentInfoDeployer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/UnifiedDeploymentInfoDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,76 +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.wsintegration.container.jboss42; - -//$Id$ - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.wsintegration.spi.deployment.AbstractDeployer; -import org.jboss.wsintegration.spi.deployment.Deployment; -import org.jboss.wsintegration.spi.deployment.JAXRPCDeployment; -import org.jboss.wsintegration.spi.deployment.JAXWSDeployment; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsintegration.spi.metadata.webservices.WebservicesMetaData; - -/** - * A deployer that builds the UnifiedDeploymentInfo - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class UnifiedDeploymentInfoDeployer extends AbstractDeployer -{ - private DeploymentInfoAdapter deploymentInfoAdapter; - - public void setDeploymentInfoAdapter(DeploymentInfoAdapter deploymentInfoAdapter) - { - this.deploymentInfoAdapter = deploymentInfoAdapter; - } - - @Override - public void create(Deployment dep) - { - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - if (udi == null) - { - DeploymentInfo unit = dep.getContext().getAttachment(DeploymentInfo.class); - if (unit == null) - throw new IllegalStateException("Cannot obtain deployment unit"); - - DeploymentType type = dep.getType(); - if (type.toString().startsWith("JAXWS")) - { - udi = new JAXWSDeployment(type); - deploymentInfoAdapter.buildDeploymentInfo(udi, unit); - } - else - { - WebservicesMetaData wsMetaData = dep.getContext().getAttachment(WebservicesMetaData.class); - udi = new JAXRPCDeployment(type, wsMetaData); - deploymentInfoAdapter.buildDeploymentInfo(udi, unit); - } - - dep.getContext().addAttachment(UnifiedDeploymentInfo.class, udi); - } - } -} \ No newline at end of file Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/WebAppDeployerDeployer.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/WebAppDeployerDeployer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/WebAppDeployerDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,118 +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.wsintegration.container.jboss42; - -// $Id$ - -import java.net.URL; - -import javax.management.MBeanServer; - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.deployment.MainDeployerMBean; -import org.jboss.logging.Logger; -import org.jboss.mx.util.MBeanProxy; -import org.jboss.mx.util.MBeanProxyCreationException; -import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.wsintegration.spi.deployment.AbstractDeployer; -import org.jboss.wsintegration.spi.deployment.Deployment; -import org.jboss.wsintegration.spi.deployment.ServiceEndpointPublisher; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.deployment.WSDeploymentException; - -/** - * Publish the HTTP service endpoint to Tomcat - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-May-2006 - */ -public class WebAppDeployerDeployer extends AbstractDeployer -{ - // provide logging - private static Logger log = Logger.getLogger(WebAppDeployerDeployer.class); - - private ServiceEndpointPublisher serviceEndpointPublisher; - - public void setServiceEndpointPublisher(ServiceEndpointPublisher serviceEndpointPublisher) - { - this.serviceEndpointPublisher = serviceEndpointPublisher; - } - - public void create(Deployment dep) - { - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - if (udi == null) - throw new IllegalStateException("Cannot obtain unified deployement info"); - - URL warURL = udi.webappURL; - - log.debug("publishServiceEndpoint: " + warURL); - try - { - DeploymentInfo di = udi.getAttachment(DeploymentInfo.class); - if (di == null) - throw new IllegalStateException("Cannot obtain DeploymentInfo from context"); - - serviceEndpointPublisher.rewriteWebXml(udi); - - // Preserve the repository config - DeploymentInfo auxdi = new DeploymentInfo(warURL, null, MBeanServerLocator.locateJBoss()); - auxdi.repositoryConfig = di.getTopRepositoryConfig(); - getMainDeployer().deploy(auxdi); - } - catch (Exception ex) - { - WSDeploymentException.rethrow(ex); - } - } - - public void destroy(Deployment dep) - { - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - if (udi == null) - throw new IllegalStateException("Cannot obtain unified deployement info"); - - URL warURL = udi.webappURL; - if (warURL == null) - { - log.error("Cannot obtain warURL for: " + udi.name); - return; - } - - log.debug("destroyServiceEndpoint: " + warURL); - try - { - getMainDeployer().undeploy(warURL); - } - catch (Exception ex) - { - WSDeploymentException.rethrow(ex); - } - } - - private MainDeployerMBean getMainDeployer() throws MBeanProxyCreationException - { - MBeanServer server = MBeanServerLocator.locateJBoss(); - MainDeployerMBean mainDeployer = (MainDeployerMBean)MBeanProxy.get(MainDeployerMBean.class, MainDeployerMBean.OBJECT_NAME, server); - return mainDeployer; - } -} Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/WebMetaDataAdapter.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/WebMetaDataAdapter.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/WebMetaDataAdapter.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,122 +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.wsintegration.container.jboss42; - -// $Id$ - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import org.jboss.metadata.WebMetaData; -import org.jboss.metadata.WebSecurityMetaData; -import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedWebMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedWebSecurityMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; - -/** - * Build container independent web meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class WebMetaDataAdapter -{ - public UnifiedWebMetaData buildUnifiedWebMetaData(UnifiedDeploymentInfo udi, WebMetaData webMetaData) - { - udi.addAttachment(WebMetaData.class, webMetaData); - - UnifiedWebMetaData umd = new UnifiedWebMetaData(); - umd.setContextRoot(webMetaData.getContextRoot()); - umd.setServletMappings(webMetaData.getServletMappings()); - umd.setServletClassNames(getServletClassMap(webMetaData)); - umd.setConfigName(webMetaData.getConfigName()); - umd.setConfigFile(webMetaData.getConfigFile()); - umd.setSecurityDomain(webMetaData.getSecurityDomain()); - umd.setPublishLocationAdapter(getPublishLocationAdpater(webMetaData)); - umd.setSecurityMetaData(getSecurityMetaData(webMetaData.getSecurityContraints())); - - return umd; - } - - private PublishLocationAdapter getPublishLocationAdpater(final WebMetaData wmd) - { - return new PublishLocationAdapter() - { - public String getWsdlPublishLocationByName(String name) - { - return wmd.getWsdlPublishLocationByName(name); - } - }; - } - - private List<UnifiedWebSecurityMetaData> getSecurityMetaData(final Iterator securityConstraints) - { - ArrayList<UnifiedWebSecurityMetaData> unifiedsecurityMetaData = new ArrayList<UnifiedWebSecurityMetaData>(); - - while (securityConstraints.hasNext()) - { - WebSecurityMetaData securityMetaData = (WebSecurityMetaData)securityConstraints.next(); - - UnifiedWebSecurityMetaData current = new UnifiedWebSecurityMetaData(); - unifiedsecurityMetaData.add(current); - - current.setTransportGuarantee(securityMetaData.getTransportGuarantee()); - - HashMap resources = securityMetaData.getWebResources(); - for (Object webResourceObj : resources.values()) - { - WebResourceCollection webResource = (WebResourceCollection)webResourceObj; - UnifiedWebResourceCollection currentResource = current.addWebResource(webResource.getName()); - for (String currentPattern : webResource.getUrlPatterns()) - { - currentResource.addPattern(currentPattern); - } - } - - } - - return unifiedsecurityMetaData; - } - - private Map<String, String> getServletClassMap(WebMetaData wmd) - { - Map<String, String> mappings = new HashMap<String, String>(); - Iterator it = wmd.getServletClassMap().entrySet().iterator(); - while (it.hasNext()) - { - Map.Entry entry = (Entry)it.next(); - String servletName = (String)entry.getKey(); - String servletClass = (String)entry.getValue(); - // Skip JSPs - if (servletClass != null) - mappings.put(servletName, servletClass); - } - return mappings; - } -} Modified: trunk/integration/jboss50/build.xml =================================================================== --- trunk/integration/jboss50/build.xml 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/build.xml 2007-05-18 22:55:26 UTC (rev 3146) @@ -59,7 +59,7 @@ <mkdir dir="${jbws50.output.classes.dir}"/> <javac srcdir="${jbws50.java.dir}" sourcepath="" destdir="${jbws50.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <include name="org/jboss/wsintegration/container/jboss50/**"/> + <include name="org/jboss/wsf/container/jboss50/**"/> <classpath refid="jbws50.integration.classpath"/> </javac> </target> @@ -100,7 +100,7 @@ <mkdir dir="${jbws50.output.lib.dir}"/> <jar jarfile="${jbws50.output.lib.dir}/jbossws-jboss50.jar" manifest="${jbws50.output.etc.dir}/default.mf"> <fileset dir="${jbws50.output.classes.dir}"> - <include name="org/jboss/wsintegration/container/jboss50/**"/> + <include name="org/jboss/wsf/container/jboss50/**"/> </fileset> <metainf dir="${jbws50.resources.dir}/jbossws-jboss50.jar/META-INF"/> </jar> Copied: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50 (from rev 3145, trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50) Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/AbstractDeployerHook.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,17 +19,17 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; //$Id$ import org.jboss.deployers.spi.deployer.DeploymentUnit; import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.deployment.DeployerManager; -import org.jboss.wsintegration.spi.deployment.Deployment; -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.deployment.Service; -import org.jboss.wsintegration.spi.deployment.WSDeploymentException; +import org.jboss.wsf.spi.deployment.DeployerManager; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Service; +import org.jboss.wsf.spi.deployment.WSDeploymentException; /** * An abstract web service deployer. Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHookEJB.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/AbstractDeployerHookEJB.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHookEJB.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; //$Id$ Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHookJSE.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/AbstractDeployerHookJSE.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHookJSE.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; import org.jboss.deployers.spi.deployer.DeploymentUnit; import org.jboss.metadata.WebMetaData; Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/AbstractWebServiceDeployer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; import java.util.LinkedList; import java.util.List; Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdaptor.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/ApplicationMetaDataAdaptor.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdaptor.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; // $Id$ @@ -36,13 +36,13 @@ import org.jboss.metadata.SessionMetaData; import org.jboss.metadata.ApplicationMetaData.WebserviceDescription; import org.jboss.metadata.ApplicationMetaData.Webservices; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedMessageDrivenMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedSessionMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedMessageDrivenMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedSessionMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter; /** * Build container independent application meta data Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdaptorEJB3.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/ApplicationMetaDataAdaptorEJB3.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdaptorEJB3.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; // $Id$ @@ -39,13 +39,13 @@ import org.jboss.ejb3.metamodel.WebserviceDescription; import org.jboss.ejb3.metamodel.Webservices; import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedMessageDrivenMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedSessionMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedMessageDrivenMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedSessionMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter; /** * Build container independent application meta data Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/ArchiveDeployerHook.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; //$Id$ @@ -29,12 +29,12 @@ import org.jboss.deployers.spi.deployer.DeploymentUnit; import org.jboss.virtual.VirtualFile; import org.jboss.ws.integration.UnifiedVirtualFile; -import org.jboss.wsintegration.spi.deployment.Deployment; -import org.jboss.wsintegration.spi.deployment.WSDeploymentException; -import org.jboss.wsintegration.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsintegration.spi.metadata.webservices.WebservicesFactory; -import org.jboss.wsintegration.spi.metadata.webservices.WebservicesMetaData; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.WSDeploymentException; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; +import org.jboss.wsf.spi.utils.DOMUtils; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ClassLoaderInjectionDeployer.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/ClassLoaderInjectionDeployer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ClassLoaderInjectionDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,16 +19,16 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; //$Id$ import org.jboss.deployers.spi.deployer.DeploymentUnit; import org.jboss.metadata.WebMetaData; -import org.jboss.wsintegration.spi.deployment.AbstractDeployer; -import org.jboss.wsintegration.spi.deployment.Deployment; -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.deployment.WSDeploymentException; +import org.jboss.wsf.spi.deployment.AbstractDeployer; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.WSDeploymentException; /** * A deployer that injects the correct classloader into the Deployment Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeployerHook.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/DeployerHook.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeployerHook.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; //$Id$ Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/DeploymentInfoAdapter.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; import java.net.URL; import java.net.URLClassLoader; @@ -29,7 +29,7 @@ import org.jboss.logging.Logger; import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.WebMetaData; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; // $Id$ Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/InvocationHandlerEJB21.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; // $Id$ @@ -42,14 +42,14 @@ import org.jboss.logging.Logger; import org.jboss.mx.util.MBeanServerLocator; import org.jboss.security.SecurityAssociation; -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.invocation.AbstractInvocationHandler; -import org.jboss.wsintegration.spi.invocation.EndpointInvocation; -import org.jboss.wsintegration.spi.invocation.HandlerCallback; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.invocation.AbstractInvocationHandler; +import org.jboss.wsf.spi.invocation.EndpointInvocation; +import org.jboss.wsf.spi.invocation.HandlerCallback; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; +import org.jboss.wsf.spi.utils.ObjectNameFactory; /** * Handles invocations on EJB3 endpoints. Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/InvocationHandlerEJB3.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; // $Id$ @@ -37,12 +37,12 @@ import org.jboss.ejb3.stateless.StatelessBeanContext; import org.jboss.ejb3.stateless.StatelessContainer; import org.jboss.injection.lang.reflect.BeanProperty; -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.invocation.AbstractInvocationHandler; -import org.jboss.wsintegration.spi.invocation.EndpointInvocation; -import org.jboss.wsintegration.spi.invocation.WebServiceContextEJB; -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.invocation.AbstractInvocationHandler; +import org.jboss.wsf.spi.invocation.EndpointInvocation; +import org.jboss.wsf.spi.invocation.WebServiceContextEJB; +import org.jboss.wsf.spi.utils.ObjectNameFactory; /** * Handles invocations on EJB3 endpoints. Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,21 +19,21 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; //$Id$ import org.jboss.deployers.spi.deployer.DeploymentUnit; import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.BeanMetaData; -import org.jboss.wsintegration.spi.deployment.Deployment; -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.deployment.Service; -import org.jboss.wsintegration.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsintegration.spi.metadata.webservices.PortComponentMetaData; -import org.jboss.wsintegration.spi.metadata.webservices.WebserviceDescriptionMetaData; -import org.jboss.wsintegration.spi.metadata.webservices.WebservicesMetaData; -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Service; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; +import org.jboss.wsf.spi.utils.ObjectNameFactory; /** * A deployer JAXRPC EJB21 Endpoints Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/JAXRPCDeployerHookJSE.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,23 +19,23 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; //$Id$ import org.jboss.deployers.spi.deployer.DeploymentUnit; import org.jboss.metadata.WebMetaData; import org.jboss.metadata.web.Servlet; -import org.jboss.wsintegration.spi.deployment.BasicDeployment; -import org.jboss.wsintegration.spi.deployment.BasicEndpoint; -import org.jboss.wsintegration.spi.deployment.Deployment; -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.deployment.Service; -import org.jboss.wsintegration.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsintegration.spi.metadata.webservices.PortComponentMetaData; -import org.jboss.wsintegration.spi.metadata.webservices.WebserviceDescriptionMetaData; -import org.jboss.wsintegration.spi.metadata.webservices.WebservicesMetaData; -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; +import org.jboss.wsf.spi.deployment.BasicDeployment; +import org.jboss.wsf.spi.deployment.BasicEndpoint; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Service; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; +import org.jboss.wsf.spi.utils.ObjectNameFactory; /** * A deployer JAXRPC JSE Endpoints Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/JAXWSDeployerHookEJB3.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; //$Id$ @@ -32,13 +32,13 @@ import org.jboss.ejb3.EJBContainer; import org.jboss.ejb3.Ejb3Deployment; import org.jboss.ejb3.stateless.StatelessContainer; -import org.jboss.wsintegration.spi.deployment.BasicDeployment; -import org.jboss.wsintegration.spi.deployment.BasicEndpoint; -import org.jboss.wsintegration.spi.deployment.Deployment; -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.deployment.Service; -import org.jboss.wsintegration.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; +import org.jboss.wsf.spi.deployment.BasicDeployment; +import org.jboss.wsf.spi.deployment.BasicEndpoint; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Service; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.utils.ObjectNameFactory; /** * A deployer JAXWS EJB3 Endpoints Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/JAXWSDeployerHookJSE.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; //$Id$ @@ -32,13 +32,13 @@ import org.jboss.deployers.spi.deployer.DeploymentUnit; import org.jboss.metadata.WebMetaData; import org.jboss.metadata.web.Servlet; -import org.jboss.wsintegration.spi.deployment.BasicDeployment; -import org.jboss.wsintegration.spi.deployment.BasicEndpoint; -import org.jboss.wsintegration.spi.deployment.Deployment; -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.deployment.Service; -import org.jboss.wsintegration.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; +import org.jboss.wsf.spi.deployment.BasicDeployment; +import org.jboss.wsf.spi.deployment.BasicEndpoint; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Service; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.utils.ObjectNameFactory; /** * A deployer JAXWS JSE Endpoints Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/MainDeployerHook.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,14 +19,14 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; //$Id$ import org.jboss.deployers.spi.DeploymentException; import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.wsintegration.container.jboss50.AbstractDeployerHook; -import org.jboss.wsintegration.spi.deployment.Deployment; +import org.jboss.wsf.container.jboss50.AbstractDeployerHook; +import org.jboss.wsf.spi.deployment.Deployment; /** * A basic hook that delegates a deployment manger. Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ManagedServerConfig.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/ManagedServerConfig.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ManagedServerConfig.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; // $Id$ @@ -29,7 +29,7 @@ import javax.management.MBeanServerFactory; import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.management.BasicServerConfig; +import org.jboss.wsf.spi.management.BasicServerConfig; /** * A Service Endpoint Registry Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ManagedServerConfigMBean.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/ManagedServerConfigMBean.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ManagedServerConfigMBean.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,9 +19,9 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; -import org.jboss.wsintegration.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfig; /** * MBean interface. Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeployer.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/ModifyWebMetaDataDeployer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; //$Id$ @@ -28,9 +28,9 @@ import org.jboss.metadata.NameValuePair; import org.jboss.metadata.WebMetaData; import org.jboss.metadata.web.Servlet; -import org.jboss.wsintegration.spi.deployment.AbstractDeployer; -import org.jboss.wsintegration.spi.deployment.Deployment; -import org.jboss.wsintegration.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.AbstractDeployer; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; /** * A deployer that modifies the web.xml meta data Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityRolesHandlerEJB21.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/SecurityRolesHandlerEJB21.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityRolesHandlerEJB21.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; //$Id$ @@ -28,9 +28,9 @@ import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.AssemblyDescriptorMetaData; -import org.jboss.wsintegration.spi.deployment.SecurityRolesHandler; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.deployment.SecurityRolesHandler; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityRolesHandlerEJB3.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/SecurityRolesHandlerEJB3.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityRolesHandlerEJB3.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; //$Id$ @@ -29,9 +29,9 @@ import org.jboss.ejb3.EJBContainer; import org.jboss.ejb3.Ejb3Deployment; -import org.jboss.wsintegration.spi.deployment.SecurityRolesHandler; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.deployment.SecurityRolesHandler; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ServiceEndpointInterceptor.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/ServiceEndpointInterceptor.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ServiceEndpointInterceptor.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; // $Id$ @@ -29,8 +29,8 @@ import org.jboss.invocation.Invocation; import org.jboss.invocation.InvocationKey; import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.invocation.HandlerCallback; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.invocation.HandlerCallback; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** * This Interceptor does the ws4ee handler processing. @@ -60,8 +60,8 @@ } // Get the endpoint invocation - org.jboss.wsintegration.spi.invocation.EndpointInvocation epInv = (org.jboss.wsintegration.spi.invocation.EndpointInvocation)mi - .getValue(org.jboss.wsintegration.spi.invocation.EndpointInvocation.class.getName()); + org.jboss.wsf.spi.invocation.EndpointInvocation epInv = (org.jboss.wsf.spi.invocation.EndpointInvocation)mi + .getValue(org.jboss.wsf.spi.invocation.EndpointInvocation.class.getName()); // Get the handler callback HandlerCallback callback = (HandlerCallback)mi.getValue(HandlerCallback.class.getName()); Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeployer.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/UnifiedDeploymentInfoDeployer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,18 +19,18 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; //$Id$ import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.wsintegration.spi.deployment.AbstractDeployer; -import org.jboss.wsintegration.spi.deployment.Deployment; -import org.jboss.wsintegration.spi.deployment.JAXRPCDeployment; -import org.jboss.wsintegration.spi.deployment.JAXWSDeployment; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsintegration.spi.metadata.webservices.WebservicesMetaData; +import org.jboss.wsf.spi.deployment.AbstractDeployer; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.JAXRPCDeployment; +import org.jboss.wsf.spi.deployment.JAXWSDeployment; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; /** * A deployer that builds the UnifiedDeploymentInfo Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/VirtualFileAdaptor.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/VirtualFileAdaptor.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/VirtualFileAdaptor.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; import java.io.IOException; import java.net.URL; Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployerDeployer.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/WebAppDeployerDeployer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployerDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; // $Id$ @@ -34,11 +34,11 @@ import org.jboss.logging.Logger; import org.jboss.virtual.VFS; import org.jboss.virtual.VirtualFile; -import org.jboss.wsintegration.spi.deployment.AbstractDeployer; -import org.jboss.wsintegration.spi.deployment.Deployment; -import org.jboss.wsintegration.spi.deployment.ServiceEndpointPublisher; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.deployment.WSDeploymentException; +import org.jboss.wsf.spi.deployment.AbstractDeployer; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.ServiceEndpointPublisher; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.deployment.WSDeploymentException; /** * Publish the HTTP service endpoint to Tomcat Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdaptor.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/WebMetaDataAdaptor.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdaptor.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; // $Id$ @@ -35,11 +35,11 @@ import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection; import org.jboss.metadata.web.Servlet; import org.jboss.metadata.web.ServletMapping; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedWebMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedWebSecurityMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; /** * Build container independent web meta data Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebServiceDeployerEJB.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/WebServiceDeployerEJB.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebServiceDeployerEJB.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; //$Id$ Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebServiceDeployerJSE.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/WebServiceDeployerJSE.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebServiceDeployerJSE.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; //$Id$ Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebServiceMainDeployer.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/WebServiceMainDeployer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebServiceMainDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.container.jboss50; +package org.jboss.wsf.container.jboss50; //$Id$ Modified: trunk/integration/jbws/ant-import/build-deploy.xml =================================================================== --- trunk/integration/jbws/ant-import/build-deploy.xml 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jbws/ant-import/build-deploy.xml 2007-05-18 22:55:26 UTC (rev 3146) @@ -136,7 +136,7 @@ <include name="jbossws-wsconsume-impl.jar"/> </fileset> <fileset dir="${jboss42.home}/lib"> - <include name="jbossws-spi.jar"/>  + <include name="jbossws-integration.jar"/>  <include name="jbossws-spi.jar"/> </fileset> <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> Modified: trunk/integration/jbws/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- trunk/integration/jbws/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jbws/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-05-18 22:55:26 UTC (rev 3146) @@ -5,7 +5,7 @@  - <bean name="WebServiceDeployerEJB" class="org.jboss.wsintegration.container.jboss50.WebServiceDeployerEJB"> + <bean name="WebServiceDeployerEJB" class="org.jboss.wsf.container.jboss50.WebServiceDeployerEJB"> <property name="relOrderEJB2x"><inject bean="EJB2xDeployer" property="relativeOrder"/></property> <property name="relOrderEJB3"><inject bean="EJBRegistrationDeployer" property="relativeOrder"/></property> <install bean="MainDeployer" method="addDeployer"> @@ -25,7 +25,7 @@  - <bean name="WebServiceDeployerJSE" class="org.jboss.wsintegration.container.jboss50.WebServiceDeployerJSE"> + <bean name="WebServiceDeployerJSE" class="org.jboss.wsf.container.jboss50.WebServiceDeployerJSE"> <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property> <install bean="MainDeployer" method="addDeployer"> <parameter> @@ -43,7 +43,7 @@  - <bean name="WebServiceMainDeployer" class="org.jboss.wsintegration.container.jboss50.WebServiceMainDeployer"> + <bean name="WebServiceMainDeployer" class="org.jboss.wsf.container.jboss50.WebServiceMainDeployer"> <property name="relOrderJSE"><inject bean="WebServiceDeployerJSE" property="relativeOrder"/></property> <property name="relOrderEJB"><inject bean="WebServiceDeployerEJB" property="relativeOrder"/></property> <install bean="MainDeployer" method="addDeployer"> Modified: trunk/integration/jbws/src/main/resources/jbossws-jbws42.sar/META-INF/jboss-service.xml =================================================================== --- trunk/integration/jbws/src/main/resources/jbossws-jbws42.sar/META-INF/jboss-service.xml 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jbws/src/main/resources/jbossws-jbws42.sar/META-INF/jboss-service.xml 2007-05-18 22:55:26 UTC (rev 3146) @@ -7,7 +7,7 @@  - <mbean name="jboss.ws:service=DeployerInterceptorJSE" code="org.jboss.wsintegration.container.jboss42.DeployerInterceptorJSE"> + <mbean name="jboss.ws:service=DeployerInterceptorJSE" code="org.jboss.wsf.container.jboss42.DeployerInterceptorJSE"> <depends-list optional-attribute-name="Interceptables"> <depends-list-element>jboss.web:service=WebServer</depends-list-element> </depends-list> @@ -16,7 +16,7 @@  - <mbean name="jboss.ws:service=DeployerInterceptorEJB21" code="org.jboss.wsintegration.container.jboss42.DeployerInterceptorEJB21"> + <mbean name="jboss.ws:service=DeployerInterceptorEJB21" code="org.jboss.wsf.container.jboss42.DeployerInterceptorEJB21"> <depends-list optional-attribute-name="Interceptables"> <depends-list-element>jboss.ejb:service=EJBDeployer</depends-list-element> </depends-list> @@ -25,7 +25,7 @@  - <mbean name="jboss.ws:service=DeployerInterceptorEJB3" code="org.jboss.wsintegration.container.jboss42.DeployerInterceptorEJB3"> + <mbean name="jboss.ws:service=DeployerInterceptorEJB3" code="org.jboss.wsf.container.jboss42.DeployerInterceptorEJB3"> <depends-list optional-attribute-name="Interceptables"> <depends-list-element>jboss.ejb3:service=EJB3Deployer</depends-list-element> </depends-list> Modified: trunk/integration/jbws/src/main/resources/jbossws-jbws42.sar/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- trunk/integration/jbws/src/main/resources/jbossws-jbws42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jbws/src/main/resources/jbossws-jbws42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-05-18 22:55:26 UTC (rev 3146) @@ -3,7 +3,7 @@ <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">  - <bean name="WSServerConfig" class="org.jboss.wsintegration.container.jboss42.ManagedServerConfig"> + <bean name="WSServerConfig" class="org.jboss.wsf.container.jboss42.ManagedServerConfig">  - <bean name="WSEndpointRegistry" class="org.jboss.ws.core.server.ManagedEndpointRegistry"/> + <bean name="WSEndpointRegistry" class="org.jboss.wsf.stack.jbws.ManagedEndpointRegistry"/>  <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"/> @@ -76,9 +76,9 @@ Each DeploymentManger maintains a list of Deployers Each Deployer handles a single aspect of web service deployment. --> - <bean name="WSDeployerManagerJSE" class="org.jboss.wsintegration.spi.deployment.BasicDeployerManager"> + <bean name="WSDeployerManagerJSE" class="org.jboss.wsf.spi.deployment.BasicDeployerManager"> <property name="deployers"> - <list class="java.util.LinkedList" elementClass="org.jboss.wsintegration.spi.deployment.Deployer"> + <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer"> <inject bean="WSUnifiedDeploymentInfoDeployer"/> <inject bean="WSUnifiedMetaDataDeployer"/> <inject bean="WSUnifiedMetaDataAssociationDeployer"/> @@ -86,9 +86,9 @@ </list> </property> </bean> - <bean name="WSDeployerManagerEJB" class="org.jboss.wsintegration.spi.deployment.BasicDeployerManager"> + <bean name="WSDeployerManagerEJB" class="org.jboss.wsf.spi.deployment.BasicDeployerManager"> <property name="deployers"> - <list class="java.util.LinkedList" elementClass="org.jboss.wsintegration.spi.deployment.Deployer"> + <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer"> <inject bean="WSUnifiedDeploymentInfoDeployer"/> <inject bean="WSUnifiedMetaDataDeployer"/> <inject bean="WSUnifiedMetaDataAssociationDeployer"/> @@ -97,9 +97,9 @@ </list> </property> </bean> - <bean name="WSMainDeployerManager" class="org.jboss.wsintegration.spi.deployment.BasicDeployerManager"> + <bean name="WSMainDeployerManager" class="org.jboss.wsf.spi.deployment.BasicDeployerManager"> <property name="deployers"> - <list class="java.util.LinkedList" elementClass="org.jboss.wsintegration.spi.deployment.Deployer"> + <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer"> <inject bean="WSEndpointNameDeployer"/> <inject bean="WSEndpointHandlerDeployer"/> <inject bean="WSPublishContractDeployer"/> @@ -117,56 +117,56 @@ The Deployers Each handles a single aspect of web service deployment --> - <bean name="WSClassLoaderInjectionDeployer" class="org.jboss.wsintegration.container.jboss42.ClassLoaderInjectionDeployer"/> - <bean name="WSEagerInitializeDeployer" class="org.jboss.wsintegration.stack.jbws.deployment.EagerInitializeDeployer"/> - <bean name="WSEndpointHandlerDeployer" class="org.jboss.wsintegration.spi.deployment.EndpointHandlerDeployer"> - <property name="requestHandler">org.jboss.ws.core.server.RequestHandlerImpl</property> - <property name="lifecycleHandler">org.jboss.ws.core.server.LifecycleHandlerImpl</property> + <bean name="WSClassLoaderInjectionDeployer" class="org.jboss.wsf.container.jboss42.ClassLoaderInjectionDeployer"/> + <bean name="WSEagerInitializeDeployer" class="org.jboss.wsf.stack.jbws.EagerInitializeDeployer"/> + <bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer"> + <property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property> + <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property> <property name="invocationHandler"> <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>JAXRPC_JSE</key><value>org.jboss.ws.core.jaxrpc.ServiceLifecycleInvocationHandler</value></entry> - <entry><key>JAXRPC_EJB21</key><value>org.jboss.wsintegration.container.jboss42.InvocationHandlerEJB21</value></entry> - <entry><key>JAXWS_JSE</key><value>org.jboss.ws.core.jaxrpc.ServiceLifecycleInvocationHandler</value></entry> - <entry><key>JAXWS_EJB3</key><value>org.jboss.wsintegration.container.jboss42.InvocationHandlerEJB3</value></entry> + <entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry> + <entry><key>JAXRPC_EJB21</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerEJB21</value></entry> + <entry><key>JAXWS_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry> + <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerEJB3</value></entry> </map> </property> </bean> - <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsintegration.spi.deployment.EndpointLifecycleDeployer"/> - <bean name="WSEndpointNameDeployer" class="org.jboss.wsintegration.stack.jbws.deployment.EndpointNameDeployer"/> - <bean name="WSEndpointRegistryDeployer" class="org.jboss.wsintegration.spi.deployment.EndpointRegistryDeployer"/> - <bean name="WSEventingDeployer" class="org.jboss.wsintegration.stack.jbws.deployment.EventingDeployer"/> - <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsintegration.container.jboss42.ModifyWebMetaDataDeployer"> + <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/> + <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.stack.jbws.EndpointNameDeployer"/> + <bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/> + <bean name="WSEventingDeployer" class="org.jboss.wsf.stack.jbws.EventingDeployer"/> + <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeployer"> <property name="serviceEndpointPublisher"><inject bean="WSServiceEndpointPublisher"/></property> </bean> - <bean name="WSPublishContractDeployer" class="org.jboss.wsintegration.stack.jbws.deployment.PublishContractDeployer"/> - <bean name="WSServiceEndpointInvokerDeployer" class="org.jboss.wsintegration.stack.jbws.deployment.ServiceEndpointInvokerDeployer"/> - <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsintegration.container.jboss42.UnifiedDeploymentInfoDeployer"> + <bean name="WSPublishContractDeployer" class="org.jboss.wsf.stack.jbws.PublishContractDeployer"/> + <bean name="WSServiceEndpointInvokerDeployer" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeployer"/> + <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss42.UnifiedDeploymentInfoDeployer"> <property name="deploymentInfoAdapter"><inject bean="WSDeploymentInfoAdapter"/></property> </bean> - <bean name="WSUnifiedMetaDataAssociationDeployer" class="org.jboss.wsintegration.stack.jbws.deployment.UnifiedMetaDataAssociationDeployer"/> - <bean name="WSUnifiedMetaDataDeployer" class="org.jboss.wsintegration.stack.jbws.deployment.UnifiedMetaDataDeployer"/> - <bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsintegration.stack.jbws.deployment.WebAppGeneratorDeployer"/> - <bean name="WSWebAppDeployerDeployer" class="org.jboss.wsintegration.container.jboss42.WebAppDeployerDeployer"> + <bean name="WSUnifiedMetaDataAssociationDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataAssociationDeployer"/> + <bean name="WSUnifiedMetaDataDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployer"/> + <bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.stack.jbws.WebAppGeneratorDeployer"/> + <bean name="WSWebAppDeployerDeployer" class="org.jboss.wsf.container.jboss42.WebAppDeployerDeployer"> <property name="serviceEndpointPublisher"><inject bean="WSServiceEndpointPublisher"/></property> </bean>  - <bean name="WSServiceEndpointPublisher" class="org.jboss.wsintegration.spi.deployment.ServiceEndpointPublisher"> - <property name="servletClass">org.jboss.ws.core.server.ServiceEndpointServlet</property> + <bean name="WSServiceEndpointPublisher" class="org.jboss.wsf.spi.deployment.ServiceEndpointPublisher"> + <property name="servletClass">org.jboss.wsf.stack.jbws.ServiceEndpointServlet</property> </bean> - <bean name="WSDeploymentInfoAdapter" class="org.jboss.wsintegration.container.jboss42.DeploymentInfoAdapter"> + <bean name="WSDeploymentInfoAdapter" class="org.jboss.wsf.container.jboss42.DeploymentInfoAdapter"> <property name="appMetaDataAdapter"><inject bean="WSAppMetaDataAdapter"/></property> <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property> </bean> - <bean name="WSAppMetaDataAdapter" class="org.jboss.wsintegration.container.jboss42.ApplicationMetaDataAdapter"/> - <bean name="WSWebMetaDataAdapter" class="org.jboss.wsintegration.container.jboss42.WebMetaDataAdapter"/> + <bean name="WSAppMetaDataAdapter" class="org.jboss.wsf.container.jboss42.ApplicationMetaDataAdapter"/> + <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.WebMetaDataAdapter"/>  - <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.wsintegration.container.jboss42.JAXRPCDeployerHookJSE"> - <property name="deploymentClass">org.jboss.wsintegration.stack.jbws.deployment.UnifiedMetaDataDeployment</property> - <property name="endpointClass">org.jboss.wsintegration.spi.deployment.BasicEndpoint</property> + <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookJSE"> + <property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property> + <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> <property name="phaseOneInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> @@ -174,9 +174,9 @@ </list> </property> </bean> - <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsintegration.container.jboss42.JAXRPCDeployerHookEJB21"> - <property name="deploymentClass">org.jboss.wsintegration.stack.jbws.deployment.UnifiedMetaDataDeployment</property> - <property name="endpointClass">org.jboss.wsintegration.spi.deployment.BasicEndpoint</property> + <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookEJB21"> + <property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property> + <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> <property name="phaseOneInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> @@ -184,9 +184,9 @@ </list> </property> </bean> - <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.wsintegration.container.jboss42.JAXWSDeployerHookJSE"> - <property name="deploymentClass">org.jboss.wsintegration.stack.jbws.deployment.UnifiedMetaDataDeployment</property> - <property name="endpointClass">org.jboss.wsintegration.spi.deployment.BasicEndpoint</property> + <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookJSE"> + <property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property> + <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> <property name="phaseOneInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> @@ -194,9 +194,9 @@ </list> </property> </bean> - <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsintegration.container.jboss42.JAXWSDeployerHookEJB3"> - <property name="deploymentClass">org.jboss.wsintegration.stack.jbws.deployment.UnifiedMetaDataDeployment</property> - <property name="endpointClass">org.jboss.wsintegration.spi.deployment.BasicEndpoint</property> + <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookEJB3"> + <property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property> + <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> <property name="phaseOneInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> @@ -204,7 +204,7 @@ </list> </property> </bean> - <bean name="WSMainDeployerHook" class="org.jboss.wsintegration.container.jboss42.MainDeployerHook"> + <bean name="WSMainDeployerHook" class="org.jboss.wsf.container.jboss42.MainDeployerHook"> <property name="deployerManager"><inject bean="WSMainDeployerManager"/></property> <property name="phaseTwoInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> Modified: trunk/integration/jbws/src/main/resources/jbossws-jbws50.sar/META-INF/jbossws-beans.xml =================================================================== --- trunk/integration/jbws/src/main/resources/jbossws-jbws50.sar/META-INF/jbossws-beans.xml 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/jbws/src/main/resources/jbossws-jbws50.sar/META-INF/jbossws-beans.xml 2007-05-18 22:55:26 UTC (rev 3146) @@ -3,7 +3,7 @@ <deployment xmlns="urn:jboss:bean-deployer:2.0">  - <bean name="WSServerConfig" class="org.jboss.wsintegration.container.jboss50.ManagedServerConfig"> + <bean name="WSServerConfig" class="org.jboss.wsf.container.jboss50.ManagedServerConfig">  - <bean name="WSEndpointRegistry" class="org.jboss.ws.core.server.ManagedEndpointRegistry"/> + <bean name="WSEndpointRegistry" class="org.jboss.wsf.stack.jbws.ManagedEndpointRegistry"/>  <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"/> @@ -88,9 +88,9 @@ Each DeploymentManger maintains a list of Deployers Each Deployer handles a single aspect of web service deployment. --> - <bean name="WSDeployerManagerJSE" class="org.jboss.wsintegration.spi.deployment.BasicDeployerManager"> + <bean name="WSDeployerManagerJSE" class="org.jboss.wsf.spi.deployment.BasicDeployerManager"> <property name="deployers"> - <list class="java.util.LinkedList" elementClass="org.jboss.wsintegration.spi.deployment.Deployer"> + <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer"> <inject bean="WSUnifiedDeploymentInfoDeployer"/> <inject bean="WSUnifiedMetaDataDeployer"/> <inject bean="WSUnifiedMetaDataAssociationDeployer"/> @@ -98,9 +98,9 @@ </list> </property> </bean> - <bean name="WSDeployerManagerEJB" class="org.jboss.wsintegration.spi.deployment.BasicDeployerManager"> + <bean name="WSDeployerManagerEJB" class="org.jboss.wsf.spi.deployment.BasicDeployerManager"> <property name="deployers"> - <list class="java.util.LinkedList" elementClass="org.jboss.wsintegration.spi.deployment.Deployer"> + <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer"> <inject bean="WSUnifiedDeploymentInfoDeployer"/> <inject bean="WSUnifiedMetaDataDeployer"/> <inject bean="WSUnifiedMetaDataAssociationDeployer"/> @@ -109,9 +109,9 @@ </list> </property> </bean> - <bean name="WSMainDeployerManager" class="org.jboss.wsintegration.spi.deployment.BasicDeployerManager"> + <bean name="WSMainDeployerManager" class="org.jboss.wsf.spi.deployment.BasicDeployerManager"> <property name="deployers"> - <list class="java.util.LinkedList" elementClass="org.jboss.wsintegration.spi.deployment.Deployer"> + <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer"> <inject bean="WSEndpointNameDeployer"/> <inject bean="WSEndpointHandlerDeployer"/> <inject bean="WSPublishContractDeployer"/> @@ -129,54 +129,54 @@ The Deployers Each handles a single aspect of web service deployment --> - <bean name="WSClassLoaderInjectionDeployer" class="org.jboss.wsintegration.container.jboss50.ClassLoaderInjectionDeployer"/> - <bean name="WSEagerInitializeDeployer" class="org.jboss.wsintegration.stack.jbws.deployment.EagerInitializeDeployer"/> - <bean name="WSEndpointHandlerDeployer" class="org.jboss.wsintegration.spi.deployment.EndpointHandlerDeployer"> - <property name="requestHandler">org.jboss.ws.core.server.RequestHandlerImpl</property> - <property name="lifecycleHandler">org.jboss.ws.core.server.LifecycleHandlerImpl</property> + <bean name="WSClassLoaderInjectionDeployer" class="org.jboss.wsf.container.jboss50.ClassLoaderInjectionDeployer"/> + <bean name="WSEagerInitializeDeployer" class="org.jboss.wsf.stack.jbws.EagerInitializeDeployer"/> + <bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer"> + <property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property> + <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property> <property name="invocationHandler"> <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>JAXRPC_JSE</key><value>org.jboss.ws.core.jaxrpc.ServiceLifecycleInvocationHandler</value></entry> - <entry><key>JAXRPC_EJB21</key><value>org.jboss.wsintegration.container.jboss50.InvocationHandlerEJB21</value></entry> - <entry><key>JAXWS_JSE</key><value>org.jboss.ws.core.jaxrpc.ServiceLifecycleInvocationHandler</value></entry> - <entry><key>JAXWS_EJB3</key><value>org.jboss.wsintegration.container.jboss50.InvocationHandlerEJB3</value></entry> + <entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry> + <entry><key>JAXRPC_EJB21</key><value>org.jboss.wsf.container.jboss50.InvocationHandlerEJB21</value></entry> + <entry><key>JAXWS_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry> + <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss50.InvocationHandlerEJB3</value></entry> </map> </property> </bean> - <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsintegration.spi.deployment.EndpointLifecycleDeployer"/> - <bean name="WSEndpointNameDeployer" class="org.jboss.wsintegration.stack.jbws.deployment.EndpointNameDeployer"/> - <bean name="WSEndpointRegistryDeployer" class="org.jboss.wsintegration.spi.deployment.EndpointRegistryDeployer"/> - <bean name="WSEventingDeployer" class="org.jboss.wsintegration.stack.jbws.deployment.EventingDeployer"/> - <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsintegration.container.jboss50.ModifyWebMetaDataDeployer"> - <property name="servletClass">org.jboss.ws.core.server.ServiceEndpointServlet</property> + <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/> + <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.stack.jbws.EndpointNameDeployer"/> + <bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/> + <bean name="WSEventingDeployer" class="org.jboss.wsf.stack.jbws.EventingDeployer"/> + <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.container.jboss50.ModifyWebMetaDataDeployer"> + <property name="servletClass">org.jboss.wsf.stack.jbws.ServiceEndpointServlet</property> </bean> - <bean name="WSPublishContractDeployer" class="org.jboss.wsintegration.stack.jbws.deployment.PublishContractDeployer"/> - <bean name="WSServiceEndpointInvokerDeployer" class="org.jboss.wsintegration.stack.jbws.deployment.ServiceEndpointInvokerDeployer"/> - <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsintegration.container.jboss50.UnifiedDeploymentInfoDeployer"/> - <bean name="WSUnifiedMetaDataAssociationDeployer" class="org.jboss.wsintegration.stack.jbws.deployment.UnifiedMetaDataAssociationDeployer"/> - <bean name="WSUnifiedMetaDataDeployer" class="org.jboss.wsintegration.stack.jbws.deployment.UnifiedMetaDataDeployer"/> - <bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsintegration.stack.jbws.deployment.WebAppGeneratorDeployer"> + <bean name="WSPublishContractDeployer" class="org.jboss.wsf.stack.jbws.PublishContractDeployer"/> + <bean name="WSServiceEndpointInvokerDeployer" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeployer"/> + <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss50.UnifiedDeploymentInfoDeployer"/> + <bean name="WSUnifiedMetaDataAssociationDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataAssociationDeployer"/> + <bean name="WSUnifiedMetaDataDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployer"/> + <bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.stack.jbws.WebAppGeneratorDeployer"> <property name="securityRolesHandlerEJB21"><inject bean="WSSecurityRolesHandlerEJB21"/></property> <property name="securityRolesHandlerEJB3"><inject bean="WSSecurityRolesHandlerEJB3"/></property> </bean> - <bean name="WSWebAppDeployerDeployer" class="org.jboss.wsintegration.container.jboss50.WebAppDeployerDeployer"> + <bean name="WSWebAppDeployerDeployer" class="org.jboss.wsf.container.jboss50.WebAppDeployerDeployer"> <property name="serviceEndpointPublisher"><inject bean="WSServiceEndpointPublisher"/></property> <property name="mainDeployer"><inject bean="MainDeployer"/></property> </bean>  - <bean name="WSSecurityRolesHandlerEJB21" class="org.jboss.wsintegration.container.jboss50.SecurityRolesHandlerEJB21"/> - <bean name="WSSecurityRolesHandlerEJB3" class="org.jboss.wsintegration.container.jboss50.SecurityRolesHandlerEJB3"/> - <bean name="WSServiceEndpointPublisher" class="org.jboss.wsintegration.spi.deployment.ServiceEndpointPublisher"> + <bean name="WSSecurityRolesHandlerEJB21" class="org.jboss.wsf.container.jboss50.SecurityRolesHandlerEJB21"/> + <bean name="WSSecurityRolesHandlerEJB3" class="org.jboss.wsf.container.jboss50.SecurityRolesHandlerEJB3"/> + <bean name="WSServiceEndpointPublisher" class="org.jboss.wsf.spi.deployment.ServiceEndpointPublisher"> <property name="servletClass"><inject bean="WSModifyWebMetaDataDeployer" property="servletClass"/></property> </bean>  - <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.wsintegration.container.jboss50.JAXRPCDeployerHookJSE"> - <property name="deploymentClass">org.jboss.wsintegration.stack.jbws.deployment.UnifiedMetaDataDeployment</property> - <property name="endpointClass">org.jboss.wsintegration.spi.deployment.BasicEndpoint</property> + <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookJSE"> + <property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property> + <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> <install bean="WebServiceDeployerJSE" method="addDeployerHook"> <parameter> @@ -190,9 +190,9 @@ </uninstall> <depends>WebServiceDeployerJSE</depends> </bean> - <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsintegration.container.jboss50.JAXRPCDeployerHookEJB21"> - <property name="deploymentClass">org.jboss.wsintegration.stack.jbws.deployment.UnifiedMetaDataDeployment</property> - <property name="endpointClass">org.jboss.wsintegration.spi.deployment.BasicEndpoint</property> + <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookEJB21"> + <property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property> + <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> <install bean="WebServiceDeployerEJB" method="addDeployerHook"> <parameter> @@ -206,9 +206,9 @@ </uninstall> <depends>WebServiceDeployerEJB</depends> </bean> - <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.wsintegration.container.jboss50.JAXWSDeployerHookJSE"> - <property name="deploymentClass">org.jboss.wsintegration.stack.jbws.deployment.UnifiedMetaDataDeployment</property> - <property name="endpointClass">org.jboss.wsintegration.spi.deployment.BasicEndpoint</property> + <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookJSE"> + <property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property> + <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> <install bean="WebServiceDeployerJSE" method="addDeployerHook"> <parameter> @@ -222,9 +222,9 @@ </uninstall> <depends>WebServiceDeployerJSE</depends> </bean> - <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsintegration.container.jboss50.JAXWSDeployerHookEJB3"> - <property name="deploymentClass">org.jboss.wsintegration.stack.jbws.deployment.UnifiedMetaDataDeployment</property> - <property name="endpointClass">org.jboss.wsintegration.spi.deployment.BasicEndpoint</property> + <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookEJB3"> + <property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property> + <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> <install bean="WebServiceDeployerEJB" method="addDeployerHook"> <parameter> @@ -238,7 +238,7 @@ </uninstall> <depends>WebServiceDeployerEJB</depends> </bean> - <bean name="WSMainDeployerHook" class="org.jboss.wsintegration.container.jboss50.MainDeployerHook"> + <bean name="WSMainDeployerHook" class="org.jboss.wsf.container.jboss50.MainDeployerHook"> <property name="deployerManager"><inject bean="WSMainDeployerManager"/></property> <install bean="WebServiceMainDeployer" method="addDeployerHook"> <parameter> Modified: trunk/integration/spi/build.xml =================================================================== --- trunk/integration/spi/build.xml 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/build.xml 2007-05-18 22:55:26 UTC (rev 3146) @@ -61,7 +61,7 @@ <mkdir dir="${spi.output.classes.dir}"/> <javac srcdir="${spi.java.dir}" sourcepath="" destdir="${spi.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5"> - <include name="org/jboss/wsintegration/spi/**"/> + <include name="org/jboss/wsf/spi/**"/> <include name="org/jboss/ws/integration/**"/> <classpath refid="thirdparty.classpath"/> </javac> @@ -106,7 +106,7 @@ <mkdir dir="${spi.output.lib.dir}"/> <jar jarfile="${spi.output.lib.dir}/jbossws-spi.jar" manifest="${spi.output.etc.dir}/default.mf"> <fileset dir="${spi.output.classes.dir}"> - <include name="org/jboss/wsintegration/spi/**"/> + <include name="org/jboss/wsf/spi/**"/> <include name="org/jboss/ws/integration/**"/> </fileset> </jar> Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/annotation (from rev 3145, trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/annotation) Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/annotation/WebContext.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/annotation/WebContext.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/annotation/WebContext.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.annotation; +package org.jboss.wsf.spi.annotation; // $Id$ Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment (from rev 3145, trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment) Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/AbstractDeployer.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/AbstractDeployer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/AbstractDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.deployment; +package org.jboss.wsf.spi.deployment; //$Id$ Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeployerManager.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/BasicDeployerManager.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeployerManager.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.deployment; +package org.jboss.wsf.spi.deployment; // $Id$ @@ -27,7 +27,7 @@ import java.util.List; import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.deployment.Deployment.DeploymentState; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentState; /** * A general service deployment manger. Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeployment.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/BasicDeployment.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeployment.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.deployment; +package org.jboss.wsf.spi.deployment; //$Id$ Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeploymentContext.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/BasicDeploymentContext.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeploymentContext.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.deployment; +package org.jboss.wsf.spi.deployment; //$Id$ Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/BasicEndpoint.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,15 +19,15 @@ * 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.wsintegration.spi.deployment; +package org.jboss.wsf.spi.deployment; import java.util.HashMap; import java.util.Map; import javax.management.ObjectName; -import org.jboss.wsintegration.spi.invocation.InvocationHandler; -import org.jboss.wsintegration.spi.invocation.RequestHandler; +import org.jboss.wsf.spi.invocation.InvocationHandler; +import org.jboss.wsf.spi.invocation.RequestHandler; /** * A general JAXWS endpoint. Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicLifecycleHandler.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/BasicLifecycleHandler.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicLifecycleHandler.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,12 +19,12 @@ * 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.wsintegration.spi.deployment; +package org.jboss.wsf.spi.deployment; //$Id$ import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.deployment.Endpoint.EndpointState; +import org.jboss.wsf.spi.deployment.Endpoint.EndpointState; /** * A basic lifecycle handler Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicService.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/BasicService.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicService.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.deployment; +package org.jboss.wsf.spi.deployment; // $Id$ Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployer.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/Deployer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.deployment; +package org.jboss.wsf.spi.deployment; // $Id$ Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeployerManager.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/DeployerManager.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeployerManager.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.deployment; +package org.jboss.wsf.spi.deployment; // $Id$ Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/Deployment.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.deployment; +package org.jboss.wsf.spi.deployment; // $Id$ Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentContext.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/DeploymentContext.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentContext.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,4 +1,4 @@ -package org.jboss.wsintegration.spi.deployment; +package org.jboss.wsf.spi.deployment; public interface DeploymentContext { Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/Endpoint.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,12 +19,12 @@ * 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.wsintegration.spi.deployment; +package org.jboss.wsf.spi.deployment; import javax.management.ObjectName; -import org.jboss.wsintegration.spi.invocation.InvocationHandler; -import org.jboss.wsintegration.spi.invocation.RequestHandler; +import org.jboss.wsf.spi.invocation.InvocationHandler; +import org.jboss.wsf.spi.invocation.RequestHandler; /** * A general JAXWS endpoint. Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/EndpointHandlerDeployer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,14 +19,14 @@ * 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.wsintegration.spi.deployment; +package org.jboss.wsf.spi.deployment; //$Id$ import java.util.Map; -import org.jboss.wsintegration.spi.invocation.InvocationHandler; -import org.jboss.wsintegration.spi.invocation.RequestHandler; +import org.jboss.wsf.spi.invocation.InvocationHandler; +import org.jboss.wsf.spi.invocation.RequestHandler; /** * A deployer that assigns the handlers to the Endpoint Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointLifecycleDeployer.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/EndpointLifecycleDeployer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointLifecycleDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.deployment; +package org.jboss.wsf.spi.deployment; //$Id$ Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointRegistryDeployer.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/EndpointRegistryDeployer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointRegistryDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,10 +19,10 @@ * 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.wsintegration.spi.deployment; +package org.jboss.wsf.spi.deployment; -import org.jboss.wsintegration.spi.management.EndpointRegistry; -import org.jboss.wsintegration.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.spi.management.EndpointRegistryFactory; /** * A deployer that registers the endpoints Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXRPCClientDeployment.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/JAXRPCClientDeployment.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXRPCClientDeployment.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,11 +19,11 @@ * 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.wsintegration.spi.deployment; +package org.jboss.wsf.spi.deployment; //$Id$ -import org.jboss.wsintegration.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; /** * The container independent deployment info. Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXRPCDeployment.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/JAXRPCDeployment.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXRPCDeployment.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,15 +19,15 @@ * 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.wsintegration.spi.deployment; +package org.jboss.wsf.spi.deployment; import java.io.InputStream; import java.net.URL; import org.jboss.ws.integration.UnifiedVirtualFile; -import org.jboss.wsintegration.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsintegration.spi.metadata.webservices.WebservicesFactory; -import org.jboss.wsintegration.spi.metadata.webservices.WebservicesMetaData; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXWSDeployment.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/JAXWSDeployment.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXWSDeployment.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,11 +19,11 @@ * 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.wsintegration.spi.deployment; +package org.jboss.wsf.spi.deployment; //$Id$ -import org.jboss.wsintegration.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; /** * The container independent deployment info. Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandler.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/LifecycleHandler.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandler.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.deployment; +package org.jboss.wsf.spi.deployment; /** Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/SecurityRolesHandler.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/SecurityRolesHandler.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/SecurityRolesHandler.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,4 +1,4 @@ -package org.jboss.wsintegration.spi.deployment; +package org.jboss.wsf.spi.deployment; import org.w3c.dom.Element; Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Service.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/Service.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Service.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.deployment; +package org.jboss.wsf.spi.deployment; // $Id$ Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ServiceEndpointPublisher.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/ServiceEndpointPublisher.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ServiceEndpointPublisher.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.deployment; +package org.jboss.wsf.spi.deployment; import java.io.File; import java.io.FileInputStream; @@ -35,9 +35,9 @@ import javax.xml.ws.WebServiceException; import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; -import org.jboss.wsintegration.spi.utils.IOUtils; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.IOUtils; import org.w3c.dom.Element; /** Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/UnifiedDeploymentInfo.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.deployment; +package org.jboss.wsf.spi.deployment; // $Id$ @@ -32,7 +32,7 @@ import javax.management.ObjectName; import org.jboss.ws.integration.UnifiedVirtualFile; -import org.jboss.wsintegration.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; /** * The container independent deployment info. Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WSDeploymentException.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/WSDeploymentException.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WSDeploymentException.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.deployment; +package org.jboss.wsf.spi.deployment; // $Id$ Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation (from rev 3145, trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation) Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/AbstractInvocationHandler.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/AbstractInvocationHandler.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/AbstractInvocationHandler.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.invocation; +package org.jboss.wsf.spi.invocation; // $Id$ @@ -30,8 +30,8 @@ import javax.management.MBeanException; import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.utils.JavaUtils; /** * Handles invocations on endpoints. Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/AbstractWebServiceContext.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/AbstractWebServiceContext.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/AbstractWebServiceContext.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.invocation; +package org.jboss.wsf.spi.invocation; import java.security.Principal; Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicEndpointInvocation.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/BasicEndpointInvocation.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicEndpointInvocation.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.invocation; +package org.jboss.wsf.spi.invocation; import java.lang.reflect.Method; Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationContext.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/BasicInvocationContext.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationContext.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.invocation; +package org.jboss.wsf.spi.invocation; import java.util.HashMap; import java.util.Map; Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationHandler.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/BasicInvocationHandler.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationHandler.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,11 +19,11 @@ * 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.wsintegration.spi.invocation; +package org.jboss.wsf.spi.invocation; //$Id$ -import org.jboss.wsintegration.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Endpoint; /** * A basic endpoint invocation handler. Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointInvocation.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/EndpointInvocation.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointInvocation.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.invocation; +package org.jboss.wsf.spi.invocation; import java.lang.reflect.Method; Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/HandlerCallback.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/HandlerCallback.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/HandlerCallback.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,11 +19,11 @@ * 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.wsintegration.spi.invocation; +package org.jboss.wsf.spi.invocation; // $Id$ -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** * A handler callback for the EJB21 Invoker Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationContext.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/InvocationContext.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationContext.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.invocation; +package org.jboss.wsf.spi.invocation; //$Id$ Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/InvocationHandler.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,11 +19,11 @@ * 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.wsintegration.spi.invocation; +package org.jboss.wsf.spi.invocation; //$Id$ -import org.jboss.wsintegration.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Endpoint; /** * A general endpoint invocation handler. Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerJSE.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/InvocationHandlerJSE.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerJSE.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.invocation; +package org.jboss.wsf.spi.invocation; // $Id$ @@ -27,7 +27,7 @@ import javax.xml.ws.WebServiceContext; -import org.jboss.wsintegration.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Endpoint; /** * Handles invocations on JSE endpoints. Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/RequestHandler.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/RequestHandler.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/RequestHandler.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.invocation; +package org.jboss.wsf.spi.invocation; // $Id$ @@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.jboss.wsintegration.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Endpoint; /** * A general JAXWS request handler. Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/SecurityAssociationAdaptor.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/SecurityAssociationAdaptor.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/SecurityAssociationAdaptor.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.invocation; +package org.jboss.wsf.spi.invocation; // $Id$ Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextEJB.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/WebServiceContextEJB.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextEJB.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.invocation; +package org.jboss.wsf.spi.invocation; // $Id$ Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextInjector.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/WebServiceContextInjector.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextInjector.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.invocation; +package org.jboss.wsf.spi.invocation; // $Id$ Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextJSE.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/WebServiceContextJSE.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextJSE.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.invocation; +package org.jboss.wsf.spi.invocation; // $Id$ Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management (from rev 3145, trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/management) Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/BasicEndpointRegistry.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/management/BasicEndpointRegistry.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/BasicEndpointRegistry.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.management; +package org.jboss.wsf.spi.management; // $Id$ @@ -31,7 +31,7 @@ import org.jboss.logging.Logger; import org.jboss.util.NotImplementedException; -import org.jboss.wsintegration.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Endpoint; /** * A general endpoint registry. Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/BasicServerConfig.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/management/BasicServerConfig.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/BasicServerConfig.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.management; +package org.jboss.wsf.spi.management; //$Id$ @@ -36,7 +36,7 @@ import javax.management.ObjectName; import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; +import org.jboss.wsf.spi.utils.ObjectNameFactory; /** * JBoss specific implementation of a ServerConfig Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/management/EndpointRegistry.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.management; +package org.jboss.wsf.spi.management; // $Id$ @@ -27,8 +27,8 @@ import javax.management.ObjectName; -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.utils.ObjectNameFactory; /** * A general endpoint registry. Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistryFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/management/EndpointRegistryFactory.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistryFactory.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.management; +package org.jboss.wsf.spi.management; //$Id$ Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/management/ServerConfig.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.management; +package org.jboss.wsf.spi.management; // $Id$ @@ -28,7 +28,7 @@ import javax.management.ObjectName; -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; +import org.jboss.wsf.spi.utils.ObjectNameFactory; /** * Interface to container independent config Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfigFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/management/ServerConfigFactory.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfigFactory.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.management; +package org.jboss.wsf.spi.management; import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.logging.Logger; Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedApplicationMetaData.java (from rev 3145, trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/UnifiedApplicationMetaData.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedApplicationMetaData.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedApplicationMetaData.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,129 @@ +/* + * 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.wsf.spi.metadata.j2ee; + +//$Id$ + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +/** + * The container independent top level meta data from the jboss.xml and ejb-jar.xml descriptor. + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class UnifiedApplicationMetaData +{ + /** ArrayList<BeanMetaData> for the ejbs */ + private List<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>(); + /** The optional JBossWS config-name */ + private String configName; + /** The optional JBossWS config-file */ + private String configFile; + /** The web context root to use for web services */ + private String webServiceContextRoot; + /** The security-domain value assigned to the application */ + private String securityDomain; + /** A HashMap<String, String> for webservice description publish locations */ + private PublishLocationAdapter publishLocationAdapter; + + public UnifiedBeanMetaData getBeanByEjbName(String ejbName) + { + for (UnifiedBeanMetaData beanMetaData : beans) + { + if (beanMetaData.getEjbName().equals(ejbName)) + { + return beanMetaData; + } + } + return null; + } + + public Iterator<UnifiedBeanMetaData> getEnterpriseBeans() + { + return beans.iterator(); + } + + public void setEnterpriseBeans(List<UnifiedBeanMetaData> beans) + { + this.beans = beans; + } + + public String getConfigName() + { + return configName; + } + + public void setConfigName(String configName) + { + this.configName = configName; + } + + public String getConfigFile() + { + return configFile; + } + + public void setConfigFile(String configFile) + { + this.configFile = configFile; + } + + public String getWebServiceContextRoot() + { + return webServiceContextRoot; + } + + public void setWebServiceContextRoot(String contextRoot) + { + this.webServiceContextRoot = contextRoot; + } + + public String getSecurityDomain() + { + return securityDomain; + } + + public void setSecurityDomain(String securityDomain) + { + this.securityDomain = securityDomain; + } + + public void setPublishLocationAdapter(PublishLocationAdapter publishLocationAdapter) + { + this.publishLocationAdapter = publishLocationAdapter; + } + + public String getWsdlPublishLocationByName(String name) + { + String publishLocation = (publishLocationAdapter != null ? publishLocationAdapter.getWsdlPublishLocationByName(name) : null); + return publishLocation; + + } + + public interface PublishLocationAdapter + { + String getWsdlPublishLocationByName(String name); + } +} Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedBeanMetaData.java (from rev 3145, trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/UnifiedBeanMetaData.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedBeanMetaData.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedBeanMetaData.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,138 @@ +/* + * 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.wsf.spi.metadata.j2ee; + +//$Id$ + +/** + * The container independent common meta data class for the entity, message-driven and session beans. + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class UnifiedBeanMetaData +{ + /** The ejb-name element specifies an enterprise bean's name. */ + private String ejbName; + /** The ejb-class element contains the fully-qualified name of the enterprise bean's class. */ + private String ejbClass; + /** The home element contains the fully-qualified name of the enterprise + bean's home interface. */ + private String homeClass; + /** The local-home element contains the fully-qualified name of the + enterprise bean's local home interface. */ + private String localHomeClass; + /** The service-endpoint element contains the fully-qualified name of the beans service endpoint interface (SEI) */ + protected String seiName; + /** The JNDI name under with the home interface should be bound */ + private String jndiName; + /** The JNDI name under with the local home interface should be bound */ + private String localJndiName; + /** The jboss port-component binding for a ejb webservice */ + protected UnifiedEjbPortComponentMetaData portComponent; + + public String getEjbName() + { + return ejbName; + } + + public void setEjbName(String ejbName) + { + this.ejbName = ejbName; + } + + public String getEjbClass() + { + return ejbClass; + } + + public void setEjbClass(String ejbClass) + { + this.ejbClass = ejbClass; + } + + public UnifiedEjbPortComponentMetaData getPortComponent() + { + return portComponent; + } + + public void setPortComponent(UnifiedEjbPortComponentMetaData portComponent) + { + this.portComponent = portComponent; + } + + public String getServiceEndpointInterface() + { + return seiName; + } + + public void setServiceEndpointInterface(String seiName) + { + this.seiName = seiName; + } + + public String getContainerObjectNameJndiName() + { + return getHome() != null ? getJndiName() : getLocalJndiName(); + } + + public String getHome() + { + return homeClass; + } + + public void setHome(String homeClass) + { + this.homeClass = homeClass; + } + + public String getJndiName() + { + return jndiName; + } + + public void setJndiName(String jndiName) + { + this.jndiName = jndiName; + } + + public String getLocalHome() + { + return localHomeClass; + } + + public void setLocalHome(String localHomeClass) + { + this.localHomeClass = localHomeClass; + } + + public String getLocalJndiName() + { + return localJndiName; + } + + public void setLocalJndiName(String localJndiName) + { + this.localJndiName = localJndiName; + } + +} Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedEjbPortComponentMetaData.java (from rev 3145, trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/UnifiedEjbPortComponentMetaData.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedEjbPortComponentMetaData.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedEjbPortComponentMetaData.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,101 @@ +/* + * 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.wsf.spi.metadata.j2ee; + + +//$Id$ + + +/** + * The container independent metadata for session/port-component element from jboss.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class UnifiedEjbPortComponentMetaData +{ + private String portComponentName; + private String portComponentURI; + private String authMethod; + private String transportGuarantee; + private Boolean secureWSDLAccess; + + public String getPortComponentName() + { + return portComponentName; + } + + public void setPortComponentName(String portComponentName) + { + this.portComponentName = portComponentName; + } + + public String getPortComponentURI() + { + return portComponentURI; + } + + public void setPortComponentURI(String portComponentURI) + { + this.portComponentURI = portComponentURI; + } + + public String getURLPattern() + { + String pattern = "/*"; + if (portComponentURI != null) + { + return portComponentURI; + } + return pattern; + } + + public String getAuthMethod() + { + return authMethod; + } + + public void setAuthMethod(String authMethod) + { + this.authMethod = authMethod; + } + + public String getTransportGuarantee() + { + return transportGuarantee; + } + + public void setTransportGuarantee(String transportGuarantee) + { + this.transportGuarantee = transportGuarantee; + } + + public Boolean getSecureWSDLAccess() + { + return secureWSDLAccess; + } + + public void setSecureWSDLAccess(Boolean secureWSDLAccess) + { + this.secureWSDLAccess = secureWSDLAccess; + } +} Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedMessageDrivenMetaData.java (from rev 3145, trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/UnifiedMessageDrivenMetaData.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedMessageDrivenMetaData.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedMessageDrivenMetaData.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,47 @@ +/* + * 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.wsf.spi.metadata.j2ee; + + +// $Id$ + + +/** + * The container independent metadata of a message driven bean. + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class UnifiedMessageDrivenMetaData extends UnifiedBeanMetaData +{ + private String destinationJndiName; + + public String getDestinationJndiName() + { + return destinationJndiName; + } + + public void setDestinationJndiName(String destinationJndiName) + { + this.destinationJndiName = destinationJndiName; + } +} Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedSessionMetaData.java (from rev 3145, trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/UnifiedSessionMetaData.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedSessionMetaData.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedSessionMetaData.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,37 @@ +/* + * 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.wsf.spi.metadata.j2ee; + + +// $Id$ + + +/** + * The container independent metadata of a message driven bean. + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class UnifiedSessionMetaData extends UnifiedBeanMetaData +{ + +} Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedWebMetaData.java (from rev 3145, trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/UnifiedWebMetaData.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedWebMetaData.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedWebMetaData.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,143 @@ +/* + * 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.wsf.spi.metadata.j2ee; + +//$Id$ + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * The container independent representation of the web.xml and jboss-web.xml deployment descriptors + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class UnifiedWebMetaData +{ + /** The war context root as specified at the jboss-web.xml descriptor level. */ + private String contextRoot; + /** The servlet-mapping <servlet-name, url-pattern> */ + private Map<String, String> servletMappings = new HashMap<String, String>(); + /** The servlet <servlet-name, servlet-class> */ + private Map<String, String> servletClassNames = new HashMap<String, String>(); + /** The optional JBossWS config-name */ + private String configName; + /** The optional JBossWS config-file */ + private String configFile; + /** The security-domain value assigned to the application */ + private String securityDomain; + /** A HashMap<String, String> for webservice description publish locations */ + private PublishLocationAdapter publishLocationAdapter; + /** web.xml security-constraints */ + private List<UnifiedWebSecurityMetaData> securityMetaData; + + public String getContextRoot() + { + return contextRoot; + } + + public void setContextRoot(String contextRoot) + { + this.contextRoot = contextRoot; + } + + public Map<String, String> getServletMappings() + { + return servletMappings; + } + + public void setServletMappings(Map<String, String> servletMappings) + { + this.servletMappings = servletMappings; + } + + public Map<String, String> getServletClassNames() + { + return servletClassNames; + } + + public void setServletClassNames(Map<String, String> servletClassNames) + { + this.servletClassNames = servletClassNames; + } + + public String getConfigName() + { + return configName; + } + + public void setConfigName(String configName) + { + this.configName = configName; + } + + public String getConfigFile() + { + return configFile; + } + + public void setConfigFile(String configFile) + { + this.configFile = configFile; + } + + public String getSecurityDomain() + { + return securityDomain; + } + + public void setSecurityDomain(String securityDomain) + { + this.securityDomain = securityDomain; + } + + public List<UnifiedWebSecurityMetaData> getSecurityMetaData() + { + return securityMetaData; + } + + public void setSecurityMetaData(List<UnifiedWebSecurityMetaData> securityMetaData) + { + this.securityMetaData = securityMetaData; + } + + public void setPublishLocationAdapter(PublishLocationAdapter publishLocationAdapter) + { + this.publishLocationAdapter = publishLocationAdapter; + } + + public String getWsdlPublishLocationByName(String name) + { + String publishLocation = null; + if (publishLocationAdapter != null) + publishLocation = publishLocationAdapter.getWsdlPublishLocationByName(name); + return publishLocation; + + } + + public interface PublishLocationAdapter + { + String getWsdlPublishLocationByName(String name); + } +} Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedWebSecurityMetaData.java (from rev 3145, trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/UnifiedWebSecurityMetaData.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedWebSecurityMetaData.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedWebSecurityMetaData.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,95 @@ +/* + * 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.wsf.spi.metadata.j2ee; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since Oct 22, 2006 + */ +public class UnifiedWebSecurityMetaData +{ + + /** The optional security-constraint/user-data-constraint/transport-guarantee */ + private String transportGuarantee; + + /** + * The HashMap for the security-constraint/web-resource-collection + * elements. + */ + private HashMap<String, UnifiedWebResourceCollection> webResources = new HashMap<String, UnifiedWebResourceCollection>(); + + public UnifiedWebResourceCollection addWebResource(final String name) + { + UnifiedWebResourceCollection wrc = new UnifiedWebResourceCollection(name); + webResources.put(name, wrc); + + return wrc; + } + + public Collection<UnifiedWebResourceCollection> getWebResources() + { + return webResources.values(); + } + + public String getTransportGuarantee() + { + return transportGuarantee; + } + + public void setTransportGuarantee(String transportGuarantee) + { + this.transportGuarantee = transportGuarantee; + } + + public static class UnifiedWebResourceCollection + { + private String name; + /** The required url-pattern element(s) */ + private HashSet<String> urlPatterns = new HashSet<String>(); + + public UnifiedWebResourceCollection(final String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + + public void addPattern(String pattern) + { + urlPatterns.add(pattern); + } + + public HashSet<String> getUrlPatterns() + { + return urlPatterns; + } + } + +} Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref (from rev 3145, trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref) Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/HandlerChainsObjectFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/HandlerChainsObjectFactory.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/HandlerChainsObjectFactory.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,12 +19,12 @@ * 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.wsintegration.spi.metadata.j2ee.serviceref; +package org.jboss.wsf.spi.metadata.j2ee.serviceref; // $Id$ import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.metadata.j2ee.serviceref; +package org.jboss.wsf.spi.metadata.j2ee.serviceref; // $Id$ @@ -28,7 +28,7 @@ import javax.xml.namespace.QName; import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.jboss.xb.QNameBuilder; import org.w3c.dom.Element; Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedCallPropertyMetaData.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedCallPropertyMetaData.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedCallPropertyMetaData.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.metadata.j2ee.serviceref; +package org.jboss.wsf.spi.metadata.j2ee.serviceref; // $Id$ Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainMetaData.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedHandlerChainMetaData.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainMetaData.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.metadata.j2ee.serviceref; +package org.jboss.wsf.spi.metadata.j2ee.serviceref; // $Id$ Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaData.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaData.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaData.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.metadata.j2ee.serviceref; +package org.jboss.wsf.spi.metadata.j2ee.serviceref; // $Id$ @@ -27,7 +27,7 @@ import java.util.List; import org.jboss.ws.integration.ServiceRefElement; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** The unified metdata data for a handler chains element * Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.metadata.j2ee.serviceref; +package org.jboss.wsf.spi.metadata.j2ee.serviceref; // $Id$ Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.metadata.j2ee.serviceref; +package org.jboss.wsf.spi.metadata.j2ee.serviceref; import org.jboss.ws.integration.ServiceRefElement; Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.metadata.j2ee.serviceref; +package org.jboss.wsf.spi.metadata.j2ee.serviceref; // $Id$ Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.metadata.j2ee.serviceref; +package org.jboss.wsf.spi.metadata.j2ee.serviceref; // $Id$ Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedStubPropertyMetaData.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedStubPropertyMetaData.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedStubPropertyMetaData.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.metadata.j2ee.serviceref; +package org.jboss.wsf.spi.metadata.j2ee.serviceref; import org.jboss.ws.integration.ServiceRefElement; Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices (from rev 3145, trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/webservices) Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/webservices/PortComponentMetaData.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ // $Id$ -package org.jboss.wsintegration.spi.metadata.webservices; +package org.jboss.wsf.spi.metadata.webservices; // $Id$ @@ -30,8 +30,8 @@ import javax.xml.namespace.QName; import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; /** * XML Binding and ws4ee meta-data element for Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebserviceDescriptionMetaData.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/webservices/WebserviceDescriptionMetaData.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebserviceDescriptionMetaData.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.metadata.webservices; +package org.jboss.wsf.spi.metadata.webservices; // $Id$ Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/webservices/WebservicesFactory.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.metadata.webservices; +package org.jboss.wsf.spi.metadata.webservices; // $Id$ @@ -31,10 +31,10 @@ import org.jboss.logging.Logger; import org.jboss.ws.integration.UnifiedVirtualFile; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesMetaData.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/webservices/WebservicesMetaData.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesMetaData.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ // $Id$ -package org.jboss.wsintegration.spi.metadata.webservices; +package org.jboss.wsf.spi.metadata.webservices; import java.net.URL; import java.util.ArrayList; Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils (from rev 3145, trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/utils) Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/DOMUtils.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/utils/DOMUtils.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/DOMUtils.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.utils; +package org.jboss.wsf.spi.utils; // $Id$ Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/DOMWriter.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/utils/DOMWriter.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/DOMWriter.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -53,7 +53,7 @@ * information on the Apache Software Foundation, please see * <http://www.apache.org/>. */ -package org.jboss.wsintegration.spi.utils; +package org.jboss.wsf.spi.utils; // $Id$ Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/IOUtils.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/utils/IOUtils.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/IOUtils.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.utils; +package org.jboss.wsf.spi.utils; // $Id$ @@ -38,8 +38,8 @@ import javax.xml.ws.WebServiceException; import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.management.ServerConfig; -import org.jboss.wsintegration.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; /** * IO utilites Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/JavaUtils.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/utils/JavaUtils.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/JavaUtils.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.utils; +package org.jboss.wsf.spi.utils; // $Id$ Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/ObjectNameFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/utils/ObjectNameFactory.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/ObjectNameFactory.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.spi.utils; +package org.jboss.wsf.spi.utils; import java.util.Hashtable; Modified: trunk/integration/sunri/build.xml =================================================================== --- trunk/integration/sunri/build.xml 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/sunri/build.xml 2007-05-18 22:55:26 UTC (rev 3146) @@ -62,7 +62,7 @@ <mkdir dir="${sunri.output.classes.dir}"/> <javac srcdir="${sunri.java.dir}" sourcepath="" destdir="${sunri.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <include name="org/jboss/wsintegration/stack/sunri/**"/> + <include name="org/jboss/wsf/stack/sunri/**"/> <classpath refid="sunri50.integration.classpath"/> </javac> </target> @@ -107,7 +107,7 @@ <mkdir dir="${sunri.output.lib.dir}"/> <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri50.jar" manifest="${sunri.output.etc.dir}/default.mf"> <fileset dir="${sunri.output.classes.dir}"> - <include name="org/jboss/wsintegration/stack/sunri/**"/> + <include name="org/jboss/wsf/stack/sunri/**"/> </fileset> </jar> Copied: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/DeploymentDescriptorParserExt.java (from rev 3145, trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/DeploymentDescriptorParserExt.java) =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/DeploymentDescriptorParserExt.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/DeploymentDescriptorParserExt.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,602 @@ +/* + * 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.wsf.stack.sunri; + +// $Id$ + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.http.HTTPBinding; +import javax.xml.ws.soap.MTOMFeature; +import javax.xml.ws.soap.SOAPBinding; + +import org.xml.sax.EntityResolver; + +import com.sun.istack.NotNull; +import com.sun.xml.ws.api.BindingID; +import com.sun.xml.ws.api.WSBinding; +import com.sun.xml.ws.api.server.Container; +import com.sun.xml.ws.api.server.InstanceResolver; +import com.sun.xml.ws.api.server.Invoker; +import com.sun.xml.ws.api.server.SDDocumentSource; +import com.sun.xml.ws.api.server.WSEndpoint; +import com.sun.xml.ws.api.streaming.XMLStreamReaderFactory; +import com.sun.xml.ws.binding.WebServiceFeatureList; +import com.sun.xml.ws.handler.HandlerChainsModel; +import com.sun.xml.ws.resources.ServerMessages; +import com.sun.xml.ws.resources.WsservletMessages; +import com.sun.xml.ws.server.EndpointFactory; +import com.sun.xml.ws.server.ServerRtException; +import com.sun.xml.ws.streaming.Attributes; +import com.sun.xml.ws.streaming.TidyXMLStreamReader; +import com.sun.xml.ws.streaming.XMLStreamReaderUtil; +import com.sun.xml.ws.transport.http.HttpAdapter; +import com.sun.xml.ws.transport.http.ResourceLoader; +import com.sun.xml.ws.transport.http.DeploymentDescriptorParser.AdapterFactory; +import com.sun.xml.ws.util.HandlerAnnotationInfo; +import com.sun.xml.ws.util.exception.LocatableWebServiceException; +import com.sun.xml.ws.util.xml.XmlUtil; + +/** + * A copy of DeploymentDescriptorParser that externalizes + * + * {@link createInvoker(Class)} + * + * + * @author WS Development Team + * @author Kohsuke Kawaguchi + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class DeploymentDescriptorParserExt<A> +{ + private final Container container; + private final ClassLoader classLoader; + private final ResourceLoader loader; + private final AdapterFactory<A> adapterFactory; + + /** + * Endpoint names that are declared. + * Used to catch double definitions. + */ + private final Set<String> names = new HashSet<String>(); + + /** + * WSDL/schema documents collected from /WEB-INF/wsdl. Keyed by the system ID. + */ + private final Map<String, SDDocumentSource> docs = new HashMap<String, SDDocumentSource>(); + + /** + * + * @param cl + * Used to load service implementations. + * @param loader + * Used to locate resources, in particular WSDL. + * @param container + * Optional {@link Container} that {@link WSEndpoint}s receive. + * @param adapterFactory + * Creates {@link HttpAdapter} (or its derived class.) + */ + public DeploymentDescriptorParserExt(ClassLoader cl, ResourceLoader loader, Container container, AdapterFactory<A> adapterFactory) throws MalformedURLException + { + classLoader = cl; + this.loader = loader; + this.container = container; + this.adapterFactory = adapterFactory; + + collectDocs("/WEB-INF/wsdl/"); + logger.fine("war metadata=" + docs); + } + + /** + * Parses the {@code sun-jaxws.xml} file and configures + * a set of {@link HttpAdapter}s. + */ + public @NotNull + List<A> parse(String systemId, InputStream is) + { + XMLStreamReader reader = null; + try + { + reader = new TidyXMLStreamReader(XMLStreamReaderFactory.create(systemId, is, true), is); + XMLStreamReaderUtil.nextElementContent(reader); + return parseAdapters(reader); + } + finally + { + if (reader != null) + { + try + { + reader.close(); + } + catch (XMLStreamException e) + { + throw new ServerRtException("runtime.parser.xmlReader", e); + } + } + try + { + is.close(); + } + catch (IOException e) + { + // ignore + } + } + } + + /** + * Parses the {@code sun-jaxws.xml} file and configures + * a set of {@link HttpAdapter}s. + */ + public @NotNull + List<A> parse(File f) throws IOException + { + FileInputStream in = new FileInputStream(f); + try + { + return parse(f.getPath(), in); + } + finally + { + in.close(); + } + } + + /** + * Get all the WSDL & schema documents recursively. + */ + private void collectDocs(String dirPath) throws MalformedURLException + { + Set<String> paths = loader.getResourcePaths(dirPath); + if (paths != null) + { + for (String path : paths) + { + if (path.endsWith("/")) + { + collectDocs(path); + } + else + { + URL res = loader.getResource(path); + docs.put(res.toString(), SDDocumentSource.create(res)); + } + } + } + } + + private List<A> parseAdapters(XMLStreamReader reader) + { + if (!reader.getName().equals(QNAME_ENDPOINTS)) + { + failWithFullName("runtime.parser.invalidElement", reader); + } + + List<A> adapters = new ArrayList<A>(); + + Attributes attrs = XMLStreamReaderUtil.getAttributes(reader); + String version = getMandatoryNonEmptyAttribute(reader, attrs, ATTR_VERSION); + if (!version.equals(ATTRVALUE_VERSION_1_0)) + { + failWithLocalName("runtime.parser.invalidVersionNumber", reader, version); + } + + while (XMLStreamReaderUtil.nextElementContent(reader) != XMLStreamConstants.END_ELEMENT) + if (reader.getName().equals(QNAME_ENDPOINT)) + { + + attrs = XMLStreamReaderUtil.getAttributes(reader); + String name = getMandatoryNonEmptyAttribute(reader, attrs, ATTR_NAME); + if (!names.add(name)) + { + logger.warning(WsservletMessages.SERVLET_WARNING_DUPLICATE_ENDPOINT_NAME(/*name*/)); + } + + String implementationName = getMandatoryNonEmptyAttribute(reader, attrs, ATTR_IMPLEMENTATION); + Class<?> implementorClass = getImplementorClass(implementationName, reader); + EndpointFactory.verifyImplementorClass(implementorClass); + + SDDocumentSource primaryWSDL = getPrimaryWSDL(reader, attrs, implementorClass); + + QName serviceName = getQNameAttribute(attrs, ATTR_SERVICE); + if (serviceName == null) + serviceName = EndpointFactory.getDefaultServiceName(implementorClass); + + QName portName = getQNameAttribute(attrs, ATTR_PORT); + if (portName == null) + portName = EndpointFactory.getDefaultPortName(serviceName, implementorClass); + + //get enable-mtom attribute value + String enable_mtom = getAttribute(attrs, ATTR_ENABLE_MTOM); + String mtomThreshold = getAttribute(attrs, ATTR_MTOM_THRESHOLD_VALUE); + String bindingId = getAttribute(attrs, ATTR_BINDING); + if (bindingId != null) + // Convert short-form tokens to API's binding ids + bindingId = getBindingIdForToken(bindingId); + WSBinding binding = createBinding(bindingId, implementorClass, enable_mtom, mtomThreshold); + String urlPattern = getMandatoryNonEmptyAttribute(reader, attrs, ATTR_URL_PATTERN); + + // TODO use 'docs' as the metadata. If wsdl is non-null it's the primary. + + boolean handlersSetInDD = setHandlersAndRoles(binding, reader, serviceName, portName); + + ensureNoContent(reader); + Invoker invoker = createInvoker(implementorClass); + WSEndpoint<?> endpoint = WSEndpoint.create(implementorClass, !handlersSetInDD, invoker, + serviceName, portName, container, binding, primaryWSDL, docs.values(), createEntityResolver(), false); + adapters.add(adapterFactory.createAdapter(name, urlPattern, endpoint)); + } + else + { + failWithLocalName("runtime.parser.invalidElement", reader); + } + return adapters; + } + + protected Invoker createInvoker(Class<?> implementorClass) + { + Invoker invoker = InstanceResolver.createDefault(implementorClass).createInvoker(); + return invoker; + } + + /** + * @param ddBindingId + * binding id explicitlyspecified in the DeploymentDescriptor or parameter + * @param implClass + * Endpoint Implementation class + * @param mtomEnabled + * represents mtom-enabled attribute in DD + * @param mtomThreshold + * threshold value specified in DD + * @return + * is returned with only MTOMFeature set resolving the various precendece rules + */ + private static WSBinding createBinding(String ddBindingId, Class implClass, String mtomEnabled, String mtomThreshold) + { + // Features specified through DD + WebServiceFeatureList features; + + MTOMFeature mtomfeature = null; + if (mtomEnabled != null) + { + if (mtomThreshold != null) + mtomfeature = new MTOMFeature(Boolean.valueOf(mtomEnabled), Integer.valueOf(mtomThreshold)); + else mtomfeature = new MTOMFeature(Boolean.valueOf(mtomEnabled)); + } + + BindingID bindingID; + if (ddBindingId != null) + { + bindingID = BindingID.parse(ddBindingId); + features = bindingID.createBuiltinFeatureList(); + + if (checkMtomConflict(features.get(MTOMFeature.class), mtomfeature)) + { + throw new ServerRtException(ServerMessages.DD_MTOM_CONFLICT(ddBindingId, mtomEnabled)); + } + } + else + { + bindingID = BindingID.parse(implClass); + // Since bindingID is coming from implclass, + // mtom through Feature annotation or DD takes precendece + + features = new WebServiceFeatureList(); + if (mtomfeature != null) + features.add(mtomfeature); // this wins over MTOM setting in bindingID + features.addAll(bindingID.createBuiltinFeatureList()); + } + + return bindingID.createBinding(features.toArray()); + } + + private static boolean checkMtomConflict(MTOMFeature lhs, MTOMFeature rhs) + { + if (lhs == null || rhs == null) + return false; + return lhs.isEnabled() ^ rhs.isEnabled(); + } + + /** + * JSR-109 defines short-form tokens for standard binding Ids. These are + * used only in DD. So stand alone deployment descirptor should also honor + * these tokens. This method converts the tokens to API's standard + * binding ids + * + * @param lexical binding attribute value from DD. Always not null + * + * @return returns corresponding API's binding ID or the same lexical + */ + public static @NotNull + String getBindingIdForToken(@NotNull + String lexical) + { + if (lexical.equals("##SOAP11_HTTP")) + { + return SOAPBinding.SOAP11HTTP_BINDING; + } + else if (lexical.equals("##SOAP11_HTTP_MTOM")) + { + return SOAPBinding.SOAP11HTTP_MTOM_BINDING; + } + else if (lexical.equals("##SOAP12_HTTP")) + { + return SOAPBinding.SOAP12HTTP_BINDING; + } + else if (lexical.equals("##SOAP12_HTTP_MTOM")) + { + return SOAPBinding.SOAP12HTTP_MTOM_BINDING; + } + else if (lexical.equals("##XML_HTTP")) + { + return HTTPBinding.HTTP_BINDING; + } + return lexical; + } + + /** + * Checks the deployment descriptor or {@link @WebServiceProvider} annotation + * to see if it points to any WSDL. If so, returns the {@link SDDocumentSource}. + * + * @return + * The pointed WSDL, if any. Otherwise null. + */ + private SDDocumentSource getPrimaryWSDL(XMLStreamReader xsr, Attributes attrs, Class<?> implementorClass) + { + + String wsdlFile = getAttribute(attrs, ATTR_WSDL); + if (wsdlFile == null) + { + wsdlFile = EndpointFactory.getWsdlLocation(implementorClass); + } + + if (wsdlFile != null) + { + if (!wsdlFile.startsWith(JAXWS_WSDL_DD_DIR)) + { + logger.warning("Ignoring wrong wsdl=" + wsdlFile + ". It should start with " + JAXWS_WSDL_DD_DIR + ". Going to generate and publish a new WSDL."); + return null; + } + + URL wsdl; + try + { + wsdl = loader.getResource('/' + wsdlFile); + } + catch (MalformedURLException e) + { + throw new LocatableWebServiceException(ServerMessages.RUNTIME_PARSER_WSDL_NOT_FOUND(wsdlFile), e, xsr); + } + if (wsdl == null) + { + throw new LocatableWebServiceException(ServerMessages.RUNTIME_PARSER_WSDL_NOT_FOUND(wsdlFile), xsr); + } + SDDocumentSource docInfo = docs.get(wsdl.toExternalForm()); + assert docInfo != null; + return docInfo; + } + + return null; + } + + /** + * Creates an {@link EntityResolver} that consults {@code /WEB-INF/jax-ws-catalog.xml}. + */ + private EntityResolver createEntityResolver() + { + try + { + return XmlUtil.createEntityResolver(loader.getCatalogFile()); + } + catch (MalformedURLException e) + { + throw new WebServiceException(e); + } + } + + protected String getAttribute(Attributes attrs, String name) + { + String value = attrs.getValue(name); + if (value != null) + { + value = value.trim(); + } + return value; + } + + protected QName getQNameAttribute(Attributes attrs, String name) + { + String value = getAttribute(attrs, name); + if (value == null || value.equals("")) + { + return null; + } + else + { + return QName.valueOf(value); + } + } + + protected String getNonEmptyAttribute(XMLStreamReader reader, Attributes attrs, String name) + { + String value = getAttribute(attrs, name); + if (value != null && value.equals("")) + { + failWithLocalName("runtime.parser.invalidAttributeValue", reader, name); + } + return value; + } + + protected String getMandatoryAttribute(XMLStreamReader reader, Attributes attrs, String name) + { + String value = getAttribute(attrs, name); + if (value == null) + { + failWithLocalName("runtime.parser.missing.attribute", reader, name); + } + return value; + } + + protected String getMandatoryNonEmptyAttribute(XMLStreamReader reader, Attributes attributes, String name) + { + String value = getAttribute(attributes, name); + if (value == null) + { + failWithLocalName("runtime.parser.missing.attribute", reader, name); + } + else if (value.equals("")) + { + failWithLocalName("runtime.parser.invalidAttributeValue", reader, name); + } + return value; + } + + /** + * Parses the handler and role information and sets it + * on the {@link WSBinding}. + * @return true if <handler-chains> element present in DD + * false otherwise. + */ + protected boolean setHandlersAndRoles(WSBinding binding, XMLStreamReader reader, QName serviceName, QName portName) + { + + if (XMLStreamReaderUtil.nextElementContent(reader) == XMLStreamConstants.END_ELEMENT || !reader.getName().equals(HandlerChainsModel.QNAME_HANDLER_CHAINS)) + { + + return false; + } + + HandlerAnnotationInfo handlerInfo = HandlerChainsModel.parseHandlerFile(reader, classLoader, serviceName, portName, binding); + + binding.setHandlerChain(handlerInfo.getHandlers()); + if (binding instanceof SOAPBinding) + { + ((SOAPBinding)binding).setRoles(handlerInfo.getRoles()); + } + + // move past </handler-chains> + XMLStreamReaderUtil.nextContent(reader); + return true; + } + + protected static void ensureNoContent(XMLStreamReader reader) + { + if (reader.getEventType() != XMLStreamConstants.END_ELEMENT) + { + fail("runtime.parser.unexpectedContent", reader); + } + } + + protected static void fail(String key, XMLStreamReader reader) + { + logger.log(Level.SEVERE, key + reader.getLocation().getLineNumber()); + throw new ServerRtException(key, Integer.toString(reader.getLocation().getLineNumber())); + } + + protected static void failWithFullName(String key, XMLStreamReader reader) + { + throw new ServerRtException(key, reader.getLocation().getLineNumber(), reader.getName()); + } + + protected static void failWithLocalName(String key, XMLStreamReader reader) + { + throw new ServerRtException(key, reader.getLocation().getLineNumber(), reader.getLocalName()); + } + + protected static void failWithLocalName(String key, XMLStreamReader reader, String arg) + { + throw new ServerRtException(key, reader.getLocation().getLineNumber(), reader.getLocalName(), arg); + } + + protected Class loadClass(String name) + { + try + { + return Class.forName(name, true, classLoader); + } + catch (ClassNotFoundException e) + { + logger.log(Level.SEVERE, e.getMessage(), e); + throw new ServerRtException("runtime.parser.classNotFound", name); + } + } + + /** + * Loads the class of the given name. + * + * @param xsr + * Used to report the source location information if there's any error. + */ + private Class getImplementorClass(String name, XMLStreamReader xsr) + { + try + { + return Class.forName(name, true, classLoader); + } + catch (ClassNotFoundException e) + { + logger.log(Level.SEVERE, e.getMessage(), e); + throw new LocatableWebServiceException(ServerMessages.RUNTIME_PARSER_CLASS_NOT_FOUND(name), e, xsr); + } + } + + public static final String NS_RUNTIME = "http://java.sun.com/xml/ns/jax-ws/ri/runtime"; + + public static final String JAXWS_WSDL_DD_DIR = "WEB-INF/wsdl"; + + public static final QName QNAME_ENDPOINTS = new QName(NS_RUNTIME, "endpoints"); + public static final QName QNAME_ENDPOINT = new QName(NS_RUNTIME, "endpoint"); + + public static final String ATTR_VERSION = "version"; + public static final String ATTR_NAME = "name"; + public static final String ATTR_IMPLEMENTATION = "implementation"; + public static final String ATTR_WSDL = "wsdl"; + public static final String ATTR_SERVICE = "service"; + public static final String ATTR_PORT = "port"; + public static final String ATTR_URL_PATTERN = "url-pattern"; + public static final String ATTR_ENABLE_MTOM = "enable-mtom"; + public static final String ATTR_MTOM_THRESHOLD_VALUE = "mtom-threshold-value"; + public static final String ATTR_BINDING = "binding"; + + public static final String ATTRVALUE_VERSION_1_0 = "2.0"; + private static final Logger logger = Logger.getLogger(com.sun.xml.ws.util.Constants.LoggingDomain + ".server.http"); +} Copied: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/DeploymentDescriptorParserJBWS.java (from rev 3145, trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/DeploymentDescriptorParserJBWS.java) =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/DeploymentDescriptorParserJBWS.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/DeploymentDescriptorParserJBWS.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,67 @@ +/* + * 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.wsf.stack.sunri; + +// $Id$ + +import java.net.MalformedURLException; + +import javax.ejb.Stateless; + +import com.sun.xml.ws.api.server.Container; +import com.sun.xml.ws.api.server.InstanceResolver; +import com.sun.xml.ws.api.server.Invoker; +import com.sun.xml.ws.transport.http.ResourceLoader; +import com.sun.xml.ws.transport.http.DeploymentDescriptorParser.AdapterFactory; + +/** + * A copy of DeploymentDescriptorParser that externalizes + * + * createInvoker(Class) + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class DeploymentDescriptorParserJBWS<A> extends DeploymentDescriptorParserExt<A> +{ + public DeploymentDescriptorParserJBWS(ClassLoader cl, ResourceLoader loader, Container container, AdapterFactory<A> adapterFactory) throws MalformedURLException + { + super(cl, loader, container, adapterFactory); + } + + @Override + protected Invoker createInvoker(Class<?> implClass) + { + Invoker invoker; + InstanceResolver<?> resolver = InstanceResolver.createDefault(implClass); + if (implClass.isAnnotationPresent(Stateless.class)) + { + invoker = new InvokerEJB3(resolver); + } + else + { + invoker = new InvokerJSE(resolver); + } + return invoker; + } + +} Copied: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointAssociation.java (from rev 3145, trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/EndpointAssociation.java) =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointAssociation.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointAssociation.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,52 @@ +/* + * 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.wsf.stack.sunri; + +// $Id$ + +import org.jboss.wsf.spi.deployment.Endpoint; + +/** + * Associates the endpoint meta data with the current thead. + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public final class EndpointAssociation +{ + private static final ThreadLocal<Endpoint> endpoint = new ThreadLocal<Endpoint>(); + + public static void setEndpoint(Endpoint ep) + { + endpoint.set(ep); + } + + public static Endpoint getEndpoint() + { + return endpoint.get(); + } + + public static void removeEndpoint() + { + endpoint.remove(); + } +} Copied: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointNameDeployer.java (from rev 3145, trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/EndpointNameDeployer.java) =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointNameDeployer.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointNameDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,69 @@ +/* + * 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.wsf.stack.sunri; + +//$Id$ + +import org.jboss.metadata.WebMetaData; +import org.jboss.wsf.spi.annotation.WebContext; +import org.jboss.wsf.spi.deployment.AbstractDeployer; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.utils.ObjectNameFactory; + +/** + * A deployer that assigns the complete name to the Endpoint + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class EndpointNameDeployer extends AbstractDeployer +{ + @Override + public void create(Deployment dep) + { + String contextRoot = null; + WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); + if (webMetaData != null) + contextRoot = webMetaData.getContextRoot(); + + for (Endpoint ep : dep.getService().getEndpoints()) + { + Class implClass = ep.getTargetBean(); + WebContext anWebContext = (WebContext)implClass.getAnnotation(WebContext.class); + if (anWebContext != null && anWebContext.contextRoot().length() > 0) + contextRoot = anWebContext.contextRoot(); + + if (contextRoot == null) + throw new IllegalStateException("Cannot obtain context root"); + + if (contextRoot.startsWith("/")) + contextRoot = contextRoot.substring(1); + + StringBuilder name = new StringBuilder(ep.getName().getCanonicalName()); + if (ep.getName().getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT) == null) + name.append("," + Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextRoot); + + ep.setName(ObjectNameFactory.create(name.toString())); + } + } +} \ No newline at end of file Copied: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java (from rev 3145, trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/InvokerEJB3.java) =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,78 @@ +/* + * 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.wsf.stack.sunri; + +// $Id$ + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +import javax.xml.ws.Provider; + +import com.sun.istack.NotNull; +import com.sun.xml.ws.api.message.Packet; +import com.sun.xml.ws.api.server.InstanceResolver; +import com.sun.xml.ws.api.server.Invoker; +import com.sun.xml.ws.api.server.WSEndpoint; +import com.sun.xml.ws.api.server.WSWebServiceContext; + +/** + * An invoker for EJB3 endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class InvokerEJB3 extends Invoker +{ + private final InstanceResolver resolver; + + public InvokerEJB3(InstanceResolver resolver) + { + this.resolver = resolver; + } + + @Override + public void start(@NotNull WSWebServiceContext wsc, @NotNull WSEndpoint endpoint) + { + resolver.start(wsc, endpoint); + } + + @Override + public void dispose() + { + resolver.dispose(); + } + + @Override + public <T> T invokeProvider(@NotNull Packet p, T arg) + { + Object targetBean = resolver.resolve(p); + return ((Provider<T>)targetBean).invoke(arg); + } + + @Override + public Object invoke(Packet p, Method m, Object... args) throws InvocationTargetException, IllegalAccessException + { + Object targetBean = resolver.resolve(p); + return m.invoke(targetBean, args); + } +} Copied: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerJSE.java (from rev 3145, trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/InvokerJSE.java) =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerJSE.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerJSE.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,115 @@ +/* + * 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.wsf.stack.sunri; + +// $Id$ + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +import javax.xml.ws.Provider; +import javax.xml.ws.WebServiceException; + +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.invocation.EndpointInvocation; +import org.jboss.wsf.spi.invocation.InvocationHandler; + +import com.sun.istack.NotNull; +import com.sun.xml.ws.api.message.Packet; +import com.sun.xml.ws.api.server.InstanceResolver; +import com.sun.xml.ws.api.server.Invoker; +import com.sun.xml.ws.api.server.WSEndpoint; +import com.sun.xml.ws.api.server.WSWebServiceContext; + +/** + * An invoker for JSE endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class InvokerJSE extends Invoker +{ + private final InstanceResolver resolver; + + public InvokerJSE(InstanceResolver resolver) + { + this.resolver = resolver; + } + + @Override + public void start(@NotNull + WSWebServiceContext wsc, @NotNull + WSEndpoint endpoint) + { + resolver.start(wsc, endpoint); + } + + @Override + public void dispose() + { + resolver.dispose(); + } + + @Override + public <T> T invokeProvider(@NotNull + Packet p, T arg) + { + Object targetBean = resolver.resolve(p); + return ((Provider<T>)targetBean).invoke(arg); + } + + @Override + public Object invoke(Packet p, Method m, Object... args) throws InvocationTargetException, IllegalAccessException + { + Endpoint ep = EndpointAssociation.getEndpoint(); + + InvocationHandler invHandler = ep.getInvocationHandler(); + EndpointInvocation inv = invHandler.createInvocation(); + inv.setJavaMethod(m); + inv.setArgs(args); + + Object retObj = null; + try + { + Object targetBean = resolver.resolve(p); + invHandler.invoke(ep, targetBean, inv); + retObj = inv.getReturnValue(); + } + catch (Exception ex) + { + handleException(ex); + } + + return retObj; + } + + private void handleException(Exception ex) throws InvocationTargetException, IllegalAccessException + { + if (ex instanceof InvocationTargetException) + throw (InvocationTargetException)ex; + + if (ex instanceof IllegalAccessException) + throw (IllegalAccessException)ex; + + throw new WebServiceException(ex); + } +} Copied: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/LifecycleHandlerImpl.java (from rev 3145, trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/LifecycleHandlerImpl.java) =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/LifecycleHandlerImpl.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/LifecycleHandlerImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,48 @@ +/* + * 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.wsf.stack.sunri; + +//$Id$ + +import org.jboss.wsf.spi.deployment.BasicLifecycleHandler; +import org.jboss.wsf.spi.deployment.Endpoint; + +/** + * A lifecycle handler + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class LifecycleHandlerImpl extends BasicLifecycleHandler +{ + public void start(Endpoint ep) + { + super.start(ep); + log.info("WebService started: " + ep.getName()); + } + + public void stop(Endpoint ep) + { + super.stop(ep); + log.info("WebService stoped: " + ep.getName()); + } +} Copied: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ManagedEndpointRegistry.java (from rev 3145, trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/ManagedEndpointRegistry.java) =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ManagedEndpointRegistry.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ManagedEndpointRegistry.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,86 @@ +/* + * 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.wsf.stack.sunri; + +// $Id$ + +import java.util.ArrayList; + +import javax.management.MBeanServer; +import javax.management.MBeanServerFactory; + +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.management.BasicEndpointRegistry; + +/** + * A Service Endpoint Registry + * + * @author Thomas.Diesler(a)jboss.org + * @since 04-May-2007 + */ +public class ManagedEndpointRegistry extends BasicEndpointRegistry implements ManagedEndpointRegistryMBean +{ + // provide logging + private static final Logger log = Logger.getLogger(ManagedEndpointRegistry.class); + + public String getImplementationTitle() + { + return getClass().getPackage().getImplementationTitle(); + } + + public String getImplementationVersion() + { + return getClass().getPackage().getImplementationVersion(); + } + + public void create() throws Exception + { + log.info(getImplementationTitle()); + log.info(getImplementationVersion()); + MBeanServer server = getMBeanServer(); + if (server != null) + { + server.registerMBean(this, OBJECT_NAME); + } + } + + public void destroy() throws Exception + { + log.debug("Destroy service endpoint manager"); + MBeanServer server = getMBeanServer(); + if (server != null) + { + server.unregisterMBean(OBJECT_NAME); + } + } + + private MBeanServer getMBeanServer() + { + MBeanServer server = null; + ArrayList servers = MBeanServerFactory.findMBeanServer(null); + if (servers.size() > 0) + { + server = (MBeanServer)servers.get(0); + } + return server; + } +} Copied: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ManagedEndpointRegistryMBean.java (from rev 3145, trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/ManagedEndpointRegistryMBean.java) =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ManagedEndpointRegistryMBean.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ManagedEndpointRegistryMBean.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,35 @@ +/* + * 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.wsf.stack.sunri; + +import org.jboss.wsf.spi.management.EndpointRegistry; + +/** + * MBean interface. + * @since 15-April-2004 + */ +public interface ManagedEndpointRegistryMBean extends EndpointRegistry +{ + String getImplementationTitle(); + + String getImplementationVersion(); +} Copied: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ModifyWebMetaDataDeployer.java (from rev 3145, trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/ModifyWebMetaDataDeployer.java) =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ModifyWebMetaDataDeployer.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ModifyWebMetaDataDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,127 @@ +/* + * 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.wsf.stack.sunri; + +//$Id$ + +import org.jboss.metadata.Listener; +import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.web.ParamValue; +import org.jboss.metadata.web.Servlet; +import org.jboss.metadata.web.ParamValue.ParamType; +import org.jboss.wsf.spi.deployment.AbstractDeployer; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.stack.sunri.metadata.sunjaxws.DDEndpoints; + +/** + * A deployer that modifies the web.xml meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class ModifyWebMetaDataDeployer extends AbstractDeployer +{ + private String listenerClass; + private String servletClass; + + public void setListenerClass(String listenerClass) + { + this.listenerClass = listenerClass; + } + + public void setServletClass(String servletClass) + { + this.servletClass = servletClass; + } + + @Override + public void create(Deployment dep) + { + WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); + if (webMetaData != null) + { + Listener listener = new Listener(); + listener.setListenerClass(listenerClass); + webMetaData.addListener(listener); + + DDEndpoints ddSunJaxws = dep.getContext().getAttachment(DDEndpoints.class); + if (ddSunJaxws == null) + throw new IllegalStateException("Cannot obtain sun-jaxws meta data"); + + // Add the path to sun-jaxws.xml + ParamValue ctxParam = new ParamValue(); + ctxParam.setType(ParamType.CONTEXT_PARAM); + ctxParam.setName(WSServletContextListenerJBWS.PARAM_SUN_JAXWS_URL); + ctxParam.setValue(ddSunJaxws.createFileURL().toExternalForm()); + webMetaData.addContextParam(ctxParam); + + for (Servlet servlet : webMetaData.getServlets()) + { + String orgServletClass = servlet.getServletClass(); + + // JSP + if (orgServletClass == null || orgServletClass.length() == 0) + { + log.debug("Innore servlet class: " + orgServletClass); + continue; + } + + if (!isJavaxServlet(orgServletClass, dep.getClassLoader())) + { + servlet.setServletClass(servletClass); + } + } + } + } + + @Override + public void destroy(Deployment dep) + { + DDEndpoints ddSunJaxws = dep.getContext().getAttachment(DDEndpoints.class); + if (ddSunJaxws != null) + { + ddSunJaxws.destroyFileURL(); + } + } + + private boolean isJavaxServlet(String orgServletClass, ClassLoader loader) + { + boolean isServlet = false; + if (loader != null) + { + try + { + Class servletClass = loader.loadClass(orgServletClass); + isServlet = javax.servlet.Servlet.class.isAssignableFrom(servletClass); + if (isServlet == true) + { + log.info("Ignore servlet: " + orgServletClass); + } + } + catch (ClassNotFoundException e) + { + log.warn("Cannot load servlet class: " + orgServletClass); + } + } + return isServlet; + } +} \ No newline at end of file Copied: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java (from rev 3145, trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/RequestHandlerImpl.java) =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,91 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.stack.sunri; + +//$Id$ + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.ws.WebServiceException; + +import org.jboss.logging.Logger; +import org.jboss.util.NotImplementedException; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.invocation.InvocationContext; +import org.jboss.wsf.spi.invocation.RequestHandler; + +import com.sun.xml.ws.transport.http.servlet.WSServlet; +import com.sun.xml.ws.transport.http.servlet.WSServletDelegate; + +/** + * A request handler + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class RequestHandlerImpl implements RequestHandler +{ + // provide logging + private static final Logger log = Logger.getLogger(RequestHandlerImpl.class); + + public void handleHttpRequest(Endpoint endpoint, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException + { + WSServletDelegate delegate = (WSServletDelegate)context.getAttribute(WSServlet.JAXWS_RI_RUNTIME_INFO); + String method = req.getMethod(); + if (method.equals("POST")) + { + delegate.doPost(req, res, context); + } + else if (method.equals("GET")) + { + delegate.doGet(req, res, context); + } + else if (method.equals("PUT")) + { + delegate.doPut(req, res, context); + } + else if (method.equals("DELETE")) + { + delegate.doDelete(req, res, context); + } + else + { + throw new WebServiceException("Unsupported method: " + method); + } + } + + public void handleRequest(Endpoint endpoint, InputStream inStream, OutputStream outStream, InvocationContext context) + { + throw new NotImplementedException(); + } + + public void handleWSDLRequest(Endpoint endpoint, OutputStream outStream, InvocationContext context) + { + throw new NotImplementedException(); + } +} Copied: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ServletResourceLoader.java (from rev 3145, trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/ServletResourceLoader.java) =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ServletResourceLoader.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ServletResourceLoader.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,65 @@ +/* + * 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.wsf.stack.sunri; + +// $Id$ + +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Set; + +import javax.servlet.ServletContext; + +import com.sun.xml.ws.transport.http.ResourceLoader; + +/** + * {@link ResourceLoader} backed by {@link ServletContext}. + * + * TDI: A copy of the original that is public + * + * @author WS Development Team + * @author Thomas.Diesler(a)jboss.org + */ +public class ServletResourceLoader implements ResourceLoader +{ + private final ServletContext context; + + public ServletResourceLoader(ServletContext context) + { + this.context = context; + } + + public URL getResource(String path) throws MalformedURLException + { + return context.getResource(path); + } + + public URL getCatalogFile() throws MalformedURLException + { + return getResource("/WEB-INF/jax-ws-catalog.xml"); + } + + public Set<String> getResourcePaths(String path) + { + return context.getResourcePaths(path); + } +} Copied: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeployer.java (from rev 3145, trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/SunJaxwsDeployer.java) =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeployer.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,116 @@ +/* + * 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.wsf.stack.sunri; + +//$Id$ + +import java.util.ArrayList; +import java.util.Iterator; + +import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.web.Servlet; +import org.jboss.metadata.web.ServletMapping; +import org.jboss.wsf.spi.deployment.AbstractDeployer; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.stack.sunri.metadata.sunjaxws.DDEndpoint; +import org.jboss.wsf.stack.sunri.metadata.sunjaxws.DDEndpoints; + +/** + * A deployer that generates sun-jaxws.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class SunJaxwsDeployer extends AbstractDeployer +{ + @Override + public void create(Deployment dep) + { + DDEndpoints dd = new DDEndpoints(); + for (Endpoint ep : dep.getService().getEndpoints()) + { + String name = getName(dep, ep); + String implementation = ep.getTargetBean().getName(); + String urlPattern = getUrlPattern(dep, ep); + + DDEndpoint ddep = new DDEndpoint(name, implementation, urlPattern); + log.info("Add " + ddep); + dd.addEndpoint(ddep); + } + dep.getContext().addAttachment(DDEndpoints.class, dd); + } + + private String getName(Deployment dep, Endpoint ep) + { + String name = null; + String impl = ep.getTargetBean().getName(); + WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); + if (webMetaData != null) + { + for (Servlet servlet : webMetaData.getServlets()) + { + String servletClass = servlet.getServletClass(); + if (impl.equals(servletClass)) + { + name = servlet.getName(); + } + } + } + return name; + } + + private String getUrlPattern(Deployment dep, Endpoint ep) + { + String urlPattern = null; + String impl = ep.getTargetBean().getName(); + WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); + if (webMetaData != null) + { + for (Servlet servlet : webMetaData.getServlets()) + { + String name = servlet.getName(); + String servletClass = servlet.getServletClass(); + if (impl.equals(servletClass)) + { + ServletMapping mapping = getServletMapping(webMetaData, name); + ArrayList<String> urlPatterns = mapping.getUrlPatterns(); + if (urlPatterns.size() > 0) + urlPattern = urlPatterns.get(0); + } + } + } + return urlPattern; + } + + private ServletMapping getServletMapping(WebMetaData webMetaData, String name) + { + Iterator it = webMetaData.getServletMappings().iterator(); + while (it.hasNext()) + { + ServletMapping mapping = (ServletMapping)it.next(); + if (name.equals(mapping.getName())) + return mapping; + } + throw new IllegalStateException("Cannot obtian mapping for: " + name); + } +} \ No newline at end of file Copied: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/VirtualFileResourceLoader.java (from rev 3145, trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/VirtualFileResourceLoader.java) =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/VirtualFileResourceLoader.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/VirtualFileResourceLoader.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,94 @@ +/* + * 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.wsf.stack.sunri; + +//$Id$ + +import java.net.MalformedURLException; +import java.net.URL; +import java.util.HashSet; +import java.util.Set; + +import org.jboss.virtual.VirtualFile; + +import com.sun.xml.ws.transport.http.ResourceLoader; + +/** + * A ResourceLoader that delegates to the VFS + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class VirtualFileResourceLoader implements ResourceLoader +{ + private final VirtualFile vfRoot; + + public VirtualFileResourceLoader(VirtualFile vfRoot) + { + this.vfRoot = vfRoot; + } + + public URL getResource(String path) throws MalformedURLException + { + if (path.startsWith("/")) + path = path.substring(1); + + URL resURL = null; + try + { + VirtualFile vfChild = vfRoot.findChild(path); + resURL = vfChild.toURL(); + } + catch (Exception ex) + { + // ignore + } + return resURL; + } + + public URL getCatalogFile() throws MalformedURLException + { + return getResource("/WEB-INF/jax-ws-catalog.xml"); + } + + public Set<String> getResourcePaths(String path) + { + if (path.startsWith("/")) + path = path.substring(1); + + Set<String> paths = new HashSet<String>(); + try + { + VirtualFile vfChild = vfRoot.findChild(path); + for (VirtualFile vf : vfChild.getChildren()) + { + String name = vf.getName(); + paths.add(name); + } + } + catch (Exception ex) + { + // ignore + } + return paths; + } +} Copied: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSEndpointServletJBWS.java (from rev 3145, trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/WSEndpointServletJBWS.java) =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSEndpointServletJBWS.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSEndpointServletJBWS.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,106 @@ +/* + * 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.wsf.stack.sunri; + +// $Id$ + +import java.io.IOException; + +import javax.management.ObjectName; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.ws.WebServiceException; + +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.invocation.RequestHandler; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.spi.utils.ObjectNameFactory; + +/** + * The JAX-WS dispatcher servlet. + * + * @author WS Development Team + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class WSEndpointServletJBWS extends HttpServlet +{ + protected Endpoint endpoint; + protected EndpointRegistry epRegistry; + + public void init(ServletConfig servletConfig) throws ServletException + { + super.init(servletConfig); + epRegistry = EndpointRegistryFactory.getEndpointRegistry(); + } + + public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException + { + if (endpoint == null) + { + String contextPath = req.getContextPath(); + initServiceEndpoint(contextPath); + } + + try + { + EndpointAssociation.setEndpoint(endpoint); + RequestHandler requestHandler = (RequestHandler)endpoint.getRequestHandler(); + requestHandler.handleHttpRequest(endpoint, req, res, getServletContext()); + } + finally + { + EndpointAssociation.removeEndpoint(); + } + } + + /** Initialize the service endpoint + */ + protected void initServiceEndpoint(String contextPath) + { + if (contextPath.startsWith("/")) + contextPath = contextPath.substring(1); + + String servletName = getServletName(); + for (ObjectName sepId : epRegistry.getEndpoints()) + { + String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT); + String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); + if (servletName.equals(propEndpoint) && contextPath.equals(propContext)) + { + endpoint = epRegistry.getEndpoint(sepId); + break; + } + } + + if (endpoint == null) + { + ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," + + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName); + throw new WebServiceException("Cannot obtain endpoint for: " + oname); + } + } +} Copied: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerExt.java (from rev 3145, trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/WSServletContextListenerExt.java) =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerExt.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerExt.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,187 @@ +/* + * 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.wsf.stack.sunri; + +// $Id$ + +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.servlet.ServletContext; +import javax.servlet.ServletContextAttributeEvent; +import javax.servlet.ServletContextAttributeListener; +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; +import javax.xml.ws.WebServiceException; + +import com.sun.istack.NotNull; +import com.sun.xml.ws.api.server.BoundEndpoint; +import com.sun.xml.ws.api.server.Container; +import com.sun.xml.ws.api.server.Module; +import com.sun.xml.ws.resources.WsservletMessages; +import com.sun.xml.ws.transport.http.DeploymentDescriptorParser.AdapterFactory; +import com.sun.xml.ws.transport.http.servlet.ServletAdapter; +import com.sun.xml.ws.transport.http.servlet.ServletAdapterList; +import com.sun.xml.ws.transport.http.servlet.WSServlet; +import com.sun.xml.ws.transport.http.servlet.WSServletDelegate; + +/** + * A copy of WSServletContextListener that externalizes + * + * getDeploymentDescriptorURL() + * createDeploymentDescriptorParser() + * + * @author WS Development Team + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class WSServletContextListenerExt implements ServletContextAttributeListener, ServletContextListener +{ + private WSServletDelegate delegate; + + public void attributeAdded(ServletContextAttributeEvent event) + { + } + + public void attributeRemoved(ServletContextAttributeEvent event) + { + } + + public void attributeReplaced(ServletContextAttributeEvent event) + { + } + + public void contextDestroyed(ServletContextEvent event) + { + if (delegate != null) + { // the deployment might have failed. + delegate.destroy(); + } + + if (logger.isLoggable(Level.INFO)) + { + logger.info(WsservletMessages.LISTENER_INFO_DESTROY()); + } + } + + public void contextInitialized(ServletContextEvent event) + { + if (logger.isLoggable(Level.INFO)) + { + logger.info(WsservletMessages.LISTENER_INFO_INITIALIZE()); + } + ServletContext context = event.getServletContext(); + ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); + if (classLoader == null) + { + classLoader = getClass().getClassLoader(); + } + + ServletContainer container = new ServletContainer(context); + try + { + ServletResourceLoader resourceLoader = new ServletResourceLoader(context); + ServletAdapterList adapterList = new ServletAdapterList(); + + // Parse the descriptor file and build endpoint infos + DeploymentDescriptorParserExt<ServletAdapter> parser = createDeploymentDescriptorParser(classLoader, container, resourceLoader, adapterList); + + URL sunJaxWsXml = getDeploymentDescriptorURL(context); + List<ServletAdapter> adapters = parser.parse(sunJaxWsXml.toExternalForm(), sunJaxWsXml.openStream()); + + delegate = new WSServletDelegate(adapters, context); + + context.setAttribute(WSServlet.JAXWS_RI_RUNTIME_INFO, delegate); + } + catch (Throwable e) + { + logger.log(Level.SEVERE, WsservletMessages.LISTENER_PARSING_FAILED(e), e); + context.removeAttribute(WSServlet.JAXWS_RI_RUNTIME_INFO); + throw new WebServiceException("listener.parsingFailed", e); + } + } + + /** + * Externalized for integration + */ + protected DeploymentDescriptorParserExt<ServletAdapter> createDeploymentDescriptorParser(ClassLoader classLoader, ServletContainer container, + ServletResourceLoader resourceLoader, AdapterFactory<ServletAdapter> adapterList) throws MalformedURLException + { + DeploymentDescriptorParserExt<ServletAdapter> parser = new DeploymentDescriptorParserExt<ServletAdapter>(classLoader, resourceLoader, container, adapterList); + return parser; + } + + /** + * Externalized for integration + */ + protected URL getDeploymentDescriptorURL(ServletContext context) throws MalformedURLException + { + URL sunJaxWsXml = context.getResource(JAXWS_RI_RUNTIME); + return sunJaxWsXml; + } + + /** + * Provides access to {@link ServletContext} via {@link Container}. Pipes + * can get ServletContext from Container and use it to load some resources. + */ + static class ServletContainer extends Container + { + private final ServletContext servletContext; + + private final Module module = new Module() + { + private final List<BoundEndpoint> endpoints = new ArrayList<BoundEndpoint>(); + + public @NotNull + List<BoundEndpoint> getBoundEndpoints() + { + return endpoints; + } + }; + + ServletContainer(ServletContext servletContext) + { + this.servletContext = servletContext; + } + + public <T> T getSPI(Class<T> spiType) + { + if (spiType == ServletContext.class) + { + return (T)servletContext; + } + if (spiType == Module.class) + { + return spiType.cast(module); + } + return null; + } + } + + protected static final String JAXWS_RI_RUNTIME = "/WEB-INF/sun-jaxws.xml"; + + private static final Logger logger = Logger.getLogger(com.sun.xml.ws.util.Constants.LoggingDomain + ".server.http"); +} Copied: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerJBWS.java (from rev 3145, trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/WSServletContextListenerJBWS.java) =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerJBWS.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerJBWS.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -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.wsf.stack.sunri; + +// $Id$ + +import java.net.MalformedURLException; +import java.net.URL; + +import javax.servlet.ServletContext; +import javax.xml.ws.WebServiceException; + +import com.sun.xml.ws.resources.WsservletMessages; +import com.sun.xml.ws.transport.http.HttpAdapter; +import com.sun.xml.ws.transport.http.DeploymentDescriptorParser.AdapterFactory; +import com.sun.xml.ws.transport.http.servlet.ServletAdapter; + +/** + * Parses {@code sun-jaxws.xml} and sets up + * {@link HttpAdapter}s for all deployed endpoints. + * + * + * This code is the entry point at the server side. + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-May-2007 + */ +public class WSServletContextListenerJBWS extends WSServletContextListenerExt +{ + public static final String PARAM_SUN_JAXWS_URL = "jbossws-sun-jaxws-url"; + + /** + * Fall back to the 'jbossws-sun-jaxws-url' init parameter for the URL location + * of sun-jaxws.xml + */ + @Override + protected URL getDeploymentDescriptorURL(ServletContext context) throws MalformedURLException + { + URL sunJaxWsXml = super.getDeploymentDescriptorURL(context); + if (sunJaxWsXml == null) + { + String urlStr = context.getInitParameter(PARAM_SUN_JAXWS_URL); + if (urlStr != null && urlStr.length() > 0) + sunJaxWsXml = new URL(urlStr); + } + if (sunJaxWsXml == null) + throw new WebServiceException(WsservletMessages.NO_SUNJAXWS_XML(JAXWS_RI_RUNTIME)); + + return sunJaxWsXml; + } + + /** + * Externalized for integration + */ + @Override + protected DeploymentDescriptorParserExt<ServletAdapter> createDeploymentDescriptorParser(ClassLoader classLoader, ServletContainer container, + ServletResourceLoader resourceLoader, AdapterFactory<ServletAdapter> adapterList) throws MalformedURLException + { + DeploymentDescriptorParserExt<ServletAdapter> parser = new DeploymentDescriptorParserJBWS<ServletAdapter>(classLoader, resourceLoader, container, adapterList); + return parser; + } +} Copied: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/metadata/sunjaxws (from rev 3145, trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/metadata/sunjaxws) Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/metadata/sunjaxws/DDEndpoint.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/metadata/sunjaxws/DDEndpoint.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/metadata/sunjaxws/DDEndpoint.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.stack.sunri.metadata.sunjaxws; +package org.jboss.wsf.stack.sunri.metadata.sunjaxws; import java.io.IOException; import java.io.Writer; Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/metadata/sunjaxws/DDEndpoints.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/metadata/sunjaxws/DDEndpoints.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/metadata/sunjaxws/DDEndpoints.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.stack.sunri.metadata.sunjaxws; +package org.jboss.wsf.stack.sunri.metadata.sunjaxws; import java.io.File; import java.io.FileOutputStream; @@ -30,9 +30,9 @@ import java.util.ArrayList; import java.util.List; -import org.jboss.wsintegration.spi.deployment.WSDeploymentException; -import org.jboss.wsintegration.spi.management.ServerConfig; -import org.jboss.wsintegration.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.deployment.WSDeploymentException; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; //$Id$ Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/metadata/sunjaxws/DDHandler.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/metadata/sunjaxws/DDHandler.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/metadata/sunjaxws/DDHandler.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.stack.sunri.metadata.sunjaxws; +package org.jboss.wsf.stack.sunri.metadata.sunjaxws; import java.io.IOException; import java.io.Writer; Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/metadata/sunjaxws/DDHandlerChain.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/metadata/sunjaxws/DDHandlerChain.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/metadata/sunjaxws/DDHandlerChain.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.stack.sunri.metadata.sunjaxws; +package org.jboss.wsf.stack.sunri.metadata.sunjaxws; import java.io.IOException; import java.io.Writer; Modified: trunk/integration/sunri/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- trunk/integration/sunri/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/sunri/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-05-18 22:55:26 UTC (rev 3146) @@ -5,7 +5,7 @@  - <bean name="WebServiceDeployerEJB" class="org.jboss.wsintegration.container.jboss50.WebServiceDeployerEJB"> + <bean name="WebServiceDeployerEJB" class="org.jboss.wsf.container.jboss50.WebServiceDeployerEJB"> <property name="relOrderEJB2x"><inject bean="EJB2xDeployer" property="relativeOrder"/></property> <property name="relOrderEJB3"><inject bean="EJBRegistrationDeployer" property="relativeOrder"/></property> <install bean="MainDeployer" method="addDeployer"> @@ -25,7 +25,7 @@  - <bean name="WebServiceDeployerJSE" class="org.jboss.wsintegration.container.jboss50.WebServiceDeployerJSE"> + <bean name="WebServiceDeployerJSE" class="org.jboss.wsf.container.jboss50.WebServiceDeployerJSE"> <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property> <install bean="MainDeployer" method="addDeployer"> <parameter> @@ -43,7 +43,7 @@  - <bean name="WebServiceMainDeployer" class="org.jboss.wsintegration.container.jboss50.WebServiceMainDeployer"> + <bean name="WebServiceMainDeployer" class="org.jboss.wsf.container.jboss50.WebServiceMainDeployer"> <property name="relOrderJSE"><inject bean="WebServiceDeployerJSE" property="relativeOrder"/></property> <property name="relOrderEJB"><inject bean="WebServiceDeployerEJB" property="relativeOrder"/></property> <install bean="MainDeployer" method="addDeployer"> Modified: trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml =================================================================== --- trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml 2007-05-18 22:55:26 UTC (rev 3146) @@ -3,7 +3,7 @@ <deployment xmlns="urn:jboss:bean-deployer:2.0">  - <bean name="WSServerConfig" class="org.jboss.wsintegration.container.jboss50.ManagedServerConfig"> + <bean name="WSServerConfig" class="org.jboss.wsf.container.jboss50.ManagedServerConfig">  - <bean name="WSEndpointRegistry" class="org.jboss.wsintegration.stack.sunri.ManagedEndpointRegistry"/> + <bean name="WSEndpointRegistry" class="org.jboss.wsf.stack.sunri.ManagedEndpointRegistry"/>   @@ -85,25 +85,25 @@ Each DeploymentManger maintains a list of Deployers Each Deployer handles a single aspect of web service deployment. --> - <bean name="WSDeployerManagerJSE" class="org.jboss.wsintegration.spi.deployment.BasicDeployerManager"> + <bean name="WSDeployerManagerJSE" class="org.jboss.wsf.spi.deployment.BasicDeployerManager"> <property name="deployers"> - <list class="java.util.LinkedList" elementClass="org.jboss.wsintegration.spi.deployment.Deployer"> + <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer"> <inject bean="WSUnifiedDeploymentInfoDeployer"/> <inject bean="WSSunJaxwsDeployer"/> <inject bean="WSModifyWebMetaDataDeployer"/> </list> </property> </bean> - <bean name="WSDeployerManagerEJB" class="org.jboss.wsintegration.spi.deployment.BasicDeployerManager"> + <bean name="WSDeployerManagerEJB" class="org.jboss.wsf.spi.deployment.BasicDeployerManager"> <property name="deployers"> - <list class="java.util.LinkedList" elementClass="org.jboss.wsintegration.spi.deployment.Deployer"> + <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer"> <inject bean="WSUnifiedDeploymentInfoDeployer"/> </list> </property> </bean> - <bean name="WSMainDeployerManager" class="org.jboss.wsintegration.spi.deployment.BasicDeployerManager"> + <bean name="WSMainDeployerManager" class="org.jboss.wsf.spi.deployment.BasicDeployerManager"> <property name="deployers"> - <list class="java.util.LinkedList" elementClass="org.jboss.wsintegration.spi.deployment.Deployer"> + <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer"> <inject bean="WSEndpointNameDeployer"/> <inject bean="WSEndpointHandlerDeployer"/> <inject bean="WSEndpointRegistryDeployer"/> @@ -116,32 +116,32 @@ The Deployers Each handles a single aspect of web service deployment --> - <bean name="WSEndpointHandlerDeployer" class="org.jboss.wsintegration.spi.deployment.EndpointHandlerDeployer"> - <property name="requestHandler">org.jboss.wsintegration.stack.sunri.RequestHandlerImpl</property> - <property name="lifecycleHandler">org.jboss.wsintegration.stack.sunri.LifecycleHandlerImpl</property> + <bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer"> + <property name="requestHandler">org.jboss.wsf.stack.sunri.RequestHandlerImpl</property> + <property name="lifecycleHandler">org.jboss.wsf.stack.sunri.LifecycleHandlerImpl</property> <property name="invocationHandler"> <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>JAXWS_JSE</key><value>org.jboss.wsintegration.spi.invocation.InvocationHandlerJSE</value></entry> - <entry><key>JAXWS_EJB3</key><value>org.jboss.wsintegration.container.jboss50.InvocationHandlerEJB3</value></entry> + <entry><key>JAXWS_JSE</key><value>org.jboss.wsf.spi.invocation.InvocationHandlerJSE</value></entry> + <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss50.InvocationHandlerEJB3</value></entry> </map> </property> </bean> - <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsintegration.spi.deployment.EndpointLifecycleDeployer"/> - <bean name="WSEndpointNameDeployer" class="org.jboss.wsintegration.stack.sunri.EndpointNameDeployer"/> - <bean name="WSEndpointRegistryDeployer" class="org.jboss.wsintegration.spi.deployment.EndpointRegistryDeployer"/> - <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsintegration.stack.sunri.ModifyWebMetaDataDeployer"> - <property name="listenerClass">org.jboss.wsintegration.stack.sunri.WSServletContextListenerJBWS</property> - <property name="servletClass">org.jboss.wsintegration.stack.sunri.WSEndpointServletJBWS</property> + <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/> + <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.stack.sunri.EndpointNameDeployer"/> + <bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/> + <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.stack.sunri.ModifyWebMetaDataDeployer"> + <property name="listenerClass">org.jboss.wsf.stack.sunri.WSServletContextListenerJBWS</property> + <property name="servletClass">org.jboss.wsf.stack.sunri.WSEndpointServletJBWS</property> </bean> - <bean name="WSSunJaxwsDeployer" class="org.jboss.wsintegration.stack.sunri.SunJaxwsDeployer"/> - <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsintegration.container.jboss50.UnifiedDeploymentInfoDeployer"/> + <bean name="WSSunJaxwsDeployer" class="org.jboss.wsf.stack.sunri.SunJaxwsDeployer"/> + <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss50.UnifiedDeploymentInfoDeployer"/>  - <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.wsintegration.container.jboss50.JAXRPCDeployerHookJSE"> - <property name="deploymentClass">org.jboss.wsintegration.spi.deployment.BasicDeployment</property> - <property name="endpointClass">org.jboss.wsintegration.spi.deployment.BasicEndpoint</property> + <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookJSE"> + <property name="deploymentClass">org.jboss.wsf.spi.deployment.BasicDeployment</property> + <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> <install bean="WebServiceDeployerJSE" method="addDeployerHook"> <parameter> @@ -155,9 +155,9 @@ </uninstall> <depends>WebServiceDeployerJSE</depends> </bean> - <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsintegration.container.jboss50.JAXRPCDeployerHookEJB21"> - <property name="deploymentClass">org.jboss.wsintegration.spi.deployment.BasicDeployment</property> - <property name="endpointClass">org.jboss.wsintegration.spi.deployment.BasicEndpoint</property> + <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookEJB21"> + <property name="deploymentClass">org.jboss.wsf.spi.deployment.BasicDeployment</property> + <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> <install bean="WebServiceDeployerEJB" method="addDeployerHook"> <parameter> @@ -171,9 +171,9 @@ </uninstall> <depends>WebServiceDeployerEJB</depends> </bean> - <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.wsintegration.container.jboss50.JAXWSDeployerHookJSE"> - <property name="deploymentClass">org.jboss.wsintegration.spi.deployment.BasicDeployment</property> - <property name="endpointClass">org.jboss.wsintegration.spi.deployment.BasicEndpoint</property> + <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookJSE"> + <property name="deploymentClass">org.jboss.wsf.spi.deployment.BasicDeployment</property> + <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> <install bean="WebServiceDeployerJSE" method="addDeployerHook"> <parameter> @@ -187,9 +187,9 @@ </uninstall> <depends>WebServiceDeployerJSE</depends> </bean> - <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsintegration.container.jboss50.JAXWSDeployerHookEJB3"> - <property name="deploymentClass">org.jboss.wsintegration.spi.deployment.BasicDeployment</property> - <property name="endpointClass">org.jboss.wsintegration.spi.deployment.BasicEndpoint</property> + <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookEJB3"> + <property name="deploymentClass">org.jboss.wsf.spi.deployment.BasicDeployment</property> + <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> <install bean="WebServiceDeployerEJB" method="addDeployerHook"> <parameter> @@ -203,7 +203,7 @@ </uninstall> <depends>WebServiceDeployerEJB</depends> </bean> - <bean name="WSMainDeployerHook" class="org.jboss.wsintegration.container.jboss50.MainDeployerHook"> + <bean name="WSMainDeployerHook" class="org.jboss.wsf.container.jboss50.MainDeployerHook"> <property name="deployerManager"><inject bean="WSMainDeployerManager"/></property> <install bean="WebServiceMainDeployer" method="addDeployerHook"> <parameter> Modified: trunk/jbossws-core/build.xml =================================================================== --- trunk/jbossws-core/build.xml 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/build.xml 2007-05-18 22:55:26 UTC (rev 3146) @@ -79,7 +79,7 @@ <include name="javax/xml/ws/**"/> <include name="javax/jws/**"/> <include name="org/jboss/annotation/**"/> - <include name="org/jboss/wsintegration/**"/> + <include name="org/jboss/wsf/**"/> <include name="org/jboss/ws/**"/> <classpath path="${core.output.classes14.dir}"/> <classpath refid="thirdparty.classpath"/> @@ -153,7 +153,7 @@ <jar jarfile="${core.output.lib.dir}/jbossws-core.jar" manifest="${core.output.etc.dir}/default.mf"> <fileset dir="${core.output.classes.dir}"> <include name="org/jboss/annotation/**"/> - <include name="org/jboss/wsintegration/**"/> + <include name="org/jboss/wsf/**"/> <include name="org/jboss/ws/**"/> </fileset> <fileset dir="${core.resources.dir}"> @@ -165,7 +165,7 @@  <jar jarfile="${core.output.lib.dir}/jbossws-client.jar" manifest="${core.output.etc.dir}/default.mf"> <fileset dir="${core.output.classes.dir}"> - <include name="org/jboss/wsintegration/**"/> + <include name="org/jboss/wsf/**"/> <include name="org/jboss/ws/**"/> </fileset> <fileset dir="${core.resources.dir}"> Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -61,7 +61,7 @@ import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** * Provides support for the dynamic invocation of a service endpoint. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -75,8 +75,8 @@ import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.jboss.ws.metadata.umdm.TypesMetaData; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.JavaUtils; import org.jboss.xb.binding.NamespaceRegistry; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/MessageTrace.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/MessageTrace.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/MessageTrace.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -30,7 +30,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.core.soap.SOAPElementImpl; import org.jboss.ws.core.soap.SOAPElementWriter; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/ServiceEndpointInvocation.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/ServiceEndpointInvocation.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/ServiceEndpointInvocation.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -46,7 +46,7 @@ import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.jboss.ws.metadata.umdm.WrappedParameter; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; import org.w3c.dom.Element; /** A web service invocation. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/client/ServiceObjectFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/client/ServiceObjectFactory.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/client/ServiceObjectFactory.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -36,8 +36,8 @@ import org.jboss.ws.WSException; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; /** * This ServiceObjectFactory reconstructs a service for a given WSDL when the webservice client does a JNDI lookup Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -36,7 +36,7 @@ import org.jboss.ws.integration.ServiceRefMetaData; import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/client/ServiceRefObjectFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/client/ServiceRefObjectFactory.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/client/ServiceRefObjectFactory.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -26,14 +26,14 @@ import javax.xml.namespace.QName; import org.jboss.ws.integration.ServiceRefElement; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData; import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -51,7 +51,7 @@ import org.jboss.ws.metadata.umdm.TypeMappingMetaData; import org.jboss.ws.metadata.umdm.TypesMetaData; import org.jboss.ws.metadata.umdm.WrappedParameter; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; /** A helper class to wrap/unwrap ducument style request/response structures. * Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SerializationContextJAXRPC.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SerializationContextJAXRPC.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SerializationContextJAXRPC.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -38,7 +38,7 @@ import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.umdm.TypesMetaData; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; /** * The serialization context for JAXRPC endpoints/clients Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceLifecycleInvocationHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceLifecycleInvocationHandler.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceLifecycleInvocationHandler.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,74 +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.ws.core.jaxrpc; - -// $Id$ - -import javax.xml.rpc.server.ServiceLifecycle; -import javax.xml.rpc.server.ServletEndpointContext; - -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.invocation.EndpointInvocation; -import org.jboss.wsintegration.spi.invocation.InvocationContext; -import org.jboss.wsintegration.spi.invocation.InvocationHandlerJSE; - -/** - * Handles invocations on JSE endpoints. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class ServiceLifecycleInvocationHandler extends InvocationHandlerJSE -{ - public void invoke(Endpoint ep, Object beanInstance, EndpointInvocation epInv) throws Exception - { - try - { - if (beanInstance == null) - beanInstance = super.getBeanInstance(ep); - - InvocationContext invContext = epInv.getInvocationContext(); - if (beanInstance instanceof ServiceLifecycle) - { - ServletEndpointContext sepContext = invContext.getAttachment(ServletEndpointContext.class); - if (sepContext != null) - ((ServiceLifecycle)beanInstance).init(sepContext); - } - - try - { - super.invoke(ep, beanInstance, epInv); - } - finally - { - if (beanInstance instanceof ServiceLifecycle) - { - ((ServiceLifecycle)beanInstance).destroy(); - } - } - } - catch (Exception e) - { - handleInvocationException(e); - } - } -} Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -54,7 +54,7 @@ import org.jboss.ws.core.jaxrpc.binding.SimpleDeserializerFactory; import org.jboss.ws.core.jaxrpc.binding.SimpleSerializerFactory; import org.jboss.ws.core.utils.HashCodeUtil; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; /** * This is the representation of a type mapping. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Deserializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Deserializer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Deserializer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -32,7 +32,7 @@ import org.jboss.ws.WSException; import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.extensions.xop.jaxrpc.XOPUnmarshallerImpl; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.jboss.xb.binding.SimpleTypeBindings; import org.jboss.xb.binding.sunday.xop.XOPUnmarshaller; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -29,7 +29,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.extensions.xop.jaxrpc.XOPMarshallerImpl; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; import org.jboss.xb.binding.NamespaceRegistry; import org.jboss.xb.binding.SimpleTypeBindings; import org.jboss.xb.binding.sunday.xop.XOPMarshaller; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamResult.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamResult.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamResult.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -32,7 +32,7 @@ import javax.xml.transform.stream.StreamResult; import org.jboss.ws.WSException; -import org.jboss.wsintegration.spi.utils.IOUtils; +import org.jboss.wsf.spi.utils.IOUtils; /** * @author Heiko.Braun(a)jboss.org Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -34,7 +34,7 @@ import javax.xml.transform.stream.StreamSource; import org.jboss.ws.WSException; -import org.jboss.wsintegration.spi.utils.IOUtils; +import org.jboss.wsf.spi.utils.IOUtils; /** * A StreamSource that can be read repeatedly. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -38,7 +38,7 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.soap.SOAPContentElement; import org.jboss.ws.core.utils.XMLPredefinedEntityReferenceResolver; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Node; /** The base class for all Deserializers. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementDeserializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementDeserializer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementDeserializer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -27,7 +27,7 @@ import javax.xml.transform.Source; import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementSerializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementSerializer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementSerializer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -27,7 +27,7 @@ import javax.xml.transform.Result; import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexSerializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexSerializer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexSerializer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -27,7 +27,7 @@ import javax.xml.transform.Result; import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; import org.jboss.xb.binding.NamespaceRegistry; import org.jboss.xb.binding.SimpleTypeBindings; import org.w3c.dom.NamedNodeMap; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameDeserializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameDeserializer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameDeserializer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -29,7 +29,7 @@ import javax.xml.transform.Source; import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.jboss.xb.binding.NamespaceRegistry; import org.jboss.xb.binding.SimpleTypeBindings; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -37,8 +37,8 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.jaxrpc.TypeMappingImpl; import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.JavaUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -34,7 +34,7 @@ import org.jboss.ws.core.soap.SOAPContentElement; import org.jboss.ws.core.soap.XMLFragment; import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; import org.w3c.dom.NamedNodeMap; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementDeserializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementDeserializer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementDeserializer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -29,7 +29,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.core.soap.SOAPFactoryImpl; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementSerializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementSerializer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementSerializer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -28,7 +28,7 @@ import javax.xml.transform.Result; import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.NamedNodeMap; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SerializerSupport.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SerializerSupport.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SerializerSupport.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -37,7 +37,7 @@ import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.core.soap.SOAPContentElement; -import org.jboss.wsintegration.spi.utils.IOUtils; +import org.jboss.wsf.spi.utils.IOUtils; import org.jboss.xb.binding.NamespaceRegistry; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBMarshallerImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBMarshallerImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBMarshallerImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -37,7 +37,7 @@ import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaXmlTypeMapping; import org.jboss.ws.metadata.jaxrpcmapping.VariableMapping; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; import org.jboss.xb.binding.Constants; import org.jboss.xb.binding.sunday.marshalling.MarshallerImpl; import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -67,8 +67,8 @@ import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.umdm.TypesMetaData; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.utils.JavaUtils; /** Provides support for the dynamic invocation of a service endpoint. * The javax.xml.rpc.Service interface acts as a factory for the creation of Call instances. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -39,7 +39,7 @@ import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC; import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** * Provides support for the programmatic configuration of Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/PortProxy.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/PortProxy.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/PortProxy.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -43,7 +43,7 @@ import org.jboss.ws.core.StubExt; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; /** * The dynamic proxy that delegates to the underlying Call implementation Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -54,12 +54,12 @@ import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.integration.ResourceLoaderAdapter; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** * Service class acts as a factory for: Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -58,12 +58,12 @@ import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.management.EndpointRegistry; -import org.jboss.wsintegration.spi.management.EndpointRegistryFactory; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; /** * This ServiceObjectFactory reconstructs a javax.xml.rpc.Service Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceRefHandlerJAXRPC.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceRefHandlerJAXRPC.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceRefHandlerJAXRPC.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -28,7 +28,7 @@ import org.jboss.logging.Logger; import org.jboss.util.naming.Util; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; /** * Binds a JAXRPC Service object in the client's ENC for every service-ref element in the Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -39,10 +39,10 @@ import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; -import org.jboss.wsintegration.spi.management.ServerConfig; -import org.jboss.wsintegration.spi.management.ServerConfigFactory; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; /** * A JNDI reference to a javax.xml.rpc.Service Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -48,7 +48,7 @@ import org.jboss.ws.core.soap.SOAPElementImpl; import org.jboss.ws.core.soap.SOAPElementWriter; import org.jboss.ws.core.soap.SOAPEnvelopeImpl; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** * Represents a list of handlers. All elements in the Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -43,8 +43,8 @@ import org.jboss.ws.metadata.umdm.HandlerMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** Delegates to JAXRPC handlers * Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/ServerHandlerChain.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/ServerHandlerChain.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/ServerHandlerChain.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -28,7 +28,7 @@ import javax.xml.rpc.handler.MessageContext; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** * Represents a list of handlers. All elements in the Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -51,7 +51,7 @@ import org.jboss.ws.metadata.umdm.TypeMappingMetaData; import org.jboss.ws.metadata.umdm.TypesMetaData; import org.jboss.ws.metadata.umdm.WrappedParameter; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; public class DynamicWrapperGenerator extends AbstractWrapperGenerator { Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingExt.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingExt.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingExt.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -26,7 +26,7 @@ import javax.xml.ws.Binding; import javax.xml.ws.handler.Handler; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; // $Id$ Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -30,7 +30,7 @@ import org.jboss.logging.Logger; import org.jboss.util.NotImplementedException; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** * The Binding interface is the base interface for JAXWS protocol bindings. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -45,7 +45,7 @@ import org.jboss.ws.core.soap.UnboundHeader; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** * The HTTPBinding interface is an abstraction for the XML/HTTP binding. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPMessageMarshaller.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPMessageMarshaller.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPMessageMarshaller.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -29,7 +29,7 @@ import org.jboss.remoting.invocation.OnewayInvocation; import org.jboss.remoting.marshal.Marshaller; import org.jboss.ws.core.HTTPMessageImpl; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -45,7 +45,7 @@ import org.jboss.ws.core.soap.UnboundHeader; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** A binding for unprocessed SOAP Messages * Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -53,7 +53,7 @@ import org.jboss.ws.core.soap.XMLFragment; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** A BindingProvider for a JAXWS payload * Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP11BindingJAXWS.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP11BindingJAXWS.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP11BindingJAXWS.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -36,7 +36,7 @@ import org.jboss.ws.core.jaxws.SOAPFaultHelperJAXWS; import org.jboss.ws.core.soap.SOAPFaultImpl; import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** * The JAXWS SOAP11Binding Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP12BindingJAXWS.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP12BindingJAXWS.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP12BindingJAXWS.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -37,7 +37,7 @@ import org.jboss.ws.core.jaxws.SOAPFaultHelperJAXWS; import org.jboss.ws.core.soap.SOAPFaultImpl; import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** * The SOAP11Binding Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -65,7 +65,7 @@ import org.jboss.ws.metadata.config.ConfigurationProvider; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** * Provides support for the dynamic invocation of a service endpoint. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -50,7 +50,7 @@ import org.jboss.ws.core.StubExt; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; /** * The dynamic proxy that delegates to the underlying client implementation Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -50,7 +50,7 @@ import org.jboss.ws.core.soap.SOAPContentElement; import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.core.soap.XMLFragment; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMWriter; /** * A helper that Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactoryJAXWS.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactoryJAXWS.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactoryJAXWS.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -46,7 +46,7 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.ConfigProvider; import org.jboss.ws.core.client.ServiceObjectFactory; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; /** * This ServiceObjectFactory reconstructs a javax.xml.ws.Service Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceRefHandlerJAXWS.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceRefHandlerJAXWS.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceRefHandlerJAXWS.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -25,7 +25,7 @@ import org.jboss.logging.Logger; import org.jboss.util.naming.Util; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; import javax.jws.HandlerChain; import javax.naming.Context; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceReferenceable.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceReferenceable.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceReferenceable.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -34,7 +34,7 @@ import javax.naming.Referenceable; import javax.naming.StringRefAddr; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerChainExecutor.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerChainExecutor.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerChainExecutor.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -41,7 +41,7 @@ import org.jboss.ws.core.jaxws.SOAPFaultHelperJAXWS; import org.jboss.ws.core.soap.SOAPEnvelopeImpl; import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMWriter; /** * Executes a list of JAXWS handlers. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -37,7 +37,7 @@ import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** * Delegates to JAXWS handlers Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -49,7 +49,7 @@ import org.jboss.ws.metadata.umdm.HandlerMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS; import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** * HandlerResolver is an interface implemented by an application to get control over Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -41,7 +41,7 @@ import org.jboss.ws.core.MessageAbstraction; import org.jboss.ws.core.jaxrpc.Style; import org.jboss.ws.core.soap.*; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -43,7 +43,7 @@ import org.jboss.ws.core.jaxws.binding.BindingProviderImpl; import org.jboss.ws.core.server.HttpContext; import org.jboss.ws.core.server.HttpServer; -import org.jboss.wsintegration.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.management.ServerConfigFactory; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -67,13 +67,13 @@ import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; import org.jboss.ws.metadata.wsdl.WSDLUtils; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** * Service delegates are used internally by Service objects to allow pluggability of JAX-WS implementations. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointServlet.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointServlet.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointServlet.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -33,11 +33,11 @@ import javax.servlet.http.HttpServletResponse; import org.jboss.ws.WSException; -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.invocation.RequestHandler; -import org.jboss.wsintegration.spi.management.EndpointRegistry; -import org.jboss.wsintegration.spi.management.EndpointRegistryFactory; -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.invocation.RequestHandler; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.spi.utils.ObjectNameFactory; /** * A servlet that is installed for every web service endpoint. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ContextServlet.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ContextServlet.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ContextServlet.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -37,9 +37,9 @@ import org.jboss.logging.Logger; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.management.EndpointRegistry; -import org.jboss.wsintegration.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.spi.management.EndpointRegistryFactory; /** * The servlet that that is associated with context /jbossws Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/LifecycleHandlerImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/LifecycleHandlerImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/LifecycleHandlerImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,58 +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.ws.core.server; - -//$Id: LifecycleHandlerImpl.java 2923 2007-04-25 14:23:29Z thomas.diesler(a)jboss.com $ - -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.wsintegration.spi.deployment.BasicLifecycleHandler; -import org.jboss.wsintegration.spi.deployment.Endpoint; - -/** - * A lifecycle handler - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class LifecycleHandlerImpl extends BasicLifecycleHandler -{ - public void start(Endpoint endpoint) - { - super.start(endpoint); - log.info("WebService started: " + getEndpointAddress(endpoint)); - } - - public void stop(Endpoint endpoint) - { - super.stop(endpoint); - log.info("WebService stoped: " + getEndpointAddress(endpoint)); - } - - private String getEndpointAddress(Endpoint ep) - { - ServerEndpointMetaData sepMetaData = ep.getAttachment(ServerEndpointMetaData.class); - if (sepMetaData == null) - throw new IllegalStateException("Cannot obtain endpoint meta data"); - - return sepMetaData.getEndpointAddress(); - } -} Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ManagedEndpointRegistry.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ManagedEndpointRegistry.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ManagedEndpointRegistry.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,128 +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.ws.core.server; - -// $Id$ - -import java.util.ArrayList; - -import javax.management.MBeanServer; -import javax.management.MBeanServerFactory; -import javax.management.ObjectName; - -import org.jboss.logging.Logger; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.management.BasicEndpointRegistry; - -/** - * A Service Endpoint Registry - * - * @author Thomas.Diesler(a)jboss.org - * @since 04-May-2007 - */ -public class ManagedEndpointRegistry extends BasicEndpointRegistry implements ManagedEndpointRegistryMBean -{ - // provide logging - private static final Logger log = Logger.getLogger(ManagedEndpointRegistry.class); - - public String getImplementationTitle() - { - return getClass().getPackage().getImplementationTitle(); - } - - public String getImplementationVersion() - { - return UnifiedMetaData.getImplementationVersion(); - } - - /** Resolve a port-component-link, like: - * - * [deployment.war]#PortComponentName - * [deployment.jar]#PortComponentName - * - */ - public Endpoint resolvePortComponentLink(String pcLink) - { - String pcName = pcLink; - int hashIndex = pcLink.indexOf("#"); - if (hashIndex > 0) - { - pcName = pcLink.substring(hashIndex + 1); - } - - Endpoint endpoint = null; - for (ObjectName sepID : getEndpoints()) - { - Endpoint auxEndpoint = getEndpoint(sepID); - ServerEndpointMetaData sepMetaData = auxEndpoint.getAttachment(ServerEndpointMetaData.class); - if (pcName.equals(sepMetaData.getPortComponentName())) - { - if (endpoint != null) - { - log.warn("Multiple service endoints found for: " + pcLink); - endpoint = null; - break; - } - endpoint = auxEndpoint; - } - } - - if (endpoint == null) - log.warn("No ServiceEndpoint found for pcLink: " + pcLink); - - return endpoint; - } - - public void create() throws Exception - { - log.info(getImplementationTitle()); - log.info(getImplementationVersion()); - MBeanServer server = getMBeanServer(); - if (server != null) - { - server.registerMBean(this, OBJECT_NAME); - } - } - - public void destroy() throws Exception - { - log.debug("Destroy service endpoint manager"); - MBeanServer server = getMBeanServer(); - if (server != null) - { - server.unregisterMBean(OBJECT_NAME); - } - } - - private MBeanServer getMBeanServer() - { - MBeanServer server = null; - ArrayList servers = MBeanServerFactory.findMBeanServer(null); - if (servers.size() > 0) - { - server = (MBeanServer)servers.get(0); - } - return server; - } -} Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ManagedEndpointRegistryMBean.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ManagedEndpointRegistryMBean.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ManagedEndpointRegistryMBean.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -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.ws.core.server; - -import javax.management.ObjectName; - -import org.jboss.wsintegration.spi.management.EndpointRegistry; -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; - -/** - * MBean interface. - * @since 15-April-2004 - */ -public interface ManagedEndpointRegistryMBean extends EndpointRegistry -{ - String getImplementationTitle(); - - String getImplementationVersion(); -} Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentLinkServlet.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentLinkServlet.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentLinkServlet.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -35,9 +35,9 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.management.EndpointRegistry; -import org.jboss.wsintegration.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.spi.management.EndpointRegistryFactory; /** * A servlet that reports the serviceURL for a given service ID. Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/RequestHandlerImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/RequestHandlerImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/RequestHandlerImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,510 +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.ws.core.server; - -//$Id$ - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.io.Writer; -import java.net.URL; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.activation.DataHandler; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.xml.namespace.QName; -import javax.xml.rpc.JAXRPCException; -import javax.xml.rpc.soap.SOAPFaultException; -import javax.xml.soap.MimeHeaders; -import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPMessage; -import javax.xml.soap.SOAPPart; -import javax.xml.ws.addressing.AddressingProperties; -import javax.xml.ws.addressing.JAXWSAConstants; -import javax.xml.ws.http.HTTPBinding; - -import org.jboss.logging.Logger; -import org.jboss.ws.Constants; -import org.jboss.ws.WSException; -import org.jboss.ws.core.CommonBinding; -import org.jboss.ws.core.CommonBindingProvider; -import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.HTTPMessageImpl; -import org.jboss.ws.core.MessageAbstraction; -import org.jboss.ws.core.MessageTrace; -import org.jboss.ws.core.jaxrpc.binding.BindingException; -import org.jboss.ws.core.jaxrpc.handler.MessageContextJAXRPC; -import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC; -import org.jboss.ws.core.jaxws.handler.MessageContextJAXWS; -import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS; -import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.core.soap.MessageFactoryImpl; -import org.jboss.ws.core.soap.SOAPConnectionImpl; -import org.jboss.ws.core.soap.SOAPMessageImpl; -import org.jboss.ws.core.utils.ThreadLocalAssociation; -import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; -import org.jboss.ws.extensions.xop.XOPContext; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.deployment.Endpoint.EndpointState; -import org.jboss.wsintegration.spi.invocation.InvocationContext; -import org.jboss.wsintegration.spi.invocation.RequestHandler; -import org.jboss.wsintegration.spi.management.ServerConfig; -import org.jboss.wsintegration.spi.management.ServerConfigFactory; -import org.jboss.wsintegration.spi.utils.DOMWriter; -import org.w3c.dom.Document; - -/** - * A request handler - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class RequestHandlerImpl implements RequestHandler -{ - // provide logging - private static final Logger log = Logger.getLogger(RequestHandlerImpl.class); - - public void handleHttpRequest(Endpoint endpoint, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException - { - String method = req.getMethod(); - if (method.equals("POST")) - { - doPost(endpoint, req, res, context); - } - else if (method.equals("GET")) - { - doGet(endpoint, req, res, context); - } - else - { - throw new WSException("Unsupported method: " + method); - } - } - - private void doGet(Endpoint endpoint, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException - { - // Process a WSDL request - if (req.getParameter("wsdl") != null || req.getParameter("WSDL") != null) - { - res.setContentType("text/xml"); - ServletOutputStream out = res.getOutputStream(); - try - { - ServletRequestContext reqContext = new ServletRequestContext(context, req, res); - handleWSDLRequest(endpoint, out, reqContext); - } - catch (Exception ex) - { - handleException(ex); - } - finally - { - try - { - out.close(); - } - catch (IOException ioex) - { - log.error("Cannot close output stream"); - } - } - } - else - { - res.setStatus(405); - res.setContentType("text/plain"); - Writer out = res.getWriter(); - out.write("HTTP GET not supported"); - out.close(); - } - } - - private void doPost(Endpoint endpoint, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException - { - log.debug("doPost: " + req.getRequestURI()); - - ServletInputStream in = req.getInputStream(); - ServletOutputStream out = res.getOutputStream(); - try - { - ServletRequestContext reqContext = new ServletRequestContext(context, req, res); - handleRequest(endpoint, in, out, reqContext); - } - catch (Exception ex) - { - handleException(ex); - } - finally - { - try - { - out.close(); - } - catch (IOException ioex) - { - log.error("Cannot close output stream"); - } - } - } - - public void handleRequest(Endpoint endpoint, InputStream inStream, OutputStream outStream, InvocationContext context) - { - log.debug("handleRequest: " + endpoint.getName()); - - ServerEndpointMetaData sepMetaData = endpoint.getAttachment(ServerEndpointMetaData.class); - if (sepMetaData == null) - throw new IllegalStateException("Cannot obtain endpoint meta data"); - - ServletRequestContext reqContext = (ServletRequestContext)context; - - Type type = sepMetaData.getType(); - - ServletContext servletContext = reqContext.getServletContext(); - HttpServletRequest httpRequest = reqContext.getHttpServletRequest(); - HttpServletResponse httpResponse = reqContext.getHttpServletResponse(); - ServletHeaderSource headerSource = new ServletHeaderSource(httpRequest, httpResponse); - - // Build the message context - CommonMessageContext msgContext; - if (type == EndpointMetaData.Type.JAXRPC) - { - msgContext = new SOAPMessageContextJAXRPC(); - msgContext.put(MessageContextJAXRPC.SERVLET_CONTEXT, servletContext); - msgContext.put(MessageContextJAXRPC.SERVLET_REQUEST, httpRequest); - msgContext.put(MessageContextJAXRPC.SERVLET_RESPONSE, httpResponse); - } - else - { - msgContext = new SOAPMessageContextJAXWS(); - msgContext.put(MessageContextJAXWS.MESSAGE_OUTBOUND_PROPERTY, new Boolean(false)); - msgContext.put(MessageContextJAXWS.INBOUND_MESSAGE_ATTACHMENTS, new HashMap<String, DataHandler>()); - msgContext.put(MessageContextJAXWS.HTTP_REQUEST_HEADERS, headerSource.getHeaderMap()); - msgContext.put(MessageContextJAXWS.HTTP_REQUEST_METHOD, httpRequest.getMethod()); - msgContext.put(MessageContextJAXWS.QUERY_STRING, httpRequest.getQueryString()); - msgContext.put(MessageContextJAXWS.PATH_INFO, httpRequest.getPathInfo()); - msgContext.put(MessageContextJAXWS.SERVLET_CONTEXT, servletContext); - msgContext.put(MessageContextJAXWS.SERVLET_REQUEST, httpRequest); - msgContext.put(MessageContextJAXWS.SERVLET_RESPONSE, httpResponse); - - } - msgContext.setEndpointMetaData(sepMetaData); - - // Associate a message context with the current thread - MessageContextAssociation.pushMessageContext(msgContext); - - try - { - MessageAbstraction resMessage = processRequest(endpoint, headerSource, reqContext, inStream); - - // Replace the message context with the response context - msgContext = MessageContextAssociation.peekMessageContext(); - - Map<String, List<String>> headers = (Map<String, List<String>>)msgContext.get(MessageContextJAXWS.HTTP_RESPONSE_HEADERS); - if (headers != null) - headerSource.setHeaderMap(headers); - - Integer code = (Integer)msgContext.get(MessageContextJAXWS.HTTP_RESPONSE_CODE); - if (code != null) - httpResponse.setStatus(code.intValue()); - - boolean isFault = false; - if (resMessage instanceof SOAPMessage) - { - SOAPPart part = ((SOAPMessage)resMessage).getSOAPPart(); - if (part == null) - throw new SOAPException("Cannot obtain SOAPPart from response message"); - - // R1126 An INSTANCE MUST return a "500 Internal Server Error" HTTP status code - // if the response envelope is a Fault. - // - // Also, a one-way operation must show up as empty content, and can be detected - // by a null envelope. - SOAPEnvelope soapEnv = part.getEnvelope(); - isFault = soapEnv != null && soapEnv.getBody().hasFault(); - if (isFault && httpResponse != null) - { - httpResponse.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); - } - } - - sendResponse(outStream, msgContext, isFault); - } - catch (Exception ex) - { - WSException.rethrow(ex); - } - finally - { - // Reset the message context association - MessageContextAssociation.popMessageContext(); - - // clear thread local storage - ThreadLocalAssociation.clear(); - } - } - - private void sendResponse(OutputStream outputStream, CommonMessageContext msgContext, boolean isFault) throws SOAPException, IOException - { - MessageAbstraction resMessage = msgContext.getMessageAbstraction(); - String wsaTo = null; - - // Get the destination from the AddressingProperties - AddressingProperties outProps = (AddressingProperties)msgContext.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND); - if (outProps != null && outProps.getTo() != null) - { - AddressingConstantsImpl ADDR = new AddressingConstantsImpl(); - wsaTo = outProps.getTo().getURI().toString(); - if (wsaTo.equals(ADDR.getAnonymousURI())) - wsaTo = null; - } - if (wsaTo != null) - { - log.debug("Sending response to addressing destination: " + wsaTo); - new SOAPConnectionImpl().callOneWay((SOAPMessage)resMessage, wsaTo); - } - else - { - resMessage.writeTo(outputStream); - } - } - - /** - * Handle a request to this web service endpoint - */ - private MessageAbstraction processRequest(Endpoint ep, MimeHeaderSource headerSource, ServletRequestContext reqContext, InputStream inputStream) - throws BindingException - { - CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); - - ServerEndpointMetaData sepMetaData = ep.getAttachment(ServerEndpointMetaData.class); - if (sepMetaData == null) - throw new IllegalStateException("Cannot obtain endpoint meta data"); - - long beginProcessing = 0; - ClassLoader ctxClassLoader = Thread.currentThread().getContextClassLoader(); - try - { - EndpointState state = ep.getState(); - if (state != EndpointState.STARTED) - { - QName faultCode = Constants.SOAP11_FAULT_CODE_SERVER; - String faultString = "Endpoint cannot handle requests in state: " + state; - throw new SOAPFaultException(faultCode, faultString, null, null); - } - - log.debug("BEGIN handleRequest: " + ep.getName()); - beginProcessing = initRequestMetrics(ep); - - MimeHeaders headers = (headerSource != null ? headerSource.getMimeHeaders() : null); - - MessageAbstraction reqMessage; - - String bindingID = sepMetaData.getBindingId(); - if (HTTPBinding.HTTP_BINDING.equals(bindingID)) - { - reqMessage = new HTTPMessageImpl(headers, inputStream); - } - else - { - MessageFactoryImpl msgFactory = new MessageFactoryImpl(); - msgFactory.setServiceMode(sepMetaData.getServiceMode()); - msgFactory.setStyle(sepMetaData.getStyle()); - - reqMessage = (SOAPMessageImpl)msgFactory.createMessage(headers, inputStream); - } - - // Associate current message with message context - msgContext.setMessageAbstraction(reqMessage); - - // debug the incomming message - MessageTrace.traceMessage("Incoming Request Message", reqMessage); - - // Set the thread context class loader - ClassLoader classLoader = sepMetaData.getClassLoader(); - Thread.currentThread().setContextClassLoader(classLoader); - - // Get the Invoker - ServiceEndpointInvoker epInvoker = ep.getAttachment(ServiceEndpointInvoker.class); - if (epInvoker == null) - throw new IllegalStateException("Cannot obtain ServiceEndpointInvoker"); - - // Invoke the service endpoint - epInvoker.invoke(reqContext); - - // Get the response message context - msgContext = MessageContextAssociation.peekMessageContext(); - - // Get the response message - MessageAbstraction resMessage = msgContext.getMessageAbstraction(); - if (resMessage != null) - postProcessResponse(headerSource, resMessage); - - return resMessage; - } - catch (Exception ex) - { - MessageAbstraction resMessage = msgContext.getMessageAbstraction(); - - // In case we have an exception before the invoker is called - // we create the fault message here. - if (resMessage == null || resMessage.isFaultMessage() == false) - { - CommonBindingProvider bindingProvider = new CommonBindingProvider(sepMetaData); - CommonBinding binding = bindingProvider.getCommonBinding(); - resMessage = binding.bindFaultMessage(ex); - } - - if (resMessage != null) - postProcessResponse(headerSource, resMessage); - - return resMessage; - } - finally - { - try - { - MessageAbstraction resMessage = msgContext.getMessageAbstraction(); - if (resMessage != null) - { - if (resMessage.isFaultMessage()) - { - processFaultMetrics(ep, beginProcessing); - } - else - { - processResponseMetrics(ep, beginProcessing); - } - } - } - catch (Exception ex) - { - log.error("Cannot process metrics", ex); - } - - // Reset the thread context class loader - Thread.currentThread().setContextClassLoader(ctxClassLoader); - log.debug("END handleRequest: " + ep.getName()); - } - } - - private long initRequestMetrics(Endpoint endpoint) - { - return 0; - } - - private void processResponseMetrics(Endpoint endpoint, long beginProcessing) - { - } - - private void processFaultMetrics(Endpoint endpoint, long beginProcessing) - { - } - - /** Set response mime headers - */ - private void postProcessResponse(MimeHeaderSource headerSource, MessageAbstraction resMessage) - { - try - { - // Set the outbound headers - if (headerSource != null && resMessage instanceof SOAPMessage) - { - XOPContext.eagerlyCreateAttachments(); - ((SOAPMessage)resMessage).saveChanges(); - headerSource.setMimeHeaders(resMessage.getMimeHeaders()); - } - - // debug the outgoing message - MessageTrace.traceMessage("Outgoing Response Message", resMessage); - } - catch (Exception ex) - { - WSException.rethrow("Faild to post process response message", ex); - } - } - - public void handleWSDLRequest(Endpoint endpoint, OutputStream outputStream, InvocationContext context) - { - log.debug("handleWSDLRequest: " + endpoint.getName()); - - ServerEndpointMetaData epMetaData = endpoint.getAttachment(ServerEndpointMetaData.class); - if (epMetaData == null) - throw new IllegalStateException("Cannot obtain endpoint meta data"); - - ServletRequestContext reqContext = (ServletRequestContext)context; - HttpServletRequest req = reqContext.getHttpServletRequest(); - - try - { - // For the base document the resourcePath should be null - String resPath = (String)req.getParameter("resource"); - URL reqURL = new URL(req.getRequestURL().toString()); - - String wsdlHost = reqURL.getProtocol() + "://" + reqURL.getHost() + ":" + reqURL.getPort(); - - ServerConfigFactory factory = ServerConfigFactory.getInstance(); - ServerConfig config = factory.getServerConfig(); - if (config.getWebServiceHost().equals(ServerConfig.UNDEFINED_HOSTNAME) == false) - { - wsdlHost = config.getWebServiceHost(); - } - log.debug("WSDL request, using host: " + wsdlHost); - - WSDLRequestHandler wsdlRequestHandler = new WSDLRequestHandler(epMetaData); - Document document = wsdlRequestHandler.getDocumentForPath(reqURL, wsdlHost, resPath); - - OutputStreamWriter writer = new OutputStreamWriter(outputStream); - new DOMWriter(writer).setPrettyprint(true).print(document.getDocumentElement()); - } - catch (RuntimeException rte) - { - throw rte; - } - catch (IOException ex) - { - throw new WSException(ex); - } - } - - private void handleException(Exception ex) throws ServletException - { - log.error("Error processing web service request", ex); - - if (ex instanceof JAXRPCException) - throw (JAXRPCException)ex; - - throw new ServletException(ex); - } -} Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServerHandlerDelegate.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServerHandlerDelegate.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServerHandlerDelegate.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -26,7 +26,7 @@ import org.jboss.ws.core.HeaderSource; import org.jboss.ws.metadata.config.Configurable; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** * @author Thomas.Diesler(a)jboss.org Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -67,14 +67,14 @@ import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.invocation.BasicEndpointInvocation; -import org.jboss.wsintegration.spi.invocation.EndpointInvocation; -import org.jboss.wsintegration.spi.invocation.InvocationContext; -import org.jboss.wsintegration.spi.invocation.InvocationHandler; -import org.jboss.wsintegration.spi.invocation.WebServiceContextJSE; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.invocation.BasicEndpointInvocation; +import org.jboss.wsf.spi.invocation.EndpointInvocation; +import org.jboss.wsf.spi.invocation.InvocationContext; +import org.jboss.wsf.spi.invocation.InvocationHandler; +import org.jboss.wsf.spi.invocation.WebServiceContextJSE; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.utils.JavaUtils; /** An implementation handles invocations on the endpoint * Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerEJB21.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerEJB21.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerEJB21.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -25,11 +25,11 @@ import org.jboss.ws.core.ServiceEndpointInvocation; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.invocation.EndpointInvocation; -import org.jboss.wsintegration.spi.invocation.HandlerCallback; -import org.jboss.wsintegration.spi.invocation.InvocationContext; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.invocation.EndpointInvocation; +import org.jboss.wsf.spi.invocation.HandlerCallback; +import org.jboss.wsf.spi.invocation.InvocationContext; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** * Handles invocations on EJB21 endpoints. Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointServlet.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointServlet.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointServlet.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -1,62 +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.ws.core.server; - -// $Id$ - -import javax.servlet.ServletContext; - -import org.jboss.logging.Logger; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; - -/** - * A servlet that is installed for every web service endpoint. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class ServiceEndpointServlet extends AbstractServiceEndpointServlet -{ - // provide logging - private static final Logger log = Logger.getLogger(ServiceEndpointServlet.class); - - /** Initialize the service endpoint - */ - protected void initServiceEndpoint(String contextPath) - { - super.initServiceEndpoint(contextPath); - - // read the config name/file from web.xml - ServletContext ctx = getServletContext(); - String configName = ctx.getInitParameter("jbossws-config-name"); - String configFile = ctx.getInitParameter("jbossws-config-file"); - if (configName != null || configFile != null) - { - ServerEndpointMetaData epMetaData = endpoint.getAttachment(ServerEndpointMetaData.class); - if (epMetaData == null) - throw new IllegalStateException("Cannot obtain endpoint meta data"); - - log.debug("Updating service endpoint config\n config-name: " + configName + "\n config-file: " + configFile); - epMetaData.setConfigName(configName, configFile); - } - } -} Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServletRequestContext.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServletRequestContext.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServletRequestContext.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.jboss.wsintegration.spi.invocation.BasicInvocationContext; +import org.jboss.wsf.spi.invocation.BasicInvocationContext; /** * Implementation of ServletEndpointContext Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -30,7 +30,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/DetailImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/DetailImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/DetailImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -34,7 +34,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Node; import org.w3c.dom.NodeList; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -43,7 +43,7 @@ import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.core.jaxrpc.Style; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Comment; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/HRefInlineHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/HRefInlineHandler.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/HRefInlineHandler.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -33,8 +33,8 @@ import javax.xml.soap.Text; import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -46,7 +46,7 @@ import org.jboss.ws.core.jaxrpc.Style; import org.jboss.ws.core.soap.attachment.MimeConstants; import org.jboss.ws.core.soap.attachment.MultipartRelatedDecoder; -import org.jboss.wsintegration.spi.utils.IOUtils; +import org.jboss.wsf.spi.utils.IOUtils; /** * MessageFactory implementation Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -31,8 +31,8 @@ import org.jboss.logging.Logger; import org.jboss.util.NotImplementedException; import org.jboss.ws.WSException; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.DOMException; import org.w3c.dom.Document; import org.w3c.dom.DocumentFragment; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/ObjectContent.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/ObjectContent.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/ObjectContent.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -36,7 +36,7 @@ import org.jboss.ws.core.jaxrpc.binding.SerializationContext; import org.jboss.ws.core.jaxrpc.binding.SerializerFactoryBase; import org.jboss.ws.core.jaxrpc.binding.SerializerSupport; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; /** * Represents the OBJECT_VALID state of an {@link SOAPContentElement}. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementMessage.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementMessage.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementMessage.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -27,7 +27,7 @@ import javax.xml.rpc.JAXRPCException; import javax.xml.soap.SOAPBodyElement; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMWriter; /** * An abstract implemenation of the SOAPBodyElement Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -37,7 +37,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.Constants; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Comment; import org.w3c.dom.DOMException; import org.w3c.dom.Document; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -40,7 +40,7 @@ import org.jboss.ws.core.soap.SOAPContent.State; import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Attr; import org.w3c.dom.DOMException; import org.w3c.dom.NamedNodeMap; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPDocument.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPDocument.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPDocument.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -21,7 +21,7 @@ */ package org.jboss.ws.core.soap; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Attr; import org.w3c.dom.CDATASection; import org.w3c.dom.Comment; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -41,7 +41,7 @@ import org.jboss.util.NotImplementedException; import org.jboss.ws.Constants; import org.jboss.ws.WSException; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Attr; import org.w3c.dom.DOMException; import org.w3c.dom.Document; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementWriter.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementWriter.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementWriter.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -34,8 +34,8 @@ import javax.xml.soap.SOAPEnvelope; import org.jboss.ws.WSException; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; /** * Writes a SAAJ elements to an output stream. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -33,7 +33,7 @@ import javax.xml.soap.SOAPFault; import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPFaultImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPFaultImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPFaultImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -41,7 +41,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.core.utils.SAAJUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMWriter; import org.jboss.xb.QNameBuilder; import org.w3c.dom.Attr; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPHeaderElementImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPHeaderElementImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPHeaderElementImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -37,7 +37,7 @@ import javax.xml.soap.SOAPHeaderElement; import org.jboss.ws.Constants; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Attr; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLContent.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLContent.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLContent.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -51,8 +51,8 @@ import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.JavaUtils; import org.w3c.dom.Comment; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLFragment.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLFragment.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLFragment.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -43,8 +43,8 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.jaxrpc.binding.BufferedStreamResult; import org.jboss.ws.core.jaxrpc.binding.BufferedStreamSource; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/AttachmentPartImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/AttachmentPartImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/AttachmentPartImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -22,7 +22,7 @@ package org.jboss.ws.core.soap.attachment; import org.jboss.util.Base64; -import org.jboss.wsintegration.spi.utils.IOUtils; +import org.jboss.wsf.spi.utils.IOUtils; import org.jboss.ws.WSException; import javax.activation.DataHandler; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/ByteArrayContentHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/ByteArrayContentHandler.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/ByteArrayContentHandler.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -33,7 +33,7 @@ import javax.activation.DataSource; import org.jboss.ws.core.utils.MimeUtils; -import org.jboss.wsintegration.spi.utils.IOUtils; +import org.jboss.wsf.spi.utils.IOUtils; /** * @author Heiko Braun <heiko.braun(a)jboss.com> Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/SwapableMemoryDataSource.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/SwapableMemoryDataSource.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/SwapableMemoryDataSource.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -33,7 +33,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.wsintegration.spi.utils.IOUtils; +import org.jboss.wsf.spi.utils.IOUtils; /** * A datasource which offloads large attachments to disk. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/XmlDataContentHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/XmlDataContentHandler.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/XmlDataContentHandler.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -33,7 +33,7 @@ import javax.activation.DataSource; import javax.xml.transform.stream.StreamSource; -import org.jboss.wsintegration.spi.utils.IOUtils; +import org.jboss.wsf.spi.utils.IOUtils; /** * <code>XmlDataContentHandler</code> is a JAF content handler that provides Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/HolderUtils.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/HolderUtils.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/HolderUtils.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -86,7 +86,7 @@ import javax.xml.rpc.holders.StringHolder; import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; /** * HolderUtils provides static utility functions for both JAX-RPC Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/MimeUtils.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/MimeUtils.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/MimeUtils.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -43,8 +43,8 @@ import org.jboss.ws.Constants; import org.jboss.ws.WSException; -import org.jboss.wsintegration.spi.utils.IOUtils; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.IOUtils; +import org.jboss.wsf.spi.utils.JavaUtils; import com.sun.image.codec.jpeg.JPEGCodec; import com.sun.image.codec.jpeg.JPEGImageDecoder; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/EndpointReferenceImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/EndpointReferenceImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/EndpointReferenceImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -41,8 +41,8 @@ import org.jboss.ws.WSException; import org.jboss.ws.extensions.addressing.soap.SOAPAddressingBuilderImpl; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -51,7 +51,7 @@ import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; import org.jboss.ws.extensions.addressing.AddressingPropertiesImpl; import org.jboss.ws.extensions.addressing.EndpointReferenceImpl; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.jboss.xb.binding.NamespaceRegistry; import org.w3c.dom.Attr; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/jaxws/AbstractSubscriptionManagerEndpoint.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/jaxws/AbstractSubscriptionManagerEndpoint.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/jaxws/AbstractSubscriptionManagerEndpoint.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -44,7 +44,7 @@ import org.jboss.ws.extensions.eventing.EventingConstants; import org.jboss.ws.extensions.eventing.common.EventingEndpointBase; import org.jboss.ws.extensions.eventing.mgmt.SubscriptionError; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/NotificationFailure.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/NotificationFailure.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/NotificationFailure.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -25,7 +25,7 @@ import java.net.URISyntaxException; import org.jboss.ws.WSException; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/Subscription.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/Subscription.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/Subscription.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -41,7 +41,7 @@ import org.jboss.ws.extensions.eventing.EventingConstants; import org.jboss.ws.extensions.eventing.jaxws.AttributedURIType; import org.jboss.ws.extensions.eventing.jaxws.EndpointReferenceType; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -59,9 +59,9 @@ import org.jboss.ws.extensions.eventing.jaxws.AttributedURIType; import org.jboss.ws.extensions.eventing.jaxws.EndpointReferenceType; import org.jboss.ws.extensions.eventing.jaxws.ReferenceParametersType; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.ObjectNameFactory; import org.w3c.dom.Element; import org.xml.sax.InputSource; import org.xml.sax.SAXException; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -31,7 +31,7 @@ import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDeployment; import org.jboss.ws.extensions.eventing.jaxws.EndpointReferenceType; -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; +import org.jboss.wsf.spi.utils.ObjectNameFactory; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/Policy.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/Policy.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/Policy.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -29,8 +29,8 @@ import java.util.Iterator; import org.jboss.ws.WSException; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; import org.jboss.xb.binding.NamespaceRegistry; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/PolicyAlternative.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/PolicyAlternative.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/PolicyAlternative.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -29,8 +29,8 @@ import java.util.Iterator; import org.jboss.ws.WSException; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/PolicyAssertion.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/PolicyAssertion.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/PolicyAssertion.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -23,8 +23,8 @@ //$Id$ -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/PolicyFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/PolicyFactory.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/PolicyFactory.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -29,7 +29,7 @@ import javax.xml.namespace.QName; import org.jboss.ws.WSException; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -28,7 +28,7 @@ import org.jboss.ws.extensions.security.element.SecurityHeader; import org.jboss.ws.extensions.security.element.Token; import org.jboss.ws.extensions.security.element.UsernameToken; -import org.jboss.wsintegration.spi.invocation.SecurityAssociationAdaptor; +import org.jboss.wsf.spi.invocation.SecurityAssociationAdaptor; import org.w3c.dom.Document; public class ReceiveUsernameOperation implements TokenOperation Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -50,7 +50,7 @@ import org.jboss.ws.metadata.wsse.Sign; import org.jboss.ws.metadata.wsse.Timestamp; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Element; public class WSSecurityDispatcher Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -46,8 +46,8 @@ import org.jboss.ws.core.soap.attachment.MimeConstants; import org.jboss.ws.core.utils.MimeUtils; import org.jboss.ws.extensions.xop.jaxrpc.XOPMarshallerImpl; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.JavaUtils; import org.jboss.xb.binding.SimpleTypeBindings; import org.jboss.xb.binding.sunday.xop.XOPMarshaller; import org.jboss.xb.binding.sunday.xop.XOPObject; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxrpc/JBossXBContentAdapter.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxrpc/JBossXBContentAdapter.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxrpc/JBossXBContentAdapter.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -37,7 +37,7 @@ import org.jboss.ws.core.soap.attachment.SwapableMemoryDataSource; import org.jboss.ws.core.utils.MimeUtils; import org.jboss.ws.extensions.xop.XOPContext; -import org.jboss.wsintegration.spi.utils.IOUtils; +import org.jboss.wsf.spi.utils.IOUtils; import org.jboss.xb.binding.sunday.marshalling.MarshallingContext; import org.jboss.xb.binding.sunday.marshalling.TermBeforeMarshallingCallback; import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -33,7 +33,7 @@ import javax.xml.bind.annotation.XmlAttachmentRef; import javax.xml.transform.Source; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; /** * Scans data types for MTOM and swaRef declarations. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -67,17 +67,17 @@ import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.management.ServerConfig; -import org.jboss.wsintegration.spi.management.ServerConfigFactory; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedMessageDrivenMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedWebMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedWebSecurityMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedMessageDrivenMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; +import org.jboss.wsf.spi.utils.ObjectNameFactory; /** An abstract meta data builder. * Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -48,9 +48,9 @@ import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; import org.jboss.ws.integration.ResourceLoaderAdapter; import org.jboss.ws.integration.UnifiedVirtualFile; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** * A client side meta data builder. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -83,7 +83,7 @@ import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.WSDLRPCSignatureItem.Direction; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; /** * A meta data builder that is based on webservices.xml. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -42,15 +42,15 @@ import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; -import org.jboss.wsintegration.spi.deployment.JAXRPCDeployment; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedWebMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; -import org.jboss.wsintegration.spi.metadata.webservices.PortComponentMetaData; -import org.jboss.wsintegration.spi.metadata.webservices.WebserviceDescriptionMetaData; +import org.jboss.wsf.spi.deployment.JAXRPCDeployment; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; /** * A server side meta data builder that is based on webservices.xml. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -52,10 +52,10 @@ import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.integration.ResourceLoaderAdapter; import org.jboss.ws.integration.UnifiedVirtualFile; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData; /** * A client side meta data builder. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -81,12 +81,12 @@ import org.jboss.ws.metadata.wsdl.WSDLBindingOperation; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLMIMEPart; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.HandlerChainsObjectFactory; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.HandlerChainsObjectFactory; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.utils.JavaUtils; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -31,9 +31,9 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedBeanMetaData; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; /** * A server side meta data builder that is based on JSR-181 annotations Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -27,8 +27,8 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedWebMetaData; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; /** * A server side meta data builder that is based on JSR-181 annotations Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -47,8 +47,8 @@ import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; import org.jboss.ws.metadata.wsdl.WSDLUtils; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.utils.JavaUtils; /** * A server side meta data builder that is based on JSR-181 annotations Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -29,9 +29,9 @@ import org.jboss.ws.annotation.EndpointConfig; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.wsintegration.spi.annotation.WebContext; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.annotation.WebContext; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; /** * Builds ServiceEndpointMetaData for a JAX-WS endpoint. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -54,16 +54,16 @@ import org.jboss.ws.tools.wsdl.WSDLGenerator; import org.jboss.ws.tools.wsdl.WSDLWriter; import org.jboss.ws.tools.wsdl.WSDLWriterResolver; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; -import org.jboss.wsintegration.spi.metadata.webservices.PortComponentMetaData; -import org.jboss.wsintegration.spi.metadata.webservices.WebserviceDescriptionMetaData; -import org.jboss.wsintegration.spi.metadata.webservices.WebservicesFactory; -import org.jboss.wsintegration.spi.metadata.webservices.WebservicesMetaData; -import org.jboss.wsintegration.spi.utils.IOUtils; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; +import org.jboss.wsf.spi.utils.IOUtils; /** * An abstract annotation meta data builder. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/CommonConfig.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/CommonConfig.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/CommonConfig.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -30,7 +30,7 @@ import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** * A common configuration Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -34,7 +34,7 @@ import org.jboss.ws.metadata.config.jaxws.ConfigRootJAXWS; import org.jboss.ws.integration.ResourceLoaderAdapter; import org.jboss.ws.integration.UnifiedVirtualFile; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.jboss.xb.binding.JBossXBException; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXRPC.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXRPC.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXRPC.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -31,9 +31,9 @@ import org.jboss.ws.metadata.config.jaxrpc.CommonConfigJAXRPC; import org.jboss.ws.metadata.config.jaxrpc.ConfigRootJAXRPC; import org.jboss.ws.metadata.config.jaxrpc.EndpointConfigJAXRPC; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -30,8 +30,8 @@ import org.jboss.ws.metadata.config.jaxws.ConfigRootJAXWS; import org.jboss.ws.metadata.config.jaxws.EndpointConfigJAXWS; import org.jboss.ws.metadata.config.jaxws.HandlerChainsConfigJAXWS; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.HandlerChainsObjectFactory; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.HandlerChainsObjectFactory; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/jaxrpc/CommonConfigJAXRPC.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/jaxrpc/CommonConfigJAXRPC.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/jaxrpc/CommonConfigJAXRPC.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -28,9 +28,9 @@ import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; // $Id$ Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/jaxws/CommonConfigJAXWS.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/jaxws/CommonConfigJAXWS.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/jaxws/CommonConfigJAXWS.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -28,9 +28,9 @@ import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; // $Id$ Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/jaxws/HandlerChainsConfigJAXWS.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/jaxws/HandlerChainsConfigJAXWS.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/jaxws/HandlerChainsConfigJAXWS.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -24,7 +24,7 @@ import java.util.ArrayList; import java.util.List; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; /** * A JBossWS handler chains configuration Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -26,7 +26,7 @@ import javax.xml.namespace.QName; import org.jboss.ws.metadata.config.ConfigurationProvider; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** * Client side endpoint meta data. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -62,9 +62,9 @@ import org.jboss.ws.metadata.config.EndpointFeature; import org.jboss.ws.metadata.config.JBossWSConfigFactory; import org.jboss.ws.integration.UnifiedVirtualFile; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.utils.JavaUtils; /** * A Service component describes a set of endpoints. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -42,7 +42,7 @@ import org.jboss.ws.metadata.acessor.ReflectiveFieldAccessor; import org.jboss.ws.metadata.acessor.ReflectiveMethodAccessor; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; /** * A Fault component describes a fault that a given operation supports. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -33,8 +33,8 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** * The common metdata data for a handler element Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXRPC.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXRPC.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXRPC.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -26,8 +26,8 @@ import java.util.HashSet; import java.util.Set; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** * The JAXRPC metdata data for a handler element Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXWS.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXWS.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXWS.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -25,9 +25,9 @@ import javax.xml.namespace.QName; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** * The JAXWS metdata data for a handler element Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -39,7 +39,7 @@ import org.jboss.ws.core.jaxrpc.Use; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; import org.jboss.ws.integration.ResourceLoaderAdapter; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -43,7 +43,7 @@ import org.jboss.ws.extensions.xop.jaxws.ReflectiveAttachmentRefScanner; import org.jboss.ws.metadata.acessor.ReflectiveMethodAccessor; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; /** * A request/response parameter that a given operation supports. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -28,7 +28,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.metadata.config.ConfigurationProvider; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** * Client side endpoint meta data. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -51,7 +51,7 @@ import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.ws.integration.UnifiedVirtualFile; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -30,10 +30,10 @@ import java.util.StringTokenizer; import org.jboss.logging.Logger; -import org.jboss.ws.core.server.ManagedEndpointRegistry; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.stack.jbws.ManagedEndpointRegistry; /** * The top level meta data. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -23,7 +23,7 @@ import javax.xml.namespace.QName; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; /** * WrappedParameter represents a document/literal wrapped parameter. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -72,7 +72,7 @@ import org.jboss.ws.core.jaxrpc.ParameterWrapping; import org.jboss.ws.core.utils.HolderUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; import org.jboss.xb.binding.Util; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -57,8 +57,8 @@ import org.jboss.util.NotImplementedException; import org.jboss.ws.Constants; import org.jboss.ws.WSException; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; import org.jboss.xb.binding.NamespaceRegistry; import org.w3c.dom.Element; import org.w3c.dom.Node; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/WSSchemaUtils.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/WSSchemaUtils.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/WSSchemaUtils.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -48,7 +48,7 @@ import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMWriter; import org.jboss.xb.binding.NamespaceRegistry; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -56,8 +56,8 @@ import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSSimpleTypeDefinition; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSStringList; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSTypeDefinition; -import org.jboss.wsintegration.spi.management.ServerConfig; -import org.jboss.wsintegration.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; /** * Util class that deals with XML Schema Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToWSDL.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToWSDL.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToWSDL.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -41,8 +41,8 @@ import org.jboss.ws.tools.Configuration.OperationConfig; import org.jboss.ws.tools.metadata.ToolsUnifiedMetaDataBuilder; import org.jboss.ws.tools.wsdl.WSDLWriter; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/ToolsUtils.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/ToolsUtils.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/ToolsUtils.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -46,7 +46,7 @@ import org.jboss.ws.core.jaxrpc.binding.SimpleSerializerFactory; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; /** * Util class for the JBossWS Tools project Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -59,7 +59,7 @@ import org.jboss.ws.tools.helpers.ReturnTypeUnwrapper; import org.jboss.ws.tools.interfaces.WSDLToJavaIntf; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WebservicesXMLCreatorImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WebservicesXMLCreatorImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WebservicesXMLCreatorImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -32,12 +32,12 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.tools.interfaces.WebservicesXMLCreator; -import org.jboss.wsintegration.spi.metadata.webservices.PortComponentMetaData; -import org.jboss.wsintegration.spi.metadata.webservices.WebserviceDescriptionMetaData; -import org.jboss.wsintegration.spi.metadata.webservices.WebservicesFactory; -import org.jboss.wsintegration.spi.metadata.webservices.WebservicesMetaData; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; import org.jboss.xb.binding.JBossXBException; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -52,7 +52,7 @@ import org.jboss.ws.core.jaxrpc.LiteralTypeMapping; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; /** Class that converts a XSD Type into Java class * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -69,7 +69,7 @@ import org.jboss.ws.tools.interfaces.JavaToXSDIntf; import org.jboss.ws.tools.interfaces.SchemaCreatorIntf; import org.jboss.ws.tools.wsdl.WSDLGenerator; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; /** * Java To WSDL Helper which uses UnifiedMetaData Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -77,7 +77,7 @@ import org.jboss.ws.tools.ToolsUtils; import org.jboss.ws.tools.WSToolsConstants; import org.jboss.ws.tools.mapping.MappingFileGenerator; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ReformatXML.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ReformatXML.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ReformatXML.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -25,8 +25,8 @@ import java.io.FileNotFoundException; import java.io.InputStream; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -64,10 +64,10 @@ import org.jboss.ws.tools.interfaces.WebservicesXMLCreator; import org.jboss.ws.tools.mapping.MappingFileGenerator; import org.jboss.ws.tools.wsdl.WSDLWriter; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; -import org.jboss.wsintegration.spi.utils.IOUtils; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.IOUtils; +import org.jboss.wsf.spi.utils.JavaUtils; /** * Helper class used by the command line tool "jbossws" Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/command/wsprovide.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/command/wsprovide.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/command/wsprovide.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -33,7 +33,7 @@ import java.util.List; import org.jboss.ws.tools.jaxws.api.WSContractProvider; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; /** * wsprovide is a command line tool that generates portable JAX-WS artifacts Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -41,7 +41,7 @@ import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.jboss.ws.metadata.umdm.WrappedParameter; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; import com.sun.codemodel.JAnnotationArrayMember; import com.sun.codemodel.JAnnotationUse; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WSContractProviderImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WSContractProviderImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WSContractProviderImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -34,8 +34,8 @@ import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.tools.jaxws.api.WSContractProvider; import org.jboss.ws.integration.ResourceLoaderAdapter; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; /** * The provided implementation of a WSContractProvider. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -44,7 +44,7 @@ import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.tools.ToolsUtils; import org.jboss.ws.tools.Configuration.OperationConfig; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; /** * Builds the Tools Endpoint Meta Data using Java Reflection Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -100,8 +100,8 @@ import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; import org.jboss.ws.tools.JavaToXSD; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -53,8 +53,8 @@ import org.jboss.ws.metadata.wsdl.WSDLSOAPHeader; import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.metadata.wsdl.WSDLRPCSignatureItem.Direction; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -42,7 +42,7 @@ import org.jboss.ws.core.utils.ResourceURL; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLException; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.xml.sax.EntityResolver; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLWriter.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLWriter.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLWriter.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -39,8 +39,8 @@ import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.XSModelTypes; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Element; /** Copied: trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws (from rev 3145, trunk/jbossws-core/src/main/java/org/jboss/wsintegration/stack/jbws/deployment) Modified: trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeployer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/wsintegration/stack/jbws/deployment/EagerInitializeDeployer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,13 +19,13 @@ * 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.wsintegration.stack.jbws.deployment; +package org.jboss.wsf.stack.jbws; //$Id$ import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.wsintegration.spi.deployment.AbstractDeployer; -import org.jboss.wsintegration.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.AbstractDeployer; +import org.jboss.wsf.spi.deployment.Deployment; /** * A deployer that initializes the UMDM Modified: trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/EndpointNameDeployer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/wsintegration/stack/jbws/deployment/EndpointNameDeployer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/EndpointNameDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,16 +19,16 @@ * 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.wsintegration.stack.jbws.deployment; +package org.jboss.wsf.stack.jbws; //$Id$ import javax.management.ObjectName; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.wsintegration.spi.deployment.AbstractDeployer; -import org.jboss.wsintegration.spi.deployment.Deployment; -import org.jboss.wsintegration.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.AbstractDeployer; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; /** * A deployer that assigns the complete name to the Endpoint Modified: trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeployer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/wsintegration/stack/jbws/deployment/EventingDeployer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.stack.jbws.deployment; +package org.jboss.wsf.stack.jbws; //$Id$ @@ -29,9 +29,9 @@ import org.jboss.ws.extensions.eventing.mgmt.SubscriptionManagerFactory; import org.jboss.ws.extensions.eventing.mgmt.SubscriptionManagerMBean; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.wsintegration.spi.deployment.AbstractDeployer; -import org.jboss.wsintegration.spi.deployment.Deployment; -import org.jboss.wsintegration.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.AbstractDeployer; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; /** * A deployer that creates event sources and register them with the Copied: trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/LifecycleHandlerImpl.java (from rev 3145, trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/LifecycleHandlerImpl.java) =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/LifecycleHandlerImpl.java (rev 0) +++ trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/LifecycleHandlerImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,58 @@ +/* + * 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.wsf.stack.jbws; + +//$Id: LifecycleHandlerImpl.java 2923 2007-04-25 14:23:29Z thomas.diesler(a)jboss.com $ + +import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; +import org.jboss.wsf.spi.deployment.BasicLifecycleHandler; +import org.jboss.wsf.spi.deployment.Endpoint; + +/** + * A lifecycle handler + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class LifecycleHandlerImpl extends BasicLifecycleHandler +{ + public void start(Endpoint endpoint) + { + super.start(endpoint); + log.info("WebService started: " + getEndpointAddress(endpoint)); + } + + public void stop(Endpoint endpoint) + { + super.stop(endpoint); + log.info("WebService stoped: " + getEndpointAddress(endpoint)); + } + + private String getEndpointAddress(Endpoint ep) + { + ServerEndpointMetaData sepMetaData = ep.getAttachment(ServerEndpointMetaData.class); + if (sepMetaData == null) + throw new IllegalStateException("Cannot obtain endpoint meta data"); + + return sepMetaData.getEndpointAddress(); + } +} Copied: trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistry.java (from rev 3145, trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ManagedEndpointRegistry.java) =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistry.java (rev 0) +++ trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistry.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,128 @@ +/* + * 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.wsf.stack.jbws; + +// $Id$ + +import java.util.ArrayList; + +import javax.management.MBeanServer; +import javax.management.MBeanServerFactory; +import javax.management.ObjectName; + +import org.jboss.logging.Logger; +import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; +import org.jboss.ws.metadata.umdm.UnifiedMetaData; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.management.BasicEndpointRegistry; + +/** + * A Service Endpoint Registry + * + * @author Thomas.Diesler(a)jboss.org + * @since 04-May-2007 + */ +public class ManagedEndpointRegistry extends BasicEndpointRegistry implements ManagedEndpointRegistryMBean +{ + // provide logging + private static final Logger log = Logger.getLogger(ManagedEndpointRegistry.class); + + public String getImplementationTitle() + { + return getClass().getPackage().getImplementationTitle(); + } + + public String getImplementationVersion() + { + return UnifiedMetaData.getImplementationVersion(); + } + + /** Resolve a port-component-link, like: + * + * [deployment.war]#PortComponentName + * [deployment.jar]#PortComponentName + * + */ + public Endpoint resolvePortComponentLink(String pcLink) + { + String pcName = pcLink; + int hashIndex = pcLink.indexOf("#"); + if (hashIndex > 0) + { + pcName = pcLink.substring(hashIndex + 1); + } + + Endpoint endpoint = null; + for (ObjectName sepID : getEndpoints()) + { + Endpoint auxEndpoint = getEndpoint(sepID); + ServerEndpointMetaData sepMetaData = auxEndpoint.getAttachment(ServerEndpointMetaData.class); + if (pcName.equals(sepMetaData.getPortComponentName())) + { + if (endpoint != null) + { + log.warn("Multiple service endoints found for: " + pcLink); + endpoint = null; + break; + } + endpoint = auxEndpoint; + } + } + + if (endpoint == null) + log.warn("No ServiceEndpoint found for pcLink: " + pcLink); + + return endpoint; + } + + public void create() throws Exception + { + log.info(getImplementationTitle()); + log.info(getImplementationVersion()); + MBeanServer server = getMBeanServer(); + if (server != null) + { + server.registerMBean(this, OBJECT_NAME); + } + } + + public void destroy() throws Exception + { + log.debug("Destroy service endpoint manager"); + MBeanServer server = getMBeanServer(); + if (server != null) + { + server.unregisterMBean(OBJECT_NAME); + } + } + + private MBeanServer getMBeanServer() + { + MBeanServer server = null; + ArrayList servers = MBeanServerFactory.findMBeanServer(null); + if (servers.size() > 0) + { + server = (MBeanServer)servers.get(0); + } + return server; + } +} Copied: trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistryMBean.java (from rev 3145, trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ManagedEndpointRegistryMBean.java) =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistryMBean.java (rev 0) +++ trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistryMBean.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,35 @@ +/* + * 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.wsf.stack.jbws; + +import org.jboss.wsf.spi.management.EndpointRegistry; + +/** + * MBean interface. + * @since 15-April-2004 + */ +public interface ManagedEndpointRegistryMBean extends EndpointRegistry +{ + String getImplementationTitle(); + + String getImplementationVersion(); +} Modified: trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeployer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/wsintegration/stack/jbws/deployment/PublishContractDeployer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,17 +19,17 @@ * 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.wsintegration.stack.jbws.deployment; +package org.jboss.wsf.stack.jbws; //$Id$ import java.io.IOException; import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.wsintegration.spi.deployment.AbstractDeployer; -import org.jboss.wsintegration.spi.deployment.Deployment; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.deployment.WSDeploymentException; +import org.jboss.wsf.spi.deployment.AbstractDeployer; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.deployment.WSDeploymentException; /** * A deployer that publishes the wsdl Copied: trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java (from rev 3145, trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/RequestHandlerImpl.java) =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java (rev 0) +++ trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,515 @@ +/* + * 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.wsf.stack.jbws; + +//$Id$ + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; +import java.net.URL; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.activation.DataHandler; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletInputStream; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.namespace.QName; +import javax.xml.rpc.JAXRPCException; +import javax.xml.rpc.soap.SOAPFaultException; +import javax.xml.soap.MimeHeaders; +import javax.xml.soap.SOAPEnvelope; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; +import javax.xml.soap.SOAPPart; +import javax.xml.ws.addressing.AddressingProperties; +import javax.xml.ws.addressing.JAXWSAConstants; +import javax.xml.ws.http.HTTPBinding; + +import org.jboss.logging.Logger; +import org.jboss.ws.Constants; +import org.jboss.ws.WSException; +import org.jboss.ws.core.CommonBinding; +import org.jboss.ws.core.CommonBindingProvider; +import org.jboss.ws.core.CommonMessageContext; +import org.jboss.ws.core.HTTPMessageImpl; +import org.jboss.ws.core.MessageAbstraction; +import org.jboss.ws.core.MessageTrace; +import org.jboss.ws.core.jaxrpc.binding.BindingException; +import org.jboss.ws.core.jaxrpc.handler.MessageContextJAXRPC; +import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC; +import org.jboss.ws.core.jaxws.handler.MessageContextJAXWS; +import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS; +import org.jboss.ws.core.server.MimeHeaderSource; +import org.jboss.ws.core.server.ServiceEndpointInvoker; +import org.jboss.ws.core.server.ServletHeaderSource; +import org.jboss.ws.core.server.ServletRequestContext; +import org.jboss.ws.core.server.WSDLRequestHandler; +import org.jboss.ws.core.soap.MessageContextAssociation; +import org.jboss.ws.core.soap.MessageFactoryImpl; +import org.jboss.ws.core.soap.SOAPConnectionImpl; +import org.jboss.ws.core.soap.SOAPMessageImpl; +import org.jboss.ws.core.utils.ThreadLocalAssociation; +import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; +import org.jboss.ws.extensions.xop.XOPContext; +import org.jboss.ws.metadata.umdm.EndpointMetaData; +import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; +import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Endpoint.EndpointState; +import org.jboss.wsf.spi.invocation.InvocationContext; +import org.jboss.wsf.spi.invocation.RequestHandler; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.utils.DOMWriter; +import org.w3c.dom.Document; + +/** + * A request handler + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class RequestHandlerImpl implements RequestHandler +{ + // provide logging + private static final Logger log = Logger.getLogger(RequestHandlerImpl.class); + + public void handleHttpRequest(Endpoint endpoint, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException + { + String method = req.getMethod(); + if (method.equals("POST")) + { + doPost(endpoint, req, res, context); + } + else if (method.equals("GET")) + { + doGet(endpoint, req, res, context); + } + else + { + throw new WSException("Unsupported method: " + method); + } + } + + private void doGet(Endpoint endpoint, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException + { + // Process a WSDL request + if (req.getParameter("wsdl") != null || req.getParameter("WSDL") != null) + { + res.setContentType("text/xml"); + ServletOutputStream out = res.getOutputStream(); + try + { + ServletRequestContext reqContext = new ServletRequestContext(context, req, res); + handleWSDLRequest(endpoint, out, reqContext); + } + catch (Exception ex) + { + handleException(ex); + } + finally + { + try + { + out.close(); + } + catch (IOException ioex) + { + log.error("Cannot close output stream"); + } + } + } + else + { + res.setStatus(405); + res.setContentType("text/plain"); + Writer out = res.getWriter(); + out.write("HTTP GET not supported"); + out.close(); + } + } + + private void doPost(Endpoint endpoint, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException + { + log.debug("doPost: " + req.getRequestURI()); + + ServletInputStream in = req.getInputStream(); + ServletOutputStream out = res.getOutputStream(); + try + { + ServletRequestContext reqContext = new ServletRequestContext(context, req, res); + handleRequest(endpoint, in, out, reqContext); + } + catch (Exception ex) + { + handleException(ex); + } + finally + { + try + { + out.close(); + } + catch (IOException ioex) + { + log.error("Cannot close output stream"); + } + } + } + + public void handleRequest(Endpoint endpoint, InputStream inStream, OutputStream outStream, InvocationContext context) + { + log.debug("handleRequest: " + endpoint.getName()); + + ServerEndpointMetaData sepMetaData = endpoint.getAttachment(ServerEndpointMetaData.class); + if (sepMetaData == null) + throw new IllegalStateException("Cannot obtain endpoint meta data"); + + ServletRequestContext reqContext = (ServletRequestContext)context; + + Type type = sepMetaData.getType(); + + ServletContext servletContext = reqContext.getServletContext(); + HttpServletRequest httpRequest = reqContext.getHttpServletRequest(); + HttpServletResponse httpResponse = reqContext.getHttpServletResponse(); + ServletHeaderSource headerSource = new ServletHeaderSource(httpRequest, httpResponse); + + // Build the message context + CommonMessageContext msgContext; + if (type == EndpointMetaData.Type.JAXRPC) + { + msgContext = new SOAPMessageContextJAXRPC(); + msgContext.put(MessageContextJAXRPC.SERVLET_CONTEXT, servletContext); + msgContext.put(MessageContextJAXRPC.SERVLET_REQUEST, httpRequest); + msgContext.put(MessageContextJAXRPC.SERVLET_RESPONSE, httpResponse); + } + else + { + msgContext = new SOAPMessageContextJAXWS(); + msgContext.put(MessageContextJAXWS.MESSAGE_OUTBOUND_PROPERTY, new Boolean(false)); + msgContext.put(MessageContextJAXWS.INBOUND_MESSAGE_ATTACHMENTS, new HashMap<String, DataHandler>()); + msgContext.put(MessageContextJAXWS.HTTP_REQUEST_HEADERS, headerSource.getHeaderMap()); + msgContext.put(MessageContextJAXWS.HTTP_REQUEST_METHOD, httpRequest.getMethod()); + msgContext.put(MessageContextJAXWS.QUERY_STRING, httpRequest.getQueryString()); + msgContext.put(MessageContextJAXWS.PATH_INFO, httpRequest.getPathInfo()); + msgContext.put(MessageContextJAXWS.SERVLET_CONTEXT, servletContext); + msgContext.put(MessageContextJAXWS.SERVLET_REQUEST, httpRequest); + msgContext.put(MessageContextJAXWS.SERVLET_RESPONSE, httpResponse); + + } + msgContext.setEndpointMetaData(sepMetaData); + + // Associate a message context with the current thread + MessageContextAssociation.pushMessageContext(msgContext); + + try + { + MessageAbstraction resMessage = processRequest(endpoint, headerSource, reqContext, inStream); + + // Replace the message context with the response context + msgContext = MessageContextAssociation.peekMessageContext(); + + Map<String, List<String>> headers = (Map<String, List<String>>)msgContext.get(MessageContextJAXWS.HTTP_RESPONSE_HEADERS); + if (headers != null) + headerSource.setHeaderMap(headers); + + Integer code = (Integer)msgContext.get(MessageContextJAXWS.HTTP_RESPONSE_CODE); + if (code != null) + httpResponse.setStatus(code.intValue()); + + boolean isFault = false; + if (resMessage instanceof SOAPMessage) + { + SOAPPart part = ((SOAPMessage)resMessage).getSOAPPart(); + if (part == null) + throw new SOAPException("Cannot obtain SOAPPart from response message"); + + // R1126 An INSTANCE MUST return a "500 Internal Server Error" HTTP status code + // if the response envelope is a Fault. + // + // Also, a one-way operation must show up as empty content, and can be detected + // by a null envelope. + SOAPEnvelope soapEnv = part.getEnvelope(); + isFault = soapEnv != null && soapEnv.getBody().hasFault(); + if (isFault && httpResponse != null) + { + httpResponse.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + } + } + + sendResponse(outStream, msgContext, isFault); + } + catch (Exception ex) + { + WSException.rethrow(ex); + } + finally + { + // Reset the message context association + MessageContextAssociation.popMessageContext(); + + // clear thread local storage + ThreadLocalAssociation.clear(); + } + } + + private void sendResponse(OutputStream outputStream, CommonMessageContext msgContext, boolean isFault) throws SOAPException, IOException + { + MessageAbstraction resMessage = msgContext.getMessageAbstraction(); + String wsaTo = null; + + // Get the destination from the AddressingProperties + AddressingProperties outProps = (AddressingProperties)msgContext.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND); + if (outProps != null && outProps.getTo() != null) + { + AddressingConstantsImpl ADDR = new AddressingConstantsImpl(); + wsaTo = outProps.getTo().getURI().toString(); + if (wsaTo.equals(ADDR.getAnonymousURI())) + wsaTo = null; + } + if (wsaTo != null) + { + log.debug("Sending response to addressing destination: " + wsaTo); + new SOAPConnectionImpl().callOneWay((SOAPMessage)resMessage, wsaTo); + } + else + { + resMessage.writeTo(outputStream); + } + } + + /** + * Handle a request to this web service endpoint + */ + private MessageAbstraction processRequest(Endpoint ep, MimeHeaderSource headerSource, ServletRequestContext reqContext, InputStream inputStream) + throws BindingException + { + CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); + + ServerEndpointMetaData sepMetaData = ep.getAttachment(ServerEndpointMetaData.class); + if (sepMetaData == null) + throw new IllegalStateException("Cannot obtain endpoint meta data"); + + long beginProcessing = 0; + ClassLoader ctxClassLoader = Thread.currentThread().getContextClassLoader(); + try + { + EndpointState state = ep.getState(); + if (state != EndpointState.STARTED) + { + QName faultCode = Constants.SOAP11_FAULT_CODE_SERVER; + String faultString = "Endpoint cannot handle requests in state: " + state; + throw new SOAPFaultException(faultCode, faultString, null, null); + } + + log.debug("BEGIN handleRequest: " + ep.getName()); + beginProcessing = initRequestMetrics(ep); + + MimeHeaders headers = (headerSource != null ? headerSource.getMimeHeaders() : null); + + MessageAbstraction reqMessage; + + String bindingID = sepMetaData.getBindingId(); + if (HTTPBinding.HTTP_BINDING.equals(bindingID)) + { + reqMessage = new HTTPMessageImpl(headers, inputStream); + } + else + { + MessageFactoryImpl msgFactory = new MessageFactoryImpl(); + msgFactory.setServiceMode(sepMetaData.getServiceMode()); + msgFactory.setStyle(sepMetaData.getStyle()); + + reqMessage = (SOAPMessageImpl)msgFactory.createMessage(headers, inputStream); + } + + // Associate current message with message context + msgContext.setMessageAbstraction(reqMessage); + + // debug the incomming message + MessageTrace.traceMessage("Incoming Request Message", reqMessage); + + // Set the thread context class loader + ClassLoader classLoader = sepMetaData.getClassLoader(); + Thread.currentThread().setContextClassLoader(classLoader); + + // Get the Invoker + ServiceEndpointInvoker epInvoker = ep.getAttachment(ServiceEndpointInvoker.class); + if (epInvoker == null) + throw new IllegalStateException("Cannot obtain ServiceEndpointInvoker"); + + // Invoke the service endpoint + epInvoker.invoke(reqContext); + + // Get the response message context + msgContext = MessageContextAssociation.peekMessageContext(); + + // Get the response message + MessageAbstraction resMessage = msgContext.getMessageAbstraction(); + if (resMessage != null) + postProcessResponse(headerSource, resMessage); + + return resMessage; + } + catch (Exception ex) + { + MessageAbstraction resMessage = msgContext.getMessageAbstraction(); + + // In case we have an exception before the invoker is called + // we create the fault message here. + if (resMessage == null || resMessage.isFaultMessage() == false) + { + CommonBindingProvider bindingProvider = new CommonBindingProvider(sepMetaData); + CommonBinding binding = bindingProvider.getCommonBinding(); + resMessage = binding.bindFaultMessage(ex); + } + + if (resMessage != null) + postProcessResponse(headerSource, resMessage); + + return resMessage; + } + finally + { + try + { + MessageAbstraction resMessage = msgContext.getMessageAbstraction(); + if (resMessage != null) + { + if (resMessage.isFaultMessage()) + { + processFaultMetrics(ep, beginProcessing); + } + else + { + processResponseMetrics(ep, beginProcessing); + } + } + } + catch (Exception ex) + { + log.error("Cannot process metrics", ex); + } + + // Reset the thread context class loader + Thread.currentThread().setContextClassLoader(ctxClassLoader); + log.debug("END handleRequest: " + ep.getName()); + } + } + + private long initRequestMetrics(Endpoint endpoint) + { + return 0; + } + + private void processResponseMetrics(Endpoint endpoint, long beginProcessing) + { + } + + private void processFaultMetrics(Endpoint endpoint, long beginProcessing) + { + } + + /** Set response mime headers + */ + private void postProcessResponse(MimeHeaderSource headerSource, MessageAbstraction resMessage) + { + try + { + // Set the outbound headers + if (headerSource != null && resMessage instanceof SOAPMessage) + { + XOPContext.eagerlyCreateAttachments(); + ((SOAPMessage)resMessage).saveChanges(); + headerSource.setMimeHeaders(resMessage.getMimeHeaders()); + } + + // debug the outgoing message + MessageTrace.traceMessage("Outgoing Response Message", resMessage); + } + catch (Exception ex) + { + WSException.rethrow("Faild to post process response message", ex); + } + } + + public void handleWSDLRequest(Endpoint endpoint, OutputStream outputStream, InvocationContext context) + { + log.debug("handleWSDLRequest: " + endpoint.getName()); + + ServerEndpointMetaData epMetaData = endpoint.getAttachment(ServerEndpointMetaData.class); + if (epMetaData == null) + throw new IllegalStateException("Cannot obtain endpoint meta data"); + + ServletRequestContext reqContext = (ServletRequestContext)context; + HttpServletRequest req = reqContext.getHttpServletRequest(); + + try + { + // For the base document the resourcePath should be null + String resPath = (String)req.getParameter("resource"); + URL reqURL = new URL(req.getRequestURL().toString()); + + String wsdlHost = reqURL.getProtocol() + "://" + reqURL.getHost() + ":" + reqURL.getPort(); + + ServerConfigFactory factory = ServerConfigFactory.getInstance(); + ServerConfig config = factory.getServerConfig(); + if (config.getWebServiceHost().equals(ServerConfig.UNDEFINED_HOSTNAME) == false) + { + wsdlHost = config.getWebServiceHost(); + } + log.debug("WSDL request, using host: " + wsdlHost); + + WSDLRequestHandler wsdlRequestHandler = new WSDLRequestHandler(epMetaData); + Document document = wsdlRequestHandler.getDocumentForPath(reqURL, wsdlHost, resPath); + + OutputStreamWriter writer = new OutputStreamWriter(outputStream); + new DOMWriter(writer).setPrettyprint(true).print(document.getDocumentElement()); + } + catch (RuntimeException rte) + { + throw rte; + } + catch (IOException ex) + { + throw new WSException(ex); + } + } + + private void handleException(Exception ex) throws ServletException + { + log.error("Error processing web service request", ex); + + if (ex instanceof JAXRPCException) + throw (JAXRPCException)ex; + + throw new ServletException(ex); + } +} Modified: trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeployer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/wsintegration/stack/jbws/deployment/ServiceEndpointInvokerDeployer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,16 +19,16 @@ * 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.wsintegration.stack.jbws.deployment; +package org.jboss.wsf.stack.jbws; //$Id$ import org.jboss.ws.core.server.ServiceEndpointInvoker; import org.jboss.ws.core.server.ServiceEndpointInvokerEJB21; -import org.jboss.wsintegration.spi.deployment.AbstractDeployer; -import org.jboss.wsintegration.spi.deployment.Deployment; -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.deployment.AbstractDeployer; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; /** * A deployer that associates the ServiceEndpointInvoker with the endpoint Copied: trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java (from rev 3145, trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointServlet.java) =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java (rev 0) +++ trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,63 @@ +/* + * 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.wsf.stack.jbws; + +// $Id$ + +import javax.servlet.ServletContext; + +import org.jboss.logging.Logger; +import org.jboss.ws.core.server.AbstractServiceEndpointServlet; +import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; + +/** + * A servlet that is installed for every web service endpoint. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class ServiceEndpointServlet extends AbstractServiceEndpointServlet +{ + // provide logging + private static final Logger log = Logger.getLogger(ServiceEndpointServlet.class); + + /** Initialize the service endpoint + */ + protected void initServiceEndpoint(String contextPath) + { + super.initServiceEndpoint(contextPath); + + // read the config name/file from web.xml + ServletContext ctx = getServletContext(); + String configName = ctx.getInitParameter("jbossws-config-name"); + String configFile = ctx.getInitParameter("jbossws-config-file"); + if (configName != null || configFile != null) + { + ServerEndpointMetaData epMetaData = endpoint.getAttachment(ServerEndpointMetaData.class); + if (epMetaData == null) + throw new IllegalStateException("Cannot obtain endpoint meta data"); + + log.debug("Updating service endpoint config\n config-name: " + configName + "\n config-file: " + configFile); + epMetaData.setConfigName(configName, configFile); + } + } +} Copied: trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/ServiceLifecycleInvocationHandler.java (from rev 3145, trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceLifecycleInvocationHandler.java) =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/ServiceLifecycleInvocationHandler.java (rev 0) +++ trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/ServiceLifecycleInvocationHandler.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -0,0 +1,74 @@ +/* + * 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.wsf.stack.jbws; + +// $Id$ + +import javax.xml.rpc.server.ServiceLifecycle; +import javax.xml.rpc.server.ServletEndpointContext; + +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.invocation.EndpointInvocation; +import org.jboss.wsf.spi.invocation.InvocationContext; +import org.jboss.wsf.spi.invocation.InvocationHandlerJSE; + +/** + * Handles invocations on JSE endpoints. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class ServiceLifecycleInvocationHandler extends InvocationHandlerJSE +{ + public void invoke(Endpoint ep, Object beanInstance, EndpointInvocation epInv) throws Exception + { + try + { + if (beanInstance == null) + beanInstance = super.getBeanInstance(ep); + + InvocationContext invContext = epInv.getInvocationContext(); + if (beanInstance instanceof ServiceLifecycle) + { + ServletEndpointContext sepContext = invContext.getAttachment(ServletEndpointContext.class); + if (sepContext != null) + ((ServiceLifecycle)beanInstance).init(sepContext); + } + + try + { + super.invoke(ep, beanInstance, epInv); + } + finally + { + if (beanInstance instanceof ServiceLifecycle) + { + ((ServiceLifecycle)beanInstance).destroy(); + } + } + } + catch (Exception e) + { + handleInvocationException(e); + } + } +} Modified: trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataAssociationDeployer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/wsintegration/stack/jbws/deployment/UnifiedMetaDataAssociationDeployer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataAssociationDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.stack.jbws.deployment; +package org.jboss.wsf.stack.jbws; //$Id$ @@ -29,9 +29,9 @@ import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.wsintegration.spi.deployment.AbstractDeployer; -import org.jboss.wsintegration.spi.deployment.Deployment; -import org.jboss.wsintegration.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.AbstractDeployer; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; /** * A deployer that assigns the EndpointMetaData to the Endpoint Modified: trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeployer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/wsintegration/stack/jbws/deployment/UnifiedMetaDataDeployer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.stack.jbws.deployment; +package org.jboss.wsf.stack.jbws; //$Id$ @@ -27,11 +27,11 @@ import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilderEJB3; import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilderJSE; import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.wsintegration.spi.deployment.AbstractDeployer; -import org.jboss.wsintegration.spi.deployment.Deployment; -import org.jboss.wsintegration.spi.deployment.JAXRPCDeployment; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.deployment.AbstractDeployer; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.JAXRPCDeployment; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; /** * A deployer that builds the UnifiedDeploymentInfo Modified: trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeployment.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/wsintegration/stack/jbws/deployment/UnifiedMetaDataDeployment.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeployment.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -53,12 +53,12 @@ * information on the Apache Software Foundation, please see * <http://www.apache.org/>. */ -package org.jboss.wsintegration.stack.jbws.deployment; +package org.jboss.wsf.stack.jbws; //$Id$ import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.wsintegration.spi.deployment.BasicDeployment; +import org.jboss.wsf.spi.deployment.BasicDeployment; /** * A deployment that injects the ClassLoader into the UnifiedMetaDataModel Modified: trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/wsintegration/stack/jbws/deployment/WSDLFilePublisher.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.stack.jbws.deployment; +package org.jboss.wsf.stack.jbws; // $Id$ @@ -47,11 +47,11 @@ import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLWriter; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.management.ServerConfig; -import org.jboss.wsintegration.spi.management.ServerConfigFactory; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.IOUtils; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.IOUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/WebAppGeneratorDeployer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/wsintegration/stack/jbws/deployment/WebAppGeneratorDeployer.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/WebAppGeneratorDeployer.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -19,7 +19,7 @@ * 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.wsintegration.stack.jbws.deployment; +package org.jboss.wsf.stack.jbws; //$Id$ @@ -36,14 +36,14 @@ import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.wsintegration.spi.deployment.AbstractDeployer; -import org.jboss.wsintegration.spi.deployment.Deployment; -import org.jboss.wsintegration.spi.deployment.SecurityRolesHandler; -import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsintegration.spi.management.ServerConfig; -import org.jboss.wsintegration.spi.management.ServerConfigFactory; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.deployment.AbstractDeployer; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.SecurityRolesHandler; +import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTest.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTest.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTest.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -35,8 +35,8 @@ import junit.framework.TestCase; import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -31,7 +31,7 @@ import javax.naming.NamingException; import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; +import org.jboss.wsf.spi.utils.ObjectNameFactory; /** * A JBossWS test helper that deals with test deployment/undeployment, etc. Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -50,7 +50,7 @@ import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; /** * Test the SOAPBindingProvider Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -31,8 +31,8 @@ import org.jboss.ws.metadata.config.jaxrpc.EndpointConfigJAXRPC; import org.jboss.ws.metadata.config.jaxws.ConfigRootJAXWS; import org.jboss.ws.metadata.config.jaxws.EndpointConfigJAXWS; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; /** * Test parsing of the JBossWS config Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayMarshallerTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayMarshallerTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayMarshallerTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -31,7 +31,7 @@ import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants; import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBMarshallerImpl; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; /** * Test the JAXB marshalling of array types Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayUnmarshallerTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayUnmarshallerTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayUnmarshallerTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -31,7 +31,7 @@ import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants; import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBUnmarshallerImpl; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; /** * Test the JAXB marshalling of array types Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayMarshallerTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayMarshallerTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayMarshallerTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -33,7 +33,7 @@ import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants; import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBMarshallerImpl; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; /** * Test the JAXB marshalling of array types Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayUnmarshallerTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayUnmarshallerTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayUnmarshallerTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -33,7 +33,7 @@ import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants; import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBUnmarshallerImpl; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; /** * Test the JAXB marshalling of array types Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayMarshallerTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayMarshallerTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayMarshallerTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -30,7 +30,7 @@ import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants; import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBMarshallerImpl; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; /** * Test the JAXB marshalling of array types Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayUnmarshallerTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayUnmarshallerTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayUnmarshallerTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -30,7 +30,7 @@ import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants; import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBUnmarshallerImpl; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; /** * Test the JAXB marshalling of array types Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeMarshallerTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeMarshallerTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeMarshallerTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -34,7 +34,7 @@ import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBMarshallerImpl; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; /** * Test the JAXB marshalling of complex types Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleMarshallerTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleMarshallerTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleMarshallerTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -34,7 +34,7 @@ import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBMarshallerImpl; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; /** * Test the JAXB marshalling of complex types Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeMarshallerTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeMarshallerTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeMarshallerTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -35,7 +35,7 @@ import org.jboss.ws.core.jaxrpc.binding.jbossxb.MarshalException; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.PackageMapping; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; /** * Test the JAXB marshalling of a SimpleUserType Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeUnmarshallerTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeUnmarshallerTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeUnmarshallerTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -31,7 +31,7 @@ import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBUnmarshallerImpl; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.PackageMapping; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; /** * Test the JAXB unmarshalling of a SimpleUserType Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -40,8 +40,8 @@ import org.jboss.ws.Constants; import org.jboss.ws.core.jaxrpc.Style; import org.jboss.ws.core.soap.MessageFactoryImpl; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPEnvelopeTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPEnvelopeTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPEnvelopeTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -33,7 +33,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.Constants; import org.jboss.ws.core.soap.MessageFactoryImpl; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -38,7 +38,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.Constants; import org.jboss.ws.core.jaxrpc.SOAPFaultHelperJAXRPC; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; /** * Test the SOAPFault Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -34,7 +34,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.core.soap.MessageFactoryImpl; import org.jboss.ws.core.soap.NameImpl; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; /** * Test the SOAPHeaderElement Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -36,7 +36,7 @@ import org.jboss.ws.Constants; import org.jboss.ws.core.soap.MessageFactoryImpl; import org.jboss.ws.core.soap.NameImpl; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; /** * Test the SOAPHeader Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/XMLFragmentTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/XMLFragmentTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/XMLFragmentTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -23,8 +23,8 @@ import junit.framework.TestCase; import org.jboss.ws.core.soap.XMLFragment; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Element; import javax.xml.transform.dom.DOMSource; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -35,8 +35,8 @@ import javax.xml.transform.stream.StreamSource; import org.jboss.test.ws.JBossWSTest; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/JavaUtilsTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/JavaUtilsTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/JavaUtilsTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -23,7 +23,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.tools.jbws_161.custom.HelloObj; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; /** * Test the JavaUtils Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLWithAnonTypesTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLWithAnonTypesTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLWithAnonTypesTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -35,7 +35,7 @@ import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/InteropClientConfig.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/InteropClientConfig.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/InteropClientConfig.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -21,7 +21,7 @@ */ package org.jboss.test.ws.interop; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.jboss.test.ws.interop.ClientScenario; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/InteropConfigFactory.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/InteropConfigFactory.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/InteropConfigFactory.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -22,7 +22,7 @@ package org.jboss.test.ws.interop; import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.jboss.test.ws.interop.ClientScenario; import org.jboss.test.ws.interop.InteropClientConfig; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -26,7 +26,7 @@ import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.StubExt; import org.jboss.ws.extensions.addressing.AddressingClientUtil; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; import javax.xml.namespace.QName; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/JavaBean.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/JavaBean.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/JavaBean.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -10,7 +10,7 @@ import java.util.Arrays; import java.util.Calendar; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; public class JavaBean { Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/ValueType.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/ValueType.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/ValueType.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -10,7 +10,7 @@ import java.util.Arrays; import java.util.Calendar; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; public class ValueType { Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -26,7 +26,7 @@ import javax.management.ObjectName; import org.jboss.test.ws.JBossWSTest; -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; +import org.jboss.wsf.spi.utils.ObjectNameFactory; /** * Auto discover HTTP(S) port configuration from Tomcat Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -29,8 +29,8 @@ import org.jboss.ws.metadata.wsdl.WSDLEndpoint; import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsintegration.spi.management.ServerConfig; -import org.jboss.wsintegration.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; /** * Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -28,8 +28,8 @@ import javax.naming.InitialContext; import javax.xml.rpc.Service; -import org.jboss.wsintegration.spi.management.ServerConfig; -import org.jboss.wsintegration.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; /** * @author darran.lofthouse(a)jboss.com Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -34,7 +34,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Attr; import org.w3c.dom.NamedNodeMap; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -35,7 +35,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMWriter; /** * ComplexType cannot be constructed from attributes Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -41,8 +41,8 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/ServerHandler.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/ServerHandler.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/ServerHandler.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -30,7 +30,7 @@ import javax.xml.soap.SOAPMessage; import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMWriter; public class ServerHandler extends GenericHandler { Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws955/JBWS955TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws955/JBWS955TestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws955/JBWS955TestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -32,8 +32,8 @@ import javax.xml.soap.SOAPMessage; import org.jboss.test.ws.JBossWSTest; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -32,7 +32,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.jaxrpc.marshall.types.JavaBean; import org.jboss.test.ws.jaxrpc.marshall.types.JavaBean2; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; /** * Test standard JAX-RPC types. Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -37,7 +37,7 @@ import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.jaxrpc.client.ServiceExt; import org.jboss.ws.metadata.umdm.HandlerMetaData; -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; +import org.jboss.wsf.spi.utils.ObjectNameFactory; /** * Test dynamic handlers Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -51,7 +51,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestServiceBean.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestServiceBean.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestServiceBean.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -36,7 +36,7 @@ import javax.xml.transform.dom.DOMSource; import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/EmployeeRecordsImpl.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/EmployeeRecordsImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/EmployeeRecordsImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -28,7 +28,7 @@ import javax.activation.DataHandler; import javax.xml.transform.stream.StreamSource; -import org.jboss.wsintegration.spi.utils.IOUtils; +import org.jboss.wsf.spi.utils.IOUtils; /** * EmployeeRecords service endpoint Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -28,7 +28,7 @@ import org.jboss.logging.Logger; import org.jboss.test.ws.JBossWSTestHelper; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; +import org.jboss.wsf.spi.utils.ObjectNameFactory; /** * A test setup that deploys process archives. Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -37,7 +37,7 @@ import org.jboss.ws.extensions.security.SecurityDecoder; import org.jboss.ws.extensions.security.SecurityStore; import org.jboss.ws.extensions.security.Util; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -50,7 +50,7 @@ import org.jboss.ws.extensions.security.TimestampOperation; import org.jboss.ws.extensions.security.Util; import org.jboss.ws.extensions.security.WsuIdTarget; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SunInteropTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SunInteropTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SunInteropTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -36,7 +36,7 @@ import org.jboss.ws.extensions.security.SecurityDecoder; import org.jboss.ws.extensions.security.SecurityStore; import org.jboss.ws.extensions.security.Util; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -39,7 +39,7 @@ import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; import org.jboss.ws.core.StubExt; -import org.jboss.wsintegration.spi.utils.IOUtils; +import org.jboss.wsf.spi.utils.IOUtils; /** * @author Heiko Braun <heiko.braun(a)jboss.com> Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -40,7 +40,7 @@ import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; import org.jboss.ws.core.StubExt; -import org.jboss.wsintegration.spi.utils.IOUtils; +import org.jboss.wsf.spi.utils.IOUtils; /** * @author Heiko Braun <heiko.braun(a)jboss.com> Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -35,7 +35,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.jaxrpc.client.CallImpl; -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; +import org.jboss.wsf.spi.utils.ObjectNameFactory; /** * [JBWS-1178] Multiple virtual host and soap:address problem Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -31,8 +31,8 @@ import org.jboss.ws.metadata.wsdl.WSDLEndpoint; import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsintegration.spi.management.ServerConfig; -import org.jboss.wsintegration.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; /** * [JBWS-1190] - WSDL generated for JSR-181 POJO does not take 'transport-guarantee' in web.xml into account Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -29,7 +29,7 @@ import javax.jws.soap.SOAPBinding; import org.jboss.annotation.ejb.RemoteBinding; -import org.jboss.wsintegration.spi.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; @WebService(name = "EJB3Bean", targetNamespace = "http://org.jboss.ws/jbws944") @WebContext(contextRoot = "/jaxws-jbws944", urlPattern = "/FooBean01") Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -12,7 +12,7 @@ import javax.jws.WebService; import javax.jws.soap.SOAPBinding; -import org.jboss.wsintegration.spi.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; @WebService(targetNamespace = "http://www.jboss.org/test/ws/jaxws/jbws981") @SOAPBinding(style = SOAPBinding.Style.RPC) Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -41,7 +41,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.xml.sax.InputSource; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -36,7 +36,7 @@ import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.annotation.security.SecurityDomain; -import org.jboss.wsintegration.spi.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; @WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/context") @SOAPBinding(style = Style.RPC) Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointNoInjectEJB.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointNoInjectEJB.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointNoInjectEJB.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -38,8 +38,8 @@ import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS; import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.wsintegration.spi.annotation.WebContext; -import org.jboss.wsintegration.spi.invocation.WebServiceContextEJB; +import org.jboss.wsf.spi.annotation.WebContext; +import org.jboss.wsf.spi.invocation.WebServiceContextEJB; @WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/context") @SOAPBinding(style = Style.RPC) Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -41,7 +41,7 @@ import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -36,7 +36,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.core.jaxws.handler.GenericLogicalHandler; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -57,7 +57,7 @@ import javax.xml.registry.infomodel.User; import org.jboss.test.ws.JBossWSTest; -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; +import org.jboss.wsf.spi.utils.ObjectNameFactory; /** * Acts as the base class for Jaxr Test Cases Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -32,7 +32,7 @@ import org.jboss.annotation.ejb.RemoteBinding; import org.jboss.annotation.security.SecurityDomain; -import org.jboss.wsintegration.spi.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; /** * Test the JSR-181 annotation: javax.jws.WebService Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -36,7 +36,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.core.jaxws.handler.GenericLogicalHandler; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/oneway/JSR181OneWayTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/oneway/JSR181OneWayTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/oneway/JSR181OneWayTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -35,8 +35,8 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -36,7 +36,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.core.jaxws.handler.GenericLogicalHandler; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -47,7 +47,7 @@ import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; /** * Test a Provider<SOAPMessage> Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -48,7 +48,7 @@ import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -35,7 +35,7 @@ import org.jboss.test.ws.jaxws.samples.retail.profile.DiscountResponse; import org.jboss.test.ws.jaxws.samples.retail.profile.ProfileMgmt; import org.jboss.test.ws.jaxws.samples.retail.profile.ProfileMgmtService; -import org.jboss.wsintegration.spi.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; /** * An example order management component Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationBean.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationBean.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationBean.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -27,7 +27,7 @@ import javax.xml.ws.Response; import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; @Stateless @WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.retail.cc.CCVerification", name="CCVerification") Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtBean.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtBean.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtBean.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -25,7 +25,7 @@ import javax.jws.HandlerChain; import javax.jws.WebService; -import org.jboss.wsintegration.spi.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; @Stateless @WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.retail.profile.ProfileMgmt", name="ProfileMgmt", serviceName = "ProfileMgmtService") Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webmethod/JSR181WebMethodTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webmethod/JSR181WebMethodTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webmethod/JSR181WebMethodTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -43,7 +43,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.soap.NameImpl; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -28,7 +28,7 @@ import javax.jws.soap.SOAPBinding; import org.jboss.annotation.ejb.RemoteBinding; -import org.jboss.wsintegration.spi.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; /** * Test the JSR-181 annotation: javax.jws.WebService Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -30,7 +30,7 @@ import javax.jws.soap.SOAPBinding; import org.jboss.annotation.ejb.RemoteBinding; -import org.jboss.wsintegration.spi.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; /** * Test the JSR-181 javax.jws.WebService annotation on an EJB3 endpoint. Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -26,7 +26,7 @@ import javax.jws.WebService; import org.jboss.annotation.ejb.RemoteBinding; -import org.jboss.wsintegration.spi.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; /** * Test the JSR-181 annotation: javax.jws.WebService Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -27,7 +27,7 @@ import javax.jws.WebService; import javax.jws.soap.SOAPBinding; -import org.jboss.wsintegration.spi.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; /** * Test the JSR-181 javax.jws.WebService annotation on an SEI Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointImpl.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointImpl.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointImpl.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -30,7 +30,7 @@ import org.jboss.annotation.security.SecurityDomain; import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; @WebService(name = "SecureEndpoint", targetNamespace = "http://org.jboss.ws/wsref") @Stateless(name = "SecureEndpoint") Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -38,7 +38,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; import org.jboss.ws.core.utils.UUIDGenerator; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; /** * A client side handler for the ws-addressing Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -35,7 +35,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; /** * A server side handler for the ws-addressing Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -25,7 +25,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.extensions.addressing.EndpointReferenceImpl; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestWSDDParser.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestWSDDParser.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestWSDDParser.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -22,12 +22,13 @@ package org.jboss.test.ws.jaxws.wsdd; import junit.framework.TestCase; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; -import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; -import org.jboss.wsintegration.spi.metadata.webservices.PortComponentMetaData; -import org.jboss.wsintegration.spi.metadata.webservices.WebserviceDescriptionMetaData; -import org.jboss.wsintegration.spi.metadata.webservices.WebservicesFactory; -import org.jboss.wsintegration.spi.metadata.webservices.WebservicesMetaData; + +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; +import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventSinkServlet.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventSinkServlet.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventSinkServlet.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -29,8 +29,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -31,7 +31,7 @@ import org.jboss.ws.extensions.eventing.EventingConstants; import org.jboss.ws.extensions.eventing.jaxws.SubscribeResponse; import org.jboss.ws.extensions.eventing.mgmt.EventDispatcher; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/SubscriptionManagerTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/SubscriptionManagerTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/SubscriptionManagerTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -36,7 +36,7 @@ import org.jboss.ws.extensions.eventing.mgmt.Filter; import org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager; import org.jboss.ws.extensions.eventing.mgmt.SubscriptionTicket; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -40,8 +40,8 @@ import org.jboss.ws.tools.JavaToWSDL; import org.jboss.ws.tools.WSToolsConstants; import org.jboss.ws.tools.wsdl.WSDLWriter; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.IOUtils; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.IOUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/SchemaGeneratorTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/SchemaGeneratorTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/SchemaGeneratorTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -28,7 +28,7 @@ import org.jboss.test.ws.common.jbossxb.complex.Base; import org.jboss.test.ws.common.jbossxb.complex.Composite; import org.jboss.test.ws.common.jbossxb.complex.Derived; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; /** Test the XSD schema generator Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -47,8 +47,8 @@ import org.jboss.ws.tools.client.ServiceCreator; import org.jboss.ws.tools.exceptions.JBossWSToolsException; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.JavaUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -34,8 +34,8 @@ import org.jboss.ws.tools.WSDLToJava; import org.jboss.ws.tools.client.ServiceCreator; import org.jboss.ws.tools.mapping.MappingFileGenerator; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -31,8 +31,8 @@ import org.jboss.ws.tools.JavaToWSDL; import org.jboss.ws.tools.WSToolsConstants; import org.jboss.ws.tools.wsdl.WSDLWriter; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.IOUtils; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.IOUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -25,7 +25,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.tools.WSTools; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -40,8 +40,8 @@ import org.jboss.ws.tools.interfaces.WSDLToJavaIntf; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.ws.tools.wsdl.WSDLWriter; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.IOUtils; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.IOUtils; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaModelTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaModelTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaModelTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -33,7 +33,7 @@ import org.jboss.ws.Constants; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.tools.JavaToXSD; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaTypesCreatorTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaTypesCreatorTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaTypesCreatorTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -32,7 +32,7 @@ import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSTypeDefinition; import org.jboss.ws.tools.schema.SchemaTypeCreator; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -32,7 +32,7 @@ import org.jboss.test.ws.jaxws.samples.soapbinding.PurchaseOrderAck; import org.jboss.ws.tools.jaxws.api.WSContractProvider; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsintegration.spi.utils.JavaUtils; +import org.jboss.wsf.spi.utils.JavaUtils; /** * Tests the WSContractProvider API. Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -28,7 +28,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.util.xml.DOMUtils; import org.jboss.ws.tools.WSTools; -import org.jboss.wsintegration.spi.utils.IOUtils; +import org.jboss.wsf.spi.utils.IOUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1170/JBWS1170TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1170/JBWS1170TestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1170/JBWS1170TestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -27,7 +27,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.tools.WSTools; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -25,7 +25,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.tools.WSTools; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/AnonTypesTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/AnonTypesTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/AnonTypesTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -30,7 +30,7 @@ import org.jboss.test.ws.tools.jbws_204.wscompile.anontypes.Items; import org.jboss.ws.Constants; import org.jboss.ws.tools.JavaToXSD; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/NillableTypesTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/NillableTypesTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/NillableTypesTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -34,7 +34,7 @@ import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.metadata.wsdl.xmlschema.WSSchemaUtils; import org.jboss.ws.tools.JavaToXSD; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardArraysTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardArraysTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardArraysTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -30,7 +30,7 @@ import org.jboss.test.ws.tools.WSToolsTest; import org.jboss.ws.Constants; import org.jboss.ws.tools.JavaToXSD; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardDoubleArraysTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardDoubleArraysTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardDoubleArraysTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -29,7 +29,7 @@ import org.jboss.test.ws.tools.WSToolsTest; import org.jboss.ws.Constants; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/JavaWsdlMappingMetaDataTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/JavaWsdlMappingMetaDataTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/JavaWsdlMappingMetaDataTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -37,7 +37,7 @@ import org.jboss.ws.metadata.jaxrpcmapping.ServiceInterfaceMapping; import org.jboss.ws.metadata.jaxrpcmapping.WsdlMessageMapping; import org.jboss.ws.metadata.jaxrpcmapping.WsdlReturnValueMapping; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -28,11 +28,11 @@ import javax.xml.namespace.QName; import org.jboss.test.ws.JBossWSTest; -import org.jboss.wsintegration.spi.metadata.webservices.PortComponentMetaData; -import org.jboss.wsintegration.spi.metadata.webservices.WebserviceDescriptionMetaData; -import org.jboss.wsintegration.spi.metadata.webservices.WebservicesFactory; -import org.jboss.wsintegration.spi.metadata.webservices.WebservicesMetaData; -import org.jboss.wsintegration.spi.utils.DOMUtils; +import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; +import org.jboss.wsf.spi.utils.DOMUtils; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; Modified: trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTest.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTest.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTest.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -35,8 +35,8 @@ import junit.framework.TestCase; import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.utils.DOMUtils; -import org.jboss.wsintegration.spi.utils.DOMWriter; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; Modified: trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestHelper.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -31,7 +31,7 @@ import javax.naming.NamingException; import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; +import org.jboss.wsf.spi.utils.ObjectNameFactory; /** * A JBossWS test helper that deals with test deployment/undeployment, etc. Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EJB3Bean.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EJB3Bean.java 2007-05-18 21:40:57 UTC (rev 3145) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EJB3Bean.java 2007-05-18 22:55:26 UTC (rev 3146) @@ -27,7 +27,7 @@ import javax.jws.soap.SOAPBinding; import org.jboss.logging.Logger; -import org.jboss.wsintegration.spi.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; // Test that the wsdl can be read from the nested deployment @WebService(name="TestEndpoint", serviceName="TestEndpointService", wsdlLocation="META-INF/wsdl/TestEndpoint.wsdl")

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3145 - in trunk: integration/jboss42/ant-import and 20 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-18 17:40:57 -0400 (Fri, 18 May 2007) New Revision: 3145 Added: trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/BasicInvocationHandler.java trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/DeploymentDescriptorParserExt.java trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/DeploymentDescriptorParserJBWS.java trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/EndpointAssociation.java trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/InvokerEJB3.java trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/InvokerJSE.java trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/WSEndpointServletJBWS.java trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/WSServletContextListenerExt.java trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/WSServletContextListenerJBWS.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceLifecycleInvocationHandler.java Removed: trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/WSEndpointServlet.java trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/WSServletContextListener.java Modified: trunk/build/ant-import/build-samples.xml trunk/integration/jboss42/ant-import/build-thirdparty.xml trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/InvocationHandlerEJB21.java trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/InvocationHandlerEJB3.java trunk/integration/jboss50/ant-import/build-thirdparty.xml trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/InvocationHandlerEJB21.java trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/InvocationHandlerEJB3.java trunk/integration/jbws/ant-import/build-deploy.xml trunk/integration/jbws/ant-import/build-testsuite.xml trunk/integration/jbws/build.xml trunk/integration/jbws/src/main/resources/jbossws-jbws42.sar/jbossws.beans/META-INF/jboss-beans.xml trunk/integration/jbws/src/main/resources/jbossws-jbws50.sar/META-INF/jbossws-beans.xml trunk/integration/spi/ant-import/build-release.xml trunk/integration/spi/build.xml trunk/integration/spi/src/main/etc/component-info.xml trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/AbstractInvocationHandler.java trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/BasicEndpointInvocation.java trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/InvocationHandler.java trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/InvocationHandlerJSE.java trunk/integration/sunri/ant-import/build-deploy.xml trunk/integration/sunri/ant-import/build-testsuite.xml trunk/integration/sunri/ant-import/build-thirdparty.xml trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/EndpointNameDeployer.java trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/ModifyWebMetaDataDeployer.java trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml trunk/jbossws-core/ant-import-tests/build-testsuite.xml trunk/jbossws-core/ant-import/build-thirdparty.xml trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java trunk/testsuite/ant-import/build-jars-jaxws.xml trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java Log: Add support for InvocationHandler with SunRI Modified: trunk/build/ant-import/build-samples.xml =================================================================== --- trunk/build/ant-import/build-samples.xml 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/build/ant-import/build-samples.xml 2007-05-18 21:40:57 UTC (rev 3145) @@ -67,7 +67,7 @@ <mkdir dir="${build.src.samples.dir}/lib"/> <copy todir="${build.src.samples.dir}/lib"> <fileset dir="${core.output.lib.dir}"> - <include name="jbossws-integration.jar"/> + <include name="jbossws-spi.jar"/> <include name="jbossws-client.jar"/> <include name="jbossws-core.jar"/> <include name="jboss-jaxrpc.jar"/> Modified: trunk/integration/jboss42/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/jboss42/ant-import/build-thirdparty.xml 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/integration/jboss42/ant-import/build-thirdparty.xml 2007-05-18 21:40:57 UTC (rev 3145) @@ -32,7 +32,7 @@  <path id="jbws42.integration.classpath"> - <pathelement location="${spi.dir}/output/lib/jbossws-integration.jar"/> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> <pathelement location="${spi.dir}/thirdparty/jaxws-api.jar"/> <pathelement location="${spi.dir}/thirdparty/jaxrpc-api.jar"/> <pathelement location="${spi.dir}/thirdparty/jsr181-api.jar"/> Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/InvocationHandlerEJB21.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/InvocationHandlerEJB21.java 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/InvocationHandlerEJB21.java 2007-05-18 21:40:57 UTC (rev 3145) @@ -123,7 +123,7 @@ } - public void invoke(Endpoint ep, EndpointInvocation epInv) throws Exception + public void invoke(Endpoint ep, Object beanInstance, EndpointInvocation epInv) throws Exception { log.debug("Invoke: " + epInv.getJavaMethod().getName()); Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/InvocationHandlerEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/InvocationHandlerEJB3.java 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/InvocationHandlerEJB3.java 2007-05-18 21:40:57 UTC (rev 3145) @@ -81,7 +81,7 @@ throw new WebServiceException("Cannot find service endpoint target: " + objectName); } - public void invoke(Endpoint ep, EndpointInvocation epInv) throws Exception + public void invoke(Endpoint ep, Object beanInstance, EndpointInvocation epInv) throws Exception { try { Modified: trunk/integration/jboss50/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-05-18 21:40:57 UTC (rev 3145) @@ -32,7 +32,7 @@  <path id="jbws50.integration.classpath"> - <pathelement location="${spi.dir}/output/lib/jbossws-integration.jar"/> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> <pathelement location="${spi.dir}/thirdparty/jaxws-api.jar"/> <pathelement location="${spi.dir}/thirdparty/jaxrpc-api.jar"/> <pathelement location="${spi.dir}/thirdparty/jsr181-api.jar"/> Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/InvocationHandlerEJB21.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/InvocationHandlerEJB21.java 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/InvocationHandlerEJB21.java 2007-05-18 21:40:57 UTC (rev 3145) @@ -123,7 +123,7 @@ } - public void invoke(Endpoint ep, EndpointInvocation epInv) throws Exception + public void invoke(Endpoint ep, Object beanInstance, EndpointInvocation epInv) throws Exception { log.debug("Invoke: " + epInv.getJavaMethod().getName()); Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/InvocationHandlerEJB3.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/InvocationHandlerEJB3.java 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/InvocationHandlerEJB3.java 2007-05-18 21:40:57 UTC (rev 3145) @@ -81,7 +81,7 @@ throw new WebServiceException("Cannot find service endpoint target: " + objectName); } - public void invoke(Endpoint ep, EndpointInvocation epInv) throws Exception + public void invoke(Endpoint ep, Object beanInstance, EndpointInvocation epInv) throws Exception { try { Modified: trunk/integration/jbws/ant-import/build-deploy.xml =================================================================== --- trunk/integration/jbws/ant-import/build-deploy.xml 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/integration/jbws/ant-import/build-deploy.xml 2007-05-18 21:40:57 UTC (rev 3145) @@ -43,7 +43,7 @@ </copy> <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="${spi.dir}/output/lib"> - <include name="jbossws-integration.jar"/> + <include name="jbossws-spi.jar"/> </fileset> <fileset dir="${core.dir}/output/lib"> <include name="jboss-jaxrpc.jar"/> @@ -107,7 +107,7 @@ </copy> <copy todir="${jboss42.home}/lib" overwrite="true"> <fileset dir="${spi.dir}/output/lib"> - <include name="jbossws-integration.jar"/> + <include name="jbossws-spi.jar"/> </fileset> </copy> <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true"> @@ -136,8 +136,8 @@ <include name="jbossws-wsconsume-impl.jar"/> </fileset> <fileset dir="${jboss42.home}/lib"> - <include name="jbossws-integration.jar"/>  - <include name="jbossws-integration.jar"/> + <include name="jbossws-spi.jar"/>  + <include name="jbossws-spi.jar"/> </fileset> <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> <include name="jboss-jaxrpc.jar"/> Modified: trunk/integration/jbws/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/jbws/ant-import/build-testsuite.xml 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/integration/jbws/ant-import/build-testsuite.xml 2007-05-18 21:40:57 UTC (rev 3145) @@ -39,7 +39,7 @@ <target name="tests-init" depends="tests-prepare"> <path id="jbossws.classpath"> - <pathelement location="${spi.dir}/output/lib/jbossws-integration.jar"/> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> Modified: trunk/integration/jbws/build.xml =================================================================== --- trunk/integration/jbws/build.xml 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/integration/jbws/build.xml 2007-05-18 21:40:57 UTC (rev 3145) @@ -161,7 +161,7 @@ <include name="jbossws-context.war"/> </fileset> <fileset dir="${spi.dir}/output/lib"> - <include name="jbossws-integration.jar"/> + <include name="jbossws-spi.jar"/> </fileset> <fileset dir="${core.dir}/output/lib"> <include name="jboss-jaxws.jar"/> Modified: trunk/integration/jbws/src/main/resources/jbossws-jbws42.sar/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- trunk/integration/jbws/src/main/resources/jbossws-jbws42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/integration/jbws/src/main/resources/jbossws-jbws42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-05-18 21:40:57 UTC (rev 3145) @@ -124,9 +124,9 @@ <property name="lifecycleHandler">org.jboss.ws.core.server.LifecycleHandlerImpl</property> <property name="invocationHandler"> <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>JAXRPC_JSE</key><value>org.jboss.wsintegration.spi.invocation.InvocationHandlerJSE</value></entry> + <entry><key>JAXRPC_JSE</key><value>org.jboss.ws.core.jaxrpc.ServiceLifecycleInvocationHandler</value></entry> <entry><key>JAXRPC_EJB21</key><value>org.jboss.wsintegration.container.jboss42.InvocationHandlerEJB21</value></entry> - <entry><key>JAXWS_JSE</key><value>org.jboss.wsintegration.spi.invocation.InvocationHandlerJSE</value></entry> + <entry><key>JAXWS_JSE</key><value>org.jboss.ws.core.jaxrpc.ServiceLifecycleInvocationHandler</value></entry> <entry><key>JAXWS_EJB3</key><value>org.jboss.wsintegration.container.jboss42.InvocationHandlerEJB3</value></entry> </map> </property> Modified: trunk/integration/jbws/src/main/resources/jbossws-jbws50.sar/META-INF/jbossws-beans.xml =================================================================== --- trunk/integration/jbws/src/main/resources/jbossws-jbws50.sar/META-INF/jbossws-beans.xml 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/integration/jbws/src/main/resources/jbossws-jbws50.sar/META-INF/jbossws-beans.xml 2007-05-18 21:40:57 UTC (rev 3145) @@ -136,9 +136,9 @@ <property name="lifecycleHandler">org.jboss.ws.core.server.LifecycleHandlerImpl</property> <property name="invocationHandler"> <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>JAXRPC_JSE</key><value>org.jboss.wsintegration.spi.invocation.InvocationHandlerJSE</value></entry> + <entry><key>JAXRPC_JSE</key><value>org.jboss.ws.core.jaxrpc.ServiceLifecycleInvocationHandler</value></entry> <entry><key>JAXRPC_EJB21</key><value>org.jboss.wsintegration.container.jboss50.InvocationHandlerEJB21</value></entry> - <entry><key>JAXWS_JSE</key><value>org.jboss.wsintegration.spi.invocation.InvocationHandlerJSE</value></entry> + <entry><key>JAXWS_JSE</key><value>org.jboss.ws.core.jaxrpc.ServiceLifecycleInvocationHandler</value></entry> <entry><key>JAXWS_EJB3</key><value>org.jboss.wsintegration.container.jboss50.InvocationHandlerEJB3</value></entry> </map> </property> Modified: trunk/integration/spi/ant-import/build-release.xml =================================================================== --- trunk/integration/spi/ant-import/build-release.xml 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/integration/spi/ant-import/build-release.xml 2007-05-18 21:40:57 UTC (rev 3145) @@ -22,7 +22,7 @@ <mkdir dir="${jboss.repository.dir}/jbossws/${repository.id}/lib"/> <copy todir="${jboss.repository.dir}/jbossws-spi/${repository.id}/lib" overwrite="true"> <fileset dir="${spi.output.lib.dir}"> - <include name="jbossws-integration.jar"/> + <include name="jbossws-spi.jar"/> <include name="jbossws-integration-src.zip"/> </fileset> </copy> Modified: trunk/integration/spi/build.xml =================================================================== --- trunk/integration/spi/build.xml 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/integration/spi/build.xml 2007-05-18 21:40:57 UTC (rev 3145) @@ -102,9 +102,9 @@ --> <target name="module-jars"> -  +  <mkdir dir="${spi.output.lib.dir}"/> - <jar jarfile="${spi.output.lib.dir}/jbossws-integration.jar" manifest="${spi.output.etc.dir}/default.mf"> + <jar jarfile="${spi.output.lib.dir}/jbossws-spi.jar" manifest="${spi.output.etc.dir}/default.mf"> <fileset dir="${spi.output.classes.dir}"> <include name="org/jboss/wsintegration/spi/**"/> <include name="org/jboss/ws/integration/**"/> @@ -112,7 +112,7 @@ </jar>  - <zip zipfile="${spi.output.lib.dir}/jbossws-integration-src.zip" > + <zip zipfile="${spi.output.lib.dir}/jbossws-spi-src.zip" > <fileset dir="${spi.java.dir}"/> </zip> Modified: trunk/integration/spi/src/main/etc/component-info.xml =================================================================== --- trunk/integration/spi/src/main/etc/component-info.xml 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/integration/spi/src/main/etc/component-info.xml 2007-05-18 21:40:57 UTC (rev 3145) @@ -5,10 +5,10 @@ version="@repository.id@" licenseType="lgpl"> - <artifact id="jbossws-integration.jar"/> + <artifact id="jbossws-spi.jar"/> <export> - <include input="jbossws-integration.jar"/> + <include input="jbossws-spi.jar"/> </export> </component> Modified: trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/AbstractInvocationHandler.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/AbstractInvocationHandler.java 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/AbstractInvocationHandler.java 2007-05-18 21:40:57 UTC (rev 3145) @@ -39,7 +39,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 25-Apr-2007 */ -public abstract class AbstractInvocationHandler implements InvocationHandler +public abstract class AbstractInvocationHandler extends BasicInvocationHandler { // provide logging private static final Logger log = Logger.getLogger(AbstractInvocationHandler.class); Modified: trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/BasicEndpointInvocation.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/BasicEndpointInvocation.java 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/BasicEndpointInvocation.java 2007-05-18 21:40:57 UTC (rev 3145) @@ -37,6 +37,11 @@ private Method javaMethod; private Object[] args; private Object returnValue; + + public BasicEndpointInvocation() + { + this.invocationContext = new BasicInvocationContext(); + } public InvocationContext getInvocationContext() { Added: trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/BasicInvocationHandler.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/BasicInvocationHandler.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/BasicInvocationHandler.java 2007-05-18 21:40:57 UTC (rev 3145) @@ -0,0 +1,56 @@ +/* + * 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.wsintegration.spi.invocation; + +//$Id$ + +import org.jboss.wsintegration.spi.deployment.Endpoint; + +/** + * A basic endpoint invocation handler. + * + * @author Thomas.Diesler(a)jboss.com + * @since 20-Apr-2007 + */ +public abstract class BasicInvocationHandler implements InvocationHandler +{ + public EndpointInvocation createInvocation() + { + return new BasicEndpointInvocation(); + } + + public void create(Endpoint ep) + { + } + + public void start(Endpoint ep) + { + } + + public void stop(Endpoint ep) + { + } + + public void destroy(Endpoint ep) + { + } +} Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/BasicInvocationHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/InvocationHandler.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/InvocationHandler.java 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/InvocationHandler.java 2007-05-18 21:40:57 UTC (rev 3145) @@ -26,13 +26,16 @@ import org.jboss.wsintegration.spi.deployment.Endpoint; /** - * A general ep invoker. + * A general endpoint invocation handler. * * @author Thomas.Diesler(a)jboss.com * @since 20-Apr-2007 */ public interface InvocationHandler { + /** Create the default invokation object */ + EndpointInvocation createInvocation(); + /** Create the invocation handler */ void create(Endpoint ep); @@ -40,7 +43,7 @@ void start(Endpoint ep); /** Invoke the the service endpoint */ - void invoke(Endpoint ep, EndpointInvocation inv) throws Exception; + void invoke(Endpoint ep, Object beanInstance, EndpointInvocation inv) throws Exception; /** Stop the invocation handler */ void stop(Endpoint ep); Modified: trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/InvocationHandlerJSE.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/InvocationHandlerJSE.java 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/invocation/InvocationHandlerJSE.java 2007-05-18 21:40:57 UTC (rev 3145) @@ -25,8 +25,6 @@ import java.lang.reflect.Method; -import javax.xml.rpc.server.ServiceLifecycle; -import javax.xml.rpc.server.ServletEndpointContext; import javax.xml.ws.WebServiceContext; import org.jboss.wsintegration.spi.deployment.Endpoint; @@ -39,48 +37,30 @@ */ public class InvocationHandlerJSE extends AbstractInvocationHandler { - protected Object getTargetBean(Endpoint ep) throws InstantiationException, IllegalAccessException + protected Object getBeanInstance(Endpoint ep) throws InstantiationException, IllegalAccessException { Class epImpl = ep.getTargetBean(); Object targetBean = epImpl.newInstance(); return targetBean; } - public void invoke(Endpoint ep, EndpointInvocation epInv) throws Exception + public void invoke(Endpoint ep, Object beanInstance, EndpointInvocation epInv) throws Exception { try { - Object targetBean = getTargetBean(ep); - + if (beanInstance == null) + beanInstance = getBeanInstance(ep); + InvocationContext invContext = epInv.getInvocationContext(); WebServiceContext wsContext = invContext.getAttachment(WebServiceContext.class); if (wsContext != null) { - new WebServiceContextInjector().injectContext(targetBean, (WebServiceContext)wsContext); + new WebServiceContextInjector().injectContext(beanInstance, (WebServiceContext)wsContext); } - if (targetBean instanceof ServiceLifecycle) - { - ServletEndpointContext sepContext = invContext.getAttachment(ServletEndpointContext.class); - if (sepContext == null) - throw new IllegalStateException("Cannot obtain ServletEndpointContext"); - - ((ServiceLifecycle)targetBean).init(sepContext); - } - - try - { - Method method = getImplMethod(ep.getTargetBean(), epInv.getJavaMethod()); - Object retObj = method.invoke(targetBean, epInv.getArgs()); - epInv.setReturnValue(retObj); - } - finally - { - if (targetBean instanceof ServiceLifecycle) - { - ((ServiceLifecycle)targetBean).destroy(); - } - } + Method method = getImplMethod(beanInstance.getClass(), epInv.getJavaMethod()); + Object retObj = method.invoke(beanInstance, epInv.getArgs()); + epInv.setReturnValue(retObj); } catch (Exception e) { Modified: trunk/integration/sunri/ant-import/build-deploy.xml =================================================================== --- trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-18 21:40:57 UTC (rev 3145) @@ -37,7 +37,7 @@ </copy> <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="${spi.dir}/output/lib"> - <include name="jbossws-integration.jar"/> + <include name="jbossws-spi.jar"/> </fileset> </copy> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> Modified: trunk/integration/sunri/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-18 21:40:57 UTC (rev 3145) @@ -62,7 +62,7 @@  <path id="javac.classpath"> <path refid="sunri.classpath"/> - <pathelement location="${spi.dir}/output/lib/jbossws-integration.jar"/> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> <pathelement location="${jboss.client}/jboss-common-core.jar"/> <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/> Modified: trunk/integration/sunri/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-05-18 21:40:57 UTC (rev 3145) @@ -70,7 +70,7 @@  <path id="sunri50.integration.classpath"> - <pathelement location="${spi.dir}/output/lib/jbossws-integration.jar"/> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> <pathelement location="${jboss50.lib}/jboss-common-core.jar"/> <pathelement location="${jboss50.lib}/jboss-dependency.jar"/> Added: trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/DeploymentDescriptorParserExt.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/DeploymentDescriptorParserExt.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/DeploymentDescriptorParserExt.java 2007-05-18 21:40:57 UTC (rev 3145) @@ -0,0 +1,602 @@ +/* + * 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.wsintegration.stack.sunri; + +// $Id$ + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.http.HTTPBinding; +import javax.xml.ws.soap.MTOMFeature; +import javax.xml.ws.soap.SOAPBinding; + +import org.xml.sax.EntityResolver; + +import com.sun.istack.NotNull; +import com.sun.xml.ws.api.BindingID; +import com.sun.xml.ws.api.WSBinding; +import com.sun.xml.ws.api.server.Container; +import com.sun.xml.ws.api.server.InstanceResolver; +import com.sun.xml.ws.api.server.Invoker; +import com.sun.xml.ws.api.server.SDDocumentSource; +import com.sun.xml.ws.api.server.WSEndpoint; +import com.sun.xml.ws.api.streaming.XMLStreamReaderFactory; +import com.sun.xml.ws.binding.WebServiceFeatureList; +import com.sun.xml.ws.handler.HandlerChainsModel; +import com.sun.xml.ws.resources.ServerMessages; +import com.sun.xml.ws.resources.WsservletMessages; +import com.sun.xml.ws.server.EndpointFactory; +import com.sun.xml.ws.server.ServerRtException; +import com.sun.xml.ws.streaming.Attributes; +import com.sun.xml.ws.streaming.TidyXMLStreamReader; +import com.sun.xml.ws.streaming.XMLStreamReaderUtil; +import com.sun.xml.ws.transport.http.HttpAdapter; +import com.sun.xml.ws.transport.http.ResourceLoader; +import com.sun.xml.ws.transport.http.DeploymentDescriptorParser.AdapterFactory; +import com.sun.xml.ws.util.HandlerAnnotationInfo; +import com.sun.xml.ws.util.exception.LocatableWebServiceException; +import com.sun.xml.ws.util.xml.XmlUtil; + +/** + * A copy of DeploymentDescriptorParser that externalizes + * + * {@link createInvoker(Class)} + * + * + * @author WS Development Team + * @author Kohsuke Kawaguchi + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class DeploymentDescriptorParserExt<A> +{ + private final Container container; + private final ClassLoader classLoader; + private final ResourceLoader loader; + private final AdapterFactory<A> adapterFactory; + + /** + * Endpoint names that are declared. + * Used to catch double definitions. + */ + private final Set<String> names = new HashSet<String>(); + + /** + * WSDL/schema documents collected from /WEB-INF/wsdl. Keyed by the system ID. + */ + private final Map<String, SDDocumentSource> docs = new HashMap<String, SDDocumentSource>(); + + /** + * + * @param cl + * Used to load service implementations. + * @param loader + * Used to locate resources, in particular WSDL. + * @param container + * Optional {@link Container} that {@link WSEndpoint}s receive. + * @param adapterFactory + * Creates {@link HttpAdapter} (or its derived class.) + */ + public DeploymentDescriptorParserExt(ClassLoader cl, ResourceLoader loader, Container container, AdapterFactory<A> adapterFactory) throws MalformedURLException + { + classLoader = cl; + this.loader = loader; + this.container = container; + this.adapterFactory = adapterFactory; + + collectDocs("/WEB-INF/wsdl/"); + logger.fine("war metadata=" + docs); + } + + /** + * Parses the {@code sun-jaxws.xml} file and configures + * a set of {@link HttpAdapter}s. + */ + public @NotNull + List<A> parse(String systemId, InputStream is) + { + XMLStreamReader reader = null; + try + { + reader = new TidyXMLStreamReader(XMLStreamReaderFactory.create(systemId, is, true), is); + XMLStreamReaderUtil.nextElementContent(reader); + return parseAdapters(reader); + } + finally + { + if (reader != null) + { + try + { + reader.close(); + } + catch (XMLStreamException e) + { + throw new ServerRtException("runtime.parser.xmlReader", e); + } + } + try + { + is.close(); + } + catch (IOException e) + { + // ignore + } + } + } + + /** + * Parses the {@code sun-jaxws.xml} file and configures + * a set of {@link HttpAdapter}s. + */ + public @NotNull + List<A> parse(File f) throws IOException + { + FileInputStream in = new FileInputStream(f); + try + { + return parse(f.getPath(), in); + } + finally + { + in.close(); + } + } + + /** + * Get all the WSDL & schema documents recursively. + */ + private void collectDocs(String dirPath) throws MalformedURLException + { + Set<String> paths = loader.getResourcePaths(dirPath); + if (paths != null) + { + for (String path : paths) + { + if (path.endsWith("/")) + { + collectDocs(path); + } + else + { + URL res = loader.getResource(path); + docs.put(res.toString(), SDDocumentSource.create(res)); + } + } + } + } + + private List<A> parseAdapters(XMLStreamReader reader) + { + if (!reader.getName().equals(QNAME_ENDPOINTS)) + { + failWithFullName("runtime.parser.invalidElement", reader); + } + + List<A> adapters = new ArrayList<A>(); + + Attributes attrs = XMLStreamReaderUtil.getAttributes(reader); + String version = getMandatoryNonEmptyAttribute(reader, attrs, ATTR_VERSION); + if (!version.equals(ATTRVALUE_VERSION_1_0)) + { + failWithLocalName("runtime.parser.invalidVersionNumber", reader, version); + } + + while (XMLStreamReaderUtil.nextElementContent(reader) != XMLStreamConstants.END_ELEMENT) + if (reader.getName().equals(QNAME_ENDPOINT)) + { + + attrs = XMLStreamReaderUtil.getAttributes(reader); + String name = getMandatoryNonEmptyAttribute(reader, attrs, ATTR_NAME); + if (!names.add(name)) + { + logger.warning(WsservletMessages.SERVLET_WARNING_DUPLICATE_ENDPOINT_NAME(/*name*/)); + } + + String implementationName = getMandatoryNonEmptyAttribute(reader, attrs, ATTR_IMPLEMENTATION); + Class<?> implementorClass = getImplementorClass(implementationName, reader); + EndpointFactory.verifyImplementorClass(implementorClass); + + SDDocumentSource primaryWSDL = getPrimaryWSDL(reader, attrs, implementorClass); + + QName serviceName = getQNameAttribute(attrs, ATTR_SERVICE); + if (serviceName == null) + serviceName = EndpointFactory.getDefaultServiceName(implementorClass); + + QName portName = getQNameAttribute(attrs, ATTR_PORT); + if (portName == null) + portName = EndpointFactory.getDefaultPortName(serviceName, implementorClass); + + //get enable-mtom attribute value + String enable_mtom = getAttribute(attrs, ATTR_ENABLE_MTOM); + String mtomThreshold = getAttribute(attrs, ATTR_MTOM_THRESHOLD_VALUE); + String bindingId = getAttribute(attrs, ATTR_BINDING); + if (bindingId != null) + // Convert short-form tokens to API's binding ids + bindingId = getBindingIdForToken(bindingId); + WSBinding binding = createBinding(bindingId, implementorClass, enable_mtom, mtomThreshold); + String urlPattern = getMandatoryNonEmptyAttribute(reader, attrs, ATTR_URL_PATTERN); + + // TODO use 'docs' as the metadata. If wsdl is non-null it's the primary. + + boolean handlersSetInDD = setHandlersAndRoles(binding, reader, serviceName, portName); + + ensureNoContent(reader); + Invoker invoker = createInvoker(implementorClass); + WSEndpoint<?> endpoint = WSEndpoint.create(implementorClass, !handlersSetInDD, invoker, + serviceName, portName, container, binding, primaryWSDL, docs.values(), createEntityResolver(), false); + adapters.add(adapterFactory.createAdapter(name, urlPattern, endpoint)); + } + else + { + failWithLocalName("runtime.parser.invalidElement", reader); + } + return adapters; + } + + protected Invoker createInvoker(Class<?> implementorClass) + { + Invoker invoker = InstanceResolver.createDefault(implementorClass).createInvoker(); + return invoker; + } + + /** + * @param ddBindingId + * binding id explicitlyspecified in the DeploymentDescriptor or parameter + * @param implClass + * Endpoint Implementation class + * @param mtomEnabled + * represents mtom-enabled attribute in DD + * @param mtomThreshold + * threshold value specified in DD + * @return + * is returned with only MTOMFeature set resolving the various precendece rules + */ + private static WSBinding createBinding(String ddBindingId, Class implClass, String mtomEnabled, String mtomThreshold) + { + // Features specified through DD + WebServiceFeatureList features; + + MTOMFeature mtomfeature = null; + if (mtomEnabled != null) + { + if (mtomThreshold != null) + mtomfeature = new MTOMFeature(Boolean.valueOf(mtomEnabled), Integer.valueOf(mtomThreshold)); + else mtomfeature = new MTOMFeature(Boolean.valueOf(mtomEnabled)); + } + + BindingID bindingID; + if (ddBindingId != null) + { + bindingID = BindingID.parse(ddBindingId); + features = bindingID.createBuiltinFeatureList(); + + if (checkMtomConflict(features.get(MTOMFeature.class), mtomfeature)) + { + throw new ServerRtException(ServerMessages.DD_MTOM_CONFLICT(ddBindingId, mtomEnabled)); + } + } + else + { + bindingID = BindingID.parse(implClass); + // Since bindingID is coming from implclass, + // mtom through Feature annotation or DD takes precendece + + features = new WebServiceFeatureList(); + if (mtomfeature != null) + features.add(mtomfeature); // this wins over MTOM setting in bindingID + features.addAll(bindingID.createBuiltinFeatureList()); + } + + return bindingID.createBinding(features.toArray()); + } + + private static boolean checkMtomConflict(MTOMFeature lhs, MTOMFeature rhs) + { + if (lhs == null || rhs == null) + return false; + return lhs.isEnabled() ^ rhs.isEnabled(); + } + + /** + * JSR-109 defines short-form tokens for standard binding Ids. These are + * used only in DD. So stand alone deployment descirptor should also honor + * these tokens. This method converts the tokens to API's standard + * binding ids + * + * @param lexical binding attribute value from DD. Always not null + * + * @return returns corresponding API's binding ID or the same lexical + */ + public static @NotNull + String getBindingIdForToken(@NotNull + String lexical) + { + if (lexical.equals("##SOAP11_HTTP")) + { + return SOAPBinding.SOAP11HTTP_BINDING; + } + else if (lexical.equals("##SOAP11_HTTP_MTOM")) + { + return SOAPBinding.SOAP11HTTP_MTOM_BINDING; + } + else if (lexical.equals("##SOAP12_HTTP")) + { + return SOAPBinding.SOAP12HTTP_BINDING; + } + else if (lexical.equals("##SOAP12_HTTP_MTOM")) + { + return SOAPBinding.SOAP12HTTP_MTOM_BINDING; + } + else if (lexical.equals("##XML_HTTP")) + { + return HTTPBinding.HTTP_BINDING; + } + return lexical; + } + + /** + * Checks the deployment descriptor or {@link @WebServiceProvider} annotation + * to see if it points to any WSDL. If so, returns the {@link SDDocumentSource}. + * + * @return + * The pointed WSDL, if any. Otherwise null. + */ + private SDDocumentSource getPrimaryWSDL(XMLStreamReader xsr, Attributes attrs, Class<?> implementorClass) + { + + String wsdlFile = getAttribute(attrs, ATTR_WSDL); + if (wsdlFile == null) + { + wsdlFile = EndpointFactory.getWsdlLocation(implementorClass); + } + + if (wsdlFile != null) + { + if (!wsdlFile.startsWith(JAXWS_WSDL_DD_DIR)) + { + logger.warning("Ignoring wrong wsdl=" + wsdlFile + ". It should start with " + JAXWS_WSDL_DD_DIR + ". Going to generate and publish a new WSDL."); + return null; + } + + URL wsdl; + try + { + wsdl = loader.getResource('/' + wsdlFile); + } + catch (MalformedURLException e) + { + throw new LocatableWebServiceException(ServerMessages.RUNTIME_PARSER_WSDL_NOT_FOUND(wsdlFile), e, xsr); + } + if (wsdl == null) + { + throw new LocatableWebServiceException(ServerMessages.RUNTIME_PARSER_WSDL_NOT_FOUND(wsdlFile), xsr); + } + SDDocumentSource docInfo = docs.get(wsdl.toExternalForm()); + assert docInfo != null; + return docInfo; + } + + return null; + } + + /** + * Creates an {@link EntityResolver} that consults {@code /WEB-INF/jax-ws-catalog.xml}. + */ + private EntityResolver createEntityResolver() + { + try + { + return XmlUtil.createEntityResolver(loader.getCatalogFile()); + } + catch (MalformedURLException e) + { + throw new WebServiceException(e); + } + } + + protected String getAttribute(Attributes attrs, String name) + { + String value = attrs.getValue(name); + if (value != null) + { + value = value.trim(); + } + return value; + } + + protected QName getQNameAttribute(Attributes attrs, String name) + { + String value = getAttribute(attrs, name); + if (value == null || value.equals("")) + { + return null; + } + else + { + return QName.valueOf(value); + } + } + + protected String getNonEmptyAttribute(XMLStreamReader reader, Attributes attrs, String name) + { + String value = getAttribute(attrs, name); + if (value != null && value.equals("")) + { + failWithLocalName("runtime.parser.invalidAttributeValue", reader, name); + } + return value; + } + + protected String getMandatoryAttribute(XMLStreamReader reader, Attributes attrs, String name) + { + String value = getAttribute(attrs, name); + if (value == null) + { + failWithLocalName("runtime.parser.missing.attribute", reader, name); + } + return value; + } + + protected String getMandatoryNonEmptyAttribute(XMLStreamReader reader, Attributes attributes, String name) + { + String value = getAttribute(attributes, name); + if (value == null) + { + failWithLocalName("runtime.parser.missing.attribute", reader, name); + } + else if (value.equals("")) + { + failWithLocalName("runtime.parser.invalidAttributeValue", reader, name); + } + return value; + } + + /** + * Parses the handler and role information and sets it + * on the {@link WSBinding}. + * @return true if <handler-chains> element present in DD + * false otherwise. + */ + protected boolean setHandlersAndRoles(WSBinding binding, XMLStreamReader reader, QName serviceName, QName portName) + { + + if (XMLStreamReaderUtil.nextElementContent(reader) == XMLStreamConstants.END_ELEMENT || !reader.getName().equals(HandlerChainsModel.QNAME_HANDLER_CHAINS)) + { + + return false; + } + + HandlerAnnotationInfo handlerInfo = HandlerChainsModel.parseHandlerFile(reader, classLoader, serviceName, portName, binding); + + binding.setHandlerChain(handlerInfo.getHandlers()); + if (binding instanceof SOAPBinding) + { + ((SOAPBinding)binding).setRoles(handlerInfo.getRoles()); + } + + // move past </handler-chains> + XMLStreamReaderUtil.nextContent(reader); + return true; + } + + protected static void ensureNoContent(XMLStreamReader reader) + { + if (reader.getEventType() != XMLStreamConstants.END_ELEMENT) + { + fail("runtime.parser.unexpectedContent", reader); + } + } + + protected static void fail(String key, XMLStreamReader reader) + { + logger.log(Level.SEVERE, key + reader.getLocation().getLineNumber()); + throw new ServerRtException(key, Integer.toString(reader.getLocation().getLineNumber())); + } + + protected static void failWithFullName(String key, XMLStreamReader reader) + { + throw new ServerRtException(key, reader.getLocation().getLineNumber(), reader.getName()); + } + + protected static void failWithLocalName(String key, XMLStreamReader reader) + { + throw new ServerRtException(key, reader.getLocation().getLineNumber(), reader.getLocalName()); + } + + protected static void failWithLocalName(String key, XMLStreamReader reader, String arg) + { + throw new ServerRtException(key, reader.getLocation().getLineNumber(), reader.getLocalName(), arg); + } + + protected Class loadClass(String name) + { + try + { + return Class.forName(name, true, classLoader); + } + catch (ClassNotFoundException e) + { + logger.log(Level.SEVERE, e.getMessage(), e); + throw new ServerRtException("runtime.parser.classNotFound", name); + } + } + + /** + * Loads the class of the given name. + * + * @param xsr + * Used to report the source location information if there's any error. + */ + private Class getImplementorClass(String name, XMLStreamReader xsr) + { + try + { + return Class.forName(name, true, classLoader); + } + catch (ClassNotFoundException e) + { + logger.log(Level.SEVERE, e.getMessage(), e); + throw new LocatableWebServiceException(ServerMessages.RUNTIME_PARSER_CLASS_NOT_FOUND(name), e, xsr); + } + } + + public static final String NS_RUNTIME = "http://java.sun.com/xml/ns/jax-ws/ri/runtime"; + + public static final String JAXWS_WSDL_DD_DIR = "WEB-INF/wsdl"; + + public static final QName QNAME_ENDPOINTS = new QName(NS_RUNTIME, "endpoints"); + public static final QName QNAME_ENDPOINT = new QName(NS_RUNTIME, "endpoint"); + + public static final String ATTR_VERSION = "version"; + public static final String ATTR_NAME = "name"; + public static final String ATTR_IMPLEMENTATION = "implementation"; + public static final String ATTR_WSDL = "wsdl"; + public static final String ATTR_SERVICE = "service"; + public static final String ATTR_PORT = "port"; + public static final String ATTR_URL_PATTERN = "url-pattern"; + public static final String ATTR_ENABLE_MTOM = "enable-mtom"; + public static final String ATTR_MTOM_THRESHOLD_VALUE = "mtom-threshold-value"; + public static final String ATTR_BINDING = "binding"; + + public static final String ATTRVALUE_VERSION_1_0 = "2.0"; + private static final Logger logger = Logger.getLogger(com.sun.xml.ws.util.Constants.LoggingDomain + ".server.http"); +} Property changes on: trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/DeploymentDescriptorParserExt.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/DeploymentDescriptorParserJBWS.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/DeploymentDescriptorParserJBWS.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/DeploymentDescriptorParserJBWS.java 2007-05-18 21:40:57 UTC (rev 3145) @@ -0,0 +1,67 @@ +/* + * 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.wsintegration.stack.sunri; + +// $Id$ + +import java.net.MalformedURLException; + +import javax.ejb.Stateless; + +import com.sun.xml.ws.api.server.Container; +import com.sun.xml.ws.api.server.InstanceResolver; +import com.sun.xml.ws.api.server.Invoker; +import com.sun.xml.ws.transport.http.ResourceLoader; +import com.sun.xml.ws.transport.http.DeploymentDescriptorParser.AdapterFactory; + +/** + * A copy of DeploymentDescriptorParser that externalizes + * + * createInvoker(Class) + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class DeploymentDescriptorParserJBWS<A> extends DeploymentDescriptorParserExt<A> +{ + public DeploymentDescriptorParserJBWS(ClassLoader cl, ResourceLoader loader, Container container, AdapterFactory<A> adapterFactory) throws MalformedURLException + { + super(cl, loader, container, adapterFactory); + } + + @Override + protected Invoker createInvoker(Class<?> implClass) + { + Invoker invoker; + InstanceResolver<?> resolver = InstanceResolver.createDefault(implClass); + if (implClass.isAnnotationPresent(Stateless.class)) + { + invoker = new InvokerEJB3(resolver); + } + else + { + invoker = new InvokerJSE(resolver); + } + return invoker; + } + +} Property changes on: trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/DeploymentDescriptorParserJBWS.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/EndpointAssociation.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/EndpointAssociation.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/EndpointAssociation.java 2007-05-18 21:40:57 UTC (rev 3145) @@ -0,0 +1,52 @@ +/* + * 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.wsintegration.stack.sunri; + +// $Id$ + +import org.jboss.wsintegration.spi.deployment.Endpoint; + +/** + * Associates the endpoint meta data with the current thead. + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public final class EndpointAssociation +{ + private static final ThreadLocal<Endpoint> endpoint = new ThreadLocal<Endpoint>(); + + public static void setEndpoint(Endpoint ep) + { + endpoint.set(ep); + } + + public static Endpoint getEndpoint() + { + return endpoint.get(); + } + + public static void removeEndpoint() + { + endpoint.remove(); + } +} Property changes on: trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/EndpointAssociation.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/EndpointNameDeployer.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/EndpointNameDeployer.java 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/EndpointNameDeployer.java 2007-05-18 21:40:57 UTC (rev 3145) @@ -24,6 +24,7 @@ //$Id$ import org.jboss.metadata.WebMetaData; +import org.jboss.wsintegration.spi.annotation.WebContext; import org.jboss.wsintegration.spi.deployment.AbstractDeployer; import org.jboss.wsintegration.spi.deployment.Deployment; import org.jboss.wsintegration.spi.deployment.Endpoint; @@ -45,14 +46,19 @@ if (webMetaData != null) contextRoot = webMetaData.getContextRoot(); - if (contextRoot == null) - throw new IllegalStateException("Cannot obtain context root"); + for (Endpoint ep : dep.getService().getEndpoints()) + { + Class implClass = ep.getTargetBean(); + WebContext anWebContext = (WebContext)implClass.getAnnotation(WebContext.class); + if (anWebContext != null && anWebContext.contextRoot().length() > 0) + contextRoot = anWebContext.contextRoot(); - if (contextRoot.startsWith("/")) - contextRoot = contextRoot.substring(1); + if (contextRoot == null) + throw new IllegalStateException("Cannot obtain context root"); - for (Endpoint ep : dep.getService().getEndpoints()) - { + if (contextRoot.startsWith("/")) + contextRoot = contextRoot.substring(1); + StringBuilder name = new StringBuilder(ep.getName().getCanonicalName()); if (ep.getName().getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT) == null) name.append("," + Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextRoot); Added: trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/InvokerEJB3.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/InvokerEJB3.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/InvokerEJB3.java 2007-05-18 21:40:57 UTC (rev 3145) @@ -0,0 +1,78 @@ +/* + * 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.wsintegration.stack.sunri; + +// $Id$ + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +import javax.xml.ws.Provider; + +import com.sun.istack.NotNull; +import com.sun.xml.ws.api.message.Packet; +import com.sun.xml.ws.api.server.InstanceResolver; +import com.sun.xml.ws.api.server.Invoker; +import com.sun.xml.ws.api.server.WSEndpoint; +import com.sun.xml.ws.api.server.WSWebServiceContext; + +/** + * An invoker for EJB3 endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class InvokerEJB3 extends Invoker +{ + private final InstanceResolver resolver; + + public InvokerEJB3(InstanceResolver resolver) + { + this.resolver = resolver; + } + + @Override + public void start(@NotNull WSWebServiceContext wsc, @NotNull WSEndpoint endpoint) + { + resolver.start(wsc, endpoint); + } + + @Override + public void dispose() + { + resolver.dispose(); + } + + @Override + public <T> T invokeProvider(@NotNull Packet p, T arg) + { + Object targetBean = resolver.resolve(p); + return ((Provider<T>)targetBean).invoke(arg); + } + + @Override + public Object invoke(Packet p, Method m, Object... args) throws InvocationTargetException, IllegalAccessException + { + Object targetBean = resolver.resolve(p); + return m.invoke(targetBean, args); + } +} Property changes on: trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/InvokerEJB3.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/InvokerJSE.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/InvokerJSE.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/InvokerJSE.java 2007-05-18 21:40:57 UTC (rev 3145) @@ -0,0 +1,115 @@ +/* + * 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.wsintegration.stack.sunri; + +// $Id$ + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +import javax.xml.ws.Provider; +import javax.xml.ws.WebServiceException; + +import org.jboss.wsintegration.spi.deployment.Endpoint; +import org.jboss.wsintegration.spi.invocation.EndpointInvocation; +import org.jboss.wsintegration.spi.invocation.InvocationHandler; + +import com.sun.istack.NotNull; +import com.sun.xml.ws.api.message.Packet; +import com.sun.xml.ws.api.server.InstanceResolver; +import com.sun.xml.ws.api.server.Invoker; +import com.sun.xml.ws.api.server.WSEndpoint; +import com.sun.xml.ws.api.server.WSWebServiceContext; + +/** + * An invoker for JSE endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class InvokerJSE extends Invoker +{ + private final InstanceResolver resolver; + + public InvokerJSE(InstanceResolver resolver) + { + this.resolver = resolver; + } + + @Override + public void start(@NotNull + WSWebServiceContext wsc, @NotNull + WSEndpoint endpoint) + { + resolver.start(wsc, endpoint); + } + + @Override + public void dispose() + { + resolver.dispose(); + } + + @Override + public <T> T invokeProvider(@NotNull + Packet p, T arg) + { + Object targetBean = resolver.resolve(p); + return ((Provider<T>)targetBean).invoke(arg); + } + + @Override + public Object invoke(Packet p, Method m, Object... args) throws InvocationTargetException, IllegalAccessException + { + Endpoint ep = EndpointAssociation.getEndpoint(); + + InvocationHandler invHandler = ep.getInvocationHandler(); + EndpointInvocation inv = invHandler.createInvocation(); + inv.setJavaMethod(m); + inv.setArgs(args); + + Object retObj = null; + try + { + Object targetBean = resolver.resolve(p); + invHandler.invoke(ep, targetBean, inv); + retObj = inv.getReturnValue(); + } + catch (Exception ex) + { + handleException(ex); + } + + return retObj; + } + + private void handleException(Exception ex) throws InvocationTargetException, IllegalAccessException + { + if (ex instanceof InvocationTargetException) + throw (InvocationTargetException)ex; + + if (ex instanceof IllegalAccessException) + throw (IllegalAccessException)ex; + + throw new WebServiceException(ex); + } +} Property changes on: trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/InvokerJSE.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/ModifyWebMetaDataDeployer.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/ModifyWebMetaDataDeployer.java 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/ModifyWebMetaDataDeployer.java 2007-05-18 21:40:57 UTC (rev 3145) @@ -70,7 +70,7 @@ // Add the path to sun-jaxws.xml ParamValue ctxParam = new ParamValue(); ctxParam.setType(ParamType.CONTEXT_PARAM); - ctxParam.setName(WSServletContextListener.PARAM_SUN_JAXWS_URL); + ctxParam.setName(WSServletContextListenerJBWS.PARAM_SUN_JAXWS_URL); ctxParam.setValue(ddSunJaxws.createFileURL().toExternalForm()); webMetaData.addContextParam(ctxParam); Deleted: trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/WSEndpointServlet.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/WSEndpointServlet.java 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/WSEndpointServlet.java 2007-05-18 21:40:57 UTC (rev 3145) @@ -1,98 +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.wsintegration.stack.sunri; - -// $Id$ - -import java.io.IOException; - -import javax.management.ObjectName; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.xml.ws.WebServiceException; - -import org.jboss.wsintegration.spi.deployment.Endpoint; -import org.jboss.wsintegration.spi.invocation.RequestHandler; -import org.jboss.wsintegration.spi.management.EndpointRegistry; -import org.jboss.wsintegration.spi.management.EndpointRegistryFactory; -import org.jboss.wsintegration.spi.utils.ObjectNameFactory; - -/** - * The JAX-WS dispatcher servlet. - * - * @author WS Development Team - * @author Thomas.Diesler(a)jboss.org - * @since 10-May-2007 - */ -public class WSEndpointServlet extends HttpServlet -{ - protected Endpoint endpoint; - protected EndpointRegistry epRegistry; - - public void init(ServletConfig servletConfig) throws ServletException - { - super.init(servletConfig); - epRegistry = EndpointRegistryFactory.getEndpointRegistry(); - } - - public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException - { - if (endpoint == null) - { - String contextPath = req.getContextPath(); - initServiceEndpoint(contextPath); - } - - RequestHandler requestHandler = (RequestHandler)endpoint.getRequestHandler(); - requestHandler.handleHttpRequest(endpoint, req, res, getServletContext()); - } - - /** Initialize the service endpoint - */ - protected void initServiceEndpoint(String contextPath) - { - if (contextPath.startsWith("/")) - contextPath = contextPath.substring(1); - - String servletName = getServletName(); - for (ObjectName sepId : epRegistry.getEndpoints()) - { - String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT); - String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); - if (servletName.equals(propEndpoint) && contextPath.equals(propContext)) - { - endpoint = epRegistry.getEndpoint(sepId); - break; - } - } - - if (endpoint == null) - { - ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," - + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName); - throw new WebServiceException("Cannot obtain endpoint for: " + oname); - } - } -} Added: trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/WSEndpointServletJBWS.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/WSEndpointServletJBWS.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/WSEndpointServletJBWS.java 2007-05-18 21:40:57 UTC (rev 3145) @@ -0,0 +1,106 @@ +/* + * 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.wsintegration.stack.sunri; + +// $Id$ + +import java.io.IOException; + +import javax.management.ObjectName; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.ws.WebServiceException; + +import org.jboss.wsintegration.spi.deployment.Endpoint; +import org.jboss.wsintegration.spi.invocation.RequestHandler; +import org.jboss.wsintegration.spi.management.EndpointRegistry; +import org.jboss.wsintegration.spi.management.EndpointRegistryFactory; +import org.jboss.wsintegration.spi.utils.ObjectNameFactory; + +/** + * The JAX-WS dispatcher servlet. + * + * @author WS Development Team + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class WSEndpointServletJBWS extends HttpServlet +{ + protected Endpoint endpoint; + protected EndpointRegistry epRegistry; + + public void init(ServletConfig servletConfig) throws ServletException + { + super.init(servletConfig); + epRegistry = EndpointRegistryFactory.getEndpointRegistry(); + } + + public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException + { + if (endpoint == null) + { + String contextPath = req.getContextPath(); + initServiceEndpoint(contextPath); + } + + try + { + EndpointAssociation.setEndpoint(endpoint); + RequestHandler requestHandler = (RequestHandler)endpoint.getRequestHandler(); + requestHandler.handleHttpRequest(endpoint, req, res, getServletContext()); + } + finally + { + EndpointAssociation.removeEndpoint(); + } + } + + /** Initialize the service endpoint + */ + protected void initServiceEndpoint(String contextPath) + { + if (contextPath.startsWith("/")) + contextPath = contextPath.substring(1); + + String servletName = getServletName(); + for (ObjectName sepId : epRegistry.getEndpoints()) + { + String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT); + String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); + if (servletName.equals(propEndpoint) && contextPath.equals(propContext)) + { + endpoint = epRegistry.getEndpoint(sepId); + break; + } + } + + if (endpoint == null) + { + ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," + + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName); + throw new WebServiceException("Cannot obtain endpoint for: " + oname); + } + } +} Property changes on: trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/WSEndpointServletJBWS.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/WSServletContextListener.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/WSServletContextListener.java 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/WSServletContextListener.java 2007-05-18 21:40:57 UTC (rev 3145) @@ -1,180 +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.wsintegration.stack.sunri; - -// $Id$ - -import java.net.URL; -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import javax.servlet.ServletContext; -import javax.servlet.ServletContextAttributeEvent; -import javax.servlet.ServletContextAttributeListener; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.xml.ws.WebServiceException; - -import com.sun.istack.NotNull; -import com.sun.xml.ws.api.server.BoundEndpoint; -import com.sun.xml.ws.api.server.Container; -import com.sun.xml.ws.api.server.Module; -import com.sun.xml.ws.resources.WsservletMessages; -import com.sun.xml.ws.transport.http.DeploymentDescriptorParser; -import com.sun.xml.ws.transport.http.HttpAdapter; -import com.sun.xml.ws.transport.http.servlet.ServletAdapter; -import com.sun.xml.ws.transport.http.servlet.ServletAdapterList; -import com.sun.xml.ws.transport.http.servlet.WSServlet; -import com.sun.xml.ws.transport.http.servlet.WSServletDelegate; - -/** - * Parses {@code sun-jaxws.xml} and sets up - * {@link HttpAdapter}s for all deployed endpoints. - * - * - * This code is the entry point at the server side. - * - * @author WS Development Team - * @author Thomas.Diesler(a)jboss.org - * @since 10-May-2007 - */ -public class WSServletContextListener implements ServletContextAttributeListener, ServletContextListener -{ - public static final String PARAM_SUN_JAXWS_URL = "jbossws-sun-jaxws-url"; - - private WSServletDelegate delegate; - - public void attributeAdded(ServletContextAttributeEvent event) - { - } - - public void attributeRemoved(ServletContextAttributeEvent event) - { - } - - public void attributeReplaced(ServletContextAttributeEvent event) - { - } - - public void contextDestroyed(ServletContextEvent event) - { - if (delegate != null) - { // the deployment might have failed. - delegate.destroy(); - } - - if (logger.isLoggable(Level.INFO)) - { - logger.info(WsservletMessages.LISTENER_INFO_DESTROY()); - } - } - - public void contextInitialized(ServletContextEvent event) - { - if (logger.isLoggable(Level.INFO)) - { - logger.info(WsservletMessages.LISTENER_INFO_INITIALIZE()); - } - ServletContext context = event.getServletContext(); - ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); - if (classLoader == null) - { - classLoader = getClass().getClassLoader(); - } - - ServletContainer container = new ServletContainer(context); - try - { - ServletResourceLoader resourceLoader = new ServletResourceLoader(context); - ServletAdapterList adapterList = new ServletAdapterList(); - - // Parse the descriptor file and build endpoint infos - DeploymentDescriptorParser<ServletAdapter> parser = new DeploymentDescriptorParser<ServletAdapter>(classLoader, resourceLoader, container, adapterList); - - URL sunJaxWsXml = context.getResource(JAXWS_RI_RUNTIME); - if (sunJaxWsXml == null) - { - String urlStr = context.getInitParameter(PARAM_SUN_JAXWS_URL); - if (urlStr != null && urlStr.length() > 0) - sunJaxWsXml = new URL(urlStr); - } - if (sunJaxWsXml == null) - throw new WebServiceException(WsservletMessages.NO_SUNJAXWS_XML(JAXWS_RI_RUNTIME)); - - List<ServletAdapter> adapters = parser.parse(sunJaxWsXml.toExternalForm(), sunJaxWsXml.openStream()); - - delegate = new WSServletDelegate(adapters, context); - - context.setAttribute(WSServlet.JAXWS_RI_RUNTIME_INFO, delegate); - } - catch (Throwable e) - { - logger.log(Level.SEVERE, WsservletMessages.LISTENER_PARSING_FAILED(e), e); - context.removeAttribute(WSServlet.JAXWS_RI_RUNTIME_INFO); - throw new WebServiceException("listener.parsingFailed", e); - } - } - - /** - * Provides access to {@link ServletContext} via {@link Container}. Pipes - * can get ServletContext from Container and use it to load some resources. - */ - private static class ServletContainer extends Container - { - private final ServletContext servletContext; - - private final Module module = new Module() - { - private final List<BoundEndpoint> endpoints = new ArrayList<BoundEndpoint>(); - - public @NotNull - List<BoundEndpoint> getBoundEndpoints() - { - return endpoints; - } - }; - - ServletContainer(ServletContext servletContext) - { - this.servletContext = servletContext; - } - - public <T> T getSPI(Class<T> spiType) - { - if (spiType == ServletContext.class) - { - return (T)servletContext; - } - if (spiType == Module.class) - { - return spiType.cast(module); - } - return null; - } - } - - private static final String JAXWS_RI_RUNTIME = "/WEB-INF/sun-jaxws.xml"; - - private static final Logger logger = Logger.getLogger(com.sun.xml.ws.util.Constants.LoggingDomain + ".server.http"); -} Added: trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/WSServletContextListenerExt.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/WSServletContextListenerExt.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/WSServletContextListenerExt.java 2007-05-18 21:40:57 UTC (rev 3145) @@ -0,0 +1,187 @@ +/* + * 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.wsintegration.stack.sunri; + +// $Id$ + +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.servlet.ServletContext; +import javax.servlet.ServletContextAttributeEvent; +import javax.servlet.ServletContextAttributeListener; +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; +import javax.xml.ws.WebServiceException; + +import com.sun.istack.NotNull; +import com.sun.xml.ws.api.server.BoundEndpoint; +import com.sun.xml.ws.api.server.Container; +import com.sun.xml.ws.api.server.Module; +import com.sun.xml.ws.resources.WsservletMessages; +import com.sun.xml.ws.transport.http.DeploymentDescriptorParser.AdapterFactory; +import com.sun.xml.ws.transport.http.servlet.ServletAdapter; +import com.sun.xml.ws.transport.http.servlet.ServletAdapterList; +import com.sun.xml.ws.transport.http.servlet.WSServlet; +import com.sun.xml.ws.transport.http.servlet.WSServletDelegate; + +/** + * A copy of WSServletContextListener that externalizes + * + * getDeploymentDescriptorURL() + * createDeploymentDescriptorParser() + * + * @author WS Development Team + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class WSServletContextListenerExt implements ServletContextAttributeListener, ServletContextListener +{ + private WSServletDelegate delegate; + + public void attributeAdded(ServletContextAttributeEvent event) + { + } + + public void attributeRemoved(ServletContextAttributeEvent event) + { + } + + public void attributeReplaced(ServletContextAttributeEvent event) + { + } + + public void contextDestroyed(ServletContextEvent event) + { + if (delegate != null) + { // the deployment might have failed. + delegate.destroy(); + } + + if (logger.isLoggable(Level.INFO)) + { + logger.info(WsservletMessages.LISTENER_INFO_DESTROY()); + } + } + + public void contextInitialized(ServletContextEvent event) + { + if (logger.isLoggable(Level.INFO)) + { + logger.info(WsservletMessages.LISTENER_INFO_INITIALIZE()); + } + ServletContext context = event.getServletContext(); + ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); + if (classLoader == null) + { + classLoader = getClass().getClassLoader(); + } + + ServletContainer container = new ServletContainer(context); + try + { + ServletResourceLoader resourceLoader = new ServletResourceLoader(context); + ServletAdapterList adapterList = new ServletAdapterList(); + + // Parse the descriptor file and build endpoint infos + DeploymentDescriptorParserExt<ServletAdapter> parser = createDeploymentDescriptorParser(classLoader, container, resourceLoader, adapterList); + + URL sunJaxWsXml = getDeploymentDescriptorURL(context); + List<ServletAdapter> adapters = parser.parse(sunJaxWsXml.toExternalForm(), sunJaxWsXml.openStream()); + + delegate = new WSServletDelegate(adapters, context); + + context.setAttribute(WSServlet.JAXWS_RI_RUNTIME_INFO, delegate); + } + catch (Throwable e) + { + logger.log(Level.SEVERE, WsservletMessages.LISTENER_PARSING_FAILED(e), e); + context.removeAttribute(WSServlet.JAXWS_RI_RUNTIME_INFO); + throw new WebServiceException("listener.parsingFailed", e); + } + } + + /** + * Externalized for integration + */ + protected DeploymentDescriptorParserExt<ServletAdapter> createDeploymentDescriptorParser(ClassLoader classLoader, ServletContainer container, + ServletResourceLoader resourceLoader, AdapterFactory<ServletAdapter> adapterList) throws MalformedURLException + { + DeploymentDescriptorParserExt<ServletAdapter> parser = new DeploymentDescriptorParserExt<ServletAdapter>(classLoader, resourceLoader, container, adapterList); + return parser; + } + + /** + * Externalized for integration + */ + protected URL getDeploymentDescriptorURL(ServletContext context) throws MalformedURLException + { + URL sunJaxWsXml = context.getResource(JAXWS_RI_RUNTIME); + return sunJaxWsXml; + } + + /** + * Provides access to {@link ServletContext} via {@link Container}. Pipes + * can get ServletContext from Container and use it to load some resources. + */ + static class ServletContainer extends Container + { + private final ServletContext servletContext; + + private final Module module = new Module() + { + private final List<BoundEndpoint> endpoints = new ArrayList<BoundEndpoint>(); + + public @NotNull + List<BoundEndpoint> getBoundEndpoints() + { + return endpoints; + } + }; + + ServletContainer(ServletContext servletContext) + { + this.servletContext = servletContext; + } + + public <T> T getSPI(Class<T> spiType) + { + if (spiType == ServletContext.class) + { + return (T)servletContext; + } + if (spiType == Module.class) + { + return spiType.cast(module); + } + return null; + } + } + + protected static final String JAXWS_RI_RUNTIME = "/WEB-INF/sun-jaxws.xml"; + + private static final Logger logger = Logger.getLogger(com.sun.xml.ws.util.Constants.LoggingDomain + ".server.http"); +} Property changes on: trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/WSServletContextListenerExt.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/WSServletContextListenerJBWS.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/WSServletContextListenerJBWS.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/WSServletContextListenerJBWS.java 2007-05-18 21:40:57 UTC (rev 3145) @@ -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.wsintegration.stack.sunri; + +// $Id$ + +import java.net.MalformedURLException; +import java.net.URL; + +import javax.servlet.ServletContext; +import javax.xml.ws.WebServiceException; + +import com.sun.xml.ws.resources.WsservletMessages; +import com.sun.xml.ws.transport.http.HttpAdapter; +import com.sun.xml.ws.transport.http.DeploymentDescriptorParser.AdapterFactory; +import com.sun.xml.ws.transport.http.servlet.ServletAdapter; + +/** + * Parses {@code sun-jaxws.xml} and sets up + * {@link HttpAdapter}s for all deployed endpoints. + * + * + * This code is the entry point at the server side. + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-May-2007 + */ +public class WSServletContextListenerJBWS extends WSServletContextListenerExt +{ + public static final String PARAM_SUN_JAXWS_URL = "jbossws-sun-jaxws-url"; + + /** + * Fall back to the 'jbossws-sun-jaxws-url' init parameter for the URL location + * of sun-jaxws.xml + */ + @Override + protected URL getDeploymentDescriptorURL(ServletContext context) throws MalformedURLException + { + URL sunJaxWsXml = super.getDeploymentDescriptorURL(context); + if (sunJaxWsXml == null) + { + String urlStr = context.getInitParameter(PARAM_SUN_JAXWS_URL); + if (urlStr != null && urlStr.length() > 0) + sunJaxWsXml = new URL(urlStr); + } + if (sunJaxWsXml == null) + throw new WebServiceException(WsservletMessages.NO_SUNJAXWS_XML(JAXWS_RI_RUNTIME)); + + return sunJaxWsXml; + } + + /** + * Externalized for integration + */ + @Override + protected DeploymentDescriptorParserExt<ServletAdapter> createDeploymentDescriptorParser(ClassLoader classLoader, ServletContainer container, + ServletResourceLoader resourceLoader, AdapterFactory<ServletAdapter> adapterList) throws MalformedURLException + { + DeploymentDescriptorParserExt<ServletAdapter> parser = new DeploymentDescriptorParserJBWS<ServletAdapter>(classLoader, resourceLoader, container, adapterList); + return parser; + } +} Property changes on: trunk/integration/sunri/src/main/java/org/jboss/wsintegration/stack/sunri/WSServletContextListenerJBWS.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml =================================================================== --- trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml 2007-05-18 21:40:57 UTC (rev 3145) @@ -130,8 +130,8 @@ <bean name="WSEndpointNameDeployer" class="org.jboss.wsintegration.stack.sunri.EndpointNameDeployer"/> <bean name="WSEndpointRegistryDeployer" class="org.jboss.wsintegration.spi.deployment.EndpointRegistryDeployer"/> <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsintegration.stack.sunri.ModifyWebMetaDataDeployer"> - <property name="listenerClass">org.jboss.wsintegration.stack.sunri.WSServletContextListener</property> - <property name="servletClass">org.jboss.wsintegration.stack.sunri.WSEndpointServlet</property> + <property name="listenerClass">org.jboss.wsintegration.stack.sunri.WSServletContextListenerJBWS</property> + <property name="servletClass">org.jboss.wsintegration.stack.sunri.WSEndpointServletJBWS</property> </bean> <bean name="WSSunJaxwsDeployer" class="org.jboss.wsintegration.stack.sunri.SunJaxwsDeployer"/> <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsintegration.container.jboss50.UnifiedDeploymentInfoDeployer"/> Modified: trunk/jbossws-core/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-05-18 21:40:57 UTC (rev 3145) @@ -106,7 +106,7 @@  <path id="thirdparty.classpath"> - <pathelement location="${spi.dir}/output/lib/jbossws-integration.jar"/> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/> <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> <pathelement location="${thirdparty.dir}/activation.jar"/> Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-18 21:40:57 UTC (rev 3145) @@ -28,7 +28,7 @@ <target name="tests-init" depends="jars,tests-prepare"> <path id="jbossws.classpath"> - <pathelement location="${spi.dir}/output/lib/jbossws-integration.jar"/> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> Added: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceLifecycleInvocationHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceLifecycleInvocationHandler.java (rev 0) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceLifecycleInvocationHandler.java 2007-05-18 21:40:57 UTC (rev 3145) @@ -0,0 +1,74 @@ +/* + * 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.jaxrpc; + +// $Id$ + +import javax.xml.rpc.server.ServiceLifecycle; +import javax.xml.rpc.server.ServletEndpointContext; + +import org.jboss.wsintegration.spi.deployment.Endpoint; +import org.jboss.wsintegration.spi.invocation.EndpointInvocation; +import org.jboss.wsintegration.spi.invocation.InvocationContext; +import org.jboss.wsintegration.spi.invocation.InvocationHandlerJSE; + +/** + * Handles invocations on JSE endpoints. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class ServiceLifecycleInvocationHandler extends InvocationHandlerJSE +{ + public void invoke(Endpoint ep, Object beanInstance, EndpointInvocation epInv) throws Exception + { + try + { + if (beanInstance == null) + beanInstance = super.getBeanInstance(ep); + + InvocationContext invContext = epInv.getInvocationContext(); + if (beanInstance instanceof ServiceLifecycle) + { + ServletEndpointContext sepContext = invContext.getAttachment(ServletEndpointContext.class); + if (sepContext != null) + ((ServiceLifecycle)beanInstance).init(sepContext); + } + + try + { + super.invoke(ep, beanInstance, epInv); + } + finally + { + if (beanInstance instanceof ServiceLifecycle) + { + ((ServiceLifecycle)beanInstance).destroy(); + } + } + } + catch (Exception e) + { + handleInvocationException(e); + } + } +} Property changes on: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceLifecycleInvocationHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-05-18 21:40:57 UTC (rev 3145) @@ -204,7 +204,7 @@ // Invoke an instance of the SEI implementation bean EndpointInvocation inv = setupInvocation(endpoint, sepInv, invContext); InvocationHandler invHandler = endpoint.getInvocationHandler(); - invHandler.invoke(endpoint, inv); + invHandler.invoke(endpoint, null, inv); } finally { Modified: trunk/testsuite/ant-import/build-jars-jaxws.xml =================================================================== --- trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-05-18 21:40:57 UTC (rev 3145) @@ -39,7 +39,7 @@ </jar> <jar jarfile="${tests.output.dir}/libs/jaxws-eardeployment.ear"> <fileset dir="${tests.output.dir}/libs"> -  + <include name="jaxws-eardeployment.jar"/> <include name="jaxws-eardeployment.war"/> </fileset> <metainf dir="${tests.output.dir}/resources/jaxws/eardeployment/META-INF"> Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java 2007-05-18 19:01:11 UTC (rev 3144) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java 2007-05-18 21:40:57 UTC (rev 3145) @@ -45,7 +45,7 @@ return JBossWSTestSetup.newTestSetup(EarTestCase.class, earName); } - public void _testEJB3Endpoint() throws Exception + public void testEJB3Endpoint() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/earejb3/EJB3Bean?wsdl"); QName serviceName = new QName("http://eardeployment.jaxws.ws.test.jboss.org/", "TestEndpointService");

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3144 - in branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core: jaxrpc/handler and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: david.boeren Date: 2007-05-18 15:01:11 -0400 (Fri, 18 May 2007) New Revision: 3144 Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java Log: Changes for JBWS-1653 Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-05-18 15:29:32 UTC (rev 3143) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-05-18 19:01:11 UTC (rev 3144) @@ -256,6 +256,13 @@ // Bind the request message SOAPMessage reqMessage = (SOAPMessage)binding.bindRequestMessage(opMetaData, epInv, unboundHeaders); + + List ll = this.epMetaData.getHandlerMetaData(HandlerType.POST); + log.debug("NumberOfHandlers ofType POST fromConfigFiles= "+ll.size()); + + // FIX: Update the HandlerRegistry + log.debug("Updating the HandlerRegistry..."); + this.setConfigName(this.getConfigName()); // Add possible attachment parts addAttachmentParts(reqMessage); Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java 2007-05-18 15:29:32 UTC (rev 3143) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java 2007-05-18 19:01:11 UTC (rev 3144) @@ -207,6 +207,7 @@ /** * Sets SOAP Actor roles for this HandlerChain. This specifies the set of roles in which this HandlerChain is to act * for the SOAP message processing at this SOAP node. These roles assumed by a HandlerChain must be invariant during + * the processing of an individual SOAP message through the HandlerChain. * * A HandlerChain always acts in the role of the special SOAP actor next. Refer to the SOAP specification for the @@ -244,6 +245,9 @@ { boolean doNext = true; + if(type==HandlerType.POST) + log.debug("Requested Handlertype POST, for execution"); + if (handlers.size() > 0) { if(log.isDebugEnabled()) log.debug("Enter: handleRequest"); @@ -262,6 +266,10 @@ for (; doNext && handlerIndex < handlers.size(); handlerIndex++) { HandlerEntry handlerEntry = (HandlerEntry)handlers.get(handlerIndex); + + if(type==HandlerType.POST && handlerEntry.getType()==HandlerType.POST) + log.debug("FoundTheHandler with HandlerType=POST."); + if (type == HandlerType.ALL || type == handlerEntry.getType()) { currHandler = handlerEntry.getHandler(); Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java 2007-05-18 15:29:32 UTC (rev 3143) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java 2007-05-18 19:01:11 UTC (rev 3144) @@ -26,7 +26,6 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.UndeclaredThrowableException; -import java.util.Iterator; import javax.management.MBeanException; import javax.xml.namespace.QName; @@ -151,20 +150,14 @@ msgContext.setOperationMetaData(opMetaData); oneway = opMetaData.isOneWay(); - // Unbind the request message - epInv = binding.unbindRequestMessage(opMetaData, reqMessage); + // We no longer call unbindRequestMessage here, per case 15726 } handlersPass = handlersPass && callRequestHandlerChain(seInfo, HandlerType.ENDPOINT); handlersPass = handlersPass && callRequestHandlerChain(seInfo, HandlerType.POST); - // Check if protocol handlers modified the payload - if (msgContext.isModified() == true) - { - if (log.isDebugEnabled()) - log.debug("Handler modified body payload, unbind message again"); - epInv = binding.unbindRequestMessage(opMetaData, reqMessage); - } + // Unbind the request message + epInv = binding.unbindRequestMessage(opMetaData, reqMessage); if (handlersPass) { @@ -185,8 +178,8 @@ if (epMetaData.getType() == EndpointMetaData.Type.JAXWS) msgContext.setProperty(MessageContext.MESSAGE_OUTBOUND_PROPERTY, Boolean.TRUE); - if (binding instanceof CommonSOAPBinding) - XOPContext.setMTOMEnabled(((CommonSOAPBinding)binding).isMTOMEnabled()); + if(binding instanceof CommonSOAPBinding) + XOPContext.setMTOMEnabled( ((CommonSOAPBinding)binding).isMTOMEnabled()); // Bind the response message SOAPMessage resMessage = (SOAPMessage)binding.bindResponseMessage(opMetaData, epInv); @@ -230,8 +223,7 @@ protected CommonMessageContext processPivot(CommonMessageContext requestContext) { - if (log.isDebugEnabled()) - log.debug("Begin response processing"); + if(log.isDebugEnabled()) log.debug("Begin response processing"); // TODO: implement return requestContext; } @@ -246,21 +238,9 @@ { String faultString; SOAPBody soapBody = reqMessage.getSOAPBody(); - - Iterator bodyChildren = soapBody.getChildElements(); - SOAPBodyElement soapBodyElement = null; - - while (bodyChildren.hasNext() && soapBodyElement == null) + if (soapBody.getChildElements().hasNext()) { - Object next = bodyChildren.next(); - if (next instanceof SOAPBodyElement) - { - soapBodyElement = (SOAPBodyElement)next; - } - } - - if (soapBodyElement != null) - { + SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); Name soapName = soapBodyElement.getElementName(); faultString = "Endpoint " + epMetaData.getPortName() + " does not contain operation meta data for: " + soapName; } @@ -273,10 +253,8 @@ // with a faultcode of "Client", unless a "MustUnderstand" or "VersionMismatch" fault is generated. if (soapHeader != null && soapHeader.examineMustUnderstandHeaderElements(Constants.URI_SOAP11_NEXT_ACTOR).hasNext()) { - QName faultCode = Constants.SOAP11_FAULT_CODE_MUST_UNDERSTAND; throw new SOAPFaultException(faultCode, faultString, null, null); - } else {

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3143 - branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/client.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-05-18 11:29:32 -0400 (Fri, 18 May 2007) New Revision: 3143 Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/client/RemotingConnectionImpl.java Log: Enforce chunked encoding Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/client/RemotingConnectionImpl.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/client/RemotingConnectionImpl.java 2007-05-18 14:15:13 UTC (rev 3142) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/client/RemotingConnectionImpl.java 2007-05-18 15:29:32 UTC (rev 3143) @@ -33,6 +33,7 @@ import org.jboss.ws.core.MessageTrace; import org.jboss.ws.core.StubExt; import org.jboss.ws.core.WSTimeoutException; +import org.jboss.ws.metadata.config.EndpointProperty; import javax.xml.rpc.Stub; import javax.xml.soap.MimeHeader; @@ -96,6 +97,10 @@ // HTTPClientInvoker conect sends gratuitous POST // http://jira.jboss.com/jira/browse/JBWS-711 clientConfig.put(Client.ENABLE_LEASE, false); + + // Enable chunked encoding + // TODO: make this configurable through an endoint property + clientConfig.put("chunkedLength", "2048"); } public boolean isClosed() @@ -135,8 +140,7 @@ { timeout = callProps.get(StubExt.PROPERTY_CLIENT_TIMEOUT); targetAddress = addURLParameter(targetAddress, "timeout", timeout.toString()); - } - + } } else if (endpoint instanceof EndpointReference) { @@ -150,7 +154,7 @@ // setup remoting client Map<String, Object> metadata = createRemotingMetaData(reqMessage, callProps); - Client client = createRemotingClient(endpoint, targetAddress, oneway); + Client client = createRemotingClient(endpoint, targetAddress, oneway); try { @@ -255,9 +259,6 @@ // metadata.put(HTTPMetadataConstants.NO_THROW_ON_ERROR, "true"); // since 2.0.0.GA metadata.put("NoThrowOnError", "true"); - // Chunked transfer encoding - metadata.put("chunkedLength", "1024"); - if (reqMessage != null) { populateHeaders(reqMessage, metadata);

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3142 - in trunk: integration/jbws/src/main/etc and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-18 10:15:13 -0400 (Fri, 18 May 2007) New Revision: 3142 Modified: trunk/integration/jbws/build.xml trunk/integration/jbws/src/main/etc/component-info-jboss42.xml trunk/integration/jbws/src/main/etc/component-info-jboss50.xml trunk/jbossws-core/build.xml trunk/jbossws-core/src/main/etc/component-info.xml trunk/jbossws-core/version.properties Log: Fix component-info.xml Modified: trunk/integration/jbws/build.xml =================================================================== --- trunk/integration/jbws/build.xml 2007-05-18 14:01:34 UTC (rev 3141) +++ trunk/integration/jbws/build.xml 2007-05-18 14:15:13 UTC (rev 3142) @@ -67,7 +67,7 @@ <mkdir dir="${jbws.output.etc.dir}"/> <copy todir="${jbws.output.etc.dir}" filtering="yes"> <fileset dir="${jbws.etc.dir}"> - <include name="component-info.xml"/> + <include name="component-info-*.xml"/> </fileset> <fileset dir="${build.dir}/etc"> <include name="default.mf"/> Modified: trunk/integration/jbws/src/main/etc/component-info-jboss42.xml =================================================================== --- trunk/integration/jbws/src/main/etc/component-info-jboss42.xml 2007-05-18 14:01:34 UTC (rev 3141) +++ trunk/integration/jbws/src/main/etc/component-info-jboss42.xml 2007-05-18 14:15:13 UTC (rev 3142) @@ -16,10 +16,10 @@ <compatible version="@jboss-microcontainer@"/> </import> <import componentref="jboss/jbossws"> - <compatible version="@jboss-jbossws@"/> + <compatible version="@repository.id@"/> </import> <import componentref="jboss/jbossws-spi"> - <compatible version="@jboss-jbossws-spi@"/> + <compatible version="@repository.id@"/> </import> <export> Modified: trunk/integration/jbws/src/main/etc/component-info-jboss50.xml =================================================================== --- trunk/integration/jbws/src/main/etc/component-info-jboss50.xml 2007-05-18 14:01:34 UTC (rev 3141) +++ trunk/integration/jbws/src/main/etc/component-info-jboss50.xml 2007-05-18 14:15:13 UTC (rev 3142) @@ -17,10 +17,10 @@ <compatible version="@jboss-microcontainer@"/> </import> <import componentref="jboss/jbossws"> - <compatible version="@jboss-jbossws@"/> + <compatible version="@repository.id@"/> </import> <import componentref="jboss/jbossws-spi"> - <compatible version="@jboss-jbossws-spi@"/> + <compatible version="@repository.id@"/> </import> <export> Modified: trunk/jbossws-core/build.xml =================================================================== --- trunk/jbossws-core/build.xml 2007-05-18 14:01:34 UTC (rev 3141) +++ trunk/jbossws-core/build.xml 2007-05-18 14:15:13 UTC (rev 3142) @@ -100,6 +100,7 @@ <filter token="build.id" value="${build.id}"/> <filter token="implementation.version" value="jbossws-${version.id}"/> <filtersfile file="${build.dir}/version.properties"/> + <filtersfile file="${core.dir}/version.properties"/> </filterset> </copy> </target> Modified: trunk/jbossws-core/src/main/etc/component-info.xml =================================================================== --- trunk/jbossws-core/src/main/etc/component-info.xml 2007-05-18 14:01:34 UTC (rev 3141) +++ trunk/jbossws-core/src/main/etc/component-info.xml 2007-05-18 14:15:13 UTC (rev 3142) @@ -29,7 +29,7 @@ <compatible version="@jbpm-bpel@"/> </import> <import componentref="jboss/jbossws-spi"> - <compatible version="@jbossws-spi@"/> + <compatible version="@repository.id@"/> </import> <import componentref="jboss/jbossws-wsconsume-impl"> <compatible version="@jbossws-wsconsume-impl@"/> Modified: trunk/jbossws-core/version.properties =================================================================== --- trunk/jbossws-core/version.properties 2007-05-18 14:01:34 UTC (rev 3141) +++ trunk/jbossws-core/version.properties 2007-05-18 14:15:13 UTC (rev 3142) @@ -7,6 +7,7 @@ javassist=3.5.0.CR1 jbossws-wsconsume-impl=2.0.0 jbpm-bpel=1.1.0.Beta5 +sun-jaxb=2.1.3 stax-api=1.0 # Thirdparty library versions @@ -33,7 +34,6 @@ sun-hudson=1.93 sun-jaf=1.1 sun-javamail=1.4 -sun-jaxb=2.1.3 woodstox=3.1.1 wscommons-policy=1.0 xmlunit=1.0

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3141 - branches/jbossws-2.0/build/ant-import.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-05-18 10:01:34 -0400 (Fri, 18 May 2007) New Revision: 3141 Modified: branches/jbossws-2.0/build/ant-import/build-deploy.xml Log: Remove TRUNK llibs that may be deployed on a shared dev instance Modified: branches/jbossws-2.0/build/ant-import/build-deploy.xml =================================================================== --- branches/jbossws-2.0/build/ant-import/build-deploy.xml 2007-05-18 14:00:13 UTC (rev 3140) +++ branches/jbossws-2.0/build/ant-import/build-deploy.xml 2007-05-18 14:01:34 UTC (rev 3141) @@ -45,6 +45,9 @@ <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> +  + <delete file="${jboss50.home}/server/${jboss.server.instance}/lib/jbossws-spi.jar"/> + <copy todir="${jboss50.home}/bin" overwrite="true"> <fileset dir="${build.etc.dir}"> <include name="*.bat"/>

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3140 - branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-05-18 10:00:13 -0400 (Fri, 18 May 2007) New Revision: 3140 Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.java Log: Fix addressing samples Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java 2007-05-18 13:59:10 UTC (rev 3139) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java 2007-05-18 14:00:13 UTC (rev 3140) @@ -67,7 +67,7 @@ List<Handler> customHandlerChain = new ArrayList<Handler>(); customHandlerChain.add(new ClientHandler()); - customHandlerChain.add(new WSAddressingClientHandler()); + //customHandlerChain.add(new WSAddressingClientHandler()); bindingProvider.getBinding().setHandlerChain(customHandlerChain); Service service2 = Service.create(wsdlURL, serviceName); @@ -75,7 +75,7 @@ bindingProvider = (BindingProvider)port2; List<Handler> customHandlerChain2 = new ArrayList<Handler>(); customHandlerChain2.add(new ClientHandler()); - customHandlerChain2.add(new WSAddressingClientHandler()); + //customHandlerChain2.add(new WSAddressingClientHandler()); bindingProvider.getBinding().setHandlerChain(customHandlerChain2); } Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.java 2007-05-18 13:59:10 UTC (rev 3139) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.java 2007-05-18 14:00:13 UTC (rev 3140) @@ -41,7 +41,6 @@ */ @WebService(name = "StatefulEndpoint", targetNamespace = "http://org.jboss.ws/samples/wsaddressing", serviceName = "TestService") @SOAPBinding(style = SOAPBinding.Style.RPC) -@EndpointConfig(configName = "Standard WSAddressing Endpoint") public interface StatefulEndpoint extends Remote { @WebMethod

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3139 - trunk/build/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-18 09:59:10 -0400 (Fri, 18 May 2007) New Revision: 3139 Modified: trunk/build/ant-import/build-release.xml Log: Add release-to-repository Modified: trunk/build/ant-import/build-release.xml =================================================================== --- trunk/build/ant-import/build-release.xml 2007-05-18 13:45:09 UTC (rev 3138) +++ trunk/build/ant-import/build-release.xml 2007-05-18 13:59:10 UTC (rev 3139) @@ -16,7 +16,7 @@ <property name="build.bin.dist" value="${build.output.dir}/bin-dist"/> <property name="build.src.dist" value="${build.output.dir}/src-dist"/> - <target name="release-all" depends="all,release-to-portal" description="Release JBossWS"> + <target name="release-all" depends="all,release-to-repository,release-to-portal" description="Release JBossWS"> <echo message="*********************************************"/> <echo message="* Released: jbossws-${version.id}"/> <echo message="*"/> @@ -38,6 +38,12 @@ <echo message="*********************************************"/> </target> + <target name="release-to-repository" depends="prepare" description="Release to local repository"> + <ant antfile="${spi.dir}/build.xml" target="release" inheritall="false"/> + <ant antfile="${core.dir}/build.xml" target="release" inheritall="false"/> + <ant antfile="${int.jbws.dir}/build.xml" target="release" inheritall="false"/> + </target> +  <target name="check-portal-content" depends="prepare" unless="jbossws.portal.content.available"> <echo message="*********************************************"/>

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3138 - trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-18 09:45:09 -0400 (Fri, 18 May 2007) New Revision: 3138 Removed: trunk/jbws-jboss50/ Log: restructure for sunri integration

18 years, 11 months

1
0
0 / 0

← Newer
1
...
18
19
20
21
22
23
24
...
40
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits May 2007