[jbossws-commits] JBossWS SVN: r12884 - container/jboss60/branches/jbossws-jboss600M4/src/main/java/org/jboss/webservices/integration/tomcat.
Author: richard.opalka(a)jboss.com
Date: 2010-09-02 06:51:24 -0400 (Thu, 02 Sep 2010)
New Revision: 12884
Modified:
container/jboss60/branches/jbossws-jboss600M4/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
Log:
[JBWS-2957] fix AS IL porting layer to handle EJB3s in web archives properly
Modified:
container/jboss60/branches/jbossws-jboss600M4/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
===================================================================
---
container/jboss60/branches/jbossws-jboss600M4/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java 2010-09-02
09:58:40 UTC (rev 12883)
+++
container/jboss60/branches/jbossws-jboss600M4/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java 2010-09-02
10:51:24 UTC (rev 12884)
@@ -32,11 +32,11 @@
import org.jboss.metadata.web.spec.SecurityConstraintMetaData;
import org.jboss.metadata.web.spec.ServletMappingMetaData;
import org.jboss.metadata.web.spec.WebResourceCollectionsMetaData;
+import org.jboss.webservices.integration.util.ASHelper;
import org.jboss.webservices.integration.util.WebMetaDataHelper;
import org.jboss.wsf.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.HttpEndpoint;
/**
* Creator of web app meta data for EJB endpoints.
@@ -75,7 +75,11 @@
void create(final Deployment dep)
{
final DeploymentUnit unit = WSHelper.getRequiredAttachment(dep,
DeploymentUnit.class);
- final JBossWebMetaData jbossWebMD = new JBossWebMetaData();
+ JBossWebMetaData jbossWebMD = ASHelper.getOptionalAttachment(unit,
JBossWebMetaData.class);
+ if (jbossWebMD == null)
+ {
+ jbossWebMD = new JBossWebMetaData();
+ }
this.createWebAppDescriptor(dep, jbossWebMD);
this.createJBossWebAppDescriptor(dep, jbossWebMD);
@@ -186,7 +190,7 @@
for (final Endpoint ep : dep.getService().getEndpoints())
{
final String endpointName = ep.getShortName();
- final List<String> urlPatterns =
WebMetaDataHelper.getUrlPatterns(((HttpEndpoint)ep).getURLPattern());
+ final List<String> urlPatterns =
WebMetaDataHelper.getUrlPatterns(ep.getURLPattern());
this.log.debug("Servlet name: " + endpointName + ", URL patterns:
" + urlPatterns);
WebMetaDataHelper.newServletMapping(endpointName, urlPatterns,
servletMappings);
@@ -242,7 +246,7 @@
final WebResourceCollectionsMetaData webResourceCollections =
WebMetaDataHelper
.getWebResourceCollections(securityConstraint);
final String endpointName = ejbEndpoint.getShortName();
- final String urlPattern = ((HttpEndpoint)ejbEndpoint).getURLPattern();
+ final String urlPattern = ejbEndpoint.getURLPattern();
this.log.debug("Creating web resource collection for endpoint: " +
endpointName + ", URL pattern: "
+ urlPattern);
WebMetaDataHelper.newWebResourceCollection(endpointName, urlPattern,
secureWsdlAccess,