Author: julien(a)jboss.com Date: 2007-09-06 09:51:45 -0400 (Thu, 06 Sep 2007) New Revision: 8190 Modified: modules/common/trunk/build/build-thirdparty.xml modules/common/trunk/mc/build.xml modules/common/trunk/mc/src/main/org/jboss/portal/common/mc/bootstrap/WebBootstrap.java Log: use mc 1.0.2 that is compatible with 1.4 for now Modified: modules/common/trunk/build/build-thirdparty.xml =================================================================== --- modules/common/trunk/build/build-thirdparty.xml 2007-09-06 13:40:25 UTC (rev 8189) +++ modules/common/trunk/build/build-thirdparty.xml 2007-09-06 13:51:45 UTC (rev 8190) @@ -58,7 +58,12 @@ <componentref name="sun-javamail" version="1.3.1"/> <componentref name="sun-servlet" version="2.4"/> + <componentref name="jboss/common" version="1.2.0.GA-brew"/> + <componentref name="jboss/microcontainer" version="1.0.2"/> + + <!-- Based on http://anonsvn.jboss.org/repos/jbossas/tags/EMBEDDED_JBOSS_BETA_2/build/b... --> +<!-- <componentref name="jboss/microcontainer" version="2.0.0.Beta3"/> <componentref name="jboss/aop" version="2.0.0.alpha4"/> <componentref name="jboss/jbossxb" version="2.0.0.CR2"/> @@ -74,7 +79,7 @@ <componentref name="junit" version="3.8.1"/> <componentref name="wutka-dtdparser" version="1.2.1"/> <componentref name="trove" version="1.0.2"/> - +--> </build> <synchronizeinfo/> Modified: modules/common/trunk/mc/build.xml =================================================================== --- modules/common/trunk/mc/build.xml 2007-09-06 13:40:25 UTC (rev 8189) +++ modules/common/trunk/mc/build.xml 2007-09-06 13:51:45 UTC (rev 8190) @@ -90,7 +90,7 @@ <path id="library.classpath"> <path refid="junit.junit.classpath"/> <path refid="jboss.microcontainer.classpath"/> - <path refid="jboss/common.core.classpath"/> + <path refid="jboss.common.classpath"/> <path refid="apache.log4j.classpath"/> <path refid="sun.servlet.classpath"/> </path> Modified: modules/common/trunk/mc/src/main/org/jboss/portal/common/mc/bootstrap/WebBootstrap.java =================================================================== --- modules/common/trunk/mc/src/main/org/jboss/portal/common/mc/bootstrap/WebBootstrap.java 2007-09-06 13:40:25 UTC (rev 8189) +++ modules/common/trunk/mc/src/main/org/jboss/portal/common/mc/bootstrap/WebBootstrap.java 2007-09-06 13:51:45 UTC (rev 8190) @@ -29,6 +29,7 @@ import org.jboss.kernel.spi.event.KernelEvent; import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.kernel.spi.registry.KernelRegistryEntry; +import org.jboss.kernel.spi.config.KernelConfig; import org.apache.log4j.Logger; import javax.servlet.ServletContext; @@ -47,7 +48,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ -public class WebBootstrap extends BasicBootstrap implements ServletContextListener, KernelEventListener +public class WebBootstrap implements ServletContextListener, KernelEventListener { /** . */ @@ -65,25 +66,9 @@ /** . */ private boolean registered; - protected void bootstrap() throws Throwable - { - log.info("Web kernel bootstrap"); + /** . */ + private BootstrapExt bootstrap; - // - super.bootstrap(); - - // - getKernel().getRegistry().registerListener(this, null, "ABC"); - registered = true; - - // - deployer = new BeanXMLDeployer(getKernel()); - - // - URL url = servletContext.getResource("/WEB-INF/jboss-beans.xml"); - deployment = deployer.deploy(url); - } - public void contextInitialized(ServletContextEvent event) { servletContext = event.getServletContext(); @@ -92,8 +77,20 @@ System.setProperty("org.jboss.logging.Logger.pluginClass", "org.jboss.logging.log4j.Log4jLoggerPlugin"); // - run(); - log.info("Web kernel started"); + try + { + bootstrap = new BootstrapExt(); + + // + bootstrap.run(); + + // + log.info("Web kernel started"); + } + catch (Exception e) + { + log.info("Web kernel boostrap failed", e); + } } public void contextDestroyed(ServletContextEvent event) @@ -112,7 +109,7 @@ registered = false; try { - KernelRegistry registry = getKernel().getRegistry(); + KernelRegistry registry = bootstrap.getKernel().getRegistry(); registry.unregisterListener(this, null, "ABC"); } catch (Throwable throwable) @@ -137,7 +134,7 @@ String type = event.getType(); if ("KERNEL_REGISTRY_REGISTERED".equals(type)) { - KernelRegistryEntry entry = getKernel().getRegistry().getEntry(context); + KernelRegistryEntry entry = bootstrap.getKernel().getRegistry().getEntry(context); Object target = entry.getTarget(); servletContext.setAttribute(key, target); } @@ -147,4 +144,36 @@ } } } + + private void boostrap() throws Throwable + { + // + bootstrap.getKernel().getRegistry().registerListener(WebBootstrap.this, null, "ABC"); + registered = true; + + // + deployer = new BeanXMLDeployer(bootstrap.getKernel()); + + // + URL url = servletContext.getResource("/WEB-INF/jboss-beans.xml"); + deployment = deployer.deploy(url); + } + + private class BootstrapExt extends BasicBootstrap + { + + // I don't know why we need to declare it since super() does not declare it + public BootstrapExt() throws Exception + { + super(); + } + + protected void bootstrap() throws Throwable + { + super.bootstrap(); + + // + boostrap(); + } + } }