myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tandrasc...@apache.org
Subject [myfaces] branch master updated: refactored
Date Sat, 12 Jan 2019 18:01:20 GMT
This is an automated email from the ASF dual-hosted git repository.

tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git


The following commit(s) were added to refs/heads/master by this push:
     new dfc286b  refactored
dfc286b is described below

commit dfc286b86bc41a763415881e57e8435a6516e726
Author: Thomas Andraschko <tandraschko@apache.org>
AuthorDate: Sat Jan 12 19:01:43 2019 +0100

    refactored
---
 .../cdi/{scope => }/FacesScopeBeanHolder.java      |  4 ++--
 ...ContextImpl.java => FacesScopeContextImpl.java} |  6 +++---
 ...opedExtension.java => FacesScopeExtension.java} |  8 ++++----
 .../cdi/{scope => }/FacesScopeProvider.java        |  2 +-
 .../myfaces/cdi/{scope => }/FacesScoped.java       |  2 +-
 .../apache/myfaces/cdi/JsfArtifactProducer.java    |  3 +--
 ...ntextExtension.java => ViewScopeExtension.java} |  2 +-
 .../ViewTransientScopeBeanHolder.java              |  4 ++--
 .../ViewTransientScopeContextImpl.java}            |  6 +++---
 .../ViewTransientScopeExtension.java}              |  8 ++++----
 .../cdi/{scope => view}/ViewTransientScoped.java   |  2 +-
 .../myfaces/context/servlet/FacesContextImpl.java  |  2 +-
 ...CDIExtension.java => FlowBuilderExtension.java} |  2 +-
 .../myfaces/flow/cdi/FlowBuilderFactoryBean.java   |  2 +-
 ...peCDIExtension.java => FlowScopeExtension.java} |  4 ++--
 .../services/javax.enterprise.inject.spi.Extension | 24 +++++++++++-----------
 16 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopeBeanHolder.java b/impl/src/main/java/org/apache/myfaces/cdi/FacesScopeBeanHolder.java
similarity index 98%
rename from impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopeBeanHolder.java
rename to impl/src/main/java/org/apache/myfaces/cdi/FacesScopeBeanHolder.java
index 6a721a7..ad0d793 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopeBeanHolder.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/FacesScopeBeanHolder.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.cdi.scope;
+package org.apache.myfaces.cdi;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -130,7 +130,7 @@ public class FacesScopeBeanHolder
         ContextualStorage oldStorages = forceNewStorage(facesContext);
         if (oldStorages != null)
         {
-            FacesScopedContextImpl.destroyAllActive(oldStorages);
+            FacesScopeContextImpl.destroyAllActive(oldStorages);
         }
     }
 
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopedContextImpl.java b/impl/src/main/java/org/apache/myfaces/cdi/FacesScopeContextImpl.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopedContextImpl.java
rename to impl/src/main/java/org/apache/myfaces/cdi/FacesScopeContextImpl.java
index b2fae66..5fcf5f1 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopedContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/FacesScopeContextImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.cdi.scope;
+package org.apache.myfaces.cdi;
 
 import java.lang.annotation.Annotation;
 import java.util.Map;
@@ -35,12 +35,12 @@ import org.apache.myfaces.cdi.util.ContextualStorage;
  * Minimal implementation of FacesScope.
  */
 @Typed()
