You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2011/04/16 23:51:31 UTC
svn commit: r1094062 - in /myfaces/extensions/cdi/trunk/jee-modules/jsf20-module: api/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/api/view/ impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/component/ impl/src/main/java/org/apache...

Author: gpetracek
Date: Sat Apr 16 21:51:30 2011
New Revision: 1094062

URL: http://svn.apache.org/viewvc?rev=1094062&view=rev
Log:
EXTCDI-167 cleanup

Added:
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/component/DefaultTemporaryUIViewRoot.java
      - copied, changed from r1094059, myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/component/TemporaryUIViewRoot.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/component/spi/
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/component/spi/TemporaryUIViewRoot.java
      - copied, changed from r1094059, myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/api/view/TemporaryComponent.java
Removed:
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/api/view/TemporaryComponent.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/component/TemporaryUIViewRoot.java
Modified:
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/TemporaryViewRootAwareApplicationWrapper.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/security/SecurityAwareViewHandler.java

Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/component/DefaultTemporaryUIViewRoot.java (from r1094059, myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/component/TemporaryUIViewRoot.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/component/DefaultTemporaryUIViewRoot.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/component/DefaultTemporaryUIViewRoot.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/component/TemporaryUIViewRoot.java&r1=1094059&r2=1094062&rev=1094062&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/component/TemporaryUIViewRoot.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/component/DefaultTemporaryUIViewRoot.java Sat Apr 16 21:51:30 2011
@@ -18,7 +18,7 @@
  */
 package org.apache.myfaces.extensions.cdi.jsf2.impl.component;
 
-import org.apache.myfaces.extensions.cdi.jsf2.api.view.TemporaryComponent;
+import org.apache.myfaces.extensions.cdi.jsf2.impl.component.spi.TemporaryUIViewRoot;
 
 import javax.faces.component.UIViewRoot;
 
@@ -26,8 +26,10 @@ import javax.faces.component.UIViewRoot;
 /**
  * @author Gerhard Petracek
  */
-public class TemporaryUIViewRoot extends UIViewRoot implements TemporaryComponent
+public class DefaultTemporaryUIViewRoot extends UIViewRoot implements TemporaryUIViewRoot
 {
+    private static final long serialVersionUID = -1800819266253071047L;
+
     private boolean activateTemporaryMode;
 
     /**

Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/component/spi/TemporaryUIViewRoot.java (from r1094059, myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/api/view/TemporaryComponent.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/component/spi/TemporaryUIViewRoot.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/component/spi/TemporaryUIViewRoot.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/api/view/TemporaryComponent.java&r1=1094059&r2=1094062&rev=1094062&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/api/view/TemporaryComponent.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/component/spi/TemporaryUIViewRoot.java Sat Apr 16 21:51:30 2011
@@ -16,12 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.jsf2.api.view;
+package org.apache.myfaces.extensions.cdi.jsf2.impl.component.spi;
+
+import java.io.Serializable;
 
 /**
  * @author Gerhard Petracek
  */
-public interface TemporaryComponent
+public interface TemporaryUIViewRoot extends Serializable
 {
     /**
      * De-/activates the temporary-mode

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/TemporaryViewRootAwareApplicationWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/TemporaryViewRootAwareApplicationWrapper.java?rev=1094062&r1=1094061&r2=1094062&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/TemporaryViewRootAwareApplicationWrapper.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/TemporaryViewRootAwareApplicationWrapper.java Sat Apr 16 21:51:30 2011
@@ -18,7 +18,9 @@
  */
 package org.apache.myfaces.extensions.cdi.jsf2.impl.listener.request;
 
-import org.apache.myfaces.extensions.cdi.jsf2.impl.component.TemporaryUIViewRoot;
+import org.apache.myfaces.extensions.cdi.core.impl.util.CodiUtils;
+import org.apache.myfaces.extensions.cdi.jsf2.impl.component.DefaultTemporaryUIViewRoot;
+import org.apache.myfaces.extensions.cdi.jsf2.impl.component.spi.TemporaryUIViewRoot;
 
 import javax.el.ValueExpression;
 import javax.faces.FacesException;
@@ -59,14 +61,19 @@ class TemporaryViewRootAwareApplicationW
             {
                 return getCustomizedUIViewRoot(uiComponent);
             }
-            return new TemporaryUIViewRoot();
+            return new DefaultTemporaryUIViewRoot();
         }
         return uiComponent;
     }
 
     private UIComponent getCustomizedUIViewRoot(UIComponent uiComponent)
     {
-        //TODO proxy or custom (optional) factory
+        TemporaryUIViewRoot temporaryComponent = CodiUtils.lookupFromEnvironment(TemporaryUIViewRoot.class);
+
+        if(temporaryComponent instanceof UIComponent)
+        {
+            return (UIComponent)temporaryComponent;
+        }
         return uiComponent;
     }
 

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/security/SecurityAwareViewHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/security/SecurityAwareViewHandler.java?rev=1094062&r1=1094061&r2=1094062&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/security/SecurityAwareViewHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/security/SecurityAwareViewHandler.java Sat Apr 16 21:51:30 2011
@@ -18,7 +18,7 @@
  */
 package org.apache.myfaces.extensions.cdi.jsf2.impl.security;
 
-import org.apache.myfaces.extensions.cdi.jsf2.api.view.TemporaryComponent;
+import org.apache.myfaces.extensions.cdi.jsf2.impl.component.spi.TemporaryUIViewRoot;
 
 import javax.faces.application.ViewHandler;
 import javax.faces.component.UIViewRoot;
@@ -63,17 +63,17 @@ public class SecurityAwareViewHandler
             }
         }
 
-        if(originalViewRoot instanceof TemporaryComponent)
+        if(originalViewRoot instanceof TemporaryUIViewRoot)
         {
             //workaround for PreDestroyViewMapEvent which would be caused by the security check
-            ((TemporaryComponent)originalViewRoot).setTemporaryMode(true);
+            ((TemporaryUIViewRoot)originalViewRoot).setTemporaryMode(true);
         }
 
         newViewRoot = super.createView(context, viewId);
 
-        if(originalViewRoot instanceof TemporaryComponent)
+        if(originalViewRoot instanceof TemporaryUIViewRoot)
         {
-            ((TemporaryComponent)originalViewRoot).setTemporaryMode(false);
+            ((TemporaryUIViewRoot)originalViewRoot).setTemporaryMode(false);
         }
 
         if(viewMap != null)