[weld-commits] Weld SVN: r4634 - in core/trunk/impl: src/main/java/org/jboss/weld/bean/builtin and 3 other directories.

Author: pete.muir(a)jboss.org Date: 2009-11-03 15:59:06 -0500 (Tue, 03 Nov 2009) New Revision: 4634 Added: core/trunk/impl/src/main/java/org/jboss/weld/messages/ServletMessage.java core/trunk/impl/src/main/resources/org/jboss/weld/messages/servlet_en.properties Modified: core/trunk/impl/pom.xml core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/AbstractBuiltInBean.java core/trunk/impl/src/main/java/org/jboss/weld/servlet/WeldListener.java Log: fix and oops, log the servlet int not starting, not an exception Modified: core/trunk/impl/pom.xml =================================================================== --- core/trunk/impl/pom.xml 2009-11-03 20:51:13 UTC (rev 4633) +++ core/trunk/impl/pom.xml 2009-11-03 20:59:06 UTC (rev 4634) @@ -136,6 +136,7 @@ <enumType>org.jboss.weld.messages.JsfMessage</enumType> <enumType>org.jboss.weld.messages.ReflectionMessage</enumType> <enumType>org.jboss.weld.messages.UtilMessage</enumType> + <enumType>org.jboss.weld.messages.ServletMessage</enumType> </enumTypes> </configuration> </execution> Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/AbstractBuiltInBean.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/AbstractBuiltInBean.java 2009-11-03 20:51:13 UTC (rev 4633) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/AbstractBuiltInBean.java 2009-11-03 20:59:06 UTC (rev 4634) @@ -111,11 +111,6 @@ return true; } - public boolean isProxyRequired() - { - return true; - } - @Override public String getDescription() { Added: core/trunk/impl/src/main/java/org/jboss/weld/messages/ServletMessage.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/messages/ServletMessage.java (rev 0) +++ core/trunk/impl/src/main/java/org/jboss/weld/messages/ServletMessage.java 2009-11-03 20:59:06 UTC (rev 4634) @@ -0,0 +1,16 @@ +package org.jboss.weld.messages; + +import ch.qos.cal10n.BaseName; +import ch.qos.cal10n.Locale; +import ch.qos.cal10n.LocaleData; + +(a)BaseName(&quot;org.jboss.weld.messages.servlet&quot;) +@LocaleData({ + @Locale("en") +}) +public enum ServletMessage +{ + + NOT_STARTING + +} Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/messages/ServletMessage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Modified: core/trunk/impl/src/main/java/org/jboss/weld/servlet/WeldListener.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/servlet/WeldListener.java 2009-11-03 20:51:13 UTC (rev 4633) +++ core/trunk/impl/src/main/java/org/jboss/weld/servlet/WeldListener.java 2009-11-03 20:59:06 UTC (rev 4634) @@ -22,6 +22,10 @@ */ package org.jboss.weld.servlet; +import static org.jboss.weld.messages.ServletMessage.NOT_STARTING; +import static org.jboss.weld.util.log.Category.SERVLET; +import static org.jboss.weld.util.log.LoggerFactory.loggerFactory; + import javax.enterprise.inject.spi.BeanManager; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; @@ -35,6 +39,7 @@ import org.jboss.weld.context.ContextLifecycle; import org.jboss.weld.servlet.api.ServletServices; import org.jboss.weld.servlet.api.helpers.AbstractServletListener; +import org.slf4j.cal10n.LocLogger; /** * The Weld listener @@ -49,6 +54,8 @@ public class WeldListener extends AbstractServletListener { + private static final LocLogger log = loggerFactory().getLogger(SERVLET); + private ServletLifecycle lifecycle; private ServletLifecycle getLifecycle() @@ -78,15 +85,16 @@ @Override public void contextInitialized(ServletContextEvent sce) { + super.contextInitialized(sce); if (!Container.instance().isInitialized()) { - throw new IllegalStateException("Weld bootstrap must be complete before contextInitialized event"); + log.warn(NOT_STARTING); + return; } if (!Container.instance().deploymentServices().contains(ServletServices.class)) { throw new IllegalStateException("Cannot use WeldListener without ServletServices"); } - super.contextInitialized(sce); sce.getServletContext().setAttribute(BeanManager.class.getName(), getBeanManager(sce.getServletContext())); } Added: core/trunk/impl/src/main/resources/org/jboss/weld/messages/servlet_en.properties =================================================================== --- core/trunk/impl/src/main/resources/org/jboss/weld/messages/servlet_en.properties (rev 0) +++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/servlet_en.properties 2009-11-03 20:59:06 UTC (rev 4634) @@ -0,0 +1 @@ +NOT_STARTING=Not starting Weld/Servlet integration as Weld failed to initialize \ No newline at end of file Property changes on: core/trunk/impl/src/main/resources/org/jboss/weld/messages/servlet_en.properties ___________________________________________________________________ Name: svn:mime-type + text/plain