Author: peteroyle Date: 2009-05-25 12:46:57 -0400 (Mon, 25 May 2009) New Revision: 2707 Modified: extensions/trunk/se/pom.xml extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java Log: Cleaned up dependencies - webbeans core now scoped as 'provided'. Modified: extensions/trunk/se/pom.xml =================================================================== --- extensions/trunk/se/pom.xml 2009-05-25 15:54:31 UTC (rev 2706) +++ extensions/trunk/se/pom.xml 2009-05-25 16:46:57 UTC (rev 2707) @@ -50,27 +50,24 @@ <dependency> <groupId>org.jboss.webbeans</groupId> <artifactId>webbeans-spi</artifactId> - </dependency> - <!-- TODO (PR): remove this dependency --> - <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-core</artifactId> <exclusions> <exclusion> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> </exclusion> - <exclusion> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> </exclusions> </dependency> - + <dependency> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-logger</artifactId> + <version>1.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-core</artifactId> + <version>1.0.0-SNAPSHOT</version> + <scope>provided</scope> + </dependency> </dependencies> <scm> Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java 2009-05-25 15:54:31 UTC (rev 2706) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java 2009-05-25 16:46:57 UTC (rev 2707) @@ -21,7 +21,6 @@ import org.jboss.webbeans.bootstrap.api.Bootstrap; import org.jboss.webbeans.bootstrap.api.Environments; import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery; -import org.jboss.webbeans.context.DependentContext; import org.jboss.webbeans.context.api.BeanStore; import org.jboss.webbeans.context.api.helpers.ConcurrentHashMapBeanStore; import org.jboss.webbeans.environment.se.discovery.SEWebBeanDiscovery; @@ -65,7 +64,6 @@ bootstrap.initialize(); this.manager = bootstrap.getManager(); bootstrap.boot(); - DependentContext.instance().setActive(true); bootstrap.getManager().getInstanceByType(ShutdownManager.class).setBootstrap(bootstrap); }