You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2017/09/08 23:02:32 UTC
svn commit: r1807842 - in /myfaces/core/branches/2.3.x/impl/src/main:
java/org/apache/myfaces/cdi/ java/org/apache/myfaces/cdi/scope/
java/org/apache/myfaces/context/servlet/ resources/META-INF/services/
Author: tandraschko
Date: Fri Sep 8 23:02:32 2017
New Revision: 1807842
URL: http://svn.apache.org/viewvc?rev=1807842&view=rev
Log:
MYFACES-4127 refactored
Added:
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopeBeanHolder.java
- copied, changed from r1807817, myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScopeBeanHolder.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopeProvider.java
- copied, changed from r1807817, myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScopeProvider.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScoped.java
- copied, changed from r1807817, myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScoped.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopedContextImpl.java
- copied, changed from r1807817, myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScopedContextImpl.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/ScopeExtension.java
- copied, changed from r1807839, myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScopeContextExtension.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScopeBeanHolder.java
- copied, changed from r1807817, myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/viewtransient/ViewTransientScopeBeanHolder.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScoped.java
- copied, changed from r1807817, myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/viewtransient/ViewTransientScoped.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScopedContextImpl.java
- copied, changed from r1807817, myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/viewtransient/ViewTransientScopedContextImpl.java
Modified:
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/JsfArtifactProducer.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java
myfaces/core/branches/2.3.x/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/JsfArtifactProducer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/JsfArtifactProducer.java?rev=1807842&r1=1807841&r2=1807842&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/JsfArtifactProducer.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/JsfArtifactProducer.java Fri Sep 8 23:02:32 2017
@@ -38,8 +38,8 @@ import javax.faces.context.ExternalConte
import javax.faces.context.FacesContext;
import javax.faces.context.Flash;
import javax.inject.Named;
-import org.apache.myfaces.cdi.faces.FacesScoped;
-import org.apache.myfaces.cdi.viewtransient.ViewTransientScoped;
+import org.apache.myfaces.cdi.scope.FacesScoped;
+import org.apache.myfaces.cdi.scope.ViewTransientScoped;
public class JsfArtifactProducer
{
Copied: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopeBeanHolder.java (from r1807817, myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScopeBeanHolder.java)
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopeBeanHolder.java?p2=myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopeBeanHolder.java&p1=myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScopeBeanHolder.java&r1=1807817&r2=1807842&rev=1807842&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScopeBeanHolder.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopeBeanHolder.java Fri Sep 8 23:02:32 2017
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.cdi.faces;
+package org.apache.myfaces.cdi.scope;
import java.util.HashMap;
import java.util.Map;
Copied: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopeProvider.java (from r1807817, myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScopeProvider.java)
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopeProvider.java?p2=myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopeProvider.java&p1=myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScopeProvider.java&r1=1807817&r2=1807842&rev=1807842&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScopeProvider.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopeProvider.java Fri Sep 8 23:02:32 2017
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.myfaces.cdi.faces;
+package org.apache.myfaces.cdi.scope;
import javax.faces.context.FacesContext;
Copied: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScoped.java (from r1807817, myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScoped.java)
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScoped.java?p2=myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScoped.java&p1=myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScoped.java&r1=1807817&r2=1807842&rev=1807842&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScoped.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScoped.java Fri Sep 8 23:02:32 2017
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.cdi.faces;
+package org.apache.myfaces.cdi.scope;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
Copied: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopedContextImpl.java (from r1807817, myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScopedContextImpl.java)
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopedContextImpl.java?p2=myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopedContextImpl.java&p1=myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScopedContextImpl.java&r1=1807817&r2=1807842&rev=1807842&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScopedContextImpl.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopedContextImpl.java Fri Sep 8 23:02:32 2017
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.cdi.faces;
+package org.apache.myfaces.cdi.scope;
import java.lang.annotation.Annotation;
import java.util.Map;
Copied: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/ScopeExtension.java (from r1807839, myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScopeContextExtension.java)
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/ScopeExtension.java?p2=myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/ScopeExtension.java&p1=myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScopeContextExtension.java&r1=1807839&r2=1807842&rev=1807842&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScopeContextExtension.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/ScopeExtension.java Fri Sep 8 23:02:32 2017
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.cdi.faces;
+package org.apache.myfaces.cdi.scope;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
@@ -24,24 +24,24 @@ import javax.enterprise.inject.spi.BeanM
import javax.enterprise.inject.spi.BeforeBeanDiscovery;
import javax.enterprise.inject.spi.Extension;
-/**
- * Handle FacesScoped related features.
- *
- */
-public class FacesScopeContextExtension implements Extension
+public class ScopeExtension implements Extension
{
private FacesScopedContextImpl facesScopeContext;
+ private ViewTransientScopedContextImpl viewTransientScopedContext;
void beforeBeanDiscovery(
@Observes final BeforeBeanDiscovery event, BeanManager beanManager)
{
event.addScope(FacesScoped.class, true, false);
+ event.addScope(ViewTransientScoped.class, true, false);
}
void afterBeanDiscovery(@Observes AfterBeanDiscovery afterBeanDiscovery, BeanManager beanManager)
{
facesScopeContext = new FacesScopedContextImpl(beanManager);
afterBeanDiscovery.addContext(facesScopeContext);
-
+
+ viewTransientScopedContext = new ViewTransientScopedContextImpl(beanManager);
+ afterBeanDiscovery.addContext(viewTransientScopedContext);
}
}
Copied: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScopeBeanHolder.java (from r1807817, myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/viewtransient/ViewTransientScopeBeanHolder.java)
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScopeBeanHolder.java?p2=myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScopeBeanHolder.java&p1=myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/viewtransient/ViewTransientScopeBeanHolder.java&r1=1807817&r2=1807842&rev=1807842&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/viewtransient/ViewTransientScopeBeanHolder.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScopeBeanHolder.java Fri Sep 8 23:02:32 2017
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.cdi.viewtransient;
+package org.apache.myfaces.cdi.scope;
import java.util.HashMap;
import java.util.Map;
Copied: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScoped.java (from r1807817, myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/viewtransient/ViewTransientScoped.java)
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScoped.java?p2=myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScoped.java&p1=myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/viewtransient/ViewTransientScoped.java&r1=1807817&r2=1807842&rev=1807842&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/viewtransient/ViewTransientScoped.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScoped.java Fri Sep 8 23:02:32 2017
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.cdi.viewtransient;
+package org.apache.myfaces.cdi.scope;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
Copied: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScopedContextImpl.java (from r1807817, myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/viewtransient/ViewTransientScopedContextImpl.java)
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScopedContextImpl.java?p2=myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScopedContextImpl.java&p1=myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/viewtransient/ViewTransientScopedContextImpl.java&r1=1807817&r2=1807842&rev=1807842&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/viewtransient/ViewTransientScopedContextImpl.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScopedContextImpl.java Fri Sep 8 23:02:32 2017
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.cdi.viewtransient;
+package org.apache.myfaces.cdi.scope;
import java.lang.annotation.Annotation;
import java.util.Map;
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java?rev=1807842&r1=1807841&r2=1807842&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java Fri Sep 8 23:02:32 2017
@@ -40,7 +40,7 @@ import javax.faces.render.RenderKitFacto
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import org.apache.myfaces.cdi.faces.FacesScopeProvider;
+import org.apache.myfaces.cdi.scope.FacesScopeProvider;
import org.apache.myfaces.context.ReleaseableExternalContext;
import org.apache.myfaces.context.ReleaseableFacesContextFactory;
Modified: myfaces/core/branches/2.3.x/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension?rev=1807842&r1=1807841&r2=1807842&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension Fri Sep 8 23:02:32 2017
@@ -1,11 +1,10 @@
+org.apache.myfaces.cdi.scope.ScopeExtension
org.apache.myfaces.cdi.view.ViewScopeContextExtension
org.apache.myfaces.flow.cdi.FlowBuilderCDIExtension
org.apache.myfaces.flow.cdi.FlowScopeCDIExtension
org.apache.myfaces.cdi.dependent.DependentBeanExtension
org.apache.myfaces.config.annotation.CdiAnnotationProviderExtension
org.apache.myfaces.push.cdi.PushContextCDIExtension
-org.apache.myfaces.cdi.faces.FacesScopeContextExtension
-org.apache.myfaces.cdi.viewtransient.ViewTransientScopeContextExtension
org.apache.myfaces.cdi.bean.ManagedPropertyExtension
org.apache.myfaces.cdi.converter.FacesConverterExtension
org.apache.myfaces.cdi.validator.FacesValidatorExtension