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/01/12 22:54:01 UTC
svn commit: r898536 - in /openwebbeans/trunk:
samples/ejb-sample/src/main/resources/META-INF/openwebbeans/
samples/ejb-telephone/src/main/resources/META-INF/openwebbeans/
samples/guess/src/main/resources/META-INF/openwebbeans/
samples/jms-sample/src/ma...
Author: gerdogdu
Date: Tue Jan 12 21:54:00 2010
New Revision: 898536
URL: http://svn.apache.org/viewvc?rev=898536&view=rev
Log:
[OWB-230] Enable/Disable Configuration of JSF2 Extensions
Modified:
openwebbeans/trunk/samples/ejb-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
openwebbeans/trunk/samples/ejb-telephone/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
openwebbeans/trunk/samples/guess/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
openwebbeans/trunk/samples/jms-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
openwebbeans/trunk/samples/reservation/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/scopes/Jsf2ScopesExtension.java
Modified: openwebbeans/trunk/samples/ejb-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/ejb-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=898536&r1=898535&r2=898536&view=diff
==============================================================================
--- openwebbeans/trunk/samples/ejb-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties (original)
+++ openwebbeans/trunk/samples/ejb-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties Tue Jan 12 21:54:00 2010
@@ -27,6 +27,8 @@
#use OWB Specific XML Configuration
org.apache.webbeans.useOwbSpecificXmlConfig=true
+org.apache.webbeans.application.useJSF2Extensions=false
+
#use embedded openejb metadata discovery
org.apache.webbeans.spi.deployer.UseEjbMetaDataDiscoveryService=true
Modified: openwebbeans/trunk/samples/ejb-telephone/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/ejb-telephone/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=898536&r1=898535&r2=898536&view=diff
==============================================================================
--- openwebbeans/trunk/samples/ejb-telephone/src/main/resources/META-INF/openwebbeans/openwebbeans.properties (original)
+++ openwebbeans/trunk/samples/ejb-telephone/src/main/resources/META-INF/openwebbeans/openwebbeans.properties Tue Jan 12 21:54:00 2010
@@ -25,5 +25,7 @@
#use embedded openejb metadata discovery
org.apache.webbeans.spi.deployer.UseEjbMetaDataDiscoveryService=true
+org.apache.webbeans.application.useJSF2Extensions=false
+
#use resource service
org.apache.webbeans.resource.spi.ResourceService=org.apache.webbeans.spi.ee.openejb.resource.OpenEjbResourceServiceImpl
\ No newline at end of file
Modified: openwebbeans/trunk/samples/guess/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/guess/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=898536&r1=898535&r2=898536&view=diff
==============================================================================
--- openwebbeans/trunk/samples/guess/src/main/resources/META-INF/openwebbeans/openwebbeans.properties (original)
+++ openwebbeans/trunk/samples/guess/src/main/resources/META-INF/openwebbeans/openwebbeans.properties Tue Jan 12 21:54:00 2010
@@ -25,4 +25,6 @@
#general configuration section
#use OWB Specific XML Configuration
-org.apache.webbeans.useOwbSpecificXmlConfig=true
\ No newline at end of file
+org.apache.webbeans.useOwbSpecificXmlConfig=true
+
+org.apache.webbeans.application.useJSF2Extensions=false
\ No newline at end of file
Modified: openwebbeans/trunk/samples/jms-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/jms-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=898536&r1=898535&r2=898536&view=diff
==============================================================================
--- openwebbeans/trunk/samples/jms-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties (original)
+++ openwebbeans/trunk/samples/jms-sample/src/main/resources/META-INF/openwebbeans/openwebbeans.properties Tue Jan 12 21:54:00 2010
@@ -27,5 +27,7 @@
#use OWB Specific XML Configuration
org.apache.webbeans.useOwbSpecificXmlConfig=true
+org.apache.webbeans.application.useJSF2Extensions=false
+
#JNDI Enterprise Implementation
org.apache.webbeans.spi.JNDIService=org.apache.webbeans.spi.ee.JNDIServiceEnterpriseImpl
\ No newline at end of file
Modified: openwebbeans/trunk/samples/reservation/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=898536&r1=898535&r2=898536&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/resources/META-INF/openwebbeans/openwebbeans.properties (original)
+++ openwebbeans/trunk/samples/reservation/src/main/resources/META-INF/openwebbeans/openwebbeans.properties Tue Jan 12 21:54:00 2010
@@ -25,4 +25,6 @@
#general configuration section
#use OWB Specific XML Configuration
-org.apache.webbeans.useOwbSpecificXmlConfig=true
\ No newline at end of file
+org.apache.webbeans.useOwbSpecificXmlConfig=true
+
+org.apache.webbeans.application.useJSF2Extensions=false
\ No newline at end of file
Modified: openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/scopes/Jsf2ScopesExtension.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/scopes/Jsf2ScopesExtension.java?rev=898536&r1=898535&r2=898536&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/scopes/Jsf2ScopesExtension.java (original)
+++ openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/scopes/Jsf2ScopesExtension.java Tue Jan 12 21:54:00 2010
@@ -18,26 +18,34 @@
*/
package org.apache.webbeans.jsf.scopes;
+import java.lang.annotation.Annotation;
+
+import javax.enterprise.context.spi.Context;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
import javax.enterprise.inject.spi.BeforeBeanDiscovery;
import javax.enterprise.inject.spi.Extension;
-import javax.faces.bean.ViewScoped;
import org.apache.webbeans.config.OpenWebBeansConfiguration;
+import org.apache.webbeans.logger.WebBeansLogger;
+import org.apache.webbeans.util.ClassUtil;
/**
* This small extension adds support for various JSF 2 scopes
* TODO: this should be moved to an own module because this will
* currently hinder webbeans-jsf to run in a JSF-1 application!
*/
-public class Jsf2ScopesExtension implements Extension {
-
+public class Jsf2ScopesExtension implements Extension
+{
+ public WebBeansLogger logger = WebBeansLogger.getLogger(Jsf2ScopesExtension.class);
+
public void addViewScoped(@Observes BeforeBeanDiscovery beforeBeanDiscovery)
{
if(OpenWebBeansConfiguration.getInstance().isUseJSF2Extensions())
{
- beforeBeanDiscovery.addScope(ViewScoped.class, true, true);
+ @SuppressWarnings("unchecked")
+ Class<? extends Annotation> clazz = (Class<? extends Annotation>)ClassUtil.getClassFromName("javax.faces.bean.ViewScoped");
+ beforeBeanDiscovery.addScope(clazz, true, true);
}
}
@@ -45,7 +53,16 @@
{
if(OpenWebBeansConfiguration.getInstance().isUseJSF2Extensions())
{
- afterBeanDiscovery.addContext(new ViewScopedContext());
+ try
+ {
+ Context context = (Context)ClassUtil.getClassFromName("org.apache.webbeans.jsf.scopes.ViewScopedContext").newInstance();
+ afterBeanDiscovery.addContext(context);
+
+ }
+ catch(Exception e)
+ {
+ logger.error(e);
+ }
}
}
}
\ No newline at end of file