You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2010/01/21 18:36:34 UTC
svn commit: r901792 - in /myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet: ./ support/

Author: werpu
Date: Thu Jan 21 17:36:34 2010
New Revision: 901792

URL: http://svn.apache.org/viewvc?rev=901792&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-47

refactoring for the facelet patchup part

Added:
    myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/support/
    myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/support/ComponentRule.java   (contents, props changed)
      - copied, changed from r901788, myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/ComponentRule.java
    myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/support/InvokeDynamicBeanPropertyTagRule.java   (contents, props changed)
      - copied, changed from r901788, myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/InvokeDynamicBeanPropertyTagRule.java
    myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/support/SwitchingBeanPropertyTagRule.java   (contents, props changed)
      - copied, changed from r901788, myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/SwitchingBeanPropertyTagRule.java
    myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/support/SwitchingMetarulesetImpl.java   (contents, props changed)
      - copied, changed from r901788, myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/SwitchingMetarulesetImpl.java
Removed:
    myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/ComponentRule.java
    myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/InvokeDynamicBeanPropertyTagRule.java
    myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/SwitchingBeanPropertyTagRule.java
    myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/SwitchingMetarulesetImpl.java
Modified:
    myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/ReloadingComponentTagHandlerDelegate.java

Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/ReloadingComponentTagHandlerDelegate.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/ReloadingComponentTagHandlerDelegate.java?rev=901792&r1=901791&r2=901792&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/ReloadingComponentTagHandlerDelegate.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/ReloadingComponentTagHandlerDelegate.java Thu Jan 21 17:36:34 2010
@@ -1,7 +1,8 @@
 package org.apache.myfaces.scripting.facelet;
 
 import org.apache.myfaces.scripting.core.util.WeavingContext;
-import org.apache.myfaces.view.facelets.tag.MetaRulesetImpl;
+import org.apache.myfaces.scripting.facelet.support.ComponentRule;
+import org.apache.myfaces.scripting.facelet.support.SwitchingMetarulesetImpl;
 import org.apache.myfaces.view.facelets.tag.jsf.*;
 
 import javax.faces.component.ActionSource;

Copied: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/support/ComponentRule.java (from r901788, myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/ComponentRule.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/support/ComponentRule.java?p2=myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/support/ComponentRule.java&p1=myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/ComponentRule.java&r1=901788&r2=901792&rev=901792&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/ComponentRule.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/support/ComponentRule.java Thu Jan 21 17:36:34 2010
@@ -1,4 +1,4 @@
-package org.apache.myfaces.scripting.facelet;
+package org.apache.myfaces.scripting.facelet.support;
 
 import javax.faces.component.UIComponent;
 import javax.faces.view.facelets.*;
@@ -6,13 +6,11 @@
 import java.util.logging.Logger;
 
 /**
- * Created by IntelliJ IDEA.
- * User: werpu2
- * Date: 21.01.2010
- * Time: 16:06:23
- * To change this template use File | Settings | File Templates.
+ * we have to reimplement the component rule class here
+ * because it is declared private in the original
+ * implementation
  */
-final class ComponentRule extends MetaRule
+public final class ComponentRule extends MetaRule
 {
 
     final class LiteralAttributeMetadata extends Metadata

Propchange: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/support/ComponentRule.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/support/ComponentRule.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/support/InvokeDynamicBeanPropertyTagRule.java (from r901788, myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/InvokeDynamicBeanPropertyTagRule.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/support/InvokeDynamicBeanPropertyTagRule.java?p2=myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/support/InvokeDynamicBeanPropertyTagRule.java&p1=myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/InvokeDynamicBeanPropertyTagRule.java&r1=901788&r2=901792&rev=901792&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/InvokeDynamicBeanPropertyTagRule.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/support/InvokeDynamicBeanPropertyTagRule.java Thu Jan 21 17:36:34 2010
@@ -1,4 +1,4 @@
-package org.apache.myfaces.scripting.facelet;
+package org.apache.myfaces.scripting.facelet.support;
 
 import org.apache.myfaces.scripting.core.util.ReflectUtil;
 

Propchange: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/support/InvokeDynamicBeanPropertyTagRule.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/support/InvokeDynamicBeanPropertyTagRule.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/support/SwitchingBeanPropertyTagRule.java (from r901788, myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/SwitchingBeanPropertyTagRule.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/support/SwitchingBeanPropertyTagRule.java?p2=myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/support/SwitchingBeanPropertyTagRule.java&p1=myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/SwitchingBeanPropertyTagRule.java&r1=901788&r2=901792&rev=901792&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/SwitchingBeanPropertyTagRule.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/support/SwitchingBeanPropertyTagRule.java Thu Jan 21 17:36:34 2010
@@ -1,4 +1,4 @@
-package org.apache.myfaces.scripting.facelet;
+package org.apache.myfaces.scripting.facelet.support;
 
 import org.apache.myfaces.scripting.core.util.WeavingContext;
 import org.apache.myfaces.view.facelets.tag.BeanPropertyTagRule;

Propchange: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/support/SwitchingBeanPropertyTagRule.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/support/SwitchingBeanPropertyTagRule.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/support/SwitchingMetarulesetImpl.java (from r901788, myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/SwitchingMetarulesetImpl.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/support/SwitchingMetarulesetImpl.java?p2=myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/support/SwitchingMetarulesetImpl.java&p1=myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/SwitchingMetarulesetImpl.java&r1=901788&r2=901792&rev=901792&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/SwitchingMetarulesetImpl.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/support/SwitchingMetarulesetImpl.java Thu Jan 21 17:36:34 2010
@@ -1,6 +1,5 @@
-package org.apache.myfaces.scripting.facelet;
+package org.apache.myfaces.scripting.facelet.support;
 
-import org.apache.myfaces.view.facelets.tag.BeanPropertyTagRule;
 import org.apache.myfaces.view.facelets.tag.MetaRulesetImpl;
 import org.apache.myfaces.view.facelets.tag.MetadataImpl;
 import org.apache.myfaces.view.facelets.tag.MetadataTargetImpl;

Propchange: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/support/SwitchingMetarulesetImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/support/SwitchingMetarulesetImpl.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL