Author: jim.ma Date: 2011-09-08 01:34:08 -0400 (Thu, 08 Sep 2011) New Revision: 14952 Modified: container/jboss60/branches/jbossws-jboss610-JBWS-3343/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java Log: [JBWS-3351]:To build EJBArchiveMetaData for deployment contains EJB21 endpoint Modified: container/jboss60/branches/jbossws-jboss610-JBWS-3343/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java =================================================================== --- container/jboss60/branches/jbossws-jboss610-JBWS-3343/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2011-09-08 03:27:23 UTC (rev 14951) +++ container/jboss60/branches/jbossws-jboss610-JBWS-3343/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2011-09-08 05:34:08 UTC (rev 14952) @@ -66,13 +66,13 @@ final JSEArchiveMetaData jseMetaData = this.metaDataBuilderJSE.create(dep); dep.addAttachment(JSEArchiveMetaData.class, jseMetaData); } - else if (WSHelper.isJaxwsEjbDeployment(dep)) + if (WSHelper.isJaxwsEjbDeployment(dep)) { this.log.debug("Creating JBoss agnostic EJB3 meta data for deployment: " + dep.getSimpleName()); final EJBArchiveMetaData ejbMetaData = this.metaDataBuilderEJB3.create(dep); dep.addAttachment(EJBArchiveMetaData.class, ejbMetaData); } - else if (WSHelper.isJaxrpcEjbDeployment(dep)) + if (WSHelper.isJaxrpcEjbDeployment(dep) && !WSHelper.isJaxwsJseDeployment(dep) && !WSHelper.isJaxwsEjbDeployment(dep)) { this.log.debug("Creating JBoss agnostic EJB21 meta data for deployment: " + dep.getSimpleName()); final EJBArchiveMetaData ejbMetaData = this.metaDataBuilderEJB21.create(dep);