[jbossws-commits] JBossWS SVN: r15386 - container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/deployers/deployment.
Author: alessio.soldano(a)jboss.com
Date: 2011-12-14 20:27:25 -0500 (Wed, 14 Dec 2011)
New Revision: 15386
Modified:
container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/deployers/deployment/AbstractDeploymentModelBuilder.java
container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java
Log:
[JBWS-3398] Propagate WebservicesMetaData to jbws jaxws deployments too on AS 701
Modified:
container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/deployers/deployment/AbstractDeploymentModelBuilder.java
===================================================================
---
container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/deployers/deployment/AbstractDeploymentModelBuilder.java 2011-12-15
01:22:51 UTC (rev 15385)
+++
container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/deployers/deployment/AbstractDeploymentModelBuilder.java 2011-12-15
01:27:25 UTC (rev 15386)
@@ -36,6 +36,7 @@
import org.jboss.as.server.deployment.module.ResourceRoot;
import org.jboss.as.webservices.util.ASHelper;
import org.jboss.as.webservices.util.VirtualFileAdaptor;
+import org.jboss.as.webservices.util.WSAttachmentKeys;
import org.jboss.logging.Logger;
import org.jboss.modules.Module;
import org.jboss.vfs.VirtualFile;
@@ -48,6 +49,7 @@
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.EndpointType;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
/**
* Base class for all deployment model builders.
@@ -105,6 +107,10 @@
dep.addAttachment(DeploymentUnit.class, unit);
unit.putAttachment(DEPLOYMENT_KEY, dep);
}
+ final WebservicesMetaData wsMetaData = ASHelper.getOptionalAttachment(unit,
WSAttachmentKeys.WEBSERVICES_METADATA_KEY);
+ if (wsMetaData != null) {
+ dep.addAttachment(WebservicesMetaData.class, wsMetaData);
+ }
this.build(dep, unit);
}
Modified:
container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java
===================================================================
---
container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java 2011-12-15
01:22:51 UTC (rev 15385)
+++
container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java 2011-12-15
01:27:25 UTC (rev 15386)
@@ -26,7 +26,6 @@
import org.jboss.as.server.deployment.DeploymentUnit;
import org.jboss.as.webservices.util.ASHelper;
-import org.jboss.as.webservices.util.WSAttachmentKeys;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metadata.web.spec.ServletMetaData;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -59,10 +58,7 @@
if (webMetaData != null) {
dep.addAttachment(JBossWebMetaData.class, webMetaData);
}
- final WebservicesMetaData wsMetaData = ASHelper.getOptionalAttachment(unit,
WSAttachmentKeys.WEBSERVICES_METADATA_KEY);
- if (wsMetaData != null) {
- dep.addAttachment(WebservicesMetaData.class, wsMetaData);
- }
+ final WebservicesMetaData wsMetaData =
dep.getAttachment(WebservicesMetaData.class);
this.log.debug("Creating JAXRPC JSE endpoints meta data model");
for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions())
{