tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1558131 - in /tomee/tomee/trunk/container/openejb-core/src/main: java/org/apache/openejb/cdi/CdiScanner.java resources/container-cdi-classes.properties
Date Tue, 14 Jan 2014 18:01:14 GMT
Author: rmannibucau
Date: Tue Jan 14 18:01:14 2014
New Revision: 1558131

URL: http://svn.apache.org/r1558131
Log:
removing cdi/my integration since mf should do it perfectly alone now

Modified:
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
    tomee/tomee/trunk/container/openejb-core/src/main/resources/container-cdi-classes.properties

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java?rev=1558131&r1=1558130&r2=1558131&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
Tue Jan 14 18:01:14 2014
@@ -222,9 +222,11 @@ public class CdiScanner implements Scann
 
         addContainerClasses(app.properties, loader, "BVal");
 
+		/* useless since MyFaces uses Extension to register beans
         if (ejbJar.webapp && "true".equalsIgnoreCase(app.properties.getProperty("Jsf.MyFaces",
"true"))) {
             addContainerClasses(app.properties, loader, "MyFaces");
         }
+		*/
     }
 
 

Modified: tomee/tomee/trunk/container/openejb-core/src/main/resources/container-cdi-classes.properties
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/resources/container-cdi-classes.properties?rev=1558131&r1=1558130&r2=1558131&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/resources/container-cdi-classes.properties
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/resources/container-cdi-classes.properties
Tue Jan 14 18:01:14 2014
@@ -19,28 +19,28 @@ BVal = org.apache.bval.cdi.BValExtension
 org.apache.bval.cdi.BValInterceptor,\
 org.apache.bval.cdi.BValBinding
 
-
+# MyFaces should work without anything since it is based on Extension now
 # generated from myfaces sources with command:
 # for j in $(for i in $(find . -name *cdi*); do find $i -name *.java; done); do echo $j |
sed 's#./impl/src/main/java/##g' | sed 's#.java##g' | sed 's#/#.#g'; done
-MyFaces = org.apache.myfaces.cdi.util.CDIUtils,\
-org.apache.myfaces.cdi.util.ContextualInstanceInfo,\
-org.apache.myfaces.cdi.util.AbstractContext,\
-org.apache.myfaces.cdi.util.BeanProvider,\
-org.apache.myfaces.cdi.util.AnyLiteral,\
-org.apache.myfaces.cdi.util.ContextualStorage,\
-org.apache.myfaces.cdi.view.ViewScopeContextualStorage,\
-org.apache.myfaces.cdi.view.ViewScopeBeanHolder,\
-org.apache.myfaces.cdi.view.ViewScopeContextImpl,\
-org.apache.myfaces.cdi.view.ViewScopeContextExtension,\
-org.apache.myfaces.cdi.view._ContextualKey,\
-org.apache.myfaces.cdi.view.ViewScopeCDIMap,\
-org.apache.myfaces.cdi.DefaultCDIViewScopeHandler,\
-org.apache.myfaces.cdi.impl.CDIManagedBeanHandlerImpl,\
-org.apache.myfaces.flow.cdi.FlowScopeBeanHolder,\
-org.apache.myfaces.flow.cdi.FlowBuilderCDIExtension,\
-org.apache.myfaces.flow.cdi.FlowScopeMap,\
-org.apache.myfaces.flow.cdi.FlowDefinitionQualifier,\
-org.apache.myfaces.flow.cdi.FlowScopeCDIExtension,\
-org.apache.myfaces.flow.cdi.FlowBuilderFactoryBean,\
-org.apache.myfaces.flow.cdi.DefaultCDIFacesFlowProvider,\
-org.apache.myfaces.flow.cdi.FlowScopedContextImpl
+#MyFaces = org.apache.myfaces.cdi.util.CDIUtils,\
+#org.apache.myfaces.cdi.util.ContextualInstanceInfo,\
+#org.apache.myfaces.cdi.util.AbstractContext,\
+#org.apache.myfaces.cdi.util.BeanProvider,\
+#org.apache.myfaces.cdi.util.AnyLiteral,\
+#org.apache.myfaces.cdi.util.ContextualStorage,\
+#org.apache.myfaces.cdi.view.ViewScopeContextualStorage,\
+#org.apache.myfaces.cdi.view.ViewScopeBeanHolder,\
+#org.apache.myfaces.cdi.view.ViewScopeContextImpl,\
+#org.apache.myfaces.cdi.view.ViewScopeContextExtension,\
+#org.apache.myfaces.cdi.view._ContextualKey,\
+#org.apache.myfaces.cdi.view.ViewScopeCDIMap,\
+#org.apache.myfaces.cdi.DefaultCDIViewScopeHandler,\
+#org.apache.myfaces.cdi.impl.CDIManagedBeanHandlerImpl,\
+#org.apache.myfaces.flow.cdi.FlowScopeBeanHolder,\
+#org.apache.myfaces.flow.cdi.FlowBuilderCDIExtension,\
+#org.apache.myfaces.flow.cdi.FlowScopeMap,\
+#org.apache.myfaces.flow.cdi.FlowDefinitionQualifier,\
+#org.apache.myfaces.flow.cdi.FlowScopeCDIExtension,\
+#org.apache.myfaces.flow.cdi.FlowBuilderFactoryBean,\
+#org.apache.myfaces.flow.cdi.DefaultCDIFacesFlowProvider,\
+#org.apache.myfaces.flow.cdi.FlowScopedContextImpl



Mime
View raw message