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

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; }