Author: sergeyb Date: 2010-07-01 11:06:45 -0400 (Thu, 01 Jul 2010) New Revision: 12563 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java Log: [JBWS-2596] Making sure only EJB handlers get the resources injected at the JBossCXF level Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2010-07-01 09:55:34 UTC (rev 12562) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2010-07-01 15:06:45 UTC (rev 12563) @@ -53,6 +53,7 @@ */ public class MetadataBuilder { + public static final String DEPLOYMENT_TYPE_PROPERTY = "deployment-type"; private static final Logger log = Logger.getLogger(MetadataBuilder.class); public MetadataBuilder() @@ -82,6 +83,7 @@ log.info("Add " + ddep); dd.addEndpoint(ddep); + ep.setProperty(DEPLOYMENT_TYPE_PROPERTY, depType); } return dd; } Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2010-07-01 09:55:34 UTC (rev 12562) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2010-07-01 15:06:45 UTC (rev 12563) @@ -46,12 +46,14 @@ import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.invocation.EndpointAssociation; import org.jboss.wsf.spi.invocation.RequestHandler; import org.jboss.wsf.spi.management.EndpointRegistry; import org.jboss.wsf.spi.management.EndpointRegistryFactory; import org.jboss.wsf.spi.metadata.injection.InjectionsMetaData; import org.jboss.wsf.stack.cxf.management.InstrumentationManagerExtImpl; +import org.jboss.wsf.stack.cxf.metadata.MetadataBuilder; /** * @@ -113,7 +115,8 @@ { InjectionsMetaData metadata = endpoint.getAttachment(InjectionsMetaData.class); Context jndiContext = endpoint.getJNDIContext(); - if (factory.getServiceBean() != null) + if (DeploymentType.JAXWS_EJB3 != endpoint.getProperty(MetadataBuilder.DEPLOYMENT_TYPE_PROPERTY) + && factory.getServiceBean() != null) { InjectionHelper.injectResources(factory.getServiceBean(), metadata, jndiContext); InjectionHelper.callPostConstructMethod(factory.getServiceBean());