You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2011/03/21 19:08:44 UTC
svn commit: r1083887 - in /openwebbeans/trunk:
webbeans-el10/src/main/java/org/apache/webbeans/el10/
webbeans-impl/src/main/java/org/apache/webbeans/config/
webbeans-impl/src/main/java/org/apache/webbeans/el/
webbeans-impl/src/main/java/org/apache/webb...
Author: struberg
Date: Mon Mar 21 18:08:43 2011
New Revision: 1083887
URL: http://svn.apache.org/viewvc?rev=1083887&view=rev
Log:
OWB-532 OWB-514 get rid of AbstractOwbJsfPlugin
use BeanManagerImpl#isInUse() instead
Removed:
openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/plugins/AbstractOwbJsfPlugin.java
Modified:
openwebbeans/trunk/webbeans-el10/src/main/java/org/apache/webbeans/el10/EL10Resolver.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java
openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/plugin/OpenWebBeansJsfPlugin.java
openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/ConversationAwareViewHandler.java
openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/JSFUtil.java
openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/OwbApplicationFactory.java
openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/WebBeansPhaseListener.java
openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/plugin/OpenWebBeansJsfPlugin.java
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java
Modified: openwebbeans/trunk/webbeans-el10/src/main/java/org/apache/webbeans/el10/EL10Resolver.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-el10/src/main/java/org/apache/webbeans/el10/EL10Resolver.java?rev=1083887&r1=1083886&r2=1083887&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-el10/src/main/java/org/apache/webbeans/el10/EL10Resolver.java (original)
+++ openwebbeans/trunk/webbeans-el10/src/main/java/org/apache/webbeans/el10/EL10Resolver.java Mon Mar 21 18:08:43 2011
@@ -34,10 +34,15 @@ import javax.enterprise.inject.spi.Bean;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.el.ELContextStore;
-import org.apache.webbeans.spi.plugins.AbstractOwbJsfPlugin;
public class EL10Resolver extends ELResolver
{
+ private WebBeansContext webBeansContext;
+
+ public EL10Resolver()
+ {
+ webBeansContext = WebBeansContext.getInstance();
+ }
@Override
public Class<?> getCommonPropertyType(ELContext arg0, Object arg1)
@@ -64,28 +69,8 @@ public class EL10Resolver extends ELReso
@SuppressWarnings({"unchecked","deprecation"})
public Object getValue(ELContext context, Object obj, Object property) throws NullPointerException, PropertyNotFoundException, ELException
{
- //Check that application is OWB enabled
- //For JSF applications that are not
- //OWB enabled, no need to go with this resolver....
- WebBeansContext webBeansContext = WebBeansContext.getInstance();
- AbstractOwbJsfPlugin jsfPlugin = webBeansContext.getPluginLoader().getJsfPlugin();
-
- //No JSF plugin, sure that not OWB
- if(jsfPlugin == null && !(webBeansContext.getOpenWebBeansConfiguration().isJspApplication()))
- {
- return null;
- }
-
- //If PluginLoader is called by application explicitly
- //But not OWB application
- else if(jsfPlugin != null)
- {
- if(!jsfPlugin.isOwbApplication())
- {
- return null;
- }
- }
- else
+ // Check if the OWB actually got used in this application
+ if (!webBeansContext.getBeanManagerImpl().isInUse())
{
return null;
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java?rev=1083887&r1=1083886&r2=1083887&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java Mon Mar 21 18:08:43 2011
@@ -107,9 +107,7 @@ public class OpenWebBeansConfiguration
/**EL Adaptor*/
public static final String EL_ADAPTOR_CLASS = "org.apache.webbeans.spi.adaptor.ELAdaptor";
-
- public static final String PROPERTY_OWB_APPLICATION = "org.apache.webbeans.application.isOwbApplication";
-
+
/**
* Use BDABeansXmlScanner to determine if interceptors, decorators, and
* alternatives are enabled in the beans.xml of a given BDA. For an
@@ -136,7 +134,7 @@ public class OpenWebBeansConfiguration
*/
private void loadFromSystemProperties()
{
- Properties properties = null;
+ Properties properties;
if(System.getSecurityManager() != null)
{
properties = SecurityUtil.doPrivilegedGetSystemProperties();
@@ -210,7 +208,7 @@ public class OpenWebBeansConfiguration
/**
* (re)read the configuration from the resources in the classpath.
* @see #DEFAULT_CONFIG_PROPERTIES_NAME
- * @see #CONFIG_PROPERTIES_NAME
+ * @see #DEFAULT_CONFIG_PROPERTIES_NAME
*/
public synchronized void parseConfiguration() throws WebBeansConfigurationException
{
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java?rev=1083887&r1=1083886&r2=1083887&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java Mon Mar 21 18:08:43 2011
@@ -57,7 +57,6 @@ public class WebBeansELResolver extends
public WebBeansELResolver()
{
-
webBeansContext = WebBeansContext.getInstance();
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java?rev=1083887&r1=1083886&r2=1083887&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java Mon Mar 21 18:08:43 2011
@@ -29,7 +29,6 @@ import org.apache.webbeans.config.OWBLog
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.logger.WebBeansLogger;
-import org.apache.webbeans.spi.plugins.AbstractOwbJsfPlugin;
import org.apache.webbeans.spi.plugins.OpenWebBeansEjbPlugin;
import org.apache.webbeans.spi.plugins.OpenWebBeansJavaEEPlugin;
import org.apache.webbeans.spi.plugins.OpenWebBeansPlugin;
@@ -202,30 +201,6 @@ public class PluginLoader
}
/**
- * Gets JSF plugin.
- *
- * @return JSF plugin
- */
- public AbstractOwbJsfPlugin getJsfPlugin()
- {
- if(!pluginsExist())
- {
- return null;
- }
-
- for(OpenWebBeansPlugin plugin : this.plugins)
- {
- if(plugin instanceof AbstractOwbJsfPlugin)
- {
- return (AbstractOwbJsfPlugin)plugin;
- }
- }
-
- return null;
- }
-
-
- /**
* Gets ejb lifecycle annotations plugin
*
* @return ejb LCA plugin
Modified: openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/plugin/OpenWebBeansJsfPlugin.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/plugin/OpenWebBeansJsfPlugin.java?rev=1083887&r1=1083886&r2=1083887&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/plugin/OpenWebBeansJsfPlugin.java (original)
+++ openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/plugin/OpenWebBeansJsfPlugin.java Mon Mar 21 18:08:43 2011
@@ -19,16 +19,12 @@
package org.apache.webbeans.jsf.plugin;
import javax.faces.component.UIComponent;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.servlet.ServletContext;
-import org.apache.webbeans.config.OpenWebBeansConfiguration;
import org.apache.webbeans.exception.WebBeansConfigurationException;
-import org.apache.webbeans.spi.plugins.AbstractOwbJsfPlugin;
+import org.apache.webbeans.spi.plugins.AbstractOwbPlugin;
import org.apache.webbeans.util.ClassUtil;
-public class OpenWebBeansJsfPlugin extends AbstractOwbJsfPlugin
+public class OpenWebBeansJsfPlugin extends AbstractOwbPlugin
{
/** {@inheritDoc} */
public void isManagedBean( Class<?> clazz ) throws WebBeansConfigurationException
@@ -40,23 +36,4 @@ public class OpenWebBeansJsfPlugin exten
}
}
- @Override
- public boolean isOwbApplication()
- {
- FacesContext facesContext = FacesContext.getCurrentInstance();
- if(facesContext == null)
- {
- //This application is not JSF, probably JSP based OWB application
- //WebBeansELResolver for JSP has been registered on booting
- //phase of OWB
- return true;
- }
-
- //If this application is JSF, check that OWB has booted
- ExternalContext ext = facesContext.getExternalContext();
- ServletContext servletContext = (ServletContext) ext.getContext();
- Object attribute = servletContext.getAttribute(OpenWebBeansConfiguration.PROPERTY_OWB_APPLICATION);
-
- return attribute != null ? true : false;
- }
}
Modified: openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/ConversationAwareViewHandler.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/ConversationAwareViewHandler.java?rev=1083887&r1=1083886&r2=1083887&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/ConversationAwareViewHandler.java (original)
+++ openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/ConversationAwareViewHandler.java Mon Mar 21 18:08:43 2011
@@ -30,6 +30,8 @@ public class ConversationAwareViewHandle
{
private final ViewHandler delegate;
+ private Boolean owbApplication = null;
+
public ConversationAwareViewHandler(ViewHandler delegate)
{
this.delegate = delegate;
@@ -41,7 +43,7 @@ public class ConversationAwareViewHandle
@Override
public String getActionURL(FacesContext context, String viewId)
{
- if(!JSFUtil.isOwbApplication())
+ if(isOwbApplication())
{
return delegate.getActionURL(context, viewId);
}
@@ -58,6 +60,16 @@ public class ConversationAwareViewHandle
return url;
}
+ private boolean isOwbApplication()
+ {
+ if (owbApplication == null)
+ {
+ owbApplication = Boolean.valueOf(WebBeansContext.getInstance().getBeanManagerImpl().isInUse());
+ }
+
+ return owbApplication.booleanValue();
+ }
+
/**
* {@inheritDoc}
*/
Modified: openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/JSFUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/JSFUtil.java?rev=1083887&r1=1083886&r2=1083887&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/JSFUtil.java (original)
+++ openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/JSFUtil.java Mon Mar 21 18:08:43 2011
@@ -18,16 +18,10 @@
*/
package org.apache.webbeans.jsf12;
-import javax.faces.application.Application;
-import javax.faces.application.FacesMessage;
-import javax.faces.application.ViewHandler;
-import javax.faces.component.UIViewRoot;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
-import javax.servlet.ServletContext;
import javax.servlet.http.HttpSession;
-import org.apache.webbeans.config.OpenWebBeansConfiguration;
import org.apache.webbeans.util.Asserts;
@@ -67,46 +61,6 @@ public final class JSFUtil
return null;
}
- public static boolean isPostBack()
- {
- return getCurrentFacesContext().getRenderKit().getResponseStateManager().isPostback(getCurrentFacesContext());
- }
-
- /**
- * @return the viewId of the viewRoot, e.g. '/user/menu.xhtml'
- */
- public static String getViewId()
- {
- UIViewRoot viewRoot = getCurrentFacesContext().getViewRoot();
- if (viewRoot == null)
- {
- return null;
- }
- return viewRoot.getViewId();
- }
-
- public static ViewHandler getViewHandler()
- {
- return getCurrentFacesContext().getApplication().getViewHandler();
- }
-
- public static Application getApplication()
- {
- FacesContext context = getCurrentFacesContext();
- if(context != null)
- {
- return context.getApplication();
- }
-
- return null;
- }
-
- public static void addInfoMessage(String message)
- {
- FacesMessage fm = new FacesMessage(FacesMessage.SEVERITY_INFO,message,"");
- getCurrentFacesContext().addMessage(null, fm);
- }
-
public static String getRedirectViewIdWithCid(String redirectId, String cid)
{
Asserts.assertNotNull(redirectId, "redirectId parameter can not be null");
@@ -158,18 +112,7 @@ public final class JSFUtil
}
- public static UIViewRoot getViewRoot()
- {
- FacesContext context = getCurrentFacesContext();
-
- if(context != null)
- {
- return context.getViewRoot();
- }
-
- return null;
- }
-
+
public static String getJSFRequestParameter(String parameterName)
{
@@ -188,24 +131,4 @@ public final class JSFUtil
return cid;
}
- public static boolean isOwbApplication()
- {
- ServletContext context = null;
- if(getExternalContext() != null)
- {
- context = (ServletContext) getExternalContext().getContext();
- }
-
- if(context != null)
- {
- Object value = context.getAttribute(OpenWebBeansConfiguration.PROPERTY_OWB_APPLICATION);
- if(value != null)
- {
- return Boolean.valueOf(value.toString());
- }
- }
-
- return false;
-
- }
}
Modified: openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/OwbApplicationFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/OwbApplicationFactory.java?rev=1083887&r1=1083886&r2=1083887&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/OwbApplicationFactory.java (original)
+++ openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/OwbApplicationFactory.java Mon Mar 21 18:08:43 2011
@@ -18,6 +18,8 @@
*/
package org.apache.webbeans.jsf12;
+import org.apache.webbeans.config.WebBeansContext;
+
import javax.faces.application.Application;
import javax.faces.application.ApplicationFactory;
@@ -35,7 +37,7 @@ public class OwbApplicationFactory exten
@Override
public Application getApplication()
{
- if(!JSFUtil.isOwbApplication())
+ if(WebBeansContext.getInstance().getBeanManagerImpl().isInUse())
{
return wrapped.getApplication();
}
Modified: openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/WebBeansPhaseListener.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/WebBeansPhaseListener.java?rev=1083887&r1=1083886&r2=1083887&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/WebBeansPhaseListener.java (original)
+++ openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/WebBeansPhaseListener.java Mon Mar 21 18:08:43 2011
@@ -44,13 +44,15 @@ public class WebBeansPhaseListener imple
/**Logger instance*/
private final WebBeansLogger logger = WebBeansLogger.getLogger(WebBeansPhaseListener.class);
-
+
+ private Boolean owbApplication = null;
+
/**
* {@inheritDoc}
*/
public void afterPhase(PhaseEvent phaseEvent)
{
- if(!JSFUtil.isOwbApplication())
+ if(!isOwbApplication())
{
return;
}
@@ -87,7 +89,7 @@ public class WebBeansPhaseListener imple
*/
public void beforePhase(PhaseEvent phaseEvent)
{
- if(!JSFUtil.isOwbApplication())
+ if(!isOwbApplication())
{
return;
}
@@ -145,4 +147,15 @@ public class WebBeansPhaseListener imple
{
return PhaseId.ANY_PHASE;
}
+
+ private boolean isOwbApplication()
+ {
+ if (owbApplication == null)
+ {
+ owbApplication = Boolean.valueOf(WebBeansContext.getInstance().getBeanManagerImpl().isInUse());
+ }
+
+ return owbApplication.booleanValue();
+ }
+
}
Modified: openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/plugin/OpenWebBeansJsfPlugin.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/plugin/OpenWebBeansJsfPlugin.java?rev=1083887&r1=1083886&r2=1083887&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/plugin/OpenWebBeansJsfPlugin.java (original)
+++ openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/plugin/OpenWebBeansJsfPlugin.java Mon Mar 21 18:08:43 2011
@@ -20,16 +20,11 @@ package org.apache.webbeans.jsf12.plugin
import javax.faces.component.UIComponent;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.servlet.ServletContext;
-
-import org.apache.webbeans.config.OpenWebBeansConfiguration;
import org.apache.webbeans.exception.WebBeansConfigurationException;
-import org.apache.webbeans.spi.plugins.AbstractOwbJsfPlugin;
+import org.apache.webbeans.spi.plugins.AbstractOwbPlugin;
import org.apache.webbeans.util.ClassUtil;
-public class OpenWebBeansJsfPlugin extends AbstractOwbJsfPlugin
+public class OpenWebBeansJsfPlugin extends AbstractOwbPlugin
{
/** {@inheritDoc} */
public void isManagedBean( Class<?> clazz ) throws WebBeansConfigurationException
@@ -40,27 +35,4 @@ public class OpenWebBeansJsfPlugin exten
+ " can not implement JSF UIComponent");
}
}
-
- @Override
- public boolean isOwbApplication()
- {
- FacesContext facesContext = FacesContext.getCurrentInstance();
- if(facesContext == null)
- {
- //This application is not JSF, probably JSP based OWB application
- //WebBeansELResolver for JSP has been registered on booting
- //phase of OWB
- return true;
- }
-
- //If this application is JSF, check that OWB has booted
- ExternalContext ext = facesContext.getExternalContext();
- ServletContext servletContext = (ServletContext) ext.getContext();
- Object attribute = servletContext.getAttribute(OpenWebBeansConfiguration.PROPERTY_OWB_APPLICATION);
-
- return attribute != null ? true : false;
- }
-
-
-
}
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=1083887&r1=1083886&r2=1083887&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 Mon Mar 21 18:08:43 2011
@@ -20,7 +20,6 @@ package org.apache.webbeans.servlet;
import org.apache.webbeans.component.InjectionPointBean;
import org.apache.webbeans.config.OWBLogConst;
-import org.apache.webbeans.config.OpenWebBeansConfiguration;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.conversation.ConversationManager;
import org.apache.webbeans.el.ELContextStore;
@@ -77,10 +76,6 @@ public class WebBeansConfigurationListen
try
{
this.lifeCycle.startApplication(event);
-
- //If there is no beans.xml, not an owb application
- boolean isOwbApplication = !webBeansContext.getScannerService().getBeanXmls().isEmpty();
- event.getServletContext().setAttribute(OpenWebBeansConfiguration.PROPERTY_OWB_APPLICATION, Boolean.toString(isOwbApplication));
}
catch (Exception e)
{
@@ -97,7 +92,6 @@ public class WebBeansConfigurationListen
{
this.lifeCycle.stopApplication(event);
this.lifeCycle = null;
- event.getServletContext().setAttribute(OpenWebBeansConfiguration.PROPERTY_OWB_APPLICATION, "false");
}
/**