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/03/23 11:43:08 UTC

svn commit: r926523 - in /myfaces/extensions/scripting/trunk: core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ examples/myfaces20-example/src/main/webapp/ examples/myfaces20-example/src/main/web...

Author: werpu
Date: Tue Mar 23 10:43:07 2010
New Revision: 926523

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

Added:
    myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/cyclic/
    myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/cyclic/Cyclic1.java   (contents, props changed)
      - copied, changed from r923304, myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Cyclic1.java
    myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/cyclic/Cyclic2.java
      - copied, changed from r923304, myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Cyclic2.java
    myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/instantbean/
    myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/instantbean/HelloBean.java   (contents, props changed)
      - copied, changed from r923304, myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Cyclic2.java
    myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/helloWorld2.xhtml
Removed:
    myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Cyclic1.java
    myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Cyclic2.java
Modified:
    myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ApplicationProxy.java
    myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BaseInterface.java
    myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java
    myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java
    myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/JSFUtilJava.java
    myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/complexBean.xhtml
    myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/componentTest.xhtml
    myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/javablog.xhtml
    myfaces/extensions/scripting/trunk/src/site/xdoc/index.xml
    myfaces/extensions/scripting/trunk/src/site/xdoc/using_advanced.xml

Modified: myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ApplicationProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ApplicationProxy.java?rev=926523&r1=926522&r2=926523&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ApplicationProxy.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ApplicationProxy.java Tue Mar 23 10:43:07 2010
@@ -38,21 +38,10 @@ import java.lang.reflect.Proxy;
 import java.util.*;
 
 /**
- * our decorating applicstion
+ * our decorating application
  * which should resolve our bean issues within a central
  * bean processing interceptor
  * <p/>
- * <p/>
- * component
- * <p/>
- * komponente A Šndert sich
- * Renderer Šndert sich nicht
- * <p/>
- * class Renderer {
- * public method (UIComponent myComp) {
- * ((MyComponent)myComp)
- * }
- * }
  *
  * @author Werner Punz
  */

Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BaseInterface.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BaseInterface.java?rev=926523&r1=926522&r2=926523&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BaseInterface.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BaseInterface.java Tue Mar 23 10:43:07 2010
@@ -20,6 +20,9 @@ package org.apache.myfaces.javaloader.bl
 
 /**
  * Base interface to test inheritance detection
+ *
+ * @author Werner Punz (latest modification by $Author$)
+ * @version $Revision$ $Date$
  */
 
 public interface BaseInterface {

Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java?rev=926523&r1=926522&r2=926523&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java Tue Mar 23 10:43:07 2010
@@ -23,8 +23,11 @@ import java.util.logging.Logger;
 import static org.apache.myfaces.javaloader.blog.JSFUtilJava.resolveVariable;
 
 /**
- * @author werpu2
- * @date: 01.09.2009
+ * Our Blog View controller
+ * (note we have a dummy annotation here for testing purposes)
+ *
+ * @author Werner Punz (latest modification by $Author$)
+ * @version $Revision$ $Date$
  */
 @DependencyTestAnnotation
 public class Blog {
@@ -33,10 +36,7 @@ public class Blog {
     String title1 = "You can alter the code for this small blogging application on the fly, " +
             "you even can add new classes on the fly and Java will pick it up";
 
-    String title3 = "bla";
-    String title4 = "bla2";
 
-    String title5 = "test from title5";
 
     String firstName = "";
     String lastName = "";
@@ -48,8 +48,8 @@ public class Blog {
         return Logger.getLogger(this.getClass().getName());
     }
 
-    public String addEntry2() {
-        getLog().info("adding entry2");
+    public String addEntry() {
+        getLog().info("adding entry");
         
         /*important we have an indirection over an interface here*/
         BlogServiceInterface service = (BlogServiceInterface) resolveVariable("javaBlogService");
@@ -57,7 +57,7 @@ public class Blog {
         if (service == null) {
             getLog().severe("service not found");
         } else {
-            getLog().info("service found");
+            getLog().fine("service found");
         }
 
         BlogEntry entry = new BlogEntry();
@@ -144,27 +144,6 @@ public class Blog {
         this.content = content;
     }
 
-    public String getTitle3() {
-        return "title 3 from java blog";
-    }
-
-    public void setTitle3(String title3) {
-        this.title3 = title3;
-    }
+  
 
-    public String getTitle4() {
-        return title4;
-    }
-
-    public void setTitle4(String title4) {
-        this.title4 = title4;
-    }
-
-    public String getTitle5() {
-        return title5;
-    }
-
-    public void setTitle5(String title5) {
-
-    }
 }

Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java?rev=926523&r1=926522&r2=926523&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java Tue Mar 23 10:43:07 2010
@@ -23,43 +23,26 @@ import java.util.LinkedList;
 import java.util.List;
 
 /**
- * @author werpu2
- * @date: 01.09.2009
+ * Application scoped bean (defined in the faces-config for testing purposes)
+ * which stores the blog entries
  */
 public class BlogService implements BlogServiceInterface {
 
-    /**
-     * note we cannot cast on dynamically referenced
-     * and recompiled objects which are shared between beans
-     * because due to dynamic recompilation
-     * <p/>
-     * Object a->references b does not reference b of the same class
-     * as object c->references b, we have to use introspection in this case
-     * we can use our utils class to make it a tiny bit more comfortable
-     * <p/>
-     * Statically compiled types always stay the same however
-     * the same goes for interfaces which are present as compiled code only
-     */
     List<Object> blogEntries = Collections.synchronizedList(new LinkedList<Object>());
 
+    /**
+     * Add an entry to our blogging list
+     * Note: we have a testing annotation,
+     * which does nothing, it is there for testing
+     * purposes only
+     *
+     * @param entry the entry to be added
+     */
     @DependencyTestAnnotation
     public void addEntry(BlogEntry entry) {
-  	  if (entry != null) {
-		  //entry.setTopic("MyTopic");
-          blogEntries.add(entry);
-      }
-
-  	  
-    	
-  	  addEntryInternal(entry);
-    }
-    
-   private void addEntryInternal(BlogEntry entry) {
-    	  System.out.println("hello world");
-    	  if (entry != null) {
-    		  entry.setTopic("MyTopic");
-              blogEntries.add(entry);
-          }
+        if (entry != null) {
+            blogEntries.add(entry);
+        }
     }
 
     public List<Object> getBlogEntries() {
@@ -71,7 +54,4 @@ public class BlogService implements Blog
     }
 
 
-    public String getTest() {
-        return "ddd";
-    }
 }

Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/JSFUtilJava.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/JSFUtilJava.java?rev=926523&r1=926522&r2=926523&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/JSFUtilJava.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/JSFUtilJava.java Tue Mar 23 10:43:07 2010
@@ -18,10 +18,11 @@
  */
 package org.apache.myfaces.javaloader.blog;
 
-import static org.apache.myfaces.scripting.core.util.ReflectUtil.executeMethod;
-
+import javax.el.ELContext;
+import javax.el.ELResolver;
 import javax.faces.context.FacesContext;
 
+
 /**
  * @author werpu2
  * @date: 01.09.2009
@@ -40,27 +41,12 @@ public class JSFUtilJava {
      * @return
      */
     public static Object resolveVariable(String beanName) {
+        FacesContext facesContext = FacesContext.getCurrentInstance();
 
-        Object facesContext = FacesContext.getCurrentInstance();
-
-        Object elContext = executeMethod(facesContext, "getELContext");
-        Object elResolver = executeMethod(elContext, "getELResolver");
-
-        /*
-         if you want to enable this then use
-         org.apache.myfaces.scripting.java.JAR_PATHS
-         pointing towards the lingering jars
-         The compiler cannot pick up the implicit containers classpaths
-
-
-
-
-        */
-        //we use the introspection calls here to achieve our goal that way
-        //we can shift the dependency resolution from compile time to runtime
-        return executeMethod(elResolver, "getValue", elContext, null, beanName);
-        //return FacesContext.getCurrentInstance().getELContext().getELResolver().getRendererType(FacesContext.getCurrentInstance().getELContext(), null, beanName);
+        ELContext elContext = facesContext.getELContext();
+        ELResolver elResolver =elContext.getELResolver();
 
+        return elResolver.getValue(elContext, null, beanName);
     }
 
 }

Copied: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/cyclic/Cyclic1.java (from r923304, myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Cyclic1.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/cyclic/Cyclic1.java?p2=myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/cyclic/Cyclic1.java&p1=myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Cyclic1.java&r1=923304&r2=926523&rev=926523&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Cyclic1.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/cyclic/Cyclic1.java Tue Mar 23 10:43:07 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.javaloader.blog;
+package org.apache.myfaces.javaloader.cyclic;
 
 /**
  * cyclic dependency class test for our class scanner

Propchange: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/cyclic/Cyclic1.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/cyclic/Cyclic1.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/cyclic/Cyclic2.java (from r923304, myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Cyclic2.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/cyclic/Cyclic2.java?p2=myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/cyclic/Cyclic2.java&p1=myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Cyclic2.java&r1=923304&r2=926523&rev=926523&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Cyclic2.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/cyclic/Cyclic2.java Tue Mar 23 10:43:07 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.javaloader.blog;
+package org.apache.myfaces.javaloader.cyclic;
 
 /**
  * cyclic dependency class test for our class scanner

Copied: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/instantbean/HelloBean.java (from r923304, myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Cyclic2.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/instantbean/HelloBean.java?p2=myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/instantbean/HelloBean.java&p1=myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Cyclic2.java&r1=923304&r2=926523&rev=926523&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Cyclic2.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/instantbean/HelloBean.java Tue Mar 23 10:43:07 2010
@@ -16,30 +16,31 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.javaloader.blog;
 
-/**
- * cyclic dependency class test for our class scanner
- */
-public class Cyclic2 {
+package org.apache.myfaces.javaloader.instantbean;
 
-    static Cyclic2 instance = null;
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.RequestScoped;
 
-    Cyclic1 cycl1 = null;
+/**
+ * @author Werner Punz (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
 
-    public Cyclic1 getCycl1() {
-        return cycl1;
-    }
+@ManagedBean(name="hello")
+@RequestScoped
+public class HelloBean {
+    private String hello = "Hello world from an instant bean";
 
-    public void setCycl1(Cyclic1 cycl1) {
-        this.cycl1 = cycl1;
+    private String addedMethod() {
+        return "you can add change and remove methods on the fly without any server restart";
     }
 
-    public static Cyclic2 getInstance() {
-        return instance;
+    public String getHello() {
+        return hello + addedMethod();
     }
 
-    public static void setInstance(Cyclic2 instance) {
-        Cyclic2.instance = instance;
+    public void setHello(String hello) {
+        this.hello = hello;
     }
 }

Propchange: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/instantbean/HelloBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/instantbean/HelloBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/complexBean.xhtml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/complexBean.xhtml?rev=926523&r1=926522&r2=926523&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/complexBean.xhtml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/complexBean.xhtml Tue Mar 23 10:43:07 2010
@@ -2,66 +2,29 @@
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html">
-<h:head>
+<head>
     <title>Hello World</title>
-</h:head>
+</head>
 <h:body>
 
 
-    <h1> this example tests complex bean relationships for refreshing</h1>
-    <h:form id="myForm">
-        <!--
-        <h:outputScript name="jsf.js" library="javax.faces" target="head"/>
-
-
-        <h:inputText value="#{myBean.test}">
-            <f:ajax render="#{myBean.bindingMyTest.clientId}" event="keyup"/>
-        </h:inputText>
-        <h:inputText id="myText" value="#{myBean.test}" binding="#{myBean.bindingMyTest}"/>
-
-
-        <h:outputText value="#{receiver.myBean.hello}" />
-        <h:outputText value="#{receiver.myBean.secondaryBean.hello}" />
-        -->
-
-        <script type="text/javascript">
-            //<![CDATA[
-            function onEvent(data) {
-                if (typeof data != "undefined" && typeof data.status != "undefined") {
-                    console.debug(data.status)
-                } else {
-                    console.debug("undefined data");
-                }
-            }
-            //]]>
-        </script>
-
-        <h:selectOneMenu value="#{myBean.test}">
-            <f:selectItem itemValue="aaa" itemLabel="aaa"/>
-            <f:selectItem itemValue="bbb" itemLabel="bbb"/>
-            <f:ajax render="case1" event="change" />
-        </h:selectOneMenu>
-         <h:outputText id="case1" value="#{myBean.test}"/>
-         <h:commandLink action="complexBean" value="press me"/>
-        <h:inputText value="#{myBean.test}">
-            <f:ajax render="myText myText2" event="keyup"/>
-        </h:inputText>
-        <h:outputText id="bla" value="#{myBean.test}"/>
-        <h:panelGroup id="myText">
-            <h:inputText value="#{myBean.test}" rendered="#{myBean.test eq 'aaa'}" binding="#{myBean.bindingMyTest}"/>
-        </h:panelGroup>
-        <h:panelGroup id="myText2">
-            <h:panelGroup rendered="#{myBean.test eq 'ccc'}">
-                <script type="text/javascript">
-                    //<![CDATA[
-                    console.debug("blablabla");
-                    //]]>
-                </script>
-                <h:inputText value="#{myBean.test}"/>
-            </h:panelGroup>
-        </h:panelGroup>
+        <h1> this example tests complex bean relationships for refreshing</h1>
+        <h:form id="myForm">
+            <h:outputScript name="jsf.js" library="javax.faces" target="head"/>
+
+
+            <h:inputText value="#{myBean.test}">
+                <f:ajax render="#{myBean.bindingMyTest.clientId}" event="keyup"/>
+            </h:inputText>
+            <h:inputText id="myText" value="#{myBean.test}" binding="#{myBean.bindingMyTest}"/>
+
+
+            <h:outputText value="#{receiver.myBean.hello}" />
+            <h:outputText value="#{receiver.myBean.secondaryBean.hello}" />
+
+
+        </h:form>
 
 
-    </h:form>
 </h:body>
 </html>

Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/componentTest.xhtml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/componentTest.xhtml?rev=926523&r1=926522&r2=926523&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/componentTest.xhtml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/componentTest.xhtml Tue Mar 23 10:43:07 2010
@@ -16,9 +16,7 @@
 
 
                 <h:panelGroup styleClass="stdBoxBig">
-                    <div style="background-color:white">
-                     rewlktjhwkrejht welrijkhtiewrjgw ietrgheiltw jk
-                    </div>
+                    
                     <h:commandLink style="color: white;" value="press me" action="#{javatestbean.doAction}"/>
                     <grv:testcomponent2 testAttr="vvv" testAttr3="Attribute 3 set"
                                         testAttr4="Attribute 4 set and showing"/>

Added: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/helloWorld2.xhtml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/helloWorld2.xhtml?rev=926523&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/helloWorld2.xhtml (added)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/helloWorld2.xhtml Tue Mar 23 10:43:07 2010
@@ -0,0 +1,18 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:grv="http://myfaces.apache.org/groovy">
+<h:head>
+    <title>Hello World 2</title>
+</h:head>
+<h:body>
+<ui:composition template="/template.xhtml">
+    <ui:define name="body">
+        <h1 style="color: yellow;">
+           <h:outputText value="#{hello.hello}" />  
+        </h1>
+    </ui:define>
+</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/javablog.xhtml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/javablog.xhtml?rev=926523&r1=926522&r2=926523&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/javablog.xhtml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/javablog.xhtml Tue Mar 23 10:43:07 2010
@@ -22,8 +22,6 @@
                 <h:panelGrid id="grid" columns="1" styleClass="stdBox">
                     <h:outputFormat id="title1" escape="false" styleClass="title" value="#{javaBlogView.title}"/>
                     <h:outputFormat id="title11" escape="false"  styleClass="title1" value="#{javaBlogView.title1}"/>
-                    <h:outputFormat escape="false"  value="#{javaBlogView.title3}"/>
-                    <h:outputFormat escape="false"  value="#{javaBlogView.title4}"/>
 
                     <hr/>
 
@@ -40,7 +38,7 @@
                         <h:inputTextarea value="#{javaBlogView.content}"/>
                     </h:panelGrid>
                     <hr/>
-                    <h:commandButton styleClass="btn" action="#{javaBlogView.addEntry2}" value="Add Blog Entry"/>
+                    <h:commandButton styleClass="btn" action="#{javaBlogView.addEntry}" value="Add Blog Entry"/>
                 </h:panelGrid>
             </div>
 

Modified: myfaces/extensions/scripting/trunk/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/src/site/xdoc/index.xml?rev=926523&r1=926522&r2=926523&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/src/site/xdoc/index.xml (original)
+++ myfaces/extensions/scripting/trunk/src/site/xdoc/index.xml Tue Mar 23 10:43:07 2010
@@ -42,16 +42,17 @@
 
                 <p>
                     <center>
-                        <object width="640px" height="480px">
+                        <object width="800" height="600">
                             <param name="movie"
-                                   value="http://www.youtube.com/v/vUCCTCMjTPE&#38;hl=de_DE&#38;fs=1&#38;"></param>
+                                   value="http://www.youtube.com/v/g2YvzOloNyI&#38;hl=de_DE&#38;fs=1&#38;border=1"></param>
                             <param name="allowFullScreen" value="true"></param>
                             <param name="allowscriptaccess" value="always"></param>
-                            <embed src="http://www.youtube.com/v/vUCCTCMjTPE&#38;hl=de_DE&#38;fs=1&#38;"
+                            <embed src="http://www.youtube.com/v/g2YvzOloNyI&#38;hl=de_DE&#38;fs=1&#38;border=1"
                                    type="application/x-shockwave-flash" allowscriptaccess="always"
-                                   allowfullscreen="true" width="640px" height="480px"></embed>
+                                   allowfullscreen="true" width="800" height="550"></embed>
                         </object>
                     </center>
+
                 </p>
                 <p>
                     As the video shows, you can make changes to almost all JSF artifacts on the fly, and at the next
@@ -69,7 +70,7 @@
         </section>
         <section name="Documentation">
             <p>
-                Ext-Scritpting provides extensive documentation. Feel free
+                Ext-Scripting provides extensive documentation. Feel free
                 to browse our
                 <a href="installation.html">Installation Guide</a>
                 or

Modified: myfaces/extensions/scripting/trunk/src/site/xdoc/using_advanced.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/src/site/xdoc/using_advanced.xml?rev=926523&r1=926522&r2=926523&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/src/site/xdoc/using_advanced.xml (original)
+++ myfaces/extensions/scripting/trunk/src/site/xdoc/using_advanced.xml Tue Mar 23 10:43:07 2010
@@ -102,10 +102,10 @@
                     <center>
                         <object width="640px" height="505px">
                             <param name="movie"
-                                   value="http://www.youtube.com/v/v56ru9ZJyhQ&#38;hl=de_DE&#38;fs=1&#38;hd=1"></param>
+                                   value="http://www.youtube.com/v/v56ru9ZJyhQ&#38;hl=de_DE&#38;fs=1&#38;hd=1&#38;border=1"></param>
                             <param name="allowFullScreen" value="true"></param>
                             <param name="allowscriptaccess" value="always"></param>
-                            <embed src="http://www.youtube.com/v/v56ru9ZJyhQ&#38;hl=de_DE&#38;fs=1&#38;hd=1"
+                            <embed src="http://www.youtube.com/v/v56ru9ZJyhQ&#38;hl=de_DE&#38;fs=1&#38;hd=1&#38;border=1"
                                    type="application/x-shockwave-flash" allowscriptaccess="always"
                                    allowfullscreen="true"
                                    width="640px" height="505px"></embed>
@@ -279,14 +279,17 @@
             </p>
             <p></p>
             <center>
-                <object width="640px" height="480px">
-                    <param name="movie" value="http://www.youtube.com/v/65Hp0tjj6SQ&#38;hl=de_DE&#38;fs=1&#38;"></param>
+               
+                <object width="660" height="405">
+                    <param name="movie" value="http://www.youtube.com/v/YWlBGE3vyMw&#38;hl=de_DE&#38;fs=1?&#38;border=1"></param>
                     <param name="allowFullScreen" value="true"></param>
                     <param name="allowscriptaccess" value="always"></param>
-                    <embed src="http://www.youtube.com/v/65Hp0tjj6SQ&#38;hl=de_DE&#38;fs=1&#38;"
-                           type="application/x-shockwave-flash"
-                           allowscriptaccess="always" allowfullscreen="true" width="640px" height="480px"></embed>
+                    <embed src="http://www.youtube.com/v/YWlBGE3vyMw&#38;hl=de_DE&#38;fs=1&#38;?&#38;border=1"
+                           type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true"
+                           width="660" height="405"></embed>
                 </object>
+
+
             </center>
             <p>
                 This dependency detection works over all dynamic classes, no matter being it classes, interfaces,
@@ -316,10 +319,10 @@
             <center>
                 <object width="640" height="505">
                     <param name="movie"
-                           value="http://www.youtube.com/v/tikOR0XDnFw&#38;hl=de_DE&#38;fs=1&#38;hd=1"></param>
+                           value="http://www.youtube.com/v/tikOR0XDnFw&#38;hl=de_DE&#38;fs=1&#38;hd=1&#38;border=1"></param>
                     <param name="allowFullScreen" value="true"></param>
                     <param name="allowscriptaccess" value="always"></param>
-                    <embed src="http://www.youtube.com/v/tikOR0XDnFw&#38;hl=de_DE&#38;fs=1&#38;hd=1"
+                    <embed src="http://www.youtube.com/v/tikOR0XDnFw&#38;hl=de_DE&#38;fs=1&#38;hd=1&#38;border=1"
                            type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true"
                            width="640" height="505"></embed>
                 </object>