Author: peteroyle Date: 2009-11-04 09:12:04 -0500 (Wed, 04 Nov 2009) New Revision: 4651 Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java Log: Conditional inclusion of servlet classes depending on the requirements of the environment. Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java 2009-11-04 14:06:22 UTC (rev 4650) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java 2009-11-04 14:12:04 UTC (rev 4651) @@ -78,6 +78,7 @@ import org.jboss.weld.serialization.spi.ContextualStore; import org.jboss.weld.servlet.HttpSessionManager; import org.jboss.weld.servlet.ServletApiAbstraction; +import org.jboss.weld.servlet.api.ServletServices; import org.jboss.weld.transaction.spi.TransactionServices; import org.jboss.weld.util.Names; import org.jboss.weld.util.collections.Arrays2; @@ -114,7 +115,7 @@ private final Map<BeanDeploymentArchive, BeanDeployment> managerAwareBeanDeploymentArchives; private final BeanDeploymentArchive implementationBeanDeploymentArchive; - public DeploymentVisitor(BeanManagerImpl deploymentManager, Environment environment, Deployment deployment) + public DeploymentVisitor(BeanManagerImpl deploymentManager, Environment environment, final Deployment deployment) { this.deploymentManager = deploymentManager; this.environment = environment; @@ -124,7 +125,9 @@ { private final ServiceRegistry serviceRegistry = new SimpleServiceRegistry(); - private final Set<Class<?>> beanClasses = Arrays2.<Class<?>>asSet(ConversationImpl.class, ServletConversationManager.class, NumericConversationIdGenerator.class, HttpSessionManager.class); + private final Set<Class<?>> beanClasses = (deployment.getServices().contains(ServletServices.class)) + ? Arrays2.<Class<?>>asSet(ConversationImpl.class, ServletConversationManager.class, NumericConversationIdGenerator.class, HttpSessionManager.class) + : Arrays2.<Class<?>>asSet(); public ServiceRegistry getServices() {