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;