You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2010/07/01 22:46:15 UTC
svn commit: r959779 -
/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java
Author: gerdogdu
Date: Thu Jul 1 20:46:14 2010
New Revision: 959779
URL: http://svn.apache.org/viewvc?rev=959779&view=rev
Log:
Check that web application is CDI enabled via WEB-INF/beans.xml
Modified:
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java
Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java?rev=959779&r1=959778&r2=959779&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java (original)
+++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java Thu Jul 1 20:46:14 2010
@@ -18,6 +18,8 @@
*/
package org.apache.webbeans.servlet;
+import java.net.URL;
+
import javax.enterprise.context.RequestScoped;
import javax.enterprise.context.SessionScoped;
import javax.servlet.ServletContextEvent;
@@ -69,8 +71,20 @@ public class WebBeansConfigurationListen
try
{
- this.lifeCycle.startApplication(event);
- event.getServletContext().setAttribute(OpenWebBeansConfiguration.PROPERTY_OWB_APPLICATION, "true");
+ URL url = event.getServletContext().getResource("/WEB-INF/beans.xml");
+ if(url != null)
+ {
+ this.lifeCycle.startApplication(event);
+ event.getServletContext().setAttribute(OpenWebBeansConfiguration.PROPERTY_OWB_APPLICATION, "true");
+ }
+ else
+ {
+ if(logger.wblWillLogWarn())
+ {
+ logger.warn("CDI is not enabled for this web application, incorrect listener registration");
+ }
+ }
+
}
catch (Exception e)
{