Author: sergeyb Date: 2010-07-01 13:14:50 -0400 (Thu, 01 Jul 2010) New Revision: 12564 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] Removing MetadataBuilder deployment type property 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 15:06:45 UTC (rev 12563) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2010-07-01 17:14:50 UTC (rev 12564) @@ -53,7 +53,6 @@ */ public class MetadataBuilder { - public static final String DEPLOYMENT_TYPE_PROPERTY = "deployment-type"; private static final Logger log = Logger.getLogger(MetadataBuilder.class); public MetadataBuilder() @@ -83,7 +82,6 @@ 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 15:06:45 UTC (rev 12563) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2010-07-01 17:14:50 UTC (rev 12564) @@ -53,7 +53,6 @@ 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; /** * @@ -115,7 +114,7 @@ { InjectionsMetaData metadata = endpoint.getAttachment(InjectionsMetaData.class); Context jndiContext = endpoint.getJNDIContext(); - if (DeploymentType.JAXWS_EJB3 != endpoint.getProperty(MetadataBuilder.DEPLOYMENT_TYPE_PROPERTY) + if (DeploymentType.JAXWS_EJB3 != endpoint.getService().getDeployment().getType() && factory.getServiceBean() != null) { InjectionHelper.injectResources(factory.getServiceBean(), metadata, jndiContext);