Author: thomas.diesler(a)jboss.com Date: 2007-07-26 09:43:59 -0400 (Thu, 26 Jul 2007) New Revision: 4000 Removed: 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/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 Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.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/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/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/ApplicationMetaDataAdapterEJB21.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.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/InvocationHandlerEJB3.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/PublishContractDeploymentAspect.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/ContextRootDeploymentAspect.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/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.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 trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java Log: Remove 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-26 11:33:20 UTC (rev 3999) +++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -30,13 +30,11 @@ import org.jboss.aop.Dispatcher; import org.jboss.ejb3.stateless.StatelessContainer; +import org.jboss.wsf.common.ObjectNameFactory; import org.jboss.wsf.spi.deployment.ArchiveDeployment; -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.Invocation; import org.jboss.wsf.spi.invocation.InvocationHandler; -import org.jboss.wsf.common.ObjectNameFactory; /** * Handles invocations on EJB3 endpoints. Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java 2007-07-26 11:33:20 UTC (rev 3999) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -31,7 +31,6 @@ import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.BeanMetaData; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter; @@ -44,7 +43,7 @@ */ public abstract class AbstractApplicationMetaDataAdapter { - public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentInfo di) + public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, DeploymentInfo di) { ApplicationMetaData apmd = (ApplicationMetaData)di.metaData; dep.getContext().addAttachment(ApplicationMetaData.class, apmd); 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-26 11:33:20 UTC (rev 3999) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -35,7 +35,6 @@ import org.jboss.mx.util.MBeanProxyCreationException; import org.jboss.mx.util.MBeanServerLocator; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.deployment.WSFDeploymentException; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; @@ -51,12 +50,14 @@ { // logging support private static Logger log = Logger.getLogger(ApplicationMetaDataAdapterEJB3.class); + + public static final String DEPLOYED_OBJECT = "org.jboss.ws.ejb3.deployed.object"; - public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, UnifiedDeploymentInfo udi) + public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep) { UnifiedApplicationMetaData appMetaData = null; - ObjectName oname = (ObjectName)dep.getContext().getProperty("DeployedObject"); + ObjectName oname = (ObjectName)dep.getContext().getProperty(DEPLOYED_OBJECT); // jboss.j2ee:service=EJB3,module=some-ejb3.jar if (oname != null && oname.getDomain().equals("jboss.j2ee") && "EJB3".equals(oname.getKeyProperty("service"))) 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-26 11:33:20 UTC (rev 3999) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -31,9 +31,9 @@ import org.jboss.logging.Logger; import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.WebMetaData; -import org.jboss.wsf.spi.deployment.ArchiveDeployment; +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.DeploymentContext; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; @@ -68,27 +68,33 @@ this.webMetaDataAdapter = adapter; } - public UnifiedDeploymentInfo buildDeploymentInfo(Deployment dep, UnifiedDeploymentInfo udi, DeploymentInfo di) + public void buildDeploymentInfo(Deployment dep, DeploymentInfo di) { - dep.getContext().addAttachment(DeploymentInfo.class, di); + DeploymentContext ctx = dep.getContext(); + + ctx.addAttachment(DeploymentInfo.class, di); + ctx.setProperty(ApplicationMetaDataAdapterEJB3.DEPLOYED_OBJECT, di.deployedObject); - if (di.parent != null) + if (di.metaData instanceof WebMetaData) { - udi.setParent(new UnifiedDeploymentInfo()); - buildDeploymentInfo(dep, udi.getParent(), di.parent); + UnifiedWebMetaData webMetaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, di); + if (webMetaData != null) + ctx.addAttachment(UnifiedWebMetaData.class, webMetaData); + + ctx.setProperty(WebXMLRewriter.WEBAPP_URL, getDeploymentURL(di)); } - - //udi.setVfRoot(new ResourceLoaderAdapter(di.localCl)); - //udi.setSimpleName(di.shortName); - udi.setUrl(getDeploymentURL(di)); - - if (di.deployedObject != null) - dep.getContext().setProperty("DeployedObject", di.deployedObject); - - buildMetaData(dep, udi, di); - - log.debug("UnifiedDeploymentInfo:\n" + udi); - return udi; + else if (dep.getType() == DeploymentType.JAXRPC_EJB3 || dep.getType() == DeploymentType.JAXWS_EJB3) + { + UnifiedApplicationMetaData appMetaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep); + if (appMetaData != null) + ctx.addAttachment(UnifiedApplicationMetaData.class, appMetaData); + } + else if (di.metaData instanceof ApplicationMetaData) + { + UnifiedApplicationMetaData appMetaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, di); + if (appMetaData != null) + ctx.addAttachment(UnifiedApplicationMetaData.class, appMetaData); + } } private URL getDeploymentURL(DeploymentInfo di) @@ -111,26 +117,4 @@ } return deploymentURL; } - - private void buildMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentInfo di) - { - if (di.metaData instanceof WebMetaData) - { - UnifiedWebMetaData webMetaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, di); - if (webMetaData != null) - dep.getContext().addAttachment(UnifiedWebMetaData.class, webMetaData); - } - else if (dep.getType() == DeploymentType.JAXRPC_EJB3 || dep.getType() == DeploymentType.JAXWS_EJB3) - { - UnifiedApplicationMetaData appMetaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi); - if (appMetaData != null) - dep.getContext().addAttachment(UnifiedApplicationMetaData.class, appMetaData); - } - else if (di.metaData instanceof ApplicationMetaData) - { - UnifiedApplicationMetaData appMetaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, di); - if (appMetaData != null) - dep.getContext().addAttachment(UnifiedApplicationMetaData.class, appMetaData); - } - } } 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-26 11:33:20 UTC (rev 3999) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -42,7 +42,6 @@ import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.invocation.ExtendableWebServiceContext; import org.jboss.wsf.spi.invocation.Invocation; import org.jboss.wsf.spi.invocation.InvocationHandler; 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-26 11:33:20 UTC (rev 3999) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB3.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -36,7 +36,6 @@ import org.jboss.mx.util.MBeanServerLocator; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.SecurityHandler; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.deployment.WSFDeploymentException; /** @@ -51,7 +50,7 @@ { String securityDomain = null; - ObjectName deployedObject = (ObjectName)dep.getContext().getProperty("DeployedObject"); + ObjectName deployedObject = (ObjectName)dep.getContext().getProperty(ApplicationMetaDataAdapterEJB3.DEPLOYED_OBJECT); Ejb3ModuleMBean ejb3Module = getEJB3Module(deployedObject); for (Object manager : ejb3Module.getContainers().values()) { @@ -82,7 +81,7 @@ public void addSecurityRoles(Element webApp, Deployment dep) { // The container objects below provide access to all of the ejb metadata - ObjectName deployedObject = (ObjectName)dep.getContext().getProperty("DeployedObject"); + ObjectName deployedObject = (ObjectName)dep.getContext().getProperty(ApplicationMetaDataAdapterEJB3.DEPLOYED_OBJECT); Ejb3ModuleMBean ejb3Module = getEJB3Module(deployedObject); for (Object manager : ejb3Module.getContainers().values()) { 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-26 11:33:20 UTC (rev 3999) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeploymentAspect.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -24,13 +24,8 @@ //$Id: UnifiedDeploymentInfoDeployer.java 3407 2007-06-03 16:06:36Z thomas.diesler(a)jboss.com $ import org.jboss.deployment.DeploymentInfo; -import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.JAXRPCDeployment; -import org.jboss.wsf.spi.deployment.JAXWSDeployment; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; +import org.jboss.wsf.spi.deployment.DeploymentAspect; /** * A deployer that builds the UnifiedDeploymentInfo @@ -41,7 +36,7 @@ public class UnifiedDeploymentInfoDeploymentAspect extends DeploymentAspect { private DeploymentInfoAdapter deploymentInfoAdapter; - + public void setDeploymentInfoAdapter(DeploymentInfoAdapter adapter) { this.deploymentInfoAdapter = adapter; @@ -50,27 +45,10 @@ @Override public void create(Deployment dep) { - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - if (udi == null) - { - DeploymentInfo unit = dep.getContext().getAttachment(DeploymentInfo.class); - if (unit == null) - throw new IllegalStateException("Cannot obtain deployment unit"); + DeploymentInfo di = dep.getContext().getAttachment(DeploymentInfo.class); + if (di == null) + throw new IllegalStateException("Cannot obtain deployment info"); - DeploymentType type = dep.getType(); - if (type.toString().startsWith("JAXWS")) - { - udi = new JAXWSDeployment(type); - deploymentInfoAdapter.buildDeploymentInfo(dep, udi, unit); - } - else - { - WebservicesMetaData wsMetaData = dep.getContext().getAttachment(WebservicesMetaData.class); - udi = new JAXRPCDeployment(type, wsMetaData); - deploymentInfoAdapter.buildDeploymentInfo(dep, udi, unit); - } - - dep.getContext().addAttachment(UnifiedDeploymentInfo.class, udi); - } + deploymentInfoAdapter.buildDeploymentInfo(dep, di); } } \ No newline at end of file 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-26 11:33:20 UTC (rev 3999) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -58,10 +58,6 @@ { if (dep.getType().toString().endsWith("EJB21") || dep.getType().toString().endsWith("EJB3")) { - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - if (udi == null) - throw new IllegalStateException("Cannot obtain unified deployement info"); - URL warURL = (URL)dep.getContext().getProperty(WebXMLRewriter.WEBAPP_URL); log.debug("publishServiceEndpoint: " + warURL); @@ -87,14 +83,10 @@ public void destroy(Deployment dep) { - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - if (udi == null) - throw new IllegalStateException("Cannot obtain unified deployement info"); - URL warURL = (URL)dep.getContext().getProperty(WebXMLRewriter.WEBAPP_URL); if (warURL == null) { - log.error("Cannot obtain warURL for: " + udi); + log.error("Cannot obtain warURL"); 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-26 11:33:20 UTC (rev 3999) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -36,9 +36,7 @@ import org.jboss.metadata.WebMetaData; import org.jboss.metadata.WebSecurityMetaData; import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection; -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.metadata.j2ee.UnifiedWebMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter; @@ -52,7 +50,7 @@ */ public class WebMetaDataAdapter { - public UnifiedWebMetaData buildUnifiedWebMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentInfo di) + public UnifiedWebMetaData buildUnifiedWebMetaData(Deployment dep, DeploymentInfo di) { String contextRoot = null; @@ -84,8 +82,6 @@ webMetaData.setPublishLocationAdapter(getPublishLocationAdpater(wmd)); webMetaData.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints())); - dep.getContext().setProperty(WebXMLRewriter.WEBAPP_URL, udi.getUrl()); - return webMetaData; } Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java 2007-07-26 11:33:20 UTC (rev 3999) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -29,7 +29,6 @@ import org.jboss.metadata.ApplicationMetaData.WebserviceDescription; import org.jboss.metadata.ApplicationMetaData.Webservices; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.metadata.j2ee.*; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter; @@ -48,7 +47,7 @@ // logging support private static Logger log = Logger.getLogger(ApplicationMetaDataAdapterEJB21.class); - public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentUnit unit) + public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, DeploymentUnit unit) { ApplicationMetaData appMetaData = unit.getAttachment(ApplicationMetaData.class); dep.getContext().addAttachment(ApplicationMetaData.class, appMetaData); @@ -58,7 +57,6 @@ buildWebservicesMetaData(umd, appMetaData); umd.setSecurityDomain(appMetaData.getSecurityDomain()); - dep.getContext().addAttachment(UnifiedApplicationMetaData.class, umd); return umd; } Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java 2007-07-26 11:33:20 UTC (rev 3999) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -32,7 +32,6 @@ import org.jboss.ejb3.metamodel.*; import org.jboss.logging.Logger; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.metadata.j2ee.*; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter; @@ -51,7 +50,7 @@ // logging support private static Logger log = Logger.getLogger(ApplicationMetaDataAdapterEJB3.class); - public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentUnit unit) + public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, DeploymentUnit unit) { Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class); dep.getContext().addAttachment(Ejb3Deployment.class, ejb3Deployment); @@ -61,7 +60,6 @@ buildUnifiedBeanMetaData(umd, ejb3Deployment); buildWebservicesMetaData(umd, jarDD); - dep.getContext().addAttachment(UnifiedApplicationMetaData.class, umd); return umd; } 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-26 11:33:20 UTC (rev 3999) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -21,19 +21,21 @@ */ package org.jboss.wsf.container.jboss50; +//$Id$ + +import java.net.URL; + import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; import org.jboss.ejb3.Ejb3Deployment; import org.jboss.logging.Logger; import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.WebMetaData; -import org.jboss.virtual.VirtualFile; import org.jboss.wsf.framework.deployment.WebXMLRewriter; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; -// $Id$ - /** * Build container independent deployment info. * @@ -64,32 +66,41 @@ this.webMetaDataAdapter = adapter; } - public void buildDeploymentInfo(Deployment dep, UnifiedDeploymentInfo udi, DeploymentUnit unit) + public void buildDeploymentInfo(Deployment dep, DeploymentUnit unit) { dep.getContext().addAttachment(DeploymentUnit.class, unit); try { - if (unit.getParent() != null) + // JSE endpoints + if (unit.getAttachment(WebMetaData.class) != null) { - udi.setParent(new UnifiedDeploymentInfo()); - buildDeploymentInfo(dep, udi.getParent(), unit.getParent()); - } + UnifiedWebMetaData webMetaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, unit); + if (webMetaData != null) + dep.getContext().addAttachment(UnifiedWebMetaData.class, webMetaData); - VirtualFile vfsRoot = ((VFSDeploymentUnit)unit).getRoot(); - //udi.setVfRoot(new VirtualFileAdaptor(vfsRoot)); - - //udi.setSimpleName(unit.getSimpleName()); - udi.setUrl(vfsRoot.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.setClassLoader(new URLClassLoader(new URL[] {}, unit.getClassLoader())); - - log.debug("UnifiedDeploymentInfo:\n" + udi); + if (dep instanceof ArchiveDeployment) + { + URL webURL = ((ArchiveDeployment)dep).getRootFile().toURL(); + dep.getContext().setProperty(WebXMLRewriter.WEBAPP_URL, webURL); + } + } + + // EJB3 endpoints + else if (unit.getAttachment(Ejb3Deployment.class) != null) + { + UnifiedApplicationMetaData appMetaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, unit); + if (appMetaData != null) + dep.getContext().addAttachment(UnifiedApplicationMetaData.class, appMetaData); + } + + // EJB21 endpoints + else if (unit.getAttachment(ApplicationMetaData.class) != null) + { + UnifiedApplicationMetaData appMetaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, unit); + if (appMetaData != null) + dep.getContext().addAttachment(UnifiedApplicationMetaData.class, appMetaData); + } } catch (RuntimeException rte) { @@ -100,21 +111,4 @@ throw new IllegalStateException(ex); } } - - private void buildMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentUnit unit) throws Exception - { - if (unit.getAttachment(WebMetaData.class) != null) - { - webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, unit); - dep.getContext().setProperty(WebXMLRewriter.WEBAPP_URL, udi.getUrl()); - } - else if (unit.getAttachment(Ejb3Deployment.class) != null) - { - applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi, unit); - } - else if (unit.getAttachment(ApplicationMetaData.class) != null) - { - applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, unit); - } - } } 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-26 11:33:20 UTC (rev 3999) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -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,18 +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.ArchiveDeployment; 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/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-26 11:33:20 UTC (rev 3999) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -24,9 +24,8 @@ //$Id: UnifiedDeploymentInfoDeployer.java 3772 2007-07-01 19:29:13Z thomas.diesler(a)jboss.com $ import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.wsf.spi.deployment.*; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.DeploymentAspect; /** * A deployer that builds the UnifiedDeploymentInfo @@ -37,36 +36,19 @@ public class UnifiedDeploymentInfoDeploymentAspect extends DeploymentAspect { private DeploymentInfoAdapter deploymentInfoAdapter = new DeploymentInfoAdapter(); - + public void setDeploymentInfoAdapter(DeploymentInfoAdapter adapter) { this.deploymentInfoAdapter = adapter; } - + @Override public void create(Deployment dep) { - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - if (udi == null) - { - DeploymentUnit unit = dep.getContext().getAttachment(DeploymentUnit.class); - if (unit == null) - throw new IllegalStateException("Cannot obtain deployment unit"); + DeploymentUnit unit = dep.getContext().getAttachment(DeploymentUnit.class); + if (unit == null) + throw new IllegalStateException("Cannot obtain deployment unit"); - DeploymentType type = dep.getType(); - if (type.toString().startsWith("JAXWS")) - { - udi = new JAXWSDeployment(type); - deploymentInfoAdapter.buildDeploymentInfo(dep, udi, unit); - } - else - { - WebservicesMetaData wsMetaData = dep.getContext().getAttachment(WebservicesMetaData.class); - udi = new JAXRPCDeployment(type, wsMetaData); - deploymentInfoAdapter.buildDeploymentInfo(dep, udi, unit); - } - - dep.getContext().addAttachment(UnifiedDeploymentInfo.class, udi); - } + deploymentInfoAdapter.buildDeploymentInfo(dep, unit); } } \ No newline at end of file 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-26 11:33:20 UTC (rev 3999) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -23,6 +23,10 @@ // $Id: WebAppDeployerDeployer.java 3772 2007-07-01 19:29:13Z thomas.diesler(a)jboss.com $ +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + import org.jboss.deployers.client.spi.DeployerClient; import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory; import org.jboss.logging.Logger; @@ -31,13 +35,8 @@ 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; import org.jboss.wsf.spi.deployment.WSFDeploymentException; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; - /** * Publish the HTTP service endpoint to Tomcat * @@ -67,10 +66,6 @@ { if (dep.getType().toString().endsWith("EJB21") || dep.getType().toString().endsWith("EJB3")) { - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - if (udi == null) - throw new IllegalStateException("Cannot obtain unified deployement info"); - URL warURL = (URL)dep.getContext().getProperty(WebXMLRewriter.WEBAPP_URL); log.debug("publishServiceEndpoint: " + warURL); @@ -92,14 +87,10 @@ public void destroy(Deployment dep) { - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - if (udi == null) - throw new IllegalStateException("Cannot obtain unified deployement info"); - URL warURL = (URL)dep.getContext().getProperty(WebXMLRewriter.WEBAPP_URL); if (warURL == null) { - log.error("Cannot obtain warURL for: " + udi); + log.error("Cannot obtain warURL"); 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-26 11:33:20 UTC (rev 3999) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -32,7 +32,6 @@ import org.jboss.metadata.web.Servlet; import org.jboss.metadata.web.ServletMapping; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter; import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData; @@ -48,7 +47,7 @@ */ public class WebMetaDataAdapter { - public UnifiedWebMetaData buildUnifiedWebMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentUnit unit) + public UnifiedWebMetaData buildUnifiedWebMetaData(Deployment dep, DeploymentUnit unit) { String contextRoot = null; @@ -79,7 +78,6 @@ umd.setPublishLocationAdapter(getPublishLocationAdpater(wmd)); umd.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints())); - dep.getContext().addAttachment(UnifiedWebMetaData.class, umd); return umd; } 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-26 11:33:20 UTC (rev 3999) +++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -27,9 +27,8 @@ import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.wsf.spi.deployment.ArchiveDeployment; -import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.WSFDeploymentException; /** @@ -43,17 +42,13 @@ @Override public void create(Deployment dep) { - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - if (udi == null) - throw new IllegalStateException("Cannot obtain unified deployement info"); - UnifiedMetaData umd = dep.getContext().getAttachment(UnifiedMetaData.class); if (umd == null) throw new IllegalStateException("Cannot obtain unified meta data"); try { - WSDLFilePublisher publisher = new WSDLFilePublisher((ArchiveDeployment)dep, udi); + WSDLFilePublisher publisher = new WSDLFilePublisher((ArchiveDeployment)dep); publisher.publishWsdlFiles(umd); } catch (IOException ex) 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-26 11:33:20 UTC (rev 3999) +++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -30,8 +30,10 @@ import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.wsf.spi.deployment.JAXRPCDeployment; -import org.jboss.wsf.spi.deployment.*; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; +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.Deployment.DeploymentType; /** @@ -48,29 +50,25 @@ UnifiedMetaData umd = dep.getContext().getAttachment(UnifiedMetaData.class); if (umd == null) { - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - if (udi == null) - throw new IllegalStateException("Cannot obtain unified deployment info"); - if (dep.getType() == DeploymentType.JAXRPC_JSE) { JAXRPCServerMetaDataBuilder builder = new JAXRPCServerMetaDataBuilder(); - umd = builder.buildMetaData((ArchiveDeployment)dep, (JAXRPCDeployment)udi); + umd = builder.buildMetaData((ArchiveDeployment)dep); } else if (dep.getType() == DeploymentType.JAXRPC_EJB21) { JAXRPCServerMetaDataBuilder builder = new JAXRPCServerMetaDataBuilder(); - umd = builder.buildMetaData((ArchiveDeployment)dep, (JAXRPCDeployment)udi); + umd = builder.buildMetaData((ArchiveDeployment)dep); } else if (dep.getType() == DeploymentType.JAXWS_JSE) { JAXWSMetaDataBuilderJSE builder = new JAXWSMetaDataBuilderJSE(); - umd = builder.buildMetaData((ArchiveDeployment)dep, udi); + umd = builder.buildMetaData((ArchiveDeployment)dep); } else if (dep.getType() == DeploymentType.JAXWS_EJB3) { JAXWSMetaDataBuilderEJB3 builder = new JAXWSMetaDataBuilderEJB3(); - umd = builder.buildMetaData((ArchiveDeployment)dep, udi); + umd = builder.buildMetaData((ArchiveDeployment)dep); } else { 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-26 11:33:20 UTC (rev 3999) +++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -52,7 +52,6 @@ import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.ArchiveDeployment; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.management.ServerConfig; import org.jboss.wsf.spi.management.ServerConfigFactory; import org.w3c.dom.Document; @@ -70,14 +69,12 @@ // The deployment info for the web service archive private ArchiveDeployment dep; - private UnifiedDeploymentInfo udi; // The expected wsdl location in the deployment private String expLocation; - public WSDLFilePublisher(ArchiveDeployment dep, UnifiedDeploymentInfo udi) + public WSDLFilePublisher(ArchiveDeployment dep) { this.dep = dep; - this.udi = udi; if (dep.getType().toString().endsWith("JSE")) { 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-26 11:33:20 UTC (rev 3999) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -24,13 +24,12 @@ //$Id$ import org.jboss.wsf.spi.annotation.WebContext; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; import org.jboss.wsf.spi.deployment.ArchiveDeployment; -import org.jboss.wsf.spi.deployment.DeploymentAspect; 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.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; /** * A deployer that assigns the context root to the service Deleted: 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-26 11:33:20 UTC (rev 3999) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXRPCClientDeployment.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -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; - -//$Id$ - -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; - -/** - * The container independent deployment info. - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class JAXRPCClientDeployment extends UnifiedDeploymentInfo -{ - - public JAXRPCClientDeployment(DeploymentType type) - { - super(); - } -} Deleted: 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-26 11:33:20 UTC (rev 3999) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXRPCDeployment.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -1,88 +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 java.io.InputStream; -import java.net.URL; - -import org.jboss.ws.integration.UnifiedVirtualFile; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; -import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; -import org.jboss.xb.binding.ObjectModelFactory; -import org.jboss.xb.binding.Unmarshaller; -import org.jboss.xb.binding.UnmarshallerFactory; - -// $Id$ - -/** - * The container independent deployment info. - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class JAXRPCDeployment extends UnifiedDeploymentInfo -{ - private WebservicesMetaData wsMetaData; - - public JAXRPCDeployment(DeploymentType type, WebservicesMetaData wsMetaData) - { - super(); - this.wsMetaData = wsMetaData; - } - - public JAXRPCDeployment(DeploymentType type, UnifiedVirtualFile vfWebservices) - { - super(); - - try - { - // Unmarshall webservices.xml - URL webservicesURL = vfWebservices.toURL(); - InputStream is = webservicesURL.openStream(); - try - { - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - ObjectModelFactory factory = new WebservicesFactory(webservicesURL); - wsMetaData = (WebservicesMetaData)unmarshaller.unmarshal(is, factory, null); - } - finally - { - is.close(); - } - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception ex) - { - throw new IllegalStateException(ex); - } - } - - public WebservicesMetaData getWebservicesMetaData() - { - return wsMetaData; - } -} Deleted: 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-26 11:33:20 UTC (rev 3999) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXWSDeployment.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.framework.deployment; - -//$Id$ - -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; - -/** - * The container independent deployment info. - * - * @author Thomas.Diesler(a)jboss.org - * @since 29-Jun-2006 - */ -public class JAXWSDeployment extends UnifiedDeploymentInfo -{ - public JAXWSDeployment(DeploymentType type) - { - super(); - } -} 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-26 11:33:20 UTC (rev 3999) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -34,15 +34,20 @@ import org.dom4j.Element; import org.dom4j.io.OutputFormat; import org.dom4j.io.XMLWriter; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.annotation.WebContext; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; +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.SecurityHandler; +import org.jboss.wsf.spi.deployment.WSFDeploymentException; import org.jboss.wsf.spi.management.ServerConfig; import org.jboss.wsf.spi.management.ServerConfigFactory; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData; -import org.jboss.wsf.spi.deployment.*; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; /** * A deployer that generates a webapp for an EJB endpoint @@ -68,10 +73,6 @@ @Override public void create(Deployment dep) { - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - if (udi == null) - throw new IllegalStateException("Cannot obtain unified deployement info"); - if (dep.getType().toString().endsWith("EJB21")) { URL webAppURL = generatWebDeployment((ArchiveDeployment)dep, securityHandlerEJB21); @@ -97,7 +98,6 @@ ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig(); File tmpdir = new File(config.getServerTempDir().getCanonicalPath() + "/deploy"); - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); String deploymentName = dep.getCanonicalName().replace('/', '-'); tmpWar = File.createTempFile(deploymentName, ".war", tmpdir); tmpWar.delete(); @@ -128,8 +128,6 @@ private Document createWebAppDescriptor(Deployment dep, SecurityHandler securityHandler) { - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - Document document = DocumentHelper.createDocument(); Element webApp = document.addElement("web-app"); @@ -172,7 +170,7 @@ String beanAuthMethod = null; WebContext anWebContext = (WebContext)ep.getTargetBeanClass().getAnnotation(WebContext.class); - if(anWebContext != null) + if (anWebContext != null) { if (anWebContext.authMethod().length() > 0) beanAuthMethod = anWebContext.authMethod(); 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-26 11:33:20 UTC (rev 3999) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -33,8 +33,8 @@ import org.dom4j.io.OutputFormat; import org.dom4j.io.SAXReader; import org.dom4j.io.XMLWriter; -import org.jboss.wsf.spi.deployment.*; import org.jboss.wsf.common.IOUtils; +import org.jboss.wsf.spi.deployment.Deployment; /** * The rewriter for web.xml @@ -63,10 +63,6 @@ public RewriteResults rewriteWebXml(Deployment dep) { - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - if (udi == null) - throw new IllegalStateException("Cannot obtain unified deployment info"); - URL warURL = (URL)dep.getContext().getProperty(WebXMLRewriter.WEBAPP_URL); File warFile = new File(warURL.getFile()); if (warFile.isDirectory() == false) Deleted: 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-26 11:33:20 UTC (rev 3999) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXRPCClientDeployment.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -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; - -//$Id$ - -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; - -/** - * The container independent deployment info. - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class JAXRPCClientDeployment extends UnifiedDeploymentInfo -{ - - public JAXRPCClientDeployment(DeploymentType type) - { - super(); - } -} Deleted: 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-26 11:33:20 UTC (rev 3999) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXRPCDeployment.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -1,88 +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.io.InputStream; -import java.net.URL; - -import org.jboss.ws.integration.UnifiedVirtualFile; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; -import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; -import org.jboss.xb.binding.ObjectModelFactory; -import org.jboss.xb.binding.Unmarshaller; -import org.jboss.xb.binding.UnmarshallerFactory; - -// $Id$ - -/** - * The container independent deployment info. - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class JAXRPCDeployment extends UnifiedDeploymentInfo -{ - private WebservicesMetaData wsMetaData; - - public JAXRPCDeployment(DeploymentType type, WebservicesMetaData wsMetaData) - { - super(); - this.wsMetaData = wsMetaData; - } - - public JAXRPCDeployment(DeploymentType type, UnifiedVirtualFile vfWebservices) - { - super(); - - try - { - // Unmarshall webservices.xml - URL webservicesURL = vfWebservices.toURL(); - InputStream is = webservicesURL.openStream(); - try - { - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - ObjectModelFactory factory = new WebservicesFactory(webservicesURL); - wsMetaData = (WebservicesMetaData)unmarshaller.unmarshal(is, factory, null); - } - finally - { - is.close(); - } - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception ex) - { - throw new IllegalStateException(ex); - } - } - - public WebservicesMetaData getWebservicesMetaData() - { - return wsMetaData; - } -} Deleted: 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-26 11:33:20 UTC (rev 3999) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXWSDeployment.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.spi.deployment; - -//$Id$ - -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; - -/** - * The container independent deployment info. - * - * @author Thomas.Diesler(a)jboss.org - * @since 29-Jun-2006 - */ -public class JAXWSDeployment extends UnifiedDeploymentInfo -{ - public JAXWSDeployment(DeploymentType type) - { - super(); - } -} Deleted: 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-26 11:33:20 UTC (rev 3999) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -1,60 +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; - -// $Id$ - -import java.net.URL; - -/** - * The container independent deployment info. - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class UnifiedDeploymentInfo -{ - /** Sub deployments have a parent */ - private UnifiedDeploymentInfo parent; - /** The URL for this deployment */ - private URL url; - - public void setUrl(URL url) - { - this.url = url; - } - - public URL getUrl() - { - return url; - } - - public void setParent(UnifiedDeploymentInfo parent) - { - this.parent = parent; - } - - public UnifiedDeploymentInfo getParent() - { - return parent; - } -} Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2007-07-26 11:33:20 UTC (rev 3999) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -47,7 +47,6 @@ import org.jboss.ws.metadata.wsdl.WSDLInterface; import org.jboss.ws.metadata.wsdl.WSDLProperty; import org.jboss.ws.metadata.wsdl.WSDLService; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; /** * A meta data builder for policies; handles checks for policy support @@ -105,7 +104,7 @@ return builder; } - public void processPolicyAnnotations(EndpointMetaData epMetaData, Class<?> sepClass, UnifiedDeploymentInfo udi) + public void processPolicyAnnotations(EndpointMetaData epMetaData, Class<?> sepClass) { UnifiedVirtualFile vfRoot = epMetaData.getServiceMetaData().getUnifiedMetaData().getRootFile(); for (org.jboss.ws.extensions.policy.annotation.Policy anPolicy : sepClass.getAnnotation(PolicyAttachment.class).value()) 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-26 11:33:20 UTC (rev 3999) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -71,7 +71,6 @@ import org.jboss.wsf.spi.deployment.ArchiveDeployment; 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.management.ServerConfig; import org.jboss.wsf.spi.management.ServerConfigFactory; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; @@ -130,7 +129,7 @@ } } - protected void initEndpointAddress(Deployment dep, UnifiedDeploymentInfo udi, ServerEndpointMetaData sepMetaData) + protected void initEndpointAddress(Deployment dep, ServerEndpointMetaData sepMetaData) { String contextRoot = dep.getService().getContextRoot(); String urlPattern = null; @@ -175,7 +174,7 @@ sepMetaData.setEndpointAddress(getServiceEndpointAddress(null, servicePath)); } - public static ObjectName createServiceEndpointID(Deployment dep, UnifiedDeploymentInfo udi, ServerEndpointMetaData sepMetaData) + public static ObjectName createServiceEndpointID(Deployment dep, ServerEndpointMetaData sepMetaData) { String linkName = sepMetaData.getLinkName(); String context = sepMetaData.getContextRoot(); @@ -244,7 +243,7 @@ /** * Read the transport guarantee from web.xml */ - protected void initTransportGuaranteeJSE(Deployment dep, UnifiedDeploymentInfo udi, ServerEndpointMetaData sepMetaData, String servletLink) throws IOException + protected void initTransportGuaranteeJSE(Deployment dep, ServerEndpointMetaData sepMetaData, String servletLink) throws IOException { String transportGuarantee = null; UnifiedWebMetaData webMetaData = dep.getContext().getAttachment(UnifiedWebMetaData.class); 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-26 11:33:20 UTC (rev 3999) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -44,7 +44,6 @@ import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.JAXRPCDeployment; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData; @@ -53,6 +52,7 @@ import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; /** * A server side meta data builder that is based on webservices.xml. @@ -68,7 +68,7 @@ /** * Build from webservices.xml */ - public UnifiedMetaData buildMetaData(ArchiveDeployment dep, JAXRPCDeployment udi) + public UnifiedMetaData buildMetaData(ArchiveDeployment dep) { log.debug("START buildMetaData: [name=" + dep.getCanonicalName() + "]"); try @@ -78,7 +78,8 @@ wsMetaData.setDeploymentName(dep.getCanonicalName()); wsMetaData.setClassLoader(dep.getInitialClassLoader()); - WebserviceDescriptionMetaData[] wsDescriptionArr = udi.getWebservicesMetaData().getWebserviceDescriptions(); + WebservicesMetaData jaxrpcMapping = dep.getContext().getAttachment(WebservicesMetaData.class); + WebserviceDescriptionMetaData[] wsDescriptionArr = jaxrpcMapping.getWebserviceDescriptions(); for (WebserviceDescriptionMetaData wsdMetaData : wsDescriptionArr) { ServiceMetaData serviceMetaData = new ServiceMetaData(wsMetaData, null); @@ -141,7 +142,7 @@ initEndpointEncodingStyle(sepMetaData); - initEndpointAddress(dep, udi, sepMetaData); + initEndpointAddress(dep, sepMetaData); UnifiedApplicationMetaData apMetaData = dep.getContext().getAttachment(UnifiedApplicationMetaData.class); UnifiedWebMetaData webMetaData = dep.getContext().getAttachment(UnifiedWebMetaData.class); @@ -201,11 +202,11 @@ if (configName != null || configFile != null) sepMetaData.setConfigName(configName, configFile); - initTransportGuaranteeJSE(dep, udi, sepMetaData, linkName); + initTransportGuaranteeJSE(dep, sepMetaData, linkName); } // init service endpoint id - ObjectName sepID = createServiceEndpointID(dep, udi, sepMetaData); + ObjectName sepID = createServiceEndpointID(dep, 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-26 11:33:20 UTC (rev 3999) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -32,7 +32,6 @@ import org.jboss.ws.WSException; import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.wsf.spi.deployment.ArchiveDeployment; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; @@ -52,7 +51,7 @@ /** Build from webservices.xml */ - public UnifiedMetaData buildMetaData(ArchiveDeployment dep, UnifiedDeploymentInfo udi) + public UnifiedMetaData buildMetaData(ArchiveDeployment dep) { log.debug("START buildMetaData: [name=" + dep.getCanonicalName() + "]"); try @@ -72,7 +71,7 @@ if (beanClass.isAnnotationPresent(WebService.class) || beanClass.isAnnotationPresent(WebServiceProvider.class)) { String ejbLink = beanMetaData.getEjbName(); - JAXWSServerMetaDataBuilder.setupProviderOrWebService(dep, wsMetaData, udi, beanClass, ejbLink); + JAXWSServerMetaDataBuilder.setupProviderOrWebService(dep, wsMetaData, beanClass, ejbLink); // setup the security domain if (beanClass.isAnnotationPresent(SecurityDomain.class)) 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-26 11:33:20 UTC (rev 3999) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -28,7 +28,6 @@ import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; /** * A server side meta data builder that is based on JSR-181 annotations @@ -44,7 +43,7 @@ /** Build from annotations */ - public UnifiedMetaData buildMetaData(ArchiveDeployment dep, UnifiedDeploymentInfo udi) + public UnifiedMetaData buildMetaData(ArchiveDeployment dep) { log.debug("START buildMetaData: [name=" + dep.getCanonicalName() + "]"); try @@ -58,7 +57,7 @@ { String shortName = ep.getShortName(); Class beanClass = ep.getTargetBeanClass(); - JAXWSServerMetaDataBuilder.setupProviderOrWebService(dep, wsMetaData, udi, beanClass, shortName); + JAXWSServerMetaDataBuilder.setupProviderOrWebService(dep, wsMetaData, beanClass, shortName); } log.debug("END buildMetaData: " + wsMetaData); 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-26 11:33:20 UTC (rev 3999) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -49,7 +49,6 @@ import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.wsf.common.JavaUtils; import org.jboss.wsf.spi.deployment.ArchiveDeployment; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; /** * A server side meta data builder that is based on JSR-181 annotations @@ -60,7 +59,7 @@ */ public class JAXWSProviderMetaDataBuilder extends JAXWSServerMetaDataBuilder { - public ServerEndpointMetaData buildProviderMetaData(ArchiveDeployment dep, UnifiedMetaData wsMetaData, UnifiedDeploymentInfo udi, Class<?> sepClass, String linkName) throws IOException + public ServerEndpointMetaData buildProviderMetaData(ArchiveDeployment dep, UnifiedMetaData wsMetaData, Class<?> sepClass, String linkName) throws IOException { // 5.3 Conformance (Provider implementation): A Provider based service endpoint implementation MUST // implement a typed Provider interface. @@ -132,20 +131,20 @@ processHandlerChain(sepMetaData, sepClass); // process config - processEndpointConfig(udi, sepClass, linkName, sepMetaData); + processEndpointConfig(sepClass, linkName, sepMetaData); // Set the endpoint address processWebContext(dep, sepClass, linkName, sepMetaData); // Init the endpoint address - initEndpointAddress(dep, udi, sepMetaData); + initEndpointAddress(dep, sepMetaData); // A provider may not have a WSDL file if (sepMetaData.getServiceMetaData().getWsdlLocation() != null) MetaDataBuilder.replaceAddressLocation(sepMetaData); // init service endpoint id - ObjectName sepID = MetaDataBuilder.createServiceEndpointID(dep, udi, sepMetaData); + ObjectName sepID = MetaDataBuilder.createServiceEndpointID(dep, 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-26 11:33:20 UTC (rev 3999) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -32,7 +32,6 @@ import org.jboss.wsf.spi.annotation.WebContext; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; /** @@ -43,21 +42,21 @@ */ public abstract class JAXWSServerMetaDataBuilder extends JAXWSMetaDataBuilder { - static void setupProviderOrWebService(ArchiveDeployment dep, UnifiedMetaData umd, UnifiedDeploymentInfo udi, Class<?> beanClass, String beanName) throws Exception + static void setupProviderOrWebService(ArchiveDeployment dep, UnifiedMetaData umd, Class<?> beanClass, String beanName) throws Exception { if (beanClass.isAnnotationPresent(WebService.class)) { JAXWSWebServiceMetaDataBuilder builder = new JAXWSWebServiceMetaDataBuilder(); - builder.buildWebServiceMetaData(dep, umd, udi, beanClass, beanName); + builder.buildWebServiceMetaData(dep, umd, beanClass, beanName); } else if (beanClass.isAnnotationPresent(WebServiceProvider.class)) { JAXWSProviderMetaDataBuilder builder = new JAXWSProviderMetaDataBuilder(); - builder.buildProviderMetaData(dep, umd, udi, beanClass, beanName); + builder.buildProviderMetaData(dep, umd, beanClass, beanName); } } - protected void processEndpointConfig(UnifiedDeploymentInfo udi, Class<?> wsClass, String linkName, ServerEndpointMetaData sepMetaData) + protected void processEndpointConfig(Class<?> wsClass, String linkName, ServerEndpointMetaData sepMetaData) { EndpointConfig anEndpointConfig = wsClass.getAnnotation(EndpointConfig.class); 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-26 11:33:20 UTC (rev 3999) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -60,7 +60,6 @@ import org.jboss.wsf.common.IOUtils; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; @@ -101,11 +100,11 @@ this.generateWsdl = generateWsdl; } - public ServerEndpointMetaData buildWebServiceMetaData(Deployment dep, UnifiedMetaData wsMetaData, UnifiedDeploymentInfo udi, Class<?> sepClass, String linkName) + public ServerEndpointMetaData buildWebServiceMetaData(Deployment dep, UnifiedMetaData wsMetaData, Class<?> sepClass, String linkName) { try { - EndpointResult result = processWebService(dep, wsMetaData, sepClass, udi); + EndpointResult result = processWebService(dep, wsMetaData, sepClass); // Clear the java types, etc. resetMetaDataBuilder(dep.getInitialClassLoader()); @@ -131,13 +130,13 @@ processBindingType(sepMetaData, seiClass); // process config - processEndpointConfig(udi, sepClass, linkName, sepMetaData); + processEndpointConfig(sepClass, linkName, sepMetaData); // Process web methods processWebMethods(sepMetaData, seiClass); // Init the transport guarantee - initTransportGuaranteeJSE(dep, udi, sepMetaData, linkName); + initTransportGuaranteeJSE(dep, sepMetaData, linkName); // Initialize types createJAXBContext(sepMetaData); @@ -147,7 +146,7 @@ if (sepClass.isAnnotationPresent(PolicyAttachment.class)) { PolicyMetaDataBuilder policyBuilder = PolicyMetaDataBuilder.getServerSidePolicyMetaDataBuilder(toolMode); - policyBuilder.processPolicyAnnotations(sepMetaData, sepClass, udi); + policyBuilder.processPolicyAnnotations(sepMetaData, sepClass); } // The server must always generate WSDL @@ -180,7 +179,7 @@ processWSDDContribution(sepMetaData); // Init the endpoint address - initEndpointAddress(dep, udi, sepMetaData); + initEndpointAddress(dep, sepMetaData); // Process an optional @SOAPMessageHandlers annotation if (sepClass.isAnnotationPresent(SOAPMessageHandlers.class) || seiClass.isAnnotationPresent(SOAPMessageHandlers.class)) @@ -190,7 +189,7 @@ processEndpointMetaDataExtensions(sepMetaData, wsdlDefinitions); // init service endpoint id - ObjectName sepID = MetaDataBuilder.createServiceEndpointID(dep, udi, sepMetaData); + ObjectName sepID = MetaDataBuilder.createServiceEndpointID(dep, sepMetaData); sepMetaData.setServiceEndpointID(sepID); return sepMetaData; @@ -276,7 +275,7 @@ } } - private EndpointResult processWebService(Deployment dep, UnifiedMetaData wsMetaData, Class<?> sepClass, UnifiedDeploymentInfo udi) + private EndpointResult processWebService(Deployment dep, UnifiedMetaData wsMetaData, Class<?> sepClass) throws ClassNotFoundException, IOException { WebService anWebService = sepClass.getAnnotation(WebService.class); 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-26 11:33:20 UTC (rev 3999) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -33,10 +33,8 @@ import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentModelFactory; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.tools.WSContractProvider; /** @@ -69,12 +67,6 @@ throw new WSException("Could not create directory: " + sourceDir); } - private UnifiedDeploymentInfo createUDI(Class<?> endpointClass, ClassLoader loader) - { - UnifiedDeploymentInfo udi = new UnifiedDeploymentInfo(); - return udi; - } - @Override public void provide(Class<?> endpointClass) { @@ -104,13 +96,11 @@ if (generateWsdl) messageStream.println("Generating WSDL:"); - UnifiedDeploymentInfo udi = createUDI(endpointClass, loader); - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); DeploymentModelFactory factory = spiProvider.getSPI(DeploymentModelFactory.class); Deployment dep = factory.createDeployment("wsprovide-deployment", loader); - builder.buildWebServiceMetaData(dep, umd, udi, endpointClass, null); + builder.buildWebServiceMetaData(dep, umd, endpointClass, null); try { generator.write(); Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2007-07-26 11:33:20 UTC (rev 3999) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2007-07-26 13:43:59 UTC (rev 4000) @@ -115,7 +115,7 @@ EndpointMetaData epMetaData = new ServerEndpointMetaData(serviceMetaData, new QName("dummyPortName"), new QName("dummyPortTypeName"), Type.JAXWS); serviceMetaData.addEndpoint(epMetaData); - builder.processPolicyAnnotations(epMetaData, TestMultipleEndpointPolicy.class, null); + builder.processPolicyAnnotations(epMetaData, TestMultipleEndpointPolicy.class); PolicyMetaExtension policyExt = (PolicyMetaExtension)epMetaData.getExtension(Constants.URI_WS_POLICY);