July 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r3993 - in trunk/integration: jboss50/src/main/java/org/jboss/wsf/container/jboss50 and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-07-25 09:11:20 -0400 (Wed, 25 Jul 2007) New Revision: 3993 Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.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/WebAppDeploymentAspect.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/WebAppDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java Log: Remove UnifiedDeploymentInfo.webappURL Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-07-25 12:48:59 UTC (rev 3992) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-07-25 13:11:20 UTC (rev 3993) @@ -32,6 +32,7 @@ import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.WebMetaData; import org.jboss.ws.integration.ResourceLoaderAdapter; +import org.jboss.wsf.framework.deployment.WebXMLRewriter; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; @@ -115,7 +116,7 @@ if (di.metaData instanceof WebMetaData) { webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, di); - udi.setWebappURL(udi.getUrl()); + dep.getContext().setProperty(WebXMLRewriter.WEBAPP_URL, udi.getUrl()); } else if (dep.getType() == DeploymentType.JAXRPC_EJB3 || dep.getType() == DeploymentType.JAXWS_EJB3) { Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-07-25 12:48:59 UTC (rev 3992) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-07-25 13:11:20 UTC (rev 3993) @@ -23,6 +23,12 @@ // $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; @@ -32,17 +38,16 @@ import org.jboss.ejb3.stateless.StatelessContainer; import org.jboss.injection.lang.reflect.BeanProperty; import org.jboss.wsf.common.ObjectNameFactory; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsf.spi.invocation.*; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.invocation.ExtendableWebServiceContext; +import org.jboss.wsf.spi.invocation.Invocation; +import org.jboss.wsf.spi.invocation.InvocationHandler; +import org.jboss.wsf.spi.invocation.InvocationType; +import org.jboss.wsf.spi.invocation.WebServiceContextFactory; -import javax.ejb.EJBContext; -import javax.management.ObjectName; -import javax.xml.ws.WebServiceException; -import java.lang.reflect.Method; - /** * Handles invocations on EJB3 endpoints. * Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java 2007-07-25 12:48:59 UTC (rev 3992) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java 2007-07-25 13:11:20 UTC (rev 3993) @@ -62,7 +62,7 @@ if (udi == null) throw new IllegalStateException("Cannot obtain unified deployement info"); - URL warURL = udi.getWebappURL(); + URL warURL = (URL)dep.getContext().getProperty(WebXMLRewriter.WEBAPP_URL); log.debug("publishServiceEndpoint: " + warURL); try @@ -91,7 +91,7 @@ if (udi == null) throw new IllegalStateException("Cannot obtain unified deployement info"); - URL warURL = udi.getWebappURL(); + URL warURL = (URL)dep.getContext().getProperty(WebXMLRewriter.WEBAPP_URL); if (warURL == null) { log.error("Cannot obtain warURL for: " + udi); Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-25 12:48:59 UTC (rev 3992) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-25 13:11:20 UTC (rev 3993) @@ -27,12 +27,10 @@ import org.jboss.logging.Logger; import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.WebMetaData; +import org.jboss.wsf.framework.deployment.WebXMLRewriter; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; -import java.net.URL; -import java.net.URLClassLoader; - // $Id$ /** @@ -106,7 +104,7 @@ if (unit.getAttachment(WebMetaData.class) != null) { webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, unit); - udi.setWebappURL(udi.getVfRoot().toURL()); + dep.getContext().setProperty(WebXMLRewriter.WEBAPP_URL, udi.getVfRoot().toURL()); } else if (unit.getAttachment(Ejb3Deployment.class) != null) { Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java 2007-07-25 12:48:59 UTC (rev 3992) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java 2007-07-25 13:11:20 UTC (rev 3993) @@ -71,7 +71,7 @@ if (udi == null) throw new IllegalStateException("Cannot obtain unified deployement info"); - URL warURL = udi.getWebappURL(); + URL warURL = (URL)dep.getContext().getProperty(WebXMLRewriter.WEBAPP_URL); log.debug("publishServiceEndpoint: " + warURL); try @@ -96,7 +96,7 @@ if (udi == null) throw new IllegalStateException("Cannot obtain unified deployement info"); - URL warURL = udi.getWebappURL(); + URL warURL = (URL)dep.getContext().getProperty(WebXMLRewriter.WEBAPP_URL); if (warURL == null) { log.error("Cannot obtain warURL for: " + udi); Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2007-07-25 12:48:59 UTC (rev 3992) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2007-07-25 13:11:20 UTC (rev 3993) @@ -74,11 +74,13 @@ if (dep.getType().toString().endsWith("EJB21")) { - udi.setWebappURL(generatWebDeployment(dep, securityHandlerEJB21)); + URL webAppURL = generatWebDeployment(dep, securityHandlerEJB21); + dep.getContext().setProperty(WebXMLRewriter.WEBAPP_URL, webAppURL); } else if (dep.getType().toString().endsWith("EJB3")) { - udi.setWebappURL(generatWebDeployment(dep, securityHandlerEJB3)); + URL webAppURL = generatWebDeployment(dep, securityHandlerEJB3); + dep.getContext().setProperty(WebXMLRewriter.WEBAPP_URL, webAppURL); } } Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java 2007-07-25 12:48:59 UTC (rev 3992) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java 2007-07-25 13:11:20 UTC (rev 3993) @@ -29,5 +29,7 @@ */ public interface WebXMLRewriter { + final String WEBAPP_URL = "org.jboss.ws.webapp.url"; + RewriteResults rewriteWebXml(Deployment dep); } Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java 2007-07-25 12:48:59 UTC (rev 3992) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java 2007-07-25 13:11:20 UTC (rev 3993) @@ -67,7 +67,7 @@ if (udi == null) throw new IllegalStateException("Cannot obtain unified deployment info"); - URL warURL = udi.getWebappURL(); + URL warURL = (URL)dep.getContext().getProperty(WebXMLRewriter.WEBAPP_URL); File warFile = new File(warURL.getFile()); if (warFile.isDirectory() == false) throw new WebServiceException("Expected a war directory: " + warURL); Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java 2007-07-25 12:48:59 UTC (rev 3992) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java 2007-07-25 13:11:20 UTC (rev 3993) @@ -45,19 +45,7 @@ private URL url; /** The virtual file for the deployment root */ private UnifiedVirtualFile vfRoot; - /** The URL to the expanded webapp **/ - private URL webappURL; - - public void setWebappURL(URL webappURL) - { - this.webappURL = webappURL; - } - - public URL getWebappURL() - { - return webappURL; - } - + public void setVfRoot(UnifiedVirtualFile vfRoot) { this.vfRoot = vfRoot;

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r3992 - in trunk: integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50 and 11 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-07-25 08:48:59 -0400 (Wed, 25 Jul 2007) New Revision: 3992 Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.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/DeploymentInfoAdapter.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/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/SecurityHandlerEJB3.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeploymentAspect.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.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/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/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/UnifiedDeploymentInfoDeploymentAspect.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeployment.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXRPCClientDeployment.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXRPCDeployment.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXWSDeployment.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.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/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/UnifiedDeploymentInfo.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointServlet.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointServlet.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/SecurityEncoder.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/SendUsernameOperation.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/JAXRPCServerMetaDataBuilder.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/tools/jaxws/impl/JBossWSProviderImpl.java Log: Refactor UnifiedDeploymentInfo Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -54,7 +54,8 @@ public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, UnifiedDeploymentInfo udi) { - Ejb3ModuleMBean ejb3Module = getEJB3Module(udi.getDeployedObject()); + ObjectName deployedObject = (ObjectName)dep.getContext().getProperty("DeployedObject"); + Ejb3ModuleMBean ejb3Module = getEJB3Module(deployedObject); ArrayList<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>(); for (Object container : ejb3Module.getContainers().values()) Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -76,7 +76,7 @@ public Deployment getDeployment(DeploymentInfo unit) { Deployment dep = (Deployment)unit.context.get(Deployment.class); - return (dep != null && dep.getDeploymentType() == getDeploymentType() ? dep : null); + return (dep != null && dep.getType() == getDeploymentType() ? dep : null); } public void deploy(DeploymentInfo unit) throws DeploymentException Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -72,15 +72,16 @@ if (di.parent != null) { - udi.setParent(new UnifiedDeploymentInfo(null)); + udi.setParent(new UnifiedDeploymentInfo()); buildDeploymentInfo(dep, udi.getParent(), di.parent); } udi.setVfRoot(new ResourceLoaderAdapter(di.localCl)); udi.setSimpleName(di.shortName); udi.setUrl(getDeploymentURL(di)); - udi.setClassLoader(di.annotationsCl); - udi.setDeployedObject(di.deployedObject); + + if (di.deployedObject != null) + dep.getContext().setProperty("DeployedObject", di.deployedObject); buildMetaData(dep, udi, di); @@ -113,16 +114,16 @@ { if (di.metaData instanceof WebMetaData) { - udi.setMetaData(webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, di)); + webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, di); udi.setWebappURL(udi.getUrl()); } - else if (dep.getDeploymentType() == DeploymentType.JAXRPC_EJB3 || dep.getDeploymentType() == DeploymentType.JAXWS_EJB3) + else if (dep.getType() == DeploymentType.JAXRPC_EJB3 || dep.getType() == DeploymentType.JAXWS_EJB3) { - udi.setMetaData(applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi)); + applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi); } else if (di.metaData instanceof ApplicationMetaData) { - udi.setMetaData(applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, di)); + applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, di); } } } Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -23,6 +23,15 @@ // $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; @@ -32,22 +41,18 @@ import org.jboss.logging.Logger; import org.jboss.mx.util.MBeanServerLocator; import org.jboss.wsf.common.ObjectNameFactory; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsf.spi.invocation.*; +import org.jboss.wsf.spi.invocation.HandlerCallback; +import org.jboss.wsf.spi.invocation.Invocation; +import org.jboss.wsf.spi.invocation.InvocationHandler; +import org.jboss.wsf.spi.invocation.SecurityAdaptor; +import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.SPIProvider; -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 java.lang.reflect.Method; -import java.security.Principal; - /** * Handles invocations on EJB21 endpoints. * Used with jboss40 and jboss42. @@ -80,9 +85,9 @@ public void init(Endpoint ep) { String ejbName = ep.getShortName(); - UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class); - UnifiedApplicationMetaData applMetaData = (UnifiedApplicationMetaData)udi.getMetaData(); - UnifiedBeanMetaData beanMetaData = (UnifiedBeanMetaData)applMetaData.getBeanByEjbName(ejbName); + Deployment dep = ep.getService().getDeployment(); + UnifiedApplicationMetaData apMetaData = dep.getContext().getAttachment(UnifiedApplicationMetaData.class); + UnifiedBeanMetaData beanMetaData = (UnifiedBeanMetaData)apMetaData.getBeanByEjbName(ejbName); if (beanMetaData == null) throw new WebServiceException("Cannot obtain ejb meta data for: " + ejbName); 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-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -57,7 +57,7 @@ dep.setRootFile(new URLLoaderAdapter(unit.localUrl)); dep.setInitialClassLoader(unit.annotationsCl); dep.setRuntimeClassLoader(unit.ucl); - dep.setDeploymentType(getDeploymentType()); + dep.setType(getDeploymentType()); Service service = dep.getService(); 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-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -63,7 +63,7 @@ dep.setRootFile(new URLLoaderAdapter(unit.localUrl)); dep.setInitialClassLoader(unit.annotationsCl); dep.setRuntimeClassLoader(null); - dep.setDeploymentType(getDeploymentType()); + dep.setType(getDeploymentType()); Service service = dep.getService(); 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-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -58,7 +58,7 @@ dep.setRootFile(new URLLoaderAdapter(unit.localUrl)); dep.setInitialClassLoader(unit.annotationsCl); dep.setRuntimeClassLoader(unit.ucl); - dep.setDeploymentType(getDeploymentType()); + dep.setType(getDeploymentType()); Service service = dep.getService(); 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-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -62,7 +62,7 @@ dep.setRootFile(new URLLoaderAdapter(unit.localUrl)); dep.setInitialClassLoader(unit.annotationsCl); dep.setRuntimeClassLoader(null); - dep.setDeploymentType(getDeploymentType()); + dep.setType(getDeploymentType()); Service service = dep.getService(); Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB3.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB3.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -51,8 +51,8 @@ { String securityDomain = null; - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - Ejb3ModuleMBean ejb3Module = getEJB3Module(udi.getDeployedObject()); + ObjectName deployedObject = (ObjectName)dep.getContext().getProperty("DeployedObject"); + Ejb3ModuleMBean ejb3Module = getEJB3Module(deployedObject); for (Object manager : ejb3Module.getContainers().values()) { if (manager instanceof StatelessContainer) @@ -82,8 +82,8 @@ public void addSecurityRoles(Element webApp, Deployment dep) { // The container objects below provide access to all of the ejb metadata - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - Ejb3ModuleMBean ejb3Module = getEJB3Module(udi.getDeployedObject()); + ObjectName deployedObject = (ObjectName)dep.getContext().getProperty("DeployedObject"); + Ejb3ModuleMBean ejb3Module = getEJB3Module(deployedObject); for (Object manager : ejb3Module.getContainers().values()) { if (manager instanceof StatelessContainer) Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeploymentAspect.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeploymentAspect.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeploymentAspect.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -57,7 +57,7 @@ if (unit == null) throw new IllegalStateException("Cannot obtain deployment unit"); - DeploymentType type = dep.getDeploymentType(); + DeploymentType type = dep.getType(); if (type.toString().startsWith("JAXWS")) { udi = new JAXWSDeployment(type); Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -56,7 +56,7 @@ public void create(Deployment dep) { - if (dep.getDeploymentType().toString().endsWith("EJB21") || dep.getDeploymentType().toString().endsWith("EJB3")) + if (dep.getType().toString().endsWith("EJB21") || dep.getType().toString().endsWith("EJB3")) { UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); if (udi == null) Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -73,7 +73,7 @@ public Deployment getDeployment(DeploymentUnit unit) { Deployment dep = unit.getAttachment(Deployment.class); - return (dep != null && dep.getDeploymentType() == getDeploymentType() ? dep : null); + return (dep != null && dep.getType() == getDeploymentType() ? dep : null); } public void deploy(DeploymentUnit unit) throws DeploymentException Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -73,7 +73,7 @@ { if (unit.getParent() != null) { - udi.setParent(new UnifiedDeploymentInfo(null)); + udi.setParent(new UnifiedDeploymentInfo()); buildDeploymentInfo(dep, udi.getParent(), unit.getParent()); } @@ -87,7 +87,7 @@ // Since we create temporary classes, we need to create a delegate loader // This prevents CCE problems where the parent loader is available at deploy time, // and a child loader is available at start time. - udi.setClassLoader(new URLClassLoader(new URL[] {}, unit.getClassLoader())); + // udi.setClassLoader(new URLClassLoader(new URL[] {}, unit.getClassLoader())); log.debug("UnifiedDeploymentInfo:\n" + udi); } @@ -105,16 +105,16 @@ { if (unit.getAttachment(WebMetaData.class) != null) { - udi.setMetaData(webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, unit)); + webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, unit); udi.setWebappURL(udi.getVfRoot().toURL()); } else if (unit.getAttachment(Ejb3Deployment.class) != null) { - udi.setMetaData(applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi, unit)); + applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi, unit); } else if (unit.getAttachment(ApplicationMetaData.class) != null) { - udi.setMetaData(applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, unit)); + applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, unit); } } } Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -23,6 +23,15 @@ // $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; @@ -34,22 +43,18 @@ import org.jboss.security.SecurityContext; import org.jboss.security.plugins.SecurityContextAssociation; import org.jboss.wsf.common.ObjectNameFactory; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsf.spi.invocation.*; +import org.jboss.wsf.spi.invocation.HandlerCallback; +import org.jboss.wsf.spi.invocation.Invocation; +import org.jboss.wsf.spi.invocation.InvocationHandler; +import org.jboss.wsf.spi.invocation.SecurityAdaptor; +import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; -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 java.lang.reflect.Method; -import java.security.Principal; - /** * Handles invocations on EJB21 endpoints. * @@ -77,9 +82,9 @@ public void init(Endpoint ep) { String ejbName = ep.getShortName(); - UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class); - UnifiedApplicationMetaData applMetaData = (UnifiedApplicationMetaData)udi.getMetaData(); - UnifiedBeanMetaData beanMetaData = (UnifiedBeanMetaData)applMetaData.getBeanByEjbName(ejbName); + Deployment dep = ep.getService().getDeployment(); + UnifiedApplicationMetaData apMetaData = dep.getContext().getAttachment(UnifiedApplicationMetaData.class); + UnifiedBeanMetaData beanMetaData = (UnifiedBeanMetaData)apMetaData.getBeanByEjbName(ejbName); if (beanMetaData == null) throw new WebServiceException("Cannot obtain ejb meta data for: " + ejbName); 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-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -57,7 +57,7 @@ dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); dep.setInitialClassLoader(unit.getClassLoader()); dep.setRuntimeClassLoader(unit.getClassLoader()); - dep.setDeploymentType(getDeploymentType()); + dep.setType(getDeploymentType()); Service service = dep.getService(); 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-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -60,7 +60,7 @@ dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); dep.setInitialClassLoader(unit.getClassLoader()); dep.setRuntimeClassLoader(null); - dep.setDeploymentType(getDeploymentType()); + dep.setType(getDeploymentType()); Service service = dep.getService(); 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-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -59,7 +59,7 @@ dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); dep.setInitialClassLoader(unit.getClassLoader()); dep.setRuntimeClassLoader(unit.getClassLoader()); - dep.setDeploymentType(getDeploymentType()); + dep.setType(getDeploymentType()); Service service = dep.getService(); 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-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -59,7 +59,7 @@ dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); dep.setInitialClassLoader(unit.getClassLoader()); dep.setRuntimeClassLoader(null); - dep.setDeploymentType(getDeploymentType()); + dep.setType(getDeploymentType()); Service service = dep.getService(); Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -53,7 +53,7 @@ if (unit == null) throw new IllegalStateException("Cannot obtain deployment unit"); - DeploymentType type = dep.getDeploymentType(); + DeploymentType type = dep.getType(); if (type.toString().startsWith("JAXWS")) { udi = new JAXWSDeployment(type); Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -65,7 +65,7 @@ public void create(Deployment dep) { - if (dep.getDeploymentType().toString().endsWith("EJB21") || dep.getDeploymentType().toString().endsWith("EJB3")) + if (dep.getType().toString().endsWith("EJB21") || dep.getType().toString().endsWith("EJB3")) { UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); if (udi == null) Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java =================================================================== --- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -102,7 +102,7 @@ private void initializeAndStart() { Deployment dep = endpoint.getService().getDeployment(); - if (dep.getDeploymentType() == DeploymentType.JAXRPC_JSE || dep.getDeploymentType() == DeploymentType.JAXWS_JSE) + if (dep.getType() == DeploymentType.JAXRPC_JSE || dep.getType() == DeploymentType.JAXWS_JSE) { // Initialize the meta data model UnifiedMetaData umd = dep.getContext().getAttachment(UnifiedMetaData.class); @@ -139,7 +139,7 @@ { // Set the runtime classloader for JSE endpoints, this should be the tomcat classloader Deployment dep = endpoint.getService().getDeployment(); - if (dep.getDeploymentType() == DeploymentType.JAXRPC_JSE || dep.getDeploymentType() == DeploymentType.JAXWS_JSE) + if (dep.getType() == DeploymentType.JAXRPC_JSE || dep.getType() == DeploymentType.JAXWS_JSE) { ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); dep.setRuntimeClassLoader(classLoader); Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java =================================================================== --- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -46,7 +46,7 @@ ServiceEndpointInvoker epInvoker = ep.getAttachment(ServiceEndpointInvoker.class); if (epInvoker == null) { - DeploymentType depType = ep.getService().getDeployment().getDeploymentType(); + DeploymentType depType = ep.getService().getDeployment().getType(); if (depType == DeploymentType.JAXRPC_EJB21) { epInvoker = new ServiceEndpointInvokerEJB21(); Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java =================================================================== --- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -52,29 +52,29 @@ if (udi == null) throw new IllegalStateException("Cannot obtain unified deployment info"); - if (dep.getDeploymentType() == DeploymentType.JAXRPC_JSE) + if (dep.getType() == DeploymentType.JAXRPC_JSE) { JAXRPCServerMetaDataBuilder builder = new JAXRPCServerMetaDataBuilder(); umd = builder.buildMetaData(dep, (JAXRPCDeployment)udi); } - else if (dep.getDeploymentType() == DeploymentType.JAXRPC_EJB21) + else if (dep.getType() == DeploymentType.JAXRPC_EJB21) { JAXRPCServerMetaDataBuilder builder = new JAXRPCServerMetaDataBuilder(); umd = builder.buildMetaData(dep, (JAXRPCDeployment)udi); } - else if (dep.getDeploymentType() == DeploymentType.JAXWS_JSE) + else if (dep.getType() == DeploymentType.JAXWS_JSE) { JAXWSMetaDataBuilderJSE builder = new JAXWSMetaDataBuilderJSE(); umd = builder.buildMetaData(dep, udi); } - else if (dep.getDeploymentType() == DeploymentType.JAXWS_EJB3) + else if (dep.getType() == DeploymentType.JAXWS_EJB3) { JAXWSMetaDataBuilderEJB3 builder = new JAXWSMetaDataBuilderEJB3(); umd = builder.buildMetaData(dep, udi); } else { - throw new IllegalStateException("Invalid type: " + dep.getDeploymentType()); + throw new IllegalStateException("Invalid type: " + dep.getType()); } dep.getContext().addAttachment(UnifiedMetaData.class, umd); Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java =================================================================== --- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -79,7 +79,7 @@ this.dep = dep; this.udi = udi; - if (dep.getDeploymentType().toString().endsWith("JSE")) + if (dep.getType().toString().endsWith("JSE")) { expLocation = "WEB-INF/wsdl/"; } Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeployment.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeployment.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeployment.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -121,12 +121,12 @@ this.state = deploymentState; } - public DeploymentType getDeploymentType() + public DeploymentType getType() { return type; } - public void setDeploymentType(DeploymentType deploymentType) + public void setType(DeploymentType deploymentType) { this.type = deploymentType; } Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -86,7 +86,7 @@ private InvocationHandler getInvocationHandler(Endpoint ep) { Deployment dep = ep.getService().getDeployment(); - String key = dep.getDeploymentType().toString(); + String key = dep.getType().toString(); // Use a special key for MDB endpoints UnifiedApplicationMetaData uapp = dep.getContext().getAttachment(UnifiedApplicationMetaData.class); Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXRPCClientDeployment.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXRPCClientDeployment.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXRPCClientDeployment.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -37,6 +37,6 @@ public JAXRPCClientDeployment(DeploymentType type) { - super(type); + super(); } } Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXRPCDeployment.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXRPCDeployment.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXRPCDeployment.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -47,13 +47,13 @@ public JAXRPCDeployment(DeploymentType type, WebservicesMetaData wsMetaData) { - super(type); + super(); this.wsMetaData = wsMetaData; } public JAXRPCDeployment(DeploymentType type, UnifiedVirtualFile vfWebservices) { - super(type); + super(); try { Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXWSDeployment.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXWSDeployment.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXWSDeployment.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -36,6 +36,6 @@ { public JAXWSDeployment(DeploymentType type) { - super(type); + super(); } } Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -72,11 +72,11 @@ if (udi == null) throw new IllegalStateException("Cannot obtain unified deployement info"); - if (dep.getDeploymentType().toString().endsWith("EJB21")) + if (dep.getType().toString().endsWith("EJB21")) { udi.setWebappURL(generatWebDeployment(dep, securityHandlerEJB21)); } - else if (dep.getDeploymentType().toString().endsWith("EJB3")) + else if (dep.getType().toString().endsWith("EJB3")) { udi.setWebappURL(generatWebDeployment(dep, securityHandlerEJB3)); } 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-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -72,10 +72,10 @@ void setContext(DeploymentContext context); /** Get the deployment type */ - DeploymentType getDeploymentType(); + DeploymentType getType(); /** Set the deployment type */ - void setDeploymentType(DeploymentType type); + void setType(DeploymentType type); /** Get the current deployment state */ DeploymentState getState(); Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXRPCClientDeployment.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXRPCClientDeployment.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXRPCClientDeployment.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -37,6 +37,6 @@ public JAXRPCClientDeployment(DeploymentType type) { - super(type); + super(); } } Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXRPCDeployment.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXRPCDeployment.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXRPCDeployment.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -47,13 +47,13 @@ public JAXRPCDeployment(DeploymentType type, WebservicesMetaData wsMetaData) { - super(type); + super(); this.wsMetaData = wsMetaData; } public JAXRPCDeployment(DeploymentType type, UnifiedVirtualFile vfWebservices) { - super(type); + super(); try { Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXWSDeployment.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXWSDeployment.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXWSDeployment.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -36,6 +36,6 @@ { public JAXWSDeployment(DeploymentType type) { - super(type); + super(); } } Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -27,10 +27,7 @@ import java.net.MalformedURLException; import java.net.URL; -import javax.management.ObjectName; - import org.jboss.ws.integration.UnifiedVirtualFile; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; /** * The container independent deployment info. @@ -50,47 +47,7 @@ private UnifiedVirtualFile vfRoot; /** The URL to the expanded webapp **/ private URL webappURL; - /** We can hold "typed" metadata */ - private Object metaData; - /** The deployment classloader **/ - private ClassLoader classLoader; - /** An optional ObjectName of the deployed object */ - private ObjectName deployedObject; - public UnifiedDeploymentInfo(DeploymentType type) - { - } - - public void setDeployedObject(ObjectName deployedObject) - { - this.deployedObject = deployedObject; - } - - public ObjectName getDeployedObject() - { - return deployedObject; - } - - public void setClassLoader(ClassLoader classLoader) - { - this.classLoader = classLoader; - } - - public ClassLoader getClassLoader() - { - return classLoader; - } - - public void setMetaData(Object metaData) - { - this.metaData = metaData; - } - - public Object getMetaData() - { - return metaData; - } - public void setWebappURL(URL webappURL) { this.webappURL = webappURL; @@ -180,10 +137,10 @@ if (deploymentPath.startsWith("jar:") && deploymentPath.endsWith("!/") == false) deploymentPath += "!/"; - + if (deploymentPath.startsWith("war:") && deploymentPath.endsWith("!/") == false) deploymentPath += "!/"; - + if (deploymentPath.endsWith("/") == false) deploymentPath += "/"; @@ -193,14 +150,4 @@ } return resourceURL; } - - public String toString() - { - StringBuilder builder = new StringBuilder(); - builder.append("["); - builder.append(",simpleName=" + simpleName); - builder.append(",url=" + url); - builder.append("]"); - return builder.toString(); - } } Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointServlet.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointServlet.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointServlet.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -94,7 +94,7 @@ // Set the runtime classloader for JSE endpoints, this should be the tomcat classloader Deployment dep = endpoint.getService().getDeployment(); - if (dep.getDeploymentType() == Deployment.DeploymentType.JAXRPC_JSE || dep.getDeploymentType() == Deployment.DeploymentType.JAXWS_JSE) + if (dep.getType() == Deployment.DeploymentType.JAXRPC_JSE || dep.getType() == Deployment.DeploymentType.JAXWS_JSE) { ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); dep.setRuntimeClassLoader(classLoader); Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -63,7 +63,7 @@ @Override public void create(Deployment dep) { - DeploymentType depType = dep.getDeploymentType(); + DeploymentType depType = dep.getType(); if (depType != DeploymentType.JAXWS_EJB3 && depType != DeploymentType.JAXWS_JSE) throw new IllegalStateException("Unsupported deployment type: " + depType); Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointServlet.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointServlet.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointServlet.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -94,7 +94,7 @@ // Set the runtime classloader for JSE endpoints, this should be the tomcat classloader Deployment dep = endpoint.getService().getDeployment(); - if (dep.getDeploymentType() == Deployment.DeploymentType.JAXRPC_JSE || dep.getDeploymentType() == Deployment.DeploymentType.JAXWS_JSE) + if (dep.getType() == Deployment.DeploymentType.JAXRPC_JSE || dep.getType() == Deployment.DeploymentType.JAXWS_JSE) { ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); dep.setRuntimeClassLoader(classLoader); 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-07-25 12:35:09 UTC (rev 3991) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -273,7 +273,7 @@ CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); if (msgContext instanceof SOAPMessageContextJAXWS) { - if (ep.getService().getDeployment().getDeploymentType() == DeploymentType.JAXWS_JSE) + if (ep.getService().getDeployment().getType() == DeploymentType.JAXWS_JSE) { WebServiceContext wsContext; if (msgContext.get(MessageContext.SERVLET_REQUEST) != null) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/SecurityEncoder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/SecurityEncoder.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/SecurityEncoder.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -65,21 +65,21 @@ public void encode(Document message) throws WSSecurityException { SecurityHeader header = new SecurityHeader(message); - for (OperationDescription<EncodingOperation> o : operations) + for (OperationDescription<EncodingOperation> op : operations) { EncodingOperation operation; try { - Constructor<? extends EncodingOperation> constructor = o.getOperation().getConstructor(SecurityHeader.class, SecurityStore.class); + Constructor<? extends EncodingOperation> constructor = op.getOperation().getConstructor(SecurityHeader.class, SecurityStore.class); operation = constructor.newInstance(header, store); } catch (Exception e) { - throw new WSSecurityException("Error constructing operation: " + o.getOperation()); + throw new WSSecurityException("Error constructing operation: " + op.getOperation()); } - operation.process(message, o.getTargets(), o.getCertificateAlias(), o.getCredential(), o.getAlgorithm()); + operation.process(message, op.getTargets(), op.getCertificateAlias(), op.getCredential(), op.getAlgorithm()); } attachHeader(header, message); } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/SendUsernameOperation.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/SendUsernameOperation.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/SendUsernameOperation.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -39,8 +39,8 @@ this.store = store; } - public void process(Document message, List<Target> targets, String alias, String credential, String algorithm) throws WSSecurityException + public void process(Document message, List<Target> targets, String username, String credential, String algorithm) throws WSSecurityException { - header.addToken(new UsernameToken(alias, credential, message)); + header.addToken(new UsernameToken(username, credential, message)); } } 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-07-25 12:35:09 UTC (rev 3991) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -24,7 +24,6 @@ // $Id: $ import java.io.IOException; -import java.io.File; import java.net.MalformedURLException; import java.net.URI; import java.net.URISyntaxException; @@ -66,6 +65,9 @@ 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.wsf.common.ObjectNameFactory; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; @@ -77,9 +79,6 @@ 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.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.common.ObjectNameFactory; /** An abstract meta data builder. * @@ -172,7 +171,7 @@ sepMetaData.setEndpointAddress(getServiceEndpointAddress(null, servicePath)); } - public static ObjectName createServiceEndpointID(UnifiedDeploymentInfo udi, ServerEndpointMetaData sepMetaData) + public static ObjectName createServiceEndpointID(Deployment dep, UnifiedDeploymentInfo udi, ServerEndpointMetaData sepMetaData) { String linkName = sepMetaData.getLinkName(); String context = sepMetaData.getContextRoot(); @@ -184,14 +183,14 @@ idstr.append("," + ServerEndpointMetaData.SEPID_PROPERTY_ENDPOINT + "=" + linkName); // Add JMS destination JNDI name for MDB endpoints - if (udi.getMetaData() instanceof UnifiedApplicationMetaData) + UnifiedApplicationMetaData apMetaData = dep.getContext().getAttachment(UnifiedApplicationMetaData.class); + if (apMetaData != null) { String ejbName = sepMetaData.getLinkName(); if (ejbName == null) throw new WSException("Cannot obtain ejb-link from port component"); - UnifiedApplicationMetaData applMetaData = (UnifiedApplicationMetaData)udi.getMetaData(); - UnifiedBeanMetaData beanMetaData = (UnifiedBeanMetaData)applMetaData.getBeanByEjbName(ejbName); + UnifiedBeanMetaData beanMetaData = (UnifiedBeanMetaData)apMetaData.getBeanByEjbName(ejbName); if (beanMetaData == null) throw new WSException("Cannot obtain ejb meta data for: " + ejbName); @@ -241,12 +240,12 @@ /** * Read the transport guarantee from web.xml */ - protected void initTransportGuaranteeJSE(UnifiedDeploymentInfo udi, ServerEndpointMetaData sepMetaData, String servletLink) throws IOException + protected void initTransportGuaranteeJSE(Deployment dep, UnifiedDeploymentInfo udi, ServerEndpointMetaData sepMetaData, String servletLink) throws IOException { String transportGuarantee = null; - if (udi.getMetaData() instanceof UnifiedWebMetaData) + UnifiedWebMetaData webMetaData = dep.getContext().getAttachment(UnifiedWebMetaData.class); + if (webMetaData != null) { - UnifiedWebMetaData webMetaData = (UnifiedWebMetaData)udi.getMetaData(); Map<String, String> servletMappings = webMetaData.getServletMappings(); String urlPattern = servletMappings.get(servletLink); 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-07-25 12:35:09 UTC (rev 3991) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -75,7 +75,7 @@ // For every webservice-description build the ServiceMetaData UnifiedMetaData wsMetaData = new UnifiedMetaData(udi.getVfRoot()); wsMetaData.setDeploymentName(udi.getCanonicalName()); - wsMetaData.setClassLoader(udi.getClassLoader()); + wsMetaData.setClassLoader(dep.getInitialClassLoader()); WebserviceDescriptionMetaData[] wsDescriptionArr = udi.getWebservicesMetaData().getWebserviceDescriptions(); for (WebserviceDescriptionMetaData wsdMetaData : wsDescriptionArr) @@ -142,9 +142,10 @@ initEndpointAddress(dep, udi, sepMetaData); - if (udi.getMetaData() instanceof UnifiedApplicationMetaData) + UnifiedApplicationMetaData apMetaData = dep.getContext().getAttachment(UnifiedApplicationMetaData.class); + UnifiedWebMetaData webMetaData = dep.getContext().getAttachment(UnifiedWebMetaData.class); + if (apMetaData != null) { - UnifiedApplicationMetaData apMetaData = (UnifiedApplicationMetaData)udi.getMetaData(); wsMetaData.setSecurityDomain(apMetaData.getSecurityDomain()); // Copy the wsdl publish location from jboss.xml @@ -182,9 +183,8 @@ } } } - else if (udi.getMetaData() instanceof UnifiedWebMetaData) + else if (webMetaData != null) { - UnifiedWebMetaData webMetaData = (UnifiedWebMetaData)udi.getMetaData(); wsMetaData.setSecurityDomain(webMetaData.getSecurityDomain()); String targetBean = webMetaData.getServletClassNames().get(linkName); @@ -200,11 +200,11 @@ if (configName != null || configFile != null) sepMetaData.setConfigName(configName, configFile); - initTransportGuaranteeJSE(udi, sepMetaData, linkName); + initTransportGuaranteeJSE(dep, udi, sepMetaData, linkName); } // init service endpoint id - ObjectName sepID = createServiceEndpointID(udi, sepMetaData); + ObjectName sepID = createServiceEndpointID(dep, udi, sepMetaData); sepMetaData.setServiceEndpointID(sepID); replaceAddressLocation(sepMetaData); 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-07-25 12:35:09 UTC (rev 3991) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -59,19 +59,16 @@ { UnifiedMetaData wsMetaData = new UnifiedMetaData(udi.getVfRoot()); wsMetaData.setDeploymentName(udi.getCanonicalName()); - wsMetaData.setClassLoader(udi.getClassLoader()); + wsMetaData.setClassLoader(dep.getInitialClassLoader()); - if (udi.getClassLoader() == null) - throw new WSException("Deployment class loader not initialized"); - // The container objects below provide access to all of the ejb metadata - UnifiedApplicationMetaData appMetaData = (UnifiedApplicationMetaData)udi.getMetaData(); - Iterator<UnifiedBeanMetaData> it = appMetaData.getEnterpriseBeans(); + UnifiedApplicationMetaData apMetaData = dep.getContext().getAttachment(UnifiedApplicationMetaData.class); + Iterator<UnifiedBeanMetaData> it = apMetaData.getEnterpriseBeans(); while (it.hasNext()) { UnifiedBeanMetaData beanMetaData = it.next(); String ejbClassName = beanMetaData.getEjbClass(); - Class<?> beanClass = udi.getClassLoader().loadClass(ejbClassName); + Class<?> beanClass = wsMetaData.getClassLoader().loadClass(ejbClassName); if (beanClass.isAnnotationPresent(WebService.class) || beanClass.isAnnotationPresent(WebServiceProvider.class)) { String ejbLink = beanMetaData.getEjbName(); 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-07-25 12:35:09 UTC (rev 3991) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -50,11 +50,8 @@ { UnifiedMetaData wsMetaData = new UnifiedMetaData(udi.getVfRoot()); wsMetaData.setDeploymentName(udi.getCanonicalName()); - wsMetaData.setClassLoader(udi.getClassLoader()); + wsMetaData.setClassLoader(dep.getInitialClassLoader()); - if (udi.getClassLoader() == null) - throw new WSException("Deployment class loader not initialized"); - // For every bean for (Endpoint ep : dep.getService().getEndpoints()) { 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-07-25 12:35:09 UTC (rev 3991) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -145,7 +145,7 @@ MetaDataBuilder.replaceAddressLocation(sepMetaData); // init service endpoint id - ObjectName sepID = MetaDataBuilder.createServiceEndpointID(udi, sepMetaData); + ObjectName sepID = MetaDataBuilder.createServiceEndpointID(dep, udi, sepMetaData); sepMetaData.setServiceEndpointID(sepID); return sepMetaData; 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-07-25 12:35:09 UTC (rev 3991) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -83,7 +83,7 @@ if (anWebContext == null) return; - boolean isJSEEndpoint = (dep.getDeploymentType() == DeploymentType.JAXWS_JSE); + boolean isJSEEndpoint = (dep.getType() == DeploymentType.JAXWS_JSE); // context-root if (anWebContext.contextRoot().length() > 0) 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-07-25 12:35:09 UTC (rev 3991) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -57,6 +57,7 @@ import org.jboss.ws.tools.wsdl.WSDLGenerator; import org.jboss.ws.tools.wsdl.WSDLWriter; import org.jboss.ws.tools.wsdl.WSDLWriterResolver; +import org.jboss.wsf.common.IOUtils; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; @@ -67,7 +68,6 @@ 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.common.IOUtils; /** * An abstract annotation meta data builder. @@ -104,10 +104,10 @@ { try { - EndpointResult result = processWebService(wsMetaData, sepClass, udi); + EndpointResult result = processWebService(dep, wsMetaData, sepClass, udi); // Clear the java types, etc. - resetMetaDataBuilder(udi.getClassLoader()); + resetMetaDataBuilder(dep.getInitialClassLoader()); ServerEndpointMetaData sepMetaData = result.sepMetaData; ServiceMetaData serviceMetaData = result.serviceMetaData; @@ -136,7 +136,7 @@ processWebMethods(sepMetaData, seiClass); // Init the transport guarantee - initTransportGuaranteeJSE(udi, sepMetaData, linkName); + initTransportGuaranteeJSE(dep, udi, sepMetaData, linkName); // Initialize types createJAXBContext(sepMetaData); @@ -189,7 +189,7 @@ processEndpointMetaDataExtensions(sepMetaData, wsdlDefinitions); // init service endpoint id - ObjectName sepID = MetaDataBuilder.createServiceEndpointID(udi, sepMetaData); + ObjectName sepID = MetaDataBuilder.createServiceEndpointID(dep, udi, sepMetaData); sepMetaData.setServiceEndpointID(sepID); return sepMetaData; @@ -275,7 +275,8 @@ } } - private EndpointResult processWebService(UnifiedMetaData wsMetaData, Class<?> sepClass, UnifiedDeploymentInfo udi) throws ClassNotFoundException, IOException + private EndpointResult processWebService(Deployment dep, UnifiedMetaData wsMetaData, Class<?> sepClass, UnifiedDeploymentInfo udi) throws ClassNotFoundException, + IOException { WebService anWebService = sepClass.getAnnotation(WebService.class); if (anWebService == null) @@ -307,7 +308,7 @@ if (anWebService.endpointInterface().length() > 0) { seiName = anWebService.endpointInterface(); - seiClass = udi.getClassLoader().loadClass(seiName); + seiClass = dep.getInitialClassLoader().loadClass(seiName); WebService seiAnnotation = seiClass.getAnnotation(WebService.class); if (seiAnnotation == null) @@ -404,8 +405,7 @@ message(wsdlFile.getName()); Writer writer = IOUtils.getCharsetFileWriter(wsdlFile, Constants.DEFAULT_XML_CHARSET); - new WSDLWriter(wsdlDefinitions).write(writer, Constants.DEFAULT_XML_CHARSET, new WSDLWriterResolver() - { + new WSDLWriter(wsdlDefinitions).write(writer, Constants.DEFAULT_XML_CHARSET, new WSDLWriterResolver() { public WSDLWriterResolver resolve(String suggestedFile) throws IOException { File file; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-07-25 12:35:09 UTC (rev 3991) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-07-25 12:48:59 UTC (rev 3992) @@ -25,7 +25,6 @@ import org.jboss.ws.integration.ResourceLoaderAdapter; import org.jboss.ws.metadata.builder.jaxws.JAXWSWebServiceMetaDataBuilder; import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import static org.jboss.wsf.spi.deployment.Deployment.DeploymentType.JAXWS_JSE; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentModelFactory; @@ -72,7 +71,7 @@ private UnifiedDeploymentInfo createUDI(Class<?> endpointClass, ClassLoader loader) { //DeploymentType type = (endpointClass.isAnnotationPresent(Stateless.class)) ? JAXWS_EJB3 : JAXWS_JSE; - UnifiedDeploymentInfo udi = new UnifiedDeploymentInfo(JAXWS_JSE) + UnifiedDeploymentInfo udi = new UnifiedDeploymentInfo() { @Override public URL getMetaDataFileURL(String resourcePath) throws IOException @@ -80,7 +79,6 @@ return null; } }; - udi.setClassLoader(loader); return udi; }

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r3991 - in trunk: integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40 and 9 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-07-25 08:35:09 -0400 (Wed, 25 Jul 2007) New Revision: 3991 Added: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerFactoryImpl.java trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceContextFactoryImpl.java trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerFactoryImpl.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebServiceContextFactoryImpl.java trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerFactoryImpl.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebServiceContextFactoryImpl.java trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerFactory.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextFactory.java Removed: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationModelFactoryImpl.java trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationModelFactory.java Modified: trunk/JBossWS-Trunk.iws trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java Log: Split InvocationHandler and WebServiceContext factory Modified: trunk/JBossWS-Trunk.iws =================================================================== --- trunk/JBossWS-Trunk.iws 2007-07-25 12:01:46 UTC (rev 3990) +++ trunk/JBossWS-Trunk.iws 2007-07-25 12:35:09 UTC (rev 3991) @@ -121,7 +121,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="61" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> + <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="58" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> <option name="ENABLED" value="false" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -199,7 +199,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="108" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> + <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="105" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -212,7 +212,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="114" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> + <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="115" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -280,51 +280,15 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="InvocationModelFactory.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationModelFactory.java"> + <file leaf-file-name="org.jboss.wsf.spi.invocation.InvocationHandlerFactory" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory"> <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="82" selection-start="1399" selection-end="1399" vertical-scroll-proportion="0.3151515"> + <state line="0" column="49" selection-start="49" selection-end="49" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="InvocationModelFactoryImpl.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="63" column="4" selection-start="2245" selection-end="2245" vertical-scroll-proportion="0.52380955"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="InvocationModelFactoryImpl.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationModelFactoryImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="62" column="4" selection-start="2288" selection-end="2288" vertical-scroll-proportion="0.52380955"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="InvocationModelFactoryImpl.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="63" column="3" selection-start="2195" selection-end="2195" vertical-scroll-proportion="0.54761904"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="InvocationHandler.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="38" column="22" selection-start="1481" selection-end="1481" vertical-scroll-proportion="0.29090908"> - <folding /> - </state> - </provider> - </entry> - </file> </leaf> </component> <component name="FindManager"> @@ -377,6 +341,126 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> </PATH_ELEMENT> </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="wsf" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="container" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-42" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-42" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="wsf" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="container" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss42" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-40" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-40" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="wsf" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="container" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss40" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + </PATH> </component> <component name="PerforceChangeBrowserSettings"> <option name="USE_CLIENT_FILTER" value="true" /> @@ -596,6 +680,14 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -618,7 +710,147 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.jar" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> </component> <component name="ProjectReloadState"> <option name="STATE" value="0" /> @@ -783,12 +1015,12 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="0" y="25" width="1680" height="1000" extended-state="0" /> + <frame x="0" y="25" width="1680" height="1000" extended-state="1" /> <editor active="true" /> <layout> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.28729963" order="0" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.38717633" order="0" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.5040092" order="1" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25215784" order="1" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> @@ -798,7 +1030,7 @@ <window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="2" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.27188656" order="2" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.13440198" order="2" /> <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.39862543" order="4" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" /> @@ -874,117 +1106,119 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="46" column="13" selection-start="1840" selection-end="1840" vertical-scroll-proportion="0.096969694"> + <state line="281" column="70" selection-start="11747" selection-end="11747" vertical-scroll-proportion="0.14782609"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceContextFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="30" column="59" selection-start="1424" selection-end="1424" vertical-scroll-proportion="0.10603589"> + <state line="43" column="4" selection-start="1294" selection-end="1705" vertical-scroll-proportion="0.55757576"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="44" column="22" selection-start="1556" selection-end="1556" vertical-scroll-proportion="0.3588907"> + <state line="63" column="0" selection-start="2289" selection-end="2289" vertical-scroll-proportion="0.8060606"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebServiceContextFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="27" column="17" selection-start="1144" selection-end="1144" vertical-scroll-proportion="0.3562341"> + <state line="43" column="4" selection-start="1705" selection-end="1705" vertical-scroll-proportion="0.55757576"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerFactoryImpl.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="63" column="3" selection-start="2195" selection-end="2195" vertical-scroll-proportion="0.8060606"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="42" selection-start="1508" selection-end="1508" vertical-scroll-proportion="-0.28363636"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="63" column="4" selection-start="2245" selection-end="2245" vertical-scroll-proportion="0.8060606"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/RewriteResults.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="31" column="13" selection-start="1216" selection-end="1216" vertical-scroll-proportion="0.45801526"> + <state line="33" column="33" selection-start="1284" selection-end="1284" vertical-scroll-proportion="0.26190478"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifier.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="29" selection-start="1347" selection-end="1347" vertical-scroll-proportion="0.26666668"> + <state line="0" column="60" selection-start="60" selection-end="60" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebServiceContextFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="39" column="30" selection-start="1526" selection-end="1526" vertical-scroll-proportion="0.15272728"> + <state line="31" column="41" selection-start="1228" selection-end="1256" vertical-scroll-proportion="0.26190478"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultWebAppDesciptorModifierImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="38" column="21" selection-start="1412" selection-end="1412" vertical-scroll-proportion="0.21428572"> - <folding /> + <state line="21" column="36" selection-start="1022" selection-end="1050" vertical-scroll-proportion="0.024242423"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory"> <provider selected="true" editor-type-id="text-editor"> - <state line="157" column="78" selection-start="8211" selection-end="8236" vertical-scroll-proportion="0.14424242"> + <state line="0" column="31" selection-start="31" selection-end="31" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory"> <provider selected="true" editor-type-id="text-editor"> - <state line="38" column="22" selection-start="1481" selection-end="1481" vertical-scroll-proportion="0.29090908"> + <state line="0" column="49" selection-start="49" selection-end="49" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationModelFactory.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory"> <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="82" selection-start="1399" selection-end="1399" vertical-scroll-proportion="0.3151515"> + <state line="0" column="49" selection-start="49" selection-end="49" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory"> <provider selected="true" editor-type-id="text-editor"> - <state line="63" column="4" selection-start="2245" selection-end="2245" vertical-scroll-proportion="0.52380955"> + <state line="0" column="31" selection-start="31" selection-end="31" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationModelFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory"> <provider selected="true" editor-type-id="text-editor"> - <state line="62" column="4" selection-start="2288" selection-end="2288" vertical-scroll-proportion="0.52380955"> + <state line="0" column="49" selection-start="49" selection-end="49" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="63" column="3" selection-start="2195" selection-end="2195" vertical-scroll-proportion="0.54761904"> - <folding /> - </state> - </provider> - </entry> </component> </project> Added: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerFactoryImpl.java =================================================================== --- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerFactoryImpl.java (rev 0) +++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerFactoryImpl.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -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.jboss40; + +import org.jboss.wsf.spi.invocation.*; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 20, 2007 + */ +public class InvocationHandlerFactoryImpl extends InvocationHandlerFactory +{ + public InvocationHandler createInvocationHandler(InvocationType type) + { + InvocationHandler handler = null; + + switch(type) + { + case JAXRPC_JSE: + handler = new DefaultInvocationHandlerJAXRPC(); + break; + case JAXRPC_EJB21: + handler = new org.jboss.wsf.container.jboss42.InvocationHandlerEJB21(); + break; + case JAXRPC_MDB21: + handler = new org.jboss.wsf.container.jboss42.InvocationHandlerMDB21(); + break; + case JAXWS_JSE: + handler = new DefaultInvocationHandlerJAXWS(); + break; + case JAXWS_EJB21: + handler = new org.jboss.wsf.container.jboss42.InvocationHandlerEJB21(); + break; + case JAXWS_EJB3: + handler = new InvocationHandlerEJB3(); + } + + if(null == handler) + throw new IllegalArgumentException("Unable to resolve spi.invocation.InvocationHandler for type " +type); + + return handler; + } + +} Property changes on: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationModelFactoryImpl.java =================================================================== --- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationModelFactoryImpl.java 2007-07-25 12:01:46 UTC (rev 3990) +++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationModelFactoryImpl.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -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.wsf.container.jboss40; - -import org.jboss.wsf.spi.invocation.*; - -import javax.xml.ws.handler.MessageContext; - -/** - * @author Heiko.Braun(a)jboss.com - * Created: Jul 20, 2007 - */ -public class InvocationModelFactoryImpl extends InvocationModelFactory -{ - public InvocationHandler createInvocationHandler(InvocationType type) - { - InvocationHandler handler = null; - - switch(type) - { - case JAXRPC_JSE: - handler = new DefaultInvocationHandlerJAXRPC(); - break; - case JAXRPC_EJB21: - handler = new org.jboss.wsf.container.jboss42.InvocationHandlerEJB21(); - break; - case JAXRPC_MDB21: - handler = new org.jboss.wsf.container.jboss42.InvocationHandlerMDB21(); - break; - case JAXWS_JSE: - handler = new DefaultInvocationHandlerJAXWS(); - break; - case JAXWS_EJB21: - handler = new org.jboss.wsf.container.jboss42.InvocationHandlerEJB21(); - break; - case JAXWS_EJB3: - handler = new InvocationHandlerEJB3(); - } - - if(null == handler) - throw new IllegalArgumentException("Unable to resolve spi.invocation.InvocationHandler for type " +type); - - return handler; - } - - public ExtendableWebServiceContext createWebServiceContext(InvocationType type, MessageContext messageContext) - { - ExtendableWebServiceContext context = null; - - if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1) - context = new WebServiceContextEJB(messageContext); - else - context = new WebServiceContextJSE(messageContext); - - return context; - } -} Added: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceContextFactoryImpl.java =================================================================== --- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceContextFactoryImpl.java (rev 0) +++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceContextFactoryImpl.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -0,0 +1,45 @@ +/* + * 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.jboss40; + +import org.jboss.wsf.spi.invocation.*; + +import javax.xml.ws.handler.MessageContext; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 25, 2007 + */ +public class WebServiceContextFactoryImpl extends WebServiceContextFactory +{ + public ExtendableWebServiceContext createWebServiceContext(InvocationType type, MessageContext messageContext) + { + ExtendableWebServiceContext context = null; + + if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1) + context = new WebServiceContextEJB(messageContext); + else + context = new WebServiceContextJSE(messageContext); + + return context; + } +} Property changes on: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceContextFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory =================================================================== --- trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory (rev 0) +++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory 2007-07-25 12:35:09 UTC (rev 3991) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss40.InvocationHandlerFactoryImpl \ No newline at end of file Deleted: trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory =================================================================== --- trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory 2007-07-25 12:01:46 UTC (rev 3990) +++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory 2007-07-25 12:35:09 UTC (rev 3991) @@ -1 +0,0 @@ -org.jboss.wsf.container.jboss40.InvocationModelFactoryImpl \ No newline at end of file Added: trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory =================================================================== --- trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory (rev 0) +++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory 2007-07-25 12:35:09 UTC (rev 3991) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss40.WebServiceContextFactoryImpl \ No newline at end of file Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-07-25 12:01:46 UTC (rev 3990) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -127,7 +127,7 @@ { EJBContext ejbCtx = beanCtx.getEJBContext(); SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - ExtendableWebServiceContext wsContext = spiProvider.getSPI(InvocationModelFactory.class).createWebServiceContext(InvocationType.JAXWS_EJB3, jaxwsMessageContext); + ExtendableWebServiceContext wsContext = spiProvider.getSPI(WebServiceContextFactory.class).createWebServiceContext(InvocationType.JAXWS_EJB3, jaxwsMessageContext); wsContext.addAttachment(EJBContext.class, ejbCtx); beanProp.set(beanCtx.getInstance(), wsContext); } Added: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerFactoryImpl.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerFactoryImpl.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerFactoryImpl.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -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.wsf.spi.invocation.*; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 19, 2007 + */ +public class InvocationHandlerFactoryImpl extends InvocationHandlerFactory +{ + public InvocationHandler createInvocationHandler(InvocationType type) + { + InvocationHandler handler = null; + + switch(type) + { + case JAXRPC_JSE: + handler = new DefaultInvocationHandlerJAXRPC(); + break; + case JAXRPC_EJB21: + handler = new InvocationHandlerEJB21(); + break; + case JAXRPC_MDB21: + handler = new InvocationHandlerMDB21(); + break; + case JAXWS_JSE: + handler = new DefaultInvocationHandlerJAXWS(); + break; + case JAXWS_EJB21: + handler = new InvocationHandlerEJB21(); + break; + case JAXWS_EJB3: + handler = new InvocationHandlerEJB3(); + } + + if(null == handler) + throw new IllegalArgumentException("Unable to resolve spi.invocation.InvocationHandler for type " +type); + + return handler; + } + +} Property changes on: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java 2007-07-25 12:01:46 UTC (rev 3990) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -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.wsf.container.jboss42; - -import org.jboss.wsf.spi.invocation.*; - -import javax.xml.ws.handler.MessageContext; - -/** - * @author Heiko.Braun(a)jboss.com - * Created: Jul 19, 2007 - */ -public class InvocationModelFactoryImpl extends InvocationModelFactory -{ - public InvocationHandler createInvocationHandler(InvocationType type) - { - InvocationHandler handler = null; - - switch(type) - { - case JAXRPC_JSE: - handler = new DefaultInvocationHandlerJAXRPC(); - break; - case JAXRPC_EJB21: - handler = new InvocationHandlerEJB21(); - break; - case JAXRPC_MDB21: - handler = new InvocationHandlerMDB21(); - break; - case JAXWS_JSE: - handler = new DefaultInvocationHandlerJAXWS(); - break; - case JAXWS_EJB21: - handler = new InvocationHandlerEJB21(); - break; - case JAXWS_EJB3: - handler = new InvocationHandlerEJB3(); - } - - if(null == handler) - throw new IllegalArgumentException("Unable to resolve spi.invocation.InvocationHandler for type " +type); - - return handler; - } - - public ExtendableWebServiceContext createWebServiceContext(InvocationType type, MessageContext messageContext) - { - ExtendableWebServiceContext context = null; - - if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1) - context = new WebServiceContextEJB(messageContext); - else - context = new WebServiceContextJSE(messageContext); - - return context; - } -} Added: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebServiceContextFactoryImpl.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebServiceContextFactoryImpl.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebServiceContextFactoryImpl.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -0,0 +1,45 @@ +/* + * 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.invocation.*; + +import javax.xml.ws.handler.MessageContext; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 25, 2007 + */ +public class WebServiceContextFactoryImpl extends WebServiceContextFactory +{ + public ExtendableWebServiceContext createWebServiceContext(InvocationType type, MessageContext messageContext) + { + ExtendableWebServiceContext context = null; + + if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1) + context = new WebServiceContextEJB(messageContext); + else + context = new WebServiceContextJSE(messageContext); + + return context; + } +} Property changes on: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebServiceContextFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory =================================================================== --- trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory (rev 0) +++ trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory 2007-07-25 12:35:09 UTC (rev 3991) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss42.InvocationHandlerFactoryImpl \ No newline at end of file Deleted: trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory =================================================================== --- trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory 2007-07-25 12:01:46 UTC (rev 3990) +++ trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory 2007-07-25 12:35:09 UTC (rev 3991) @@ -1 +0,0 @@ -org.jboss.wsf.container.jboss42.InvocationModelFactoryImpl \ No newline at end of file Added: trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory =================================================================== --- trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory (rev 0) +++ trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory 2007-07-25 12:35:09 UTC (rev 3991) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss42.WebServiceContextFactoryImpl \ No newline at end of file Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-07-25 12:01:46 UTC (rev 3990) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -127,7 +127,7 @@ { EJBContext ejbCtx = beanCtx.getEJBContext(); SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - ExtendableWebServiceContext wsContext = spiProvider.getSPI(InvocationModelFactory.class).createWebServiceContext(InvocationType.JAXWS_EJB3, jaxwsMessageContext); + ExtendableWebServiceContext wsContext = spiProvider.getSPI(WebServiceContextFactory.class).createWebServiceContext(InvocationType.JAXWS_EJB3, jaxwsMessageContext); wsContext.addAttachment(EJBContext.class, ejbCtx); beanProp.set(beanCtx.getInstance(), wsContext); } Added: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerFactoryImpl.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerFactoryImpl.java (rev 0) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerFactoryImpl.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -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.jboss50; + +import org.jboss.wsf.spi.invocation.*; + +/** + * The default invocation model factory fro AS 5.0. + * + * @author Heiko.Braun(a)jboss.com + * Created: Jul 19, 2007 + */ +public class InvocationHandlerFactoryImpl extends InvocationHandlerFactory +{ + public InvocationHandler createInvocationHandler(InvocationType type) + { + InvocationHandler handler = null; + + switch(type) + { + case JAXRPC_JSE: + handler = new DefaultInvocationHandlerJAXRPC(); + break; + case JAXRPC_EJB21: + handler = new InvocationHandlerEJB21(); + break; + case JAXWS_JSE: + handler = new DefaultInvocationHandlerJAXWS(); + break; + case JAXWS_EJB21: + handler = new InvocationHandlerEJB21(); + break; + case JAXWS_EJB3: + handler = new InvocationHandlerEJB3(); + } + + if(null == handler) + throw new IllegalArgumentException("Unable to resolve spi.invocation.InvocationHandler for type " +type); + + return handler; + } +} Property changes on: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java 2007-07-25 12:01:46 UTC (rev 3990) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -1,77 +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.container.jboss50; - -import org.jboss.wsf.spi.invocation.*; -import org.jboss.wsf.spi.invocation.WebServiceContextEJB; - -import javax.xml.ws.WebServiceContext; -import javax.xml.ws.handler.MessageContext; - -/** - * The default invocation model factory fro AS 5.0. - * - * @author Heiko.Braun(a)jboss.com - * Created: Jul 19, 2007 - */ -public class InvocationModelFactoryImpl extends InvocationModelFactory -{ - public InvocationHandler createInvocationHandler(InvocationType type) - { - InvocationHandler handler = null; - - switch(type) - { - case JAXRPC_JSE: - handler = new DefaultInvocationHandlerJAXRPC(); - break; - case JAXRPC_EJB21: - handler = new InvocationHandlerEJB21(); - break; - case JAXWS_JSE: - handler = new DefaultInvocationHandlerJAXWS(); - break; - case JAXWS_EJB21: - handler = new InvocationHandlerEJB21(); - break; - case JAXWS_EJB3: - handler = new InvocationHandlerEJB3(); - } - - if(null == handler) - throw new IllegalArgumentException("Unable to resolve spi.invocation.InvocationHandler for type " +type); - - return handler; - } - - public ExtendableWebServiceContext createWebServiceContext(InvocationType type, MessageContext messageContext) - { - ExtendableWebServiceContext context = null; - - if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1) - context = new WebServiceContextEJB(messageContext); - else - context = new WebServiceContextJSE(messageContext); - - return context; - } -} Added: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebServiceContextFactoryImpl.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebServiceContextFactoryImpl.java (rev 0) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebServiceContextFactoryImpl.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -0,0 +1,45 @@ +/* + * 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.jboss50; + +import org.jboss.wsf.spi.invocation.*; + +import javax.xml.ws.handler.MessageContext; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 25, 2007 + */ +public class WebServiceContextFactoryImpl extends WebServiceContextFactory +{ + public ExtendableWebServiceContext createWebServiceContext(InvocationType type, MessageContext messageContext) + { + ExtendableWebServiceContext context = null; + + if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1) + context = new WebServiceContextEJB(messageContext); + else + context = new WebServiceContextJSE(messageContext); + + return context; + } +} Property changes on: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebServiceContextFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory =================================================================== --- trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory (rev 0) +++ trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory 2007-07-25 12:35:09 UTC (rev 3991) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss50.InvocationHandlerFactoryImpl \ No newline at end of file Deleted: trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory =================================================================== --- trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory 2007-07-25 12:01:46 UTC (rev 3990) +++ trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory 2007-07-25 12:35:09 UTC (rev 3991) @@ -1 +0,0 @@ -org.jboss.wsf.container.jboss50.InvocationModelFactoryImpl \ No newline at end of file Added: trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory =================================================================== --- trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory (rev 0) +++ trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory 2007-07-25 12:35:09 UTC (rev 3991) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss50.WebServiceContextFactoryImpl \ No newline at end of file Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-07-25 12:01:46 UTC (rev 3990) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -31,10 +31,7 @@ import org.jboss.wsf.spi.deployment.DeploymentModelFactory; import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory; import org.jboss.wsf.spi.deployment.LifecycleHandlerFactory; -import org.jboss.wsf.spi.invocation.InvocationModelFactory; -import org.jboss.wsf.spi.invocation.ResourceInjectorFactory; -import org.jboss.wsf.spi.invocation.RequestHandlerFactory; -import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory; +import org.jboss.wsf.spi.invocation.*; /** * @author Heiko.Braun(a)jboss.com @@ -86,7 +83,7 @@ // SPI provided by either container or stack integration - else if(InvocationModelFactory.class.equals(spiType)) + else if(InvocationHandlerFactory.class.equals(spiType)) { returnType = (T) loadService(spiType, null); } @@ -110,6 +107,10 @@ { returnType = (T) loadService(spiType, null); } + else if(WebServiceContextFactory.class.equals(spiType)) + { + returnType = (T) loadService(spiType, null); + } // help debugging if(null == returnType) Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2007-07-25 12:01:46 UTC (rev 3990) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -31,7 +31,7 @@ import org.jboss.wsf.spi.deployment.LifecycleHandler; import org.jboss.wsf.spi.deployment.LifecycleHandlerFactory; import org.jboss.wsf.spi.invocation.InvocationHandler; -import org.jboss.wsf.spi.invocation.InvocationModelFactory; +import org.jboss.wsf.spi.invocation.InvocationHandlerFactory; import org.jboss.wsf.spi.invocation.InvocationType; import org.jboss.wsf.spi.invocation.RequestHandler; import org.jboss.wsf.spi.invocation.RequestHandlerFactory; @@ -100,7 +100,7 @@ } InvocationType type = InvocationType.valueOf(key); - InvocationHandler invocationHandler = spiProvider.getSPI(InvocationModelFactory.class).createInvocationHandler(type); + InvocationHandler invocationHandler = spiProvider.getSPI(InvocationHandlerFactory.class).createInvocationHandler(type); return invocationHandler; } } \ No newline at end of file Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerFactory.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerFactory.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -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.invocation; + +import org.jboss.wsf.spi.SPIView; + +import javax.xml.ws.handler.MessageContext; + +/** + * Creates invocation related artefacts. + * + * @author Heiko.Braun(a)jboss.com + * Created: Jul 19, 2007 + */ +public abstract class InvocationHandlerFactory implements SPIView +{ + public abstract InvocationHandler createInvocationHandler(InvocationType type); +} Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationModelFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationModelFactory.java 2007-07-25 12:01:46 UTC (rev 3990) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationModelFactory.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -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.wsf.spi.invocation; - -import org.jboss.wsf.spi.SPIView; - -import javax.xml.ws.handler.MessageContext; - -/** - * Creates invocation related artefacts. - * - * @author Heiko.Braun(a)jboss.com - * Created: Jul 19, 2007 - */ -public abstract class InvocationModelFactory implements SPIView -{ - public abstract InvocationHandler createInvocationHandler(InvocationType type); - public abstract ExtendableWebServiceContext createWebServiceContext(InvocationType type, MessageContext messageContext); -} Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextFactory.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextFactory.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -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.spi.invocation; + +import org.jboss.wsf.spi.SPIView; + +import javax.xml.ws.handler.MessageContext; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 25, 2007 + */ +public abstract class WebServiceContextFactory implements SPIView +{ + public abstract ExtendableWebServiceContext createWebServiceContext(InvocationType type, MessageContext messageContext); +} Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextFactory.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-07-25 12:01:46 UTC (rev 3990) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -279,7 +279,7 @@ if (msgContext.get(MessageContext.SERVLET_REQUEST) != null) { SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - wsContext = spiProvider.getSPI(InvocationModelFactory.class).createWebServiceContext( + wsContext = spiProvider.getSPI(WebServiceContextFactory.class).createWebServiceContext( InvocationType.JAXWS_JSE, (SOAPMessageContextJAXWS)msgContext ); } @@ -288,7 +288,7 @@ // TODO: This is an ESB case, they require a custom MessageContext // that works independed of MessageContext.SERVLET_REQUEST throw new IllegalArgumentException("JBOSS-ESB? The current WebServiceContext impl. relies on HTTP.ServletRequest"+ - "You should provide a custom spi.invocation.InvocationModelFactory"); + "You should provide a custom spi.invocation.InvocationHandlerFactory"); } invContext.addAttachment(WebServiceContext.class, wsContext); }

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r3990 - in trunk: integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40 and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-07-25 08:01:46 -0400 (Wed, 25 Jul 2007) New Revision: 3990 Modified: trunk/JBossWS-Trunk.iws trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationModelFactoryImpl.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationModelFactory.java Log: Remove InvocationContex creation from InvocationModelFactory. It's created through the InvocationHandler anyway... Modified: trunk/JBossWS-Trunk.iws =================================================================== --- trunk/JBossWS-Trunk.iws 2007-07-25 11:56:57 UTC (rev 3989) +++ trunk/JBossWS-Trunk.iws 2007-07-25 12:01:46 UTC (rev 3990) @@ -279,7 +279,53 @@ <option name="myCurrentFavoritesList" value="JBossWS-Trunk" /> </component> <component name="FileEditorManager"> - <leaf /> + <leaf> + <file leaf-file-name="InvocationModelFactory.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationModelFactory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="35" column="82" selection-start="1399" selection-end="1399" vertical-scroll-proportion="0.3151515"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="InvocationModelFactoryImpl.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="63" column="4" selection-start="2245" selection-end="2245" vertical-scroll-proportion="0.52380955"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="InvocationModelFactoryImpl.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationModelFactoryImpl.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="62" column="4" selection-start="2288" selection-end="2288" vertical-scroll-proportion="0.52380955"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="InvocationModelFactoryImpl.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="63" column="3" selection-start="2195" selection-end="2195" vertical-scroll-proportion="0.54761904"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="InvocationHandler.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="38" column="22" selection-start="1481" selection-end="1481" vertical-scroll-proportion="0.29090908"> + <folding /> + </state> + </provider> + </entry> + </file> + </leaf> </component> <component name="FindManager"> <FindUsagesManager> @@ -321,6 +367,16 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> </PATH_ELEMENT> </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + </PATH> </component> <component name="PerforceChangeBrowserSettings"> <option name="USE_CLIENT_FILTER" value="true" /> @@ -507,7 +563,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -568,7 +624,7 @@ <option name="STATE" value="0" /> </component> <component name="ProjectView"> - <navigator currentView="PackagesPane" splitterProportion="0.5"> + <navigator currentView="ProjectPane" splitterProportion="0.5"> <flattenPackages PackagesPane="false" /> <showMembers /> <showModules /> @@ -728,11 +784,11 @@ </component> <component name="ToolWindowManager"> <frame x="0" y="25" width="1680" height="1000" extended-state="0" /> - <editor active="false" /> + <editor active="true" /> <layout> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" /> - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.28729963" order="0" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.28729963" order="0" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.5040092" order="1" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25215784" order="1" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> @@ -818,47 +874,6 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory"> - <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="58" selection-start="58" selection-end="58" vertical-scroll-proportion="0.0"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="44" column="13" selection-start="1722" selection-end="1722" vertical-scroll-proportion="-0.3167702"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/test/TestDeployerJBoss.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="83" column="12" selection-start="2874" selection-end="2874" vertical-scroll-proportion="0.024844721"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdapterFactoryImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="30" column="39" selection-start="1257" selection-end="1283" vertical-scroll-proportion="0.24390244"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextEJB.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="38" column="13" selection-start="1465" selection-end="1465" vertical-scroll-proportion="0.42857143"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java"> <provider selected="true" editor-type-id="text-editor"> <state line="46" column="13" selection-start="1840" selection-end="1840" vertical-scroll-proportion="0.096969694"> @@ -935,6 +950,41 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="38" column="22" selection-start="1481" selection-end="1481" vertical-scroll-proportion="0.29090908"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationModelFactory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="35" column="82" selection-start="1399" selection-end="1399" vertical-scroll-proportion="0.3151515"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="63" column="4" selection-start="2245" selection-end="2245" vertical-scroll-proportion="0.52380955"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationModelFactoryImpl.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="62" column="4" selection-start="2288" selection-end="2288" vertical-scroll-proportion="0.52380955"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="63" column="3" selection-start="2195" selection-end="2195" vertical-scroll-proportion="0.54761904"> + <folding /> + </state> + </provider> + </entry> </component> </project> Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationModelFactoryImpl.java =================================================================== --- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationModelFactoryImpl.java 2007-07-25 11:56:57 UTC (rev 3989) +++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationModelFactoryImpl.java 2007-07-25 12:01:46 UTC (rev 3990) @@ -62,11 +62,6 @@ return handler; } - public InvocationContext createInvocationContext(InvocationType type) - { - throw new IllegalArgumentException("Not implemented"); - } - public ExtendableWebServiceContext createWebServiceContext(InvocationType type, MessageContext messageContext) { ExtendableWebServiceContext context = null; Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java 2007-07-25 11:56:57 UTC (rev 3989) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java 2007-07-25 12:01:46 UTC (rev 3990) @@ -61,12 +61,7 @@ return handler; } - - public InvocationContext createInvocationContext(InvocationType type) - { - throw new IllegalArgumentException("Not implemented"); - } - + public ExtendableWebServiceContext createWebServiceContext(InvocationType type, MessageContext messageContext) { ExtendableWebServiceContext context = null; Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java 2007-07-25 11:56:57 UTC (rev 3989) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java 2007-07-25 12:01:46 UTC (rev 3990) @@ -63,11 +63,6 @@ return handler; } - public InvocationContext createInvocationContext(InvocationType type) - { - throw new IllegalArgumentException("Not implemented"); - } - public ExtendableWebServiceContext createWebServiceContext(InvocationType type, MessageContext messageContext) { ExtendableWebServiceContext context = null; Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationModelFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationModelFactory.java 2007-07-25 11:56:57 UTC (rev 3989) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationModelFactory.java 2007-07-25 12:01:46 UTC (rev 3990) @@ -33,7 +33,6 @@ */ public abstract class InvocationModelFactory implements SPIView { - public abstract InvocationHandler createInvocationHandler(InvocationType type); - public abstract InvocationContext createInvocationContext(InvocationType type); + public abstract InvocationHandler createInvocationHandler(InvocationType type); public abstract ExtendableWebServiceContext createWebServiceContext(InvocationType type, MessageContext messageContext); }

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r3989 - in trunk: integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42 and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-07-25 07:56:57 -0400 (Wed, 25 Jul 2007) New Revision: 3989 Added: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/RewriteResults.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifier.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java Removed: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterFactoryImpl.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/RewriteResults.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppDesciptorModifier.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebXMLRewriter.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebXMLRewriterFactory.java Modified: trunk/JBossWS-Trunk.iws trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultWebAppDesciptorModifierImpl.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifierImpl.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java Log: Move WebAppRewriter to 'framework' package Modified: trunk/JBossWS-Trunk.iws =================================================================== --- trunk/JBossWS-Trunk.iws 2007-07-25 10:18:50 UTC (rev 3988) +++ trunk/JBossWS-Trunk.iws 2007-07-25 11:56:57 UTC (rev 3989) @@ -121,7 +121,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="62" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> + <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="61" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> <option name="ENABLED" value="false" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -199,7 +199,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="115" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> + <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="108" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -212,7 +212,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="121" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> + <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="114" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -279,57 +279,7 @@ <option name="myCurrentFavoritesList" value="JBossWS-Trunk" /> </component> <component name="FileEditorManager"> - <leaf> - <file leaf-file-name="DefaultSPIProviderResolver.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="137" column="0" selection-start="4897" selection-end="4897" vertical-scroll-proportion="0.73170733"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="ServiceLoader.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/common/ServiceLoader.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="83" column="0" selection-start="3381" selection-end="3381" vertical-scroll-proportion="0.1863354"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="org.jboss.wsf.spi.invocation.SecurityAdaptorFactory" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory"> - <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="58" selection-start="58" selection-end="58" vertical-scroll-proportion="0.0"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="TestDeployerJBoss.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/test/TestDeployerJBoss.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="83" column="12" selection-start="2874" selection-end="2874" vertical-scroll-proportion="0.3416149"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="SecurityAdapterFactoryImpl.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdapterFactoryImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="30" column="39" selection-start="1257" selection-end="1283" vertical-scroll-proportion="0.24390244"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - </leaf> + <leaf /> </component> <component name="FindManager"> <FindUsagesManager> @@ -371,178 +321,6 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> </PATH_ELEMENT> </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="invocation" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="framework" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="container" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - </PATH> </component> <component name="PerforceChangeBrowserSettings"> <option name="USE_CLIENT_FILTER" value="true" /> @@ -594,10 +372,6 @@ <option name="myItemId" value="JBossWS-Trunk.ipr" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="testsuite" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -605,70 +379,6 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="testsuite" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="testsuite" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="testsuite" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/samples" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> <option name="myItemId" value="spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> @@ -797,7 +507,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -830,14 +540,6 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -860,421 +562,13 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/output" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.jar" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-42" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-42" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-42" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src/main/resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-42" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src/main/resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42.jar" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-42" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-40" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-40" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-40" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main/resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-40" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main/resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-40" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> </component> <component name="ProjectReloadState"> <option name="STATE" value="0" /> </component> <component name="ProjectView"> - <navigator currentView="ProjectPane" splitterProportion="0.5"> + <navigator currentView="PackagesPane" splitterProportion="0.5"> <flattenPackages PackagesPane="false" /> <showMembers /> <showModules /> @@ -1307,32 +601,16 @@ <recent name="org.jboss.wsf.stack.xfire" /> </key> <key name="MoveClassesOrPackagesDialog.RECENTS_KEY"> + <recent name="org.jboss.wsf.framework.deployment" /> <recent name="org.jboss.wsf.common" /> <recent name="org.jboss.wsf.spi.invocation" /> <recent name="org.jboss.ws.core.server" /> <recent name="org.jboss.wsf.stack.jbws" /> - <recent name="org.jboss.wsf.spi.management" /> </key> </component> <component name="RestoreUpdateTree" /> <component name="RunManager"> <activeType name="Remote" /> - <configuration selected="false" default="true" type="Application" factoryName="Application"> - <option name="MAIN_CLASS_NAME" /> - <option name="VM_PARAMETERS" /> - <option name="PROGRAM_PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <module name="" /> - </configuration> - <configuration selected="false" default="true" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="5005" /> - </configuration> <configuration selected="false" default="true" type="Applet" factoryName="Applet"> <module name="" /> <option name="MAIN_CLASS_NAME" /> @@ -1345,6 +623,15 @@ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> </configuration> + <configuration selected="false" default="true" type="Application" factoryName="Application"> + <option name="MAIN_CLASS_NAME" /> + <option name="VM_PARAMETERS" /> + <option name="PROGRAM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <module name="" /> + </configuration> <configuration selected="false" default="true" type="JUnit" factoryName="JUnit"> <module name="" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> @@ -1361,6 +648,13 @@ <value defaultName="wholeProject" /> </option> </configuration> + <configuration selected="false" default="true" type="Remote" factoryName="Remote"> + <option name="USE_SOCKET_TRANSPORT" value="true" /> + <option name="SERVER_MODE" value="false" /> + <option name="SHMEM_ADDRESS" value="javadebug" /> + <option name="HOST" value="localhost" /> + <option name="PORT" value="5005" /> + </configuration> <configuration selected="false" default="false" name="server" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> <option name="SERVER_MODE" value="false" /> @@ -1438,8 +732,8 @@ <layout> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" /> - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.35326758" order="0" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.49140894" order="1" /> + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.28729963" order="0" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.5040092" order="1" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25215784" order="1" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="6" /> @@ -1448,7 +742,7 @@ <window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="2" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.17509247" order="2" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.27188656" order="2" /> <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.39862543" order="4" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" /> @@ -1524,106 +818,119 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory"> <provider selected="true" editor-type-id="text-editor"> - <state line="155" column="113" selection-start="6114" selection-end="6114" vertical-scroll-proportion="0.18692811"> + <state line="0" column="58" selection-start="58" selection-end="58" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="49" column="113" selection-start="2164" selection-end="2164" vertical-scroll-proportion="0.5751634"> - <folding /> + <state line="44" column="13" selection-start="1722" selection-end="1722" vertical-scroll-proportion="-0.3167702"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdaptorImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/test/TestDeployerJBoss.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="38" column="3" selection-start="1459" selection-end="1459" vertical-scroll-proportion="0.3821656"> + <state line="83" column="12" selection-start="2874" selection-end="2874" vertical-scroll-proportion="0.024844721"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdaptorImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdapterFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="38" column="3" selection-start="1456" selection-end="1456" vertical-scroll-proportion="0.3821656"> - <folding /> + <state line="30" column="39" selection-start="1257" selection-end="1283" vertical-scroll-proportion="0.24390244"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptorFactory.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextEJB.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="21" column="36" selection-start="1022" selection-end="1050" vertical-scroll-proportion="0.026143791"> - <folding /> + <state line="38" column="13" selection-start="1465" selection-end="1465" vertical-scroll-proportion="0.42857143"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="58" selection-start="58" selection-end="58" vertical-scroll-proportion="0.0"> + <state line="46" column="13" selection-start="1840" selection-end="1840" vertical-scroll-proportion="0.096969694"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="30" column="59" selection-start="1424" selection-end="1424" vertical-scroll-proportion="0.10603589"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="44" column="22" selection-start="1556" selection-end="1556" vertical-scroll-proportion="0.3588907"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptor.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="17" selection-start="1278" selection-end="1278" vertical-scroll-proportion="0.325"> + <state line="27" column="17" selection-start="1144" selection-end="1144" vertical-scroll-proportion="0.3562341"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdapterFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="21" column="39" selection-start="1022" selection-end="1053" vertical-scroll-proportion="0.025"> + <state line="35" column="42" selection-start="1508" selection-end="1508" vertical-scroll-proportion="-0.28363636"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/test/TestDeployerJBoss.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/RewriteResults.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="83" column="12" selection-start="2874" selection-end="2874" vertical-scroll-proportion="0.3416149"> + <state line="31" column="13" selection-start="1216" selection-end="1216" vertical-scroll-proportion="0.45801526"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdapterFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifier.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="30" column="39" selection-start="1257" selection-end="1283" vertical-scroll-proportion="0.24390244"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="33" column="29" selection-start="1347" selection-end="1347" vertical-scroll-proportion="0.26666668"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java"> + <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="137" column="0" selection-start="4897" selection-end="4897" vertical-scroll-proportion="0.73170733"> + <state line="39" column="30" selection-start="1526" selection-end="1526" vertical-scroll-proportion="0.15272728"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/common/ServiceLoader.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultWebAppDesciptorModifierImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="83" column="0" selection-start="3381" selection-end="3381" vertical-scroll-proportion="0.1863354"> + <state line="38" column="21" selection-start="1412" selection-end="1412" vertical-scroll-proportion="0.21428572"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory"> + <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="58" selection-start="58" selection-end="58" vertical-scroll-proportion="0.0"> + <state line="157" column="78" selection-start="8211" selection-end="8236" vertical-scroll-proportion="0.14424242"> <folding /> </state> </provider> Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java 2007-07-25 10:18:50 UTC (rev 3988) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java 2007-07-25 11:56:57 UTC (rev 3989) @@ -24,6 +24,8 @@ //$Id: ModifyWebMetaDataDeployer.java 3772 2007-07-01 19:29:13Z thomas.diesler(a)jboss.com $ import org.jboss.wsf.spi.deployment.*; +import org.jboss.wsf.framework.deployment.WebXMLRewriter; +import org.jboss.wsf.framework.deployment.RewriteResults; /** * A deployer that modifies the web.xml meta data Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java 2007-07-25 10:18:50 UTC (rev 3988) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java 2007-07-25 11:56:57 UTC (rev 3989) @@ -33,7 +33,7 @@ import org.jboss.mx.util.MBeanProxy; import org.jboss.mx.util.MBeanProxyCreationException; import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.wsf.spi.deployment.WebXMLRewriter; +import org.jboss.wsf.framework.deployment.WebXMLRewriter; import org.jboss.wsf.spi.deployment.*; /** Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java 2007-07-25 10:18:50 UTC (rev 3988) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java 2007-07-25 11:56:57 UTC (rev 3989) @@ -29,7 +29,7 @@ import org.jboss.metadata.web.ParamValue; import org.jboss.metadata.web.ParamValue.ParamType; import org.jboss.metadata.web.Servlet; -import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier; +import org.jboss.wsf.framework.deployment.WebAppDesciptorModifier; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java 2007-07-25 10:18:50 UTC (rev 3988) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java 2007-07-25 11:56:57 UTC (rev 3989) @@ -28,7 +28,7 @@ import org.jboss.logging.Logger; import org.jboss.virtual.VFS; import org.jboss.virtual.VirtualFile; -import org.jboss.wsf.spi.deployment.WebXMLRewriter; +import org.jboss.wsf.framework.deployment.WebXMLRewriter; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-07-25 10:18:50 UTC (rev 3988) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-07-25 11:56:57 UTC (rev 3989) @@ -29,7 +29,6 @@ import org.jboss.wsf.spi.management.EndpointRegistryFactory; import org.jboss.wsf.spi.management.ServerConfigFactory; import org.jboss.wsf.spi.deployment.DeploymentModelFactory; -import org.jboss.wsf.spi.deployment.WebXMLRewriterFactory; import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory; import org.jboss.wsf.spi.deployment.LifecycleHandlerFactory; import org.jboss.wsf.spi.invocation.InvocationModelFactory; @@ -78,12 +77,6 @@ spiType, "org.jboss.wsf.framework.invocation.ResourceInjectorFactoryImpl" ); } - else if(WebXMLRewriterFactory.class.equals(spiType)) - { - returnType = (T) loadService( - spiType, "org.jboss.wsf.framework.deployment.WebXMLRewriterFactoryImpl" - ); - } else if(LifecycleHandlerFactory.class.equals(spiType)) { returnType = (T) loadService( Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultWebAppDesciptorModifierImpl.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultWebAppDesciptorModifierImpl.java 2007-07-25 10:18:50 UTC (rev 3988) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultWebAppDesciptorModifierImpl.java 2007-07-25 11:56:57 UTC (rev 3989) @@ -29,8 +29,6 @@ import org.jboss.logging.Logger; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.RewriteResults; -import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier; /** * Modifies web.xml for jbossws Added: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/RewriteResults.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/RewriteResults.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/RewriteResults.java 2007-07-25 11:56:57 UTC (rev 3989) @@ -0,0 +1,38 @@ +/* + * 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.framework.deployment; + +import java.net.URL; +import java.util.Map; +import java.util.HashMap; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 19, 2007 + */ +public class RewriteResults +{ + // The URL to the rewritten web.xml + public URL webXML; + // Maps the servlet name to the target bean + public Map<String, String> sepTargetMap = new HashMap<String, String>(); +} Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/RewriteResults.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifier.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifier.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifier.java 2007-07-25 11:56:57 UTC (rev 3989) @@ -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.framework.deployment; + +import org.dom4j.Document; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.framework.deployment.RewriteResults; + +/** + * Modifies the web app according to the stack requirements. + * + * @author Thomas.Diesler(a)jboss.org + * @since 19-May-2007 + */ +public interface WebAppDesciptorModifier +{ + final String SERVLET_CONTEXT_LISTENER = "ServletContextListener"; + final String CONTEXT_PARAMETER_MAP = "ContextParameterMap"; + final String SERVLET_CLASS = "ServletClass"; + + RewriteResults modifyDescriptor(Deployment dep, Document webXml) throws ClassNotFoundException; +} \ No newline at end of file Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifier.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifierImpl.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifierImpl.java 2007-07-25 10:18:50 UTC (rev 3988) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifierImpl.java 2007-07-25 11:56:57 UTC (rev 3989) @@ -27,10 +27,8 @@ import org.dom4j.Document; import org.dom4j.Element; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.RewriteResults; /** * Modifies web.xml for jbossws Added: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java 2007-07-25 11:56:57 UTC (rev 3989) @@ -0,0 +1,33 @@ +/* + * 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.framework.deployment; + +import org.jboss.wsf.spi.deployment.Deployment; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 19, 2007 + */ +public interface WebXMLRewriter +{ + RewriteResults rewriteWebXml(Deployment dep); +} Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterFactoryImpl.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterFactoryImpl.java 2007-07-25 10:18:50 UTC (rev 3988) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterFactoryImpl.java 2007-07-25 11:56:57 UTC (rev 3989) @@ -1,42 +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.framework.deployment; - -import org.jboss.wsf.spi.deployment.WebXMLRewriterFactory; -import org.jboss.wsf.spi.deployment.WebXMLRewriter; -import org.jboss.wsf.common.KernelAwareSPIFactory; - -/** - * @author Heiko.Braun(a)jboss.com - * Created: Jul 19, 2007 - */ -public class WebXMLRewriterFactoryImpl extends WebXMLRewriterFactory -{ - public WebXMLRewriter createWebXMLRewriter() - { - WebXMLRewriter rewriter = new KernelAwareSPIFactory().getKernelProvidedSPI( - "WSWebXMLRewriter", WebXMLRewriter.class - ); - - return rewriter; - } -} Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/RewriteResults.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/RewriteResults.java 2007-07-25 10:18:50 UTC (rev 3988) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/RewriteResults.java 2007-07-25 11:56:57 UTC (rev 3989) @@ -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.wsf.spi.deployment; - -import java.net.URL; -import java.util.Map; -import java.util.HashMap; - -/** - * @author Heiko.Braun(a)jboss.com - * Created: Jul 19, 2007 - */ -public class RewriteResults -{ - // The URL to the rewritten web.xml - public URL webXML; - // Maps the servlet name to the target bean - public Map<String, String> sepTargetMap = new HashMap<String, String>(); -} Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppDesciptorModifier.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppDesciptorModifier.java 2007-07-25 10:18:50 UTC (rev 3988) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppDesciptorModifier.java 2007-07-25 11:56:57 UTC (rev 3989) @@ -1,42 +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.spi.deployment; - -import org.dom4j.Document; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.RewriteResults; -import org.jboss.wsf.spi.SPIView; - -/** - * Modifies the web app according to the stack requirements. - * - * @author Thomas.Diesler(a)jboss.org - * @since 19-May-2007 - */ -public interface WebAppDesciptorModifier -{ - final String SERVLET_CONTEXT_LISTENER = "ServletContextListener"; - final String CONTEXT_PARAMETER_MAP = "ContextParameterMap"; - final String SERVLET_CLASS = "ServletClass"; - - RewriteResults modifyDescriptor(Deployment dep, Document webXml) throws ClassNotFoundException; -} \ No newline at end of file Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebXMLRewriter.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebXMLRewriter.java 2007-07-25 10:18:50 UTC (rev 3988) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebXMLRewriter.java 2007-07-25 11:56:57 UTC (rev 3989) @@ -1,31 +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.spi.deployment; - -/** - * @author Heiko.Braun(a)jboss.com - * Created: Jul 19, 2007 - */ -public interface WebXMLRewriter -{ - RewriteResults rewriteWebXml(Deployment dep); -} Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebXMLRewriterFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebXMLRewriterFactory.java 2007-07-25 10:18:50 UTC (rev 3988) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebXMLRewriterFactory.java 2007-07-25 11:56:57 UTC (rev 3989) @@ -1,33 +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.spi.deployment; - -import org.jboss.wsf.spi.SPIView; - -/** - * @author Heiko.Braun(a)jboss.com - * Created: Jul 19, 2007 - */ -public abstract class WebXMLRewriterFactory implements SPIView -{ - public abstract WebXMLRewriter createWebXMLRewriter(); -} Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java 2007-07-25 10:18:50 UTC (rev 3988) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java 2007-07-25 11:56:57 UTC (rev 3989) @@ -32,7 +32,7 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier; +import org.jboss.wsf.framework.deployment.WebAppDesciptorModifier; import org.jboss.wsf.stack.sunri.metadata.sunjaxws.DDEndpoint; import org.jboss.wsf.stack.sunri.metadata.sunjaxws.DDEndpoints; @@ -47,7 +47,7 @@ @Override public void create(Deployment dep) { - + DDEndpoints dd = dep.getContext().getAttachment(DDEndpoints.class); if (dd == null) { @@ -59,7 +59,7 @@ String urlPattern = ep.getURLPattern(); DDEndpoint ddep = new DDEndpoint(epName, targetBean, urlPattern); - + Class beanClass = ep.getTargetBeanClass(); BindingType anBindingType = (BindingType)beanClass.getAnnotation(BindingType.class); if (anBindingType != null && anBindingType.value().length() > 0) @@ -69,13 +69,13 @@ if (binding.equals(SOAPBinding.SOAP11HTTP_MTOM_BINDING) || binding.equals(SOAPBinding.SOAP12HTTP_MTOM_BINDING)) ddep.setEnableMTOM(true); } - + log.info("Add " + ddep); dd.addEndpoint(ddep); } - + dep.getContext().addAttachment(DDEndpoints.class, dd); - + String propKey = WebAppDesciptorModifier.CONTEXT_PARAMETER_MAP; Map<String, String> contextParams = (Map<String, String>)dep.getContext().getProperty(propKey); if (contextParams == null) Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java 2007-07-25 10:18:50 UTC (rev 3988) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java 2007-07-25 11:56:57 UTC (rev 3989) @@ -27,9 +27,9 @@ import org.dom4j.Element; import org.jboss.logging.Logger; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier; +import org.jboss.wsf.framework.deployment.WebAppDesciptorModifier; import org.jboss.wsf.stack.sunri.metadata.sunjaxws.DDEndpoints; -import org.jboss.wsf.spi.deployment.RewriteResults; +import org.jboss.wsf.framework.deployment.RewriteResults; /** * Modifies web.xml for sun-ri @@ -74,11 +74,11 @@ DDEndpoints ddSunJaxws = dep.getContext().getAttachment(DDEndpoints.class); if (ddSunJaxws == null) throw new IllegalStateException("Cannot obtain sun-jaxws meta data"); - + Element contextParam = root.addElement("context-param"); contextParam.addElement("param-name").addText(WSServletContextListenerJBWS.PARAM_SUN_JAXWS_URL); contextParam.addElement("param-value").addText(ddSunJaxws.createFileURL().toExternalForm()); - + root.addElement("listener").addElement("listener-class").addText(listenerClass); for (Iterator it = root.elementIterator("servlet"); it.hasNext();) Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java 2007-07-25 10:18:50 UTC (rev 3988) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java 2007-07-25 11:56:57 UTC (rev 3989) @@ -30,7 +30,7 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier; +import org.jboss.wsf.framework.deployment.WebAppDesciptorModifier; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.stack.xfire.metadata.services.DDBean; import org.jboss.wsf.stack.xfire.metadata.services.DDBeans; Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java 2007-07-25 10:18:50 UTC (rev 3988) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java 2007-07-25 11:56:57 UTC (rev 3989) @@ -27,9 +27,9 @@ import org.dom4j.Element; import org.jboss.logging.Logger; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier; +import org.jboss.wsf.framework.deployment.WebAppDesciptorModifier; import org.jboss.wsf.stack.xfire.metadata.services.DDBeans; -import org.jboss.wsf.spi.deployment.RewriteResults; +import org.jboss.wsf.framework.deployment.RewriteResults; /** * Modifies web.xml for xfire

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r3988 - in trunk: integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42 and 11 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-07-25 06:18:50 -0400 (Wed, 25 Jul 2007) New Revision: 3988 Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapter.java trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.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/DeploymentInfoAdapter.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/SecurityHandlerEJB3.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeploymentAspect.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.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/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/UnifiedDeploymentInfoDeploymentAspect.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeployment.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.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/UnifiedDeploymentInfo.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointServlet.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointServlet.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.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/JAXRPCServerMetaDataBuilder.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/tools/jaxws/impl/JBossWSProviderImpl.java Log: Encapsulate fields in UnifiedDeploymentInfo Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java =================================================================== --- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -55,10 +55,10 @@ { String ejbName = ep.getShortName(); UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class); - String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + udi.simpleName; - if (udi.parent != null) + String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + udi.getSimpleName(); + if (udi.getParent() != null) { - nameStr += ",ear=" + udi.parent.simpleName; + nameStr += ",ear=" + udi.getParent().getSimpleName(); } objectName = ObjectNameFactory.create(nameStr.toString()); Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapter.java =================================================================== --- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapter.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapter.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -52,7 +52,7 @@ { public UnifiedServiceRefMetaData buildServiceRefMetaData(UnifiedDeploymentInfo udi, ServiceRefMetaData srmd) throws IOException { - UnifiedServiceRefMetaData usrmd = new UnifiedServiceRefMetaData(udi.vfRoot); + UnifiedServiceRefMetaData usrmd = new UnifiedServiceRefMetaData(udi.getVfRoot()); usrmd.setServiceRefName(srmd.getServiceRefName()); usrmd.setServiceInterface(srmd.getServiceInterface()); usrmd.setWsdlFile(srmd.getWsdlFile()); Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java =================================================================== --- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -78,7 +78,7 @@ adapter.buildDeploymentInfo(dep, udi, di); UnifiedServiceRefMetaData usr = ServiceRefMetaDataAdapterFactory.newInstance().buildServiceRefMetaData(udi, serviceRef); - usr.setVfsRoot(new URLLoaderAdapter(udi.url)); + usr.setVfsRoot(new URLLoaderAdapter(udi.getUrl())); ServiceReferenceable ref = new ServiceReferenceable(usr); Util.bind(envCtx, serviceRefName, ref); Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -54,7 +54,7 @@ public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, UnifiedDeploymentInfo udi) { - Ejb3ModuleMBean ejb3Module = getEJB3Module(udi.deployedObject); + Ejb3ModuleMBean ejb3Module = getEJB3Module(udi.getDeployedObject()); ArrayList<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>(); for (Object container : ejb3Module.getContainers().values()) Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -76,7 +76,7 @@ public Deployment getDeployment(DeploymentInfo unit) { Deployment dep = (Deployment)unit.context.get(Deployment.class); - return (dep != null && dep.getType() == getDeploymentType() ? dep : null); + return (dep != null && dep.getDeploymentType() == getDeploymentType() ? dep : null); } public void deploy(DeploymentInfo unit) throws DeploymentException Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -72,16 +72,15 @@ if (di.parent != null) { - udi.parent = new UnifiedDeploymentInfo(null); - buildDeploymentInfo(dep, udi.parent, di.parent); + udi.setParent(new UnifiedDeploymentInfo(null)); + buildDeploymentInfo(dep, udi.getParent(), 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; + udi.setVfRoot(new ResourceLoaderAdapter(di.localCl)); + udi.setSimpleName(di.shortName); + udi.setUrl(getDeploymentURL(di)); + udi.setClassLoader(di.annotationsCl); + udi.setDeployedObject(di.deployedObject); buildMetaData(dep, udi, di); @@ -114,16 +113,16 @@ { if (di.metaData instanceof WebMetaData) { - udi.metaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, di); - udi.webappURL = udi.url; + udi.setMetaData(webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, di)); + udi.setWebappURL(udi.getUrl()); } - else if (udi.type == DeploymentType.JAXRPC_EJB3 || udi.type == DeploymentType.JAXWS_EJB3) + else if (dep.getDeploymentType() == DeploymentType.JAXRPC_EJB3 || dep.getDeploymentType() == DeploymentType.JAXWS_EJB3) { - udi.metaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi); + udi.setMetaData(applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi)); } else if (di.metaData instanceof ApplicationMetaData) { - udi.metaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, di); + udi.setMetaData(applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, di)); } } } Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -81,7 +81,7 @@ { String ejbName = ep.getShortName(); UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class); - UnifiedApplicationMetaData applMetaData = (UnifiedApplicationMetaData)udi.metaData; + UnifiedApplicationMetaData applMetaData = (UnifiedApplicationMetaData)udi.getMetaData(); UnifiedBeanMetaData beanMetaData = (UnifiedBeanMetaData)applMetaData.getBeanByEjbName(ejbName); if (beanMetaData == null) throw new WebServiceException("Cannot obtain ejb meta data for: " + ejbName); Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -66,10 +66,10 @@ { String ejbName = ep.getShortName(); UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class); - String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + udi.simpleName; - if (udi.parent != null) + String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + udi.getSimpleName(); + if (udi.getParent() != null) { - nameStr += ",ear=" + udi.parent.simpleName; + nameStr += ",ear=" + udi.getParent().getSimpleName(); } objectName = ObjectNameFactory.create(nameStr.toString()); 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-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -57,7 +57,7 @@ dep.setRootFile(new URLLoaderAdapter(unit.localUrl)); dep.setInitialClassLoader(unit.annotationsCl); dep.setRuntimeClassLoader(unit.ucl); - dep.setType(getDeploymentType()); + dep.setDeploymentType(getDeploymentType()); Service service = dep.getService(); 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-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -63,7 +63,7 @@ dep.setRootFile(new URLLoaderAdapter(unit.localUrl)); dep.setInitialClassLoader(unit.annotationsCl); dep.setRuntimeClassLoader(null); - dep.setType(getDeploymentType()); + dep.setDeploymentType(getDeploymentType()); Service service = dep.getService(); 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-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -58,7 +58,7 @@ dep.setRootFile(new URLLoaderAdapter(unit.localUrl)); dep.setInitialClassLoader(unit.annotationsCl); dep.setRuntimeClassLoader(unit.ucl); - dep.setType(getDeploymentType()); + dep.setDeploymentType(getDeploymentType()); Service service = dep.getService(); 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-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -62,7 +62,7 @@ dep.setRootFile(new URLLoaderAdapter(unit.localUrl)); dep.setInitialClassLoader(unit.annotationsCl); dep.setRuntimeClassLoader(null); - dep.setType(getDeploymentType()); + dep.setDeploymentType(getDeploymentType()); Service service = dep.getService(); Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB3.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB3.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -52,7 +52,7 @@ String securityDomain = null; UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - Ejb3ModuleMBean ejb3Module = getEJB3Module(udi.deployedObject); + Ejb3ModuleMBean ejb3Module = getEJB3Module(udi.getDeployedObject()); for (Object manager : ejb3Module.getContainers().values()) { if (manager instanceof StatelessContainer) @@ -83,7 +83,7 @@ { // The container objects below provide access to all of the ejb metadata UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - Ejb3ModuleMBean ejb3Module = getEJB3Module(udi.deployedObject); + Ejb3ModuleMBean ejb3Module = getEJB3Module(udi.getDeployedObject()); for (Object manager : ejb3Module.getContainers().values()) { if (manager instanceof StatelessContainer) Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeploymentAspect.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeploymentAspect.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeploymentAspect.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -57,7 +57,7 @@ if (unit == null) throw new IllegalStateException("Cannot obtain deployment unit"); - DeploymentType type = dep.getType(); + DeploymentType type = dep.getDeploymentType(); if (type.toString().startsWith("JAXWS")) { udi = new JAXWSDeployment(type); Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -56,13 +56,13 @@ public void create(Deployment dep) { - if (dep.getType().toString().endsWith("EJB21") || dep.getType().toString().endsWith("EJB3")) + if (dep.getDeploymentType().toString().endsWith("EJB21") || dep.getDeploymentType().toString().endsWith("EJB3")) { UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); if (udi == null) throw new IllegalStateException("Cannot obtain unified deployement info"); - URL warURL = udi.webappURL; + URL warURL = udi.getWebappURL(); log.debug("publishServiceEndpoint: " + warURL); try @@ -91,10 +91,10 @@ if (udi == null) throw new IllegalStateException("Cannot obtain unified deployement info"); - URL warURL = udi.webappURL; + URL warURL = udi.getWebappURL(); if (warURL == null) { - log.error("Cannot obtain warURL for: " + udi.name); + log.error("Cannot obtain warURL for: " + udi); return; } Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -65,7 +65,7 @@ while (it.hasNext()) { J2eeModuleMetaData module = (J2eeModuleMetaData)it.next(); - if (module.getFileName().equals(udi.simpleName)) + if (module.getFileName().equals(udi.getSimpleName())) contextRoot = module.getWebContext(); } } Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -73,7 +73,7 @@ public Deployment getDeployment(DeploymentUnit unit) { Deployment dep = unit.getAttachment(Deployment.class); - return (dep != null && dep.getType() == getDeploymentType() ? dep : null); + return (dep != null && dep.getDeploymentType() == getDeploymentType() ? dep : null); } public void deploy(DeploymentUnit unit) throws DeploymentException Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -73,22 +73,21 @@ { if (unit.getParent() != null) { - udi.parent = new UnifiedDeploymentInfo(null); - buildDeploymentInfo(dep, udi.parent, unit.getParent()); + udi.setParent(new UnifiedDeploymentInfo(null)); + buildDeploymentInfo(dep, udi.getParent(), unit.getParent()); } - udi.vfRoot = new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()); + udi.setVfRoot(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); - udi.name = unit.getName(); - udi.simpleName = unit.getSimpleName(); - udi.url = udi.vfRoot.toURL(); + udi.setSimpleName(unit.getSimpleName()); + udi.setUrl(udi.getVfRoot().toURL()); buildMetaData(dep, udi, unit); // Since we create temporary classes, we need to create a delegate loader // This prevents CCE problems where the parent loader is available at deploy time, // and a child loader is available at start time. - udi.classLoader = new URLClassLoader(new URL[] {}, unit.getClassLoader()); + udi.setClassLoader(new URLClassLoader(new URL[] {}, unit.getClassLoader())); log.debug("UnifiedDeploymentInfo:\n" + udi); } @@ -106,16 +105,16 @@ { if (unit.getAttachment(WebMetaData.class) != null) { - udi.metaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, unit); - udi.webappURL = udi.vfRoot.toURL(); + udi.setMetaData(webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, unit)); + udi.setWebappURL(udi.getVfRoot().toURL()); } else if (unit.getAttachment(Ejb3Deployment.class) != null) { - udi.metaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi, unit); + udi.setMetaData(applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi, unit)); } else if (unit.getAttachment(ApplicationMetaData.class) != null) { - udi.metaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, unit); + udi.setMetaData(applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, unit)); } } } Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -78,7 +78,7 @@ { String ejbName = ep.getShortName(); UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class); - UnifiedApplicationMetaData applMetaData = (UnifiedApplicationMetaData)udi.metaData; + UnifiedApplicationMetaData applMetaData = (UnifiedApplicationMetaData)udi.getMetaData(); UnifiedBeanMetaData beanMetaData = (UnifiedBeanMetaData)applMetaData.getBeanByEjbName(ejbName); if (beanMetaData == null) throw new WebServiceException("Cannot obtain ejb meta data for: " + ejbName); Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -66,10 +66,10 @@ { String ejbName = ep.getShortName(); UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class); - String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + udi.simpleName; - if (udi.parent != null) + String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + udi.getSimpleName(); + if (udi.getParent() != null) { - nameStr += ",ear=" + udi.parent.simpleName; + nameStr += ",ear=" + udi.getParent().getSimpleName(); } objectName = ObjectNameFactory.create(nameStr.toString()); 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-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -57,7 +57,7 @@ dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); dep.setInitialClassLoader(unit.getClassLoader()); dep.setRuntimeClassLoader(unit.getClassLoader()); - dep.setType(getDeploymentType()); + dep.setDeploymentType(getDeploymentType()); Service service = dep.getService(); 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-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -60,7 +60,7 @@ dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); dep.setInitialClassLoader(unit.getClassLoader()); dep.setRuntimeClassLoader(null); - dep.setType(getDeploymentType()); + dep.setDeploymentType(getDeploymentType()); Service service = dep.getService(); 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-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -59,7 +59,7 @@ dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); dep.setInitialClassLoader(unit.getClassLoader()); dep.setRuntimeClassLoader(unit.getClassLoader()); - dep.setType(getDeploymentType()); + dep.setDeploymentType(getDeploymentType()); Service service = dep.getService(); 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-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -59,7 +59,7 @@ dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); dep.setInitialClassLoader(unit.getClassLoader()); dep.setRuntimeClassLoader(null); - dep.setType(getDeploymentType()); + dep.setDeploymentType(getDeploymentType()); Service service = dep.getService(); Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -53,7 +53,7 @@ if (unit == null) throw new IllegalStateException("Cannot obtain deployment unit"); - DeploymentType type = dep.getType(); + DeploymentType type = dep.getDeploymentType(); if (type.toString().startsWith("JAXWS")) { udi = new JAXWSDeployment(type); Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -65,13 +65,13 @@ public void create(Deployment dep) { - if (dep.getType().toString().endsWith("EJB21") || dep.getType().toString().endsWith("EJB3")) + if (dep.getDeploymentType().toString().endsWith("EJB21") || dep.getDeploymentType().toString().endsWith("EJB3")) { UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); if (udi == null) throw new IllegalStateException("Cannot obtain unified deployement info"); - URL warURL = udi.webappURL; + URL warURL = udi.getWebappURL(); log.debug("publishServiceEndpoint: " + warURL); try @@ -96,10 +96,10 @@ if (udi == null) throw new IllegalStateException("Cannot obtain unified deployement info"); - URL warURL = udi.webappURL; + URL warURL = udi.getWebappURL(); if (warURL == null) { - log.error("Cannot obtain warURL for: " + udi.name); + log.error("Cannot obtain warURL for: " + udi); return; } Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -60,7 +60,7 @@ J2eeApplicationMetaData appmd = unit.getParent().getAttachment(J2eeApplicationMetaData.class); if (appmd != null) { - J2eeModuleMetaData module = appmd.getModule(udi.simpleName); + J2eeModuleMetaData module = appmd.getModule(udi.getSimpleName()); if (module != null) contextRoot = module.getWebContext(); } Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java =================================================================== --- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -102,7 +102,7 @@ private void initializeAndStart() { Deployment dep = endpoint.getService().getDeployment(); - if (dep.getType() == DeploymentType.JAXRPC_JSE || dep.getType() == DeploymentType.JAXWS_JSE) + if (dep.getDeploymentType() == DeploymentType.JAXRPC_JSE || dep.getDeploymentType() == DeploymentType.JAXWS_JSE) { // Initialize the meta data model UnifiedMetaData umd = dep.getContext().getAttachment(UnifiedMetaData.class); @@ -139,7 +139,7 @@ { // Set the runtime classloader for JSE endpoints, this should be the tomcat classloader Deployment dep = endpoint.getService().getDeployment(); - if (dep.getType() == DeploymentType.JAXRPC_JSE || dep.getType() == DeploymentType.JAXWS_JSE) + if (dep.getDeploymentType() == DeploymentType.JAXRPC_JSE || dep.getDeploymentType() == DeploymentType.JAXWS_JSE) { ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); dep.setRuntimeClassLoader(classLoader); Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java =================================================================== --- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -52,7 +52,7 @@ try { - WSDLFilePublisher publisher = new WSDLFilePublisher(udi); + WSDLFilePublisher publisher = new WSDLFilePublisher(dep, udi); publisher.publishWsdlFiles(umd); } catch (IOException ex) Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java =================================================================== --- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -46,7 +46,7 @@ ServiceEndpointInvoker epInvoker = ep.getAttachment(ServiceEndpointInvoker.class); if (epInvoker == null) { - DeploymentType depType = ep.getService().getDeployment().getType(); + DeploymentType depType = ep.getService().getDeployment().getDeploymentType(); if (depType == DeploymentType.JAXRPC_EJB21) { epInvoker = new ServiceEndpointInvokerEJB21(); Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java =================================================================== --- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -52,29 +52,29 @@ if (udi == null) throw new IllegalStateException("Cannot obtain unified deployment info"); - if (udi.type == DeploymentType.JAXRPC_JSE) + if (dep.getDeploymentType() == DeploymentType.JAXRPC_JSE) { JAXRPCServerMetaDataBuilder builder = new JAXRPCServerMetaDataBuilder(); umd = builder.buildMetaData(dep, (JAXRPCDeployment)udi); } - else if (udi.type == DeploymentType.JAXRPC_EJB21) + else if (dep.getDeploymentType() == DeploymentType.JAXRPC_EJB21) { JAXRPCServerMetaDataBuilder builder = new JAXRPCServerMetaDataBuilder(); umd = builder.buildMetaData(dep, (JAXRPCDeployment)udi); } - else if (udi.type == DeploymentType.JAXWS_JSE) + else if (dep.getDeploymentType() == DeploymentType.JAXWS_JSE) { JAXWSMetaDataBuilderJSE builder = new JAXWSMetaDataBuilderJSE(); umd = builder.buildMetaData(dep, udi); } - else if (udi.type == DeploymentType.JAXWS_EJB3) + else if (dep.getDeploymentType() == DeploymentType.JAXWS_EJB3) { JAXWSMetaDataBuilderEJB3 builder = new JAXWSMetaDataBuilderEJB3(); umd = builder.buildMetaData(dep, udi); } else { - throw new IllegalStateException("Invalid type: " + udi.type); + throw new IllegalStateException("Invalid type: " + dep.getDeploymentType()); } dep.getContext().addAttachment(UnifiedMetaData.class, umd); Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java =================================================================== --- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -47,6 +47,7 @@ import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLWriter; +import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.management.ServerConfig; import org.jboss.wsf.spi.management.ServerConfigFactory; @@ -68,15 +69,17 @@ private static final Logger log = Logger.getLogger(WSDLFilePublisher.class); // The deployment info for the web service archive + private Deployment dep; private UnifiedDeploymentInfo udi; // The expected wsdl location in the deployment private String expLocation; - public WSDLFilePublisher(UnifiedDeploymentInfo udi) + public WSDLFilePublisher(Deployment dep, UnifiedDeploymentInfo udi) { + this.dep = dep; this.udi = udi; - if (udi.type.toString().endsWith("JSE")) + if (dep.getDeploymentType().toString().endsWith("JSE")) { expLocation = "WEB-INF/wsdl/"; } @@ -240,7 +243,7 @@ */ public void unpublishWsdlFiles() throws IOException { - String deploymentDir = (udi.parent != null ? udi.parent.simpleName : udi.simpleName); + String deploymentDir = (udi.getParent() != null ? udi.getParent().getSimpleName() : udi.getSimpleName()); SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig(); File serviceDir = new File(config.getServerDataDir().getCanonicalPath() + "/wsdl/" + deploymentDir); Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeployment.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeployment.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeployment.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -121,12 +121,12 @@ this.state = deploymentState; } - public DeploymentType getType() + public DeploymentType getDeploymentType() { return type; } - public void setType(DeploymentType deploymentType) + public void setDeploymentType(DeploymentType deploymentType) { this.type = deploymentType; } Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -98,11 +98,11 @@ protected String getImplicitContextRoot(Deployment dep) { UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - String simpleName = udi.simpleName; + String simpleName = udi.getSimpleName(); String contextRoot = simpleName.substring(0, simpleName.length() - 4); - if (udi.parent != null) + if (udi.getParent() != null) { - simpleName = udi.parent.simpleName; + simpleName = udi.getParent().getSimpleName(); contextRoot = simpleName.substring(0, simpleName.length() - 4) + "-" + contextRoot; } return contextRoot; Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -86,7 +86,7 @@ private InvocationHandler getInvocationHandler(Endpoint ep) { Deployment dep = ep.getService().getDeployment(); - String key = dep.getType().toString(); + String key = dep.getDeploymentType().toString(); // Use a special key for MDB endpoints UnifiedApplicationMetaData uapp = dep.getContext().getAttachment(UnifiedApplicationMetaData.class); Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -72,13 +72,13 @@ if (udi == null) throw new IllegalStateException("Cannot obtain unified deployement info"); - if (dep.getType().toString().endsWith("EJB21")) + if (dep.getDeploymentType().toString().endsWith("EJB21")) { - udi.webappURL = generatWebDeployment(dep, securityHandlerEJB21); + udi.setWebappURL(generatWebDeployment(dep, securityHandlerEJB21)); } - else if (dep.getType().toString().endsWith("EJB3")) + else if (dep.getDeploymentType().toString().endsWith("EJB3")) { - udi.webappURL = generatWebDeployment(dep, securityHandlerEJB3); + udi.setWebappURL(generatWebDeployment(dep, securityHandlerEJB3)); } } Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -67,7 +67,7 @@ if (udi == null) throw new IllegalStateException("Cannot obtain unified deployment info"); - URL warURL = udi.webappURL; + URL warURL = udi.getWebappURL(); File warFile = new File(warURL.getFile()); if (warFile.isDirectory() == false) throw new WebServiceException("Expected a war directory: " + warURL); 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-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -72,10 +72,10 @@ void setContext(DeploymentContext context); /** Get the deployment type */ - DeploymentType getType(); + DeploymentType getDeploymentType(); /** Set the deployment type */ - void setType(DeploymentType type); + void setDeploymentType(DeploymentType type); /** Get the current deployment state */ DeploymentState getState(); Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -40,38 +40,113 @@ */ public class UnifiedDeploymentInfo { - public UnifiedDeploymentInfo(DeploymentType type) - { - this.type = type; - } - - /** The type of this deployment */ - public DeploymentType type; /** Sub deployments have a parent */ - public UnifiedDeploymentInfo parent; + private UnifiedDeploymentInfo parent; /** The suffix of the deployment url */ - public String simpleName; + private String simpleName; /** The URL for this deployment */ - public URL url; + private URL url; /** The virtual file for the deployment root */ - public UnifiedVirtualFile vfRoot; - /** The string identifing this deployment **/ - public String name; + private UnifiedVirtualFile vfRoot; /** The URL to the expanded webapp **/ - public URL webappURL; + private URL webappURL; /** We can hold "typed" metadata */ - public Object metaData; + private Object metaData; /** The deployment classloader **/ - public ClassLoader classLoader; + private ClassLoader classLoader; /** An optional ObjectName of the deployed object */ - public ObjectName deployedObject; + private ObjectName deployedObject; + public UnifiedDeploymentInfo(DeploymentType type) + { + } + + public void setDeployedObject(ObjectName deployedObject) + { + this.deployedObject = deployedObject; + } + + public ObjectName getDeployedObject() + { + return deployedObject; + } + + public void setClassLoader(ClassLoader classLoader) + { + this.classLoader = classLoader; + } + + public ClassLoader getClassLoader() + { + return classLoader; + } + + public void setMetaData(Object metaData) + { + this.metaData = metaData; + } + + public Object getMetaData() + { + return metaData; + } + + public void setWebappURL(URL webappURL) + { + this.webappURL = webappURL; + } + + public URL getWebappURL() + { + return webappURL; + } + + public void setVfRoot(UnifiedVirtualFile vfRoot) + { + this.vfRoot = vfRoot; + } + + public UnifiedVirtualFile getVfRoot() + { + return vfRoot; + } + + public void setUrl(URL url) + { + this.url = url; + } + + public URL getUrl() + { + return url; + } + + public void setSimpleName(String simpleName) + { + this.simpleName = simpleName; + } + + public String getSimpleName() + { + return simpleName; + } + + public void setParent(UnifiedDeploymentInfo parent) + { + this.parent = parent; + } + + public UnifiedDeploymentInfo getParent() + { + return parent; + } + /** The sortName concatenated with the canonical names of all parents. */ public String getCanonicalName() { - String name = simpleName; - if (parent != null) - name = parent.getCanonicalName() + "/" + name; + String name = getSimpleName(); + if (getParent() != null) + name = getParent().getCanonicalName() + "/" + name; return name; } @@ -93,15 +168,15 @@ // ignore } - if (resourceURL == null && vfRoot != null) + if (resourceURL == null && getVfRoot() != null) { - UnifiedVirtualFile vfResource = vfRoot.findChild(resourcePath); + UnifiedVirtualFile vfResource = getVfRoot().findChild(resourcePath); resourceURL = vfResource.toURL(); } if (resourceURL == null) { - String deploymentPath = url.toExternalForm(); + String deploymentPath = getUrl().toExternalForm(); if (deploymentPath.startsWith("jar:") && deploymentPath.endsWith("!/") == false) deploymentPath += "!/"; @@ -123,7 +198,6 @@ { StringBuilder builder = new StringBuilder(); builder.append("["); - builder.append("type=" + type); builder.append(",simpleName=" + simpleName); builder.append(",url=" + url); builder.append("]"); Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointServlet.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointServlet.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointServlet.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -94,7 +94,7 @@ // Set the runtime classloader for JSE endpoints, this should be the tomcat classloader Deployment dep = endpoint.getService().getDeployment(); - if (dep.getType() == Deployment.DeploymentType.JAXRPC_JSE || dep.getType() == Deployment.DeploymentType.JAXWS_JSE) + if (dep.getDeploymentType() == Deployment.DeploymentType.JAXRPC_JSE || dep.getDeploymentType() == Deployment.DeploymentType.JAXWS_JSE) { ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); dep.setRuntimeClassLoader(classLoader); Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -63,7 +63,7 @@ @Override public void create(Deployment dep) { - DeploymentType depType = dep.getType(); + DeploymentType depType = dep.getDeploymentType(); if (depType != DeploymentType.JAXWS_EJB3 && depType != DeploymentType.JAXWS_JSE) throw new IllegalStateException("Unsupported deployment type: " + depType); Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointServlet.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointServlet.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointServlet.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -94,7 +94,7 @@ // Set the runtime classloader for JSE endpoints, this should be the tomcat classloader Deployment dep = endpoint.getService().getDeployment(); - if (dep.getType() == Deployment.DeploymentType.JAXRPC_JSE || dep.getType() == Deployment.DeploymentType.JAXWS_JSE) + if (dep.getDeploymentType() == Deployment.DeploymentType.JAXRPC_JSE || dep.getDeploymentType() == Deployment.DeploymentType.JAXWS_JSE) { ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); dep.setRuntimeClassLoader(classLoader); 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-07-25 09:47:55 UTC (rev 3987) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -273,7 +273,7 @@ CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); if (msgContext instanceof SOAPMessageContextJAXWS) { - if (ep.getService().getDeployment().getType() == DeploymentType.JAXWS_JSE) + if (ep.getService().getDeployment().getDeploymentType() == DeploymentType.JAXWS_JSE) { WebServiceContext wsContext; if (msgContext.get(MessageContext.SERVLET_REQUEST) != null) 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-07-25 09:47:55 UTC (rev 3987) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -21,7 +21,7 @@ */ package org.jboss.ws.metadata.builder; -// $Id$ +// $Id: $ import java.io.IOException; import java.io.File; @@ -146,11 +146,11 @@ // If not, derive the context root from the deployment if (contextRoot == null) { - String simpleName = udi.simpleName; + String simpleName = udi.getSimpleName(); contextRoot = simpleName.substring(0, simpleName.indexOf('.')); - if (udi.parent != null) + if (udi.getParent() != null) { - simpleName = udi.parent.simpleName; + simpleName = udi.getParent().getSimpleName(); simpleName = simpleName.substring(0, simpleName.indexOf('.')); contextRoot = simpleName + "-" + contextRoot; } @@ -184,13 +184,13 @@ idstr.append("," + ServerEndpointMetaData.SEPID_PROPERTY_ENDPOINT + "=" + linkName); // Add JMS destination JNDI name for MDB endpoints - if (udi.metaData instanceof UnifiedApplicationMetaData) + if (udi.getMetaData() instanceof UnifiedApplicationMetaData) { String ejbName = sepMetaData.getLinkName(); if (ejbName == null) throw new WSException("Cannot obtain ejb-link from port component"); - UnifiedApplicationMetaData applMetaData = (UnifiedApplicationMetaData)udi.metaData; + UnifiedApplicationMetaData applMetaData = (UnifiedApplicationMetaData)udi.getMetaData(); UnifiedBeanMetaData beanMetaData = (UnifiedBeanMetaData)applMetaData.getBeanByEjbName(ejbName); if (beanMetaData == null) throw new WSException("Cannot obtain ejb meta data for: " + ejbName); @@ -244,9 +244,9 @@ protected void initTransportGuaranteeJSE(UnifiedDeploymentInfo udi, ServerEndpointMetaData sepMetaData, String servletLink) throws IOException { String transportGuarantee = null; - if (udi.metaData instanceof UnifiedWebMetaData) + if (udi.getMetaData() instanceof UnifiedWebMetaData) { - UnifiedWebMetaData webMetaData = (UnifiedWebMetaData)udi.metaData; + UnifiedWebMetaData webMetaData = (UnifiedWebMetaData)udi.getMetaData(); Map<String, String> servletMappings = webMetaData.getServletMappings(); String urlPattern = servletMappings.get(servletLink); 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-07-25 09:47:55 UTC (rev 3987) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -73,9 +73,9 @@ try { // For every webservice-description build the ServiceMetaData - UnifiedMetaData wsMetaData = new UnifiedMetaData(udi.vfRoot); + UnifiedMetaData wsMetaData = new UnifiedMetaData(udi.getVfRoot()); wsMetaData.setDeploymentName(udi.getCanonicalName()); - wsMetaData.setClassLoader(udi.classLoader); + wsMetaData.setClassLoader(udi.getClassLoader()); WebserviceDescriptionMetaData[] wsDescriptionArr = udi.getWebservicesMetaData().getWebserviceDescriptions(); for (WebserviceDescriptionMetaData wsdMetaData : wsDescriptionArr) @@ -142,9 +142,9 @@ initEndpointAddress(dep, udi, sepMetaData); - if (udi.metaData instanceof UnifiedApplicationMetaData) + if (udi.getMetaData() instanceof UnifiedApplicationMetaData) { - UnifiedApplicationMetaData apMetaData = (UnifiedApplicationMetaData)udi.metaData; + UnifiedApplicationMetaData apMetaData = (UnifiedApplicationMetaData)udi.getMetaData(); wsMetaData.setSecurityDomain(apMetaData.getSecurityDomain()); // Copy the wsdl publish location from jboss.xml @@ -182,9 +182,9 @@ } } } - else if (udi.metaData instanceof UnifiedWebMetaData) + else if (udi.getMetaData() instanceof UnifiedWebMetaData) { - UnifiedWebMetaData webMetaData = (UnifiedWebMetaData)udi.metaData; + UnifiedWebMetaData webMetaData = (UnifiedWebMetaData)udi.getMetaData(); wsMetaData.setSecurityDomain(webMetaData.getSecurityDomain()); String targetBean = webMetaData.getServletClassNames().get(linkName); 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-07-25 09:47:55 UTC (rev 3987) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -57,21 +57,21 @@ if(log.isDebugEnabled()) log.debug("START buildMetaData: [name=" + udi.getCanonicalName() + "]"); try { - UnifiedMetaData wsMetaData = new UnifiedMetaData(udi.vfRoot); + UnifiedMetaData wsMetaData = new UnifiedMetaData(udi.getVfRoot()); wsMetaData.setDeploymentName(udi.getCanonicalName()); - wsMetaData.setClassLoader(udi.classLoader); + wsMetaData.setClassLoader(udi.getClassLoader()); - if (udi.classLoader == null) + if (udi.getClassLoader() == null) throw new WSException("Deployment class loader not initialized"); // The container objects below provide access to all of the ejb metadata - UnifiedApplicationMetaData appMetaData = (UnifiedApplicationMetaData)udi.metaData; + UnifiedApplicationMetaData appMetaData = (UnifiedApplicationMetaData)udi.getMetaData(); Iterator<UnifiedBeanMetaData> it = appMetaData.getEnterpriseBeans(); while (it.hasNext()) { UnifiedBeanMetaData beanMetaData = it.next(); String ejbClassName = beanMetaData.getEjbClass(); - Class<?> beanClass = udi.classLoader.loadClass(ejbClassName); + Class<?> beanClass = udi.getClassLoader().loadClass(ejbClassName); if (beanClass.isAnnotationPresent(WebService.class) || beanClass.isAnnotationPresent(WebServiceProvider.class)) { String ejbLink = beanMetaData.getEjbName(); 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-07-25 09:47:55 UTC (rev 3987) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -48,11 +48,11 @@ log.debug("START buildMetaData: [name=" + udi.getCanonicalName() + "]"); try { - UnifiedMetaData wsMetaData = new UnifiedMetaData(udi.vfRoot); + UnifiedMetaData wsMetaData = new UnifiedMetaData(udi.getVfRoot()); wsMetaData.setDeploymentName(udi.getCanonicalName()); - wsMetaData.setClassLoader(udi.classLoader); + wsMetaData.setClassLoader(udi.getClassLoader()); - if (udi.classLoader == null) + if (udi.getClassLoader() == null) throw new WSException("Deployment class loader not initialized"); // For every bean 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-07-25 09:47:55 UTC (rev 3987) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -135,7 +135,7 @@ processEndpointConfig(udi, sepClass, linkName, sepMetaData); // Set the endpoint address - processWebContext(udi, sepClass, linkName, sepMetaData); + processWebContext(dep, sepClass, linkName, sepMetaData); // Init the endpoint address initEndpointAddress(dep, udi, sepMetaData); 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-07-25 09:47:55 UTC (rev 3987) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -76,14 +76,14 @@ sepMetaData.setConfigName(configName, configFile); } - protected void processWebContext(UnifiedDeploymentInfo udi, Class<?> wsClass, String linkName, ServerEndpointMetaData sepMetaData) + protected void processWebContext(Deployment dep, Class<?> wsClass, String linkName, ServerEndpointMetaData sepMetaData) { WebContext anWebContext = wsClass.getAnnotation(WebContext.class); if (anWebContext == null) return; - boolean isJSEEndpoint = (udi.type == DeploymentType.JAXWS_JSE); + boolean isJSEEndpoint = (dep.getDeploymentType() == DeploymentType.JAXWS_JSE); // context-root if (anWebContext.contextRoot().length() > 0) 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-07-25 09:47:55 UTC (rev 3987) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -107,7 +107,7 @@ EndpointResult result = processWebService(wsMetaData, sepClass, udi); // Clear the java types, etc. - resetMetaDataBuilder(udi.classLoader); + resetMetaDataBuilder(udi.getClassLoader()); ServerEndpointMetaData sepMetaData = result.sepMetaData; ServiceMetaData serviceMetaData = result.serviceMetaData; @@ -164,7 +164,7 @@ serviceMetaData.getTypesMetaData().setSchemaModel(schemaModel); // Note, that @WebContext needs to be defined on the endpoint not the SEI - processWebContext(udi, sepClass, linkName, sepMetaData); + processWebContext(dep, sepClass, linkName, sepMetaData); // setup handler chain from config sepMetaData.initEndpointConfig(); @@ -307,7 +307,7 @@ if (anWebService.endpointInterface().length() > 0) { seiName = anWebService.endpointInterface(); - seiClass = udi.classLoader.loadClass(seiName); + seiClass = udi.getClassLoader().loadClass(seiName); WebService seiAnnotation = seiClass.getAnnotation(WebService.class); if (seiAnnotation == null) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-07-25 09:47:55 UTC (rev 3987) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-07-25 10:18:50 UTC (rev 3988) @@ -80,7 +80,7 @@ return null; } }; - udi.classLoader = loader; + udi.setClassLoader(loader); return udi; }

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r3987 - in trunk: build/hudson/hudson-home/jobs/Core-Tests-AS-4.2 and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-07-25 05:47:55 -0400 (Wed, 25 Jul 2007) New Revision: 3987 Modified: trunk/build/ant-import/build-testsuite.xml trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml trunk/jbossws-core/ant-import-tests/build-testsuite.xml Log: decouple core test build from deploy Modified: trunk/build/ant-import/build-testsuite.xml =================================================================== --- trunk/build/ant-import/build-testsuite.xml 2007-07-25 08:15:11 UTC (rev 3986) +++ trunk/build/ant-import/build-testsuite.xml 2007-07-25 09:47:55 UTC (rev 3987) @@ -121,7 +121,7 @@ There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir. The 'ws.stack.classpath' contains jars that come with a specific stack distribution. - The 'tests.extra.classpath' contains stack specific jars that are needed for ... + The 'tests.extra.classpath' contains stack specific jars that are needed to run the stack specific tests. --> <path id="tests.client.classpath"> <path refid="ws.stack.classpath"/> @@ -177,7 +177,7 @@ There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir. The 'ws.stack.classpath' contains jars that come with a specific stack distribution. - The 'tests.extra.classpath' contains stack specific jars that are needed for + The 'tests.extra.classpath' contains stack specific jars that are needed to run the stack specific tests. --> <path id="tests.client.classpath"> <path refid="ws.stack.classpath"/> @@ -231,7 +231,7 @@ There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir. The 'ws.stack.classpath' contains jars that come with a specific stack distribution. - The 'tests.extra.classpath' contains stack specific jars that are needed for + The 'tests.extra.classpath' contains stack specific jars that are needed to run the stack specific tests. --> <path id="tests.client.classpath"> <path refid="ws.stack.classpath"/> Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-07-25 08:15:11 UTC (rev 3986) +++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-07-25 09:47:55 UTC (rev 3987) @@ -85,12 +85,7 @@ <canRoam>true</canRoam> <disabled>false</disabled> <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"> - <hudson.triggers.SCMTrigger> - <spec># Every 30 minutes after the hour -30 * * * *</spec> - </hudson.triggers.SCMTrigger> - </triggers> + <triggers class="vector"/> <logRotator> <daysToKeep>-1</daysToKeep> <numToKeep>20</numToKeep> Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-07-25 08:15:11 UTC (rev 3986) +++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-07-25 09:47:55 UTC (rev 3987) @@ -33,13 +33,12 @@ <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/> + <pathelement location="${core.dir}/thirdparty/policy.jar"/> + <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/> + <pathelement location="${core.dir}/thirdparty/wstx.jar"/> </path> <path id="tests.extra.classpath"> - <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> - <pathelement location="${jboss.client}/policy.jar"/> - <pathelement location="${jboss.client}/wsdl4j.jar"/> - <pathelement location="${jboss.client}/wstx.jar"/> <pathelement location="${core.dir}/thirdparty/qdox.jar"/> <pathelement location="${core.dir}/thirdparty/xmlunit.jar"/> </path>

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r3986 - in trunk: integration/native and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-07-25 04:15:11 -0400 (Wed, 25 Jul 2007) New Revision: 3986 Modified: trunk/build/ant-import/build-testsuite.xml trunk/integration/native/build.xml trunk/integration/sunri/build.xml trunk/integration/sunri/src/main/etc/bin-dist-build.xml trunk/integration/xfire/build.xml trunk/testsuite/src/etc/log4j.xml Log: Append to test.log. Add conditional switch to javadoc target Modified: trunk/build/ant-import/build-testsuite.xml =================================================================== --- trunk/build/ant-import/build-testsuite.xml 2007-07-25 05:56:07 UTC (rev 3985) +++ trunk/build/ant-import/build-testsuite.xml 2007-07-25 08:15:11 UTC (rev 3986) @@ -68,7 +68,7 @@ <target name="tests-prepare"> <mkdir dir="${tests.output.dir}/log"/> - <touch file="${tests.output.dir}/log/test.log"/> + <delete file="${tests.output.dir}/log/test.log"/> <property name="jboss.client" value="${jboss.home}/client"/> <property name="jboss.lib" value="${jboss.home}/lib"/> Modified: trunk/integration/native/build.xml =================================================================== --- trunk/integration/native/build.xml 2007-07-25 05:56:07 UTC (rev 3985) +++ trunk/integration/native/build.xml 2007-07-25 08:15:11 UTC (rev 3986) @@ -42,6 +42,7 @@ <target name="init" depends="prepare,thirdparty"> <ant antfile="${core.dir}/build.xml" target="jars" inheritall="false"/> + <mkdir dir="${native.output.apidocs.dir}"/> </target>  @@ -265,9 +266,8 @@ </jar> </target> - <target name="javadoc" description="Generate the Javadoc"> + <target name="javadoc" depends="init" description="Generate the Javadoc" unless="nojavadoc"> - <mkdir dir="${native.output.apidocs.dir}"/> <javadoc destdir="${native.output.apidocs.dir}" author="true" version="true" Modified: trunk/integration/sunri/build.xml =================================================================== --- trunk/integration/sunri/build.xml 2007-07-25 05:56:07 UTC (rev 3985) +++ trunk/integration/sunri/build.xml 2007-07-25 08:15:11 UTC (rev 3986) @@ -42,6 +42,7 @@ <target name="init" depends="prepare,thirdparty"> <ant antfile="${spi.dir}/build.xml" target="jars" inheritall="false"/> + <mkdir dir="${sunri.output.apidocs.dir}"/> </target>  @@ -250,15 +251,12 @@ </target>  - <target name="javadoc" depends="init" description="Generate the Javadoc"> + <target name="javadoc" depends="init" description="Generate the Javadoc" unless="nojavadoc"> - <mkdir dir="${sunri.output.apidocs.dir}"/> -  <mkdir dir="${sunri.output.dir}/thirdparty-sources"/> <unzip src="${thirdparty.dir}/jaxws-ri-src.jar" dest="${sunri.output.dir}/thirdparty-sources"/> - <javadoc destdir="${sunri.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> <classpath> <pathelement path="${sunri50.integration.classpath}"/> Modified: trunk/integration/sunri/src/main/etc/bin-dist-build.xml =================================================================== --- trunk/integration/sunri/src/main/etc/bin-dist-build.xml 2007-07-25 05:56:07 UTC (rev 3985) +++ trunk/integration/sunri/src/main/etc/bin-dist-build.xml 2007-07-25 08:15:11 UTC (rev 3986) @@ -78,6 +78,7 @@ <target name="tests-init" depends="prepare,tests-classpath"> <path id="ws.stack.classpath"> + <pathelement location="${lib.dir}/jbossws-spi.jar"/> <pathelement location="${thirdparty.dir}/FastInfoset.jar"/> <pathelement location="${thirdparty.dir}/http.jar"/> <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> @@ -93,10 +94,10 @@ <pathelement location="${thirdparty.dir}/stax-ex.jar"/> <pathelement location="${thirdparty.dir}/streambuffer.jar"/> <pathelement location="${thirdparty.dir}/wstx.jar"/> + <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> </path> <path id="tests.extra.classpath"> - <pathelement location="${lib.dir}/jbossws-spi.jar"/> <pathelement location="${lib.dir}/jbossws-sunri-client.jar"/> </path> Modified: trunk/integration/xfire/build.xml =================================================================== --- trunk/integration/xfire/build.xml 2007-07-25 05:56:07 UTC (rev 3985) +++ trunk/integration/xfire/build.xml 2007-07-25 08:15:11 UTC (rev 3986) @@ -11,7 +11,7 @@  -<project default="main" basedir="../.." name="JBossWS-SunRI-JBoss50"> +<project default="main" basedir="../.." name="JBossWS-CXF"> <import file="${basedir}/build/ant-import/build-setup.xml"/> @@ -42,6 +42,7 @@ <target name="init" depends="prepare,thirdparty"> <ant antfile="${spi.dir}/build.xml" target="jars" inheritall="false"/> + <mkdir dir="${xfire.output.apidocs.dir}"/> </target>  @@ -243,10 +244,8 @@ </target>  - <target name="javadoc" depends="init" description="Generate the Javadoc" if="javadoc"> + <target name="javadoc" depends="init" description="Generate the Javadoc" unless="nojavadoc"> - <mkdir dir="${xfire.output.apidocs.dir}"/> -  <mkdir dir="${xfire.output.dir}/thirdparty-sources"/> <unzip src="${thirdparty.dir}/xfire-distribution-sources.jar" dest="${xfire.output.dir}/thirdparty-sources"/> Modified: trunk/testsuite/src/etc/log4j.xml =================================================================== --- trunk/testsuite/src/etc/log4j.xml 2007-07-25 05:56:07 UTC (rev 3985) +++ trunk/testsuite/src/etc/log4j.xml 2007-07-25 08:15:11 UTC (rev 3986) @@ -23,7 +23,7 @@  <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender"> <param name="File" value="${build.testlog}/test.log"/> - <param name="Append" value="false"/> + <param name="Append" value="true"/>  <param name="DatePattern" value="'.'yyyy-MM-dd"/>

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r3985 - in trunk/integration/xfire: ant-import and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-07-25 01:56:07 -0400 (Wed, 25 Jul 2007) New Revision: 3985 Modified: trunk/integration/xfire/ant-import/build-bin-dist.xml trunk/integration/xfire/build.xml trunk/integration/xfire/src/main/etc/bin-dist-build.xml Log: CXF distro Modified: trunk/integration/xfire/ant-import/build-bin-dist.xml =================================================================== --- trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-07-24 23:06:45 UTC (rev 3984) +++ trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-07-25 05:56:07 UTC (rev 3985) @@ -21,7 +21,6 @@ <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/> <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/> - <ant antfile="${int.sunri.dir}/build.xml" target="thirdparty" inheritall="false"/> <property name="bindist.dir" value="${xfire.output.dir}/jbossws-xfire-${version.id}"/> <property name="bindist.bin.dir" value="${bindist.dir}/bin"/> @@ -34,7 +33,7 @@ <delete dir="${bindist.dir}"/> <mkdir dir="${bindist.build.dir}"/> <mkdir dir="${bindist.bin.dir}"/> - <mkdir dir="${bindist.lib.dir}/client"/> + <mkdir dir="${bindist.lib.dir}"/> <mkdir dir="${bindist.docs.dir}"/> <mkdir dir="${bindist.tests.dir}"/> <mkdir dir="${bindist.tools.dir}"/> @@ -82,10 +81,11 @@ </copy> <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/> -  +  <copy todir="${bindist.docs.dir}"> <fileset dir="${build.dir}/etc"> @@ -118,14 +118,6 @@ <fileset dir="${int.xfire.dir}/thirdparty"/> </copy> -  - <copy todir="${bindist.lib.dir}/client" overwrite="true"> - <fileset dir="${int.sunri.dir}/thirdparty"/> - </copy> -  <copy todir="${bindist.tests.dir}" overwrite="true"> <fileset dir="${testsuite.dir}/src"/> Modified: trunk/integration/xfire/build.xml =================================================================== --- trunk/integration/xfire/build.xml 2007-07-24 23:06:45 UTC (rev 3984) +++ trunk/integration/xfire/build.xml 2007-07-25 05:56:07 UTC (rev 3985) @@ -243,7 +243,7 @@ </target>  - <target name="javadoc" depends="init" description="Generate the Javadoc"> + <target name="javadoc" depends="init" description="Generate the Javadoc" if="javadoc"> <mkdir dir="${xfire.output.apidocs.dir}"/> Modified: trunk/integration/xfire/src/main/etc/bin-dist-build.xml =================================================================== --- trunk/integration/xfire/src/main/etc/bin-dist-build.xml 2007-07-24 23:06:45 UTC (rev 3984) +++ trunk/integration/xfire/src/main/etc/bin-dist-build.xml 2007-07-25 05:56:07 UTC (rev 3985) @@ -78,44 +78,23 @@ <target name="tests-init" depends="prepare,tests-classpath"> -  - <path id="sunri.classpath"> - <pathelement location="${thirdparty.dir}/client/FastInfoset.jar"/> - <pathelement location="${thirdparty.dir}/client/http.jar"/> - <pathelement location="${thirdparty.dir}/client/jaxws-api.jar"/> - <pathelement location="${thirdparty.dir}/client/jaxws-rt.jar"/> - <pathelement location="${thirdparty.dir}/client/jaxws-tools.jar"/> - <pathelement location="${thirdparty.dir}/client/jsr173_api.jar"/> - <pathelement location="${thirdparty.dir}/client/jsr181-api.jar"/> - <pathelement location="${thirdparty.dir}/client/jsr250-api.jar"/> - <pathelement location="${thirdparty.dir}/client/resolver.jar"/> - <pathelement location="${thirdparty.dir}/client/saaj-api.jar"/> - <pathelement location="${thirdparty.dir}/client/saaj-impl.jar"/> - <pathelement location="${thirdparty.dir}/client/sjsxp.jar"/> - <pathelement location="${thirdparty.dir}/client/stax-ex.jar"/> - <pathelement location="${thirdparty.dir}/client/streambuffer.jar"/> - <pathelement location="${thirdparty.dir}/client/wstx.jar"/> - </path> - - <path id="xfire.classpath"> - <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> - <pathelement location="${thirdparty.dir}/jdom.jar"/> - <pathelement location="${thirdparty.dir}/saaj-api.jar"/> - <pathelement location="${thirdparty.dir}/saaj-impl.jar"/> - <pathelement location="${thirdparty.dir}/xfire-all.jar"/> - <pathelement location="${thirdparty.dir}/xfire-jsr181-api.jar"/> - </path> - <path id="ws.stack.classpath"> - <path refid="sunri.classpath"/> + <pathelement location="${lib.dir}/jbossws-spi.jar"/> + <pathelement location="${lib.dir}/cxf-incubator.jar"/> + <pathelement location="${lib.dir}/geronimo-javamail.jar"/> + <pathelement location="${lib.dir}/geronimo-ws-metadata.jar"/> + <pathelement location="${lib.dir}/jaxws-api.jar"/> + <pathelement location="${lib.dir}/jdom.jar"/> + <pathelement location="${lib.dir}/neethi.jar"/> + <pathelement location="${lib.dir}/resolver.jar"/> + <pathelement location="${lib.dir}/saaj-api.jar"/> + <pathelement location="${lib.dir}/saaj-impl.jar"/> + <pathelement location="${lib.dir}/wsdl4j.jar"/> + <pathelement location="${lib.dir}/wstx.jar"/> + <pathelement location="${lib.dir}/XmlSchema.jar"/> </path> <path id="tests.extra.classpath"> - <pathelement location="${lib.dir}/jbossws-spi.jar"/> - <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> </path> </target>

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r3984 - branches/jbossws-1.2.0.SP1_JBWS-1764/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-07-24 19:06:45 -0400 (Tue, 24 Jul 2007) New Revision: 3984 Modified: branches/jbossws-1.2.0.SP1_JBWS-1764/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java Log: JBWS-1764 - UTF-8 Messages Not Correctly Handled Under Windows Modified: branches/jbossws-1.2.0.SP1_JBWS-1764/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java =================================================================== --- branches/jbossws-1.2.0.SP1_JBWS-1764/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java 2007-07-24 22:46:30 UTC (rev 3983) +++ branches/jbossws-1.2.0.SP1_JBWS-1764/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java 2007-07-24 23:06:45 UTC (rev 3984) @@ -35,6 +35,7 @@ import org.jboss.ws.WSException; import java.io.ByteArrayOutputStream; +import java.io.UnsupportedEncodingException; /** The base class for all Deserializers. * @@ -62,7 +63,7 @@ ByteArrayOutputStream baos = new ByteArrayOutputStream(1024); StreamResult streamResult = new StreamResult(baos); tf.newTransformer().transform(source, streamResult); - xmlFragment = new String(baos.toByteArray()); + xmlFragment = new String(baos.toByteArray(), "UTF-8"); if (xmlFragment.startsWith("<?xml")) { int index = xmlFragment.indexOf(">"); @@ -70,6 +71,8 @@ } } catch (TransformerException e) { WSException.rethrow(e); + } catch (UnsupportedEncodingException e) { + WSException.rethrow(e); } return xmlFragment;

17 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits July 2007