Author: struberg
Date: Wed Jul 11 20:32:03 2012
New Revision: 1360383
URL: http://svn.apache.org/viewvc?rev=1360383&view=rev
Log:
OWB-669 general web cleanup
Modified:
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/DefaultOwbFailOverService.java
openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
Modified:
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java?rev=1360383&r1=1360382&r2=1360383&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java
(original)
+++
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java
Wed Jul 11 20:32:03 2012
@@ -37,6 +37,7 @@ import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Field;
+import java.net.MalformedURLException;
import java.net.URL;
import java.security.AccessController;
import java.security.PrivilegedAction;
@@ -81,7 +82,7 @@ public class ContextLifecycleListener im
if (event.getType().equals(Lifecycle.CONFIGURE_START_EVENT))
{
ServletContext scontext = context.getServletContext();
- URL url = scontext.getResource("/WEB-INF/beans.xml");
+ URL url = getBeansXml(scontext);
if (url != null)
{
//Registering ELResolver with JSP container
@@ -89,7 +90,10 @@ public class ContextLifecycleListener im
String[] oldListeners =
context.findApplicationListeners();
LinkedList<String> listeners = new
LinkedList<String>();
+
listeners.addFirst("org.apache.webbeans.servlet.WebBeansConfigurationListener");
+
+
for(String listener : oldListeners)
{
listeners.add(listener);
@@ -113,6 +117,16 @@ public class ContextLifecycleListener im
}
}
+ private URL getBeansXml(ServletContext scontext) throws
MalformedURLException
+ {
+ URL url = scontext.getResource("/WEB-INF/beans.xml");
+ if (url == null)
+ {
+ url = scontext.getResource("/WEB-INF/classes/META-INF/beans.xml");
+ }
+ return url;
+ }
+
public void containerEvent(ContainerEvent event)
{
StandardContext context = null;
@@ -135,13 +149,12 @@ public class ContextLifecycleListener im
}
else
{
- URL url =
context.getServletContext().getResource("/WEB-INF/beans.xml");
+ URL url = getBeansXml(context.getServletContext());
if(url != null)
{
TomcatUtil.inject(listener, loader);
}
}
-
}
else if(event.getType().equals("afterContextInitialized"))
{
@@ -157,8 +170,8 @@ public class ContextLifecycleListener im
context.getServletContext().setAttribute(InstanceManager.class.getName(),
custom);
ContextAccessController.setReadOnly(context.getNamingContextListener().getName());
-
- URL url =
context.getServletContext().getResource("/WEB-INF/beans.xml");
+
+ URL url = getBeansXml(context.getServletContext());
if(url != null)
{
Object[] listeners =
context.getApplicationEventListeners();
Modified:
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/DefaultOwbFailOverService.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/DefaultOwbFailOverService.java?rev=1360383&r1=1360382&r2=1360383&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/DefaultOwbFailOverService.java
(original)
+++
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/DefaultOwbFailOverService.java
Wed Jul 11 20:32:03 2012
@@ -148,7 +148,7 @@ public class DefaultOwbFailOverService i
{
bagWrapper.sessionIsInUse();
}
- }
+ }
}
public void sessionWillPassivate(HttpSession session)
Modified:
openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=1360383&r1=1360382&r2=1360383&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
(original)
+++
openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
Wed Jul 11 20:32:03 2012
@@ -63,5 +63,5 @@ org.apache.webbeans.web.failover.issuppo
# This allows mapping a Scope Annotation class to a specific InterceptorProxy
which are
# typically sub classes of NormalScopedBeanInterceptorHandler
#
-#org.apache.webbeans.proxy.mapping.javax.enterprise.context.RequestScoped=org.apache.webbeans.web.intercept.RequestScopedBeanInterceptorHandler
+org.apache.webbeans.proxy.mapping.javax.enterprise.context.RequestScoped=org.apache.webbeans.web.intercept.RequestScopedBeanInterceptorHandler
################################################################################################