-public class FacesScopedContextImpl implements Context
+public class FacesScopeContextImpl implements Context
 {
 
     private BeanManager beanManager;
     
-    public FacesScopedContextImpl(BeanManager beanManager)
+    public FacesScopeContextImpl(BeanManager beanManager)
     {
         this.beanManager = beanManager;
     }
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopedExtension.java b/impl/src/main/java/org/apache/myfaces/cdi/FacesScopeExtension.java
similarity index 86%
rename from impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopedExtension.java
rename to impl/src/main/java/org/apache/myfaces/cdi/FacesScopeExtension.java
index 77f0a5e..1bb98c5 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopedExtension.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/FacesScopeExtension.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.cdi.scope;
+package org.apache.myfaces.cdi;
 
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.spi.AfterBeanDiscovery;
@@ -24,9 +24,9 @@ import javax.enterprise.inject.spi.BeanManager;
 import javax.enterprise.inject.spi.BeforeBeanDiscovery;
 import javax.enterprise.inject.spi.Extension;
 
-public class FacesScopedExtension implements Extension
+public class FacesScopeExtension implements Extension
 {
-    private FacesScopedContextImpl facesScopeContext;
+    private FacesScopeContextImpl facesScopeContext;
 
     void beforeBeanDiscovery(@Observes BeforeBeanDiscovery event, BeanManager beanManager)
     {
@@ -35,7 +35,7 @@ public class FacesScopedExtension implements Extension
     
     void afterBeanDiscovery(@Observes AfterBeanDiscovery afterBeanDiscovery, BeanManager
beanManager)
     {
-        facesScopeContext = new FacesScopedContextImpl(beanManager);
+        facesScopeContext = new FacesScopeContextImpl(beanManager);
         afterBeanDiscovery.addContext(facesScopeContext);
     }
 }
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopeProvider.java b/impl/src/main/java/org/apache/myfaces/cdi/FacesScopeProvider.java
similarity index 94%
rename from impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopeProvider.java
rename to impl/src/main/java/org/apache/myfaces/cdi/FacesScopeProvider.java
index de18aac..a1729ac 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopeProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/FacesScopeProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.myfaces.cdi.scope;
+package org.apache.myfaces.cdi;
 
 import javax.faces.context.FacesContext;
 
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScoped.java b/impl/src/main/java/org/apache/myfaces/cdi/FacesScoped.java
similarity index 94%
rename from impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScoped.java
rename to impl/src/main/java/org/apache/myfaces/cdi/FacesScoped.java
index 0bf81ae..86e8782 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScoped.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/FacesScoped.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.cdi.scope;
+package org.apache.myfaces.cdi;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/JsfArtifactProducer.java b/impl/src/main/java/org/apache/myfaces/cdi/JsfArtifactProducer.java
index c014dbd..178055a 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/JsfArtifactProducer.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/JsfArtifactProducer.java
@@ -38,8 +38,7 @@ import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
 import javax.faces.context.Flash;
 import javax.inject.Named;
-import org.apache.myfaces.cdi.scope.FacesScoped;
-import org.apache.myfaces.cdi.scope.ViewTransientScoped;
+import org.apache.myfaces.cdi.view.ViewTransientScoped;
 
 public class JsfArtifactProducer
 {
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeContextExtension.java
b/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeExtension.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeContextExtension.java
rename to impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeExtension.java
index 938970d..5f3a4f6 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeContextExtension.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeExtension.java
@@ -31,7 +31,7 @@ import javax.faces.view.ViewScoped;
  * 
  * @author Leonardo Uribe
  */
-public class ViewScopeContextExtension implements Extension
+public class ViewScopeExtension implements Extension
 {
     private ViewScopeContextImpl viewScopeContext;
 
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScopeBeanHolder.java
b/impl/src/main/java/org/apache/myfaces/cdi/view/ViewTransientScopeBeanHolder.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScopeBeanHolder.java
rename to impl/src/main/java/org/apache/myfaces/cdi/view/ViewTransientScopeBeanHolder.java
index c736089..1eb24ce 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScopeBeanHolder.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/view/ViewTransientScopeBeanHolder.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.cdi.scope;
+package org.apache.myfaces.cdi.view;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -116,7 +116,7 @@ public class ViewTransientScopeBeanHolder
         ContextualStorage oldWindowContextStorages = forceNewStorage(facesContext);
         if (oldWindowContextStorages != null)
         {
-            ViewTransientScopedContextImpl.destroyAllActive(oldWindowContextStorages);
+            ViewTransientScopeContextImpl.destroyAllActive(oldWindowContextStorages);
         }
     }
 
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScopedContextImpl.java
b/impl/src/main/java/org/apache/myfaces/cdi/view/ViewTransientScopeContextImpl.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScopedContextImpl.java
rename to impl/src/main/java/org/apache/myfaces/cdi/view/ViewTransientScopeContextImpl.java
index 54039a6..91bd7e6 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScopedContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/view/ViewTransientScopeContextImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.cdi.scope;
+package org.apache.myfaces.cdi.view;
 
 import java.lang.annotation.Annotation;
 import java.util.Map;
@@ -35,12 +35,12 @@ import org.apache.myfaces.cdi.util.ContextualStorage;
  * Minimal implementation of FacesScope.
  */
 @Typed()
-public class ViewTransientScopedContextImpl implements Context
+public class ViewTransientScopeContextImpl implements Context
 {
 
     private BeanManager beanManager;
     
-    public ViewTransientScopedContextImpl(BeanManager beanManager)
+    public ViewTransientScopeContextImpl(BeanManager beanManager)
     {
         this.beanManager = beanManager;
     }
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScopedExtension.java
b/impl/src/main/java/org/apache/myfaces/cdi/view/ViewTransientScopeExtension.java
similarity index 84%
rename from impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScopedExtension.java
rename to impl/src/main/java/org/apache/myfaces/cdi/view/ViewTransientScopeExtension.java
index 36ddf3a..c675f6a 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScopedExtension.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/view/ViewTransientScopeExtension.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.cdi.scope;
+package org.apache.myfaces.cdi.view;
 
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.spi.AfterBeanDiscovery;
@@ -24,9 +24,9 @@ import javax.enterprise.inject.spi.BeanManager;
 import javax.enterprise.inject.spi.BeforeBeanDiscovery;
 import javax.enterprise.inject.spi.Extension;
 
-public class ViewTransientScopedExtension implements Extension
+public class ViewTransientScopeExtension implements Extension
 {
-    private ViewTransientScopedContextImpl viewTransientScopedContext;
+    private ViewTransientScopeContextImpl viewTransientScopedContext;
 
     void beforeBeanDiscovery(@Observes BeforeBeanDiscovery event, BeanManager beanManager)
     {
@@ -35,7 +35,7 @@ public class ViewTransientScopedExtension implements Extension
     
     void afterBeanDiscovery(@Observes AfterBeanDiscovery afterBeanDiscovery, BeanManager
beanManager)
     {
-        viewTransientScopedContext = new ViewTransientScopedContextImpl(beanManager);
+        viewTransientScopedContext = new ViewTransientScopeContextImpl(beanManager);
         afterBeanDiscovery.addContext(viewTransientScopedContext);
     }
 }
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScoped.java b/impl/src/main/java/org/apache/myfaces/cdi/view/ViewTransientScoped.java
similarity index 94%
rename from impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScoped.java
rename to impl/src/main/java/org/apache/myfaces/cdi/view/ViewTransientScoped.java
index 04c12aa..05202c9 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScoped.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/view/ViewTransientScoped.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.cdi.scope;
+package org.apache.myfaces.cdi.view;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java b/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java
index ee02dcd..3429369 100755
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java
@@ -40,7 +40,7 @@ import javax.faces.render.RenderKitFactory;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
-import org.apache.myfaces.cdi.scope.FacesScopeProvider;
+import org.apache.myfaces.cdi.FacesScopeProvider;
 
 import org.apache.myfaces.util.ExternalSpecifications;
 import org.apache.myfaces.context.ReleasableFacesContextFactory;
diff --git a/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowBuilderCDIExtension.java b/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowBuilderExtension.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/flow/cdi/FlowBuilderCDIExtension.java
rename to impl/src/main/java/org/apache/myfaces/flow/cdi/FlowBuilderExtension.java
index fc1115c..80ffdf4 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowBuilderCDIExtension.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowBuilderExtension.java
@@ -41,7 +41,7 @@ import javax.faces.flow.builder.FlowDefinition;
  *
  * @author Leonardo Uribe
  */
-public class FlowBuilderCDIExtension implements Extension
+public class FlowBuilderExtension implements Extension
 {
     private List<Producer<Flow>> flowProducers = new ArrayList<Producer<Flow>>();
 
diff --git a/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowBuilderFactoryBean.java b/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowBuilderFactoryBean.java
index 1107ddd..f9c5f04 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowBuilderFactoryBean.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowBuilderFactoryBean.java
@@ -51,7 +51,7 @@ public class FlowBuilderFactoryBean
     private List<Flow> flowDefinitions = null;
 
     @Inject
-    private FlowBuilderCDIExtension flowBuilderExtension;
+    private FlowBuilderExtension flowBuilderExtension;
 
     public FlowBuilderFactoryBean()
     {
diff --git a/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeCDIExtension.java b/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeExtension.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeCDIExtension.java
rename to impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeExtension.java
index a583443..99624a4 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeCDIExtension.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeExtension.java
@@ -34,13 +34,13 @@ import org.apache.myfaces.flow.FlowReference;
  *
  * @author Leonardo Uribe
  */
-public class FlowScopeCDIExtension implements Extension
+public class FlowScopeExtension implements Extension
 {
     private FlowScopedContextImpl flowScopedContext;
     
     private Map<Class, FlowReference> flowBeanReferences;
     
-    public FlowScopeCDIExtension()
+    public FlowScopeExtension()
     {
         flowBeanReferences = new ConcurrentHashMap<Class, FlowReference>();
     }
diff --git a/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
b/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
index 224b642..1006cc1 100644
--- a/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
+++ b/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
@@ -1,15 +1,15 @@
-org.apache.myfaces.cdi.scope.FacesScopedExtension
-org.apache.myfaces.cdi.scope.ViewTransientScopedExtension
+org.apache.myfaces.cdi.FacesScopeExtension
+org.apache.myfaces.cdi.JsfArtifactProducerExtension
 org.apache.myfaces.cdi.JsfApplicationArtifactHolderExtension
-org.apache.myfaces.cdi.view.ViewScopeContextExtension
-org.apache.myfaces.flow.cdi.FlowBuilderCDIExtension
-org.apache.myfaces.flow.cdi.FlowScopeCDIExtension
-org.apache.myfaces.config.annotation.CdiAnnotationProviderExtension
-org.apache.myfaces.push.cdi.PushContextCDIExtension
-org.apache.myfaces.cdi.managedproperty.ManagedPropertyExtension
-org.apache.myfaces.cdi.converter.FacesConverterExtension
-org.apache.myfaces.cdi.validator.FacesValidatorExtension
 org.apache.myfaces.cdi.behavior.FacesBehaviorExtension
-org.apache.myfaces.cdi.model.FacesDataModelExtension
 org.apache.myfaces.cdi.config.FacesConfigExtension
-org.apache.myfaces.cdi.JsfArtifactProducerExtension
\ No newline at end of file
+org.apache.myfaces.cdi.converter.FacesConverterExtension
+org.apache.myfaces.cdi.managedproperty.ManagedPropertyExtension
+org.apache.myfaces.cdi.model.FacesDataModelExtension
+org.apache.myfaces.cdi.validator.FacesValidatorExtension
+org.apache.myfaces.cdi.view.ViewScopeExtension
+org.apache.myfaces.cdi.view.ViewTransientScopeExtension
+org.apache.myfaces.config.annotation.CdiAnnotationProviderExtension
+org.apache.myfaces.push.cdi.PushContextCDIExtension
+org.apache.myfaces.flow.cdi.FlowBuilderExtension
+org.apache.myfaces.flow.cdi.FlowScopeExtension


Mime
View raw message