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 23:13:46 UTC
svn commit: r959786 -
/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java
Author: gerdogdu
Date: Thu Jul 1 21:13:46 2010
New Revision: 959786
URL: http://svn.apache.org/viewvc?rev=959786&view=rev
Log:
Revert from "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=959786&r1=959785&r2=959786&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 21:13:46 2010
@@ -18,8 +18,6 @@
*/
package org.apache.webbeans.servlet;
-import java.net.URL;
-
import javax.enterprise.context.RequestScoped;
import javax.enterprise.context.SessionScoped;
import javax.servlet.ServletContextEvent;
@@ -71,20 +69,8 @@ public class WebBeansConfigurationListen
try
{
- 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");
- }
- }
-
+ this.lifeCycle.startApplication(event);
+ event.getServletContext().setAttribute(OpenWebBeansConfiguration.PROPERTY_OWB_APPLICATION, "true");
}
catch (Exception e)
{