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/02 18:22:11 UTC
svn commit: r918115 - in /myfaces/extensions/scripting/trunk:
core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/
core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/...
Author: werpu
Date: Tue Mar 2 17:22:10 2010
New Revision: 918115
URL: http://svn.apache.org/viewvc?rev=918115&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-82
fixed the reason simply was a caching routine in the beanimplementation listener
Modified:
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean3.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java?rev=918115&r1=918114&r2=918115&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java Tue Mar 2 17:22:10 2010
@@ -46,7 +46,7 @@
public Object getValue(ELContext elContext, final Object base, final Object property) throws NullPointerException, PropertyNotFoundException, ELException {
Object retVal = _delegate.getValue(elContext, base, property);
-
+
Object newRetVal = null;
//TODO simplify this, we do not need it anymore since we do our base scan at the beginning
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java?rev=918115&r1=918114&r2=918115&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java Tue Mar 2 17:22:10 2010
@@ -65,6 +65,7 @@
ManagedBean mbean = null;
if (!hasToReregister(beanName, clazz)) {
mbean = (ManagedBean) _alreadyRegistered.get(beanName);
+ //return;
} else {
mbean = new ManagedBean();
}
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java?rev=918115&r1=918114&r2=918115&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java Tue Mar 2 17:22:10 2010
@@ -25,29 +25,37 @@
import javax.faces.event.ComponentSystemEvent;
+
@ManagedBean(name = "javatestbean")
@RequestScoped
-
public class TestBean2 {
+
String sayHello = "<h2>hello world test</h2>";
String hello2 = "hello from added attribute";
String hello3 = "hello from added attribute 2";
int cnt = 0;
- //@ManagedProperty(value="#{TestBean3}")
+
+ @ManagedProperty(value="#{javatestbean4xxx}")
TestBean3 bean3;
+ @ManagedProperty(value="#{javatestbean4}")
+ TestBean4 bean4;
+
public void validate(ComponentSystemEvent e) {
System.out.println("Validating");
}
+
public String getSayHello() {
System.out.println("cnt++:" + cnt++);
- return "hello from bean2";
+
+ return bean3.getSayHello();
}
+
public String getSayHello2() {
return hello2;
}
@@ -90,4 +98,12 @@
public void setBean3(TestBean3 bean3) {
this.bean3 = bean3;
}
+
+ public TestBean4 getBean4() {
+ return bean4;
+ }
+
+ public void setBean4(TestBean4 bean4) {
+ this.bean4 = bean4;
+ }
}
\ No newline at end of file
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean3.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean3.java?rev=918115&r1=918114&r2=918115&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean3.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean3.java Tue Mar 2 17:22:10 2010
@@ -22,16 +22,15 @@
import javax.faces.bean.SessionScoped;
import javax.faces.bean.RequestScoped;
-@ManagedBean(name = "javatestbean3")
+@ManagedBean(name = "javatestbean4xxx")
@RequestScoped
-
public class TestBean3 {
String sayHello = "hello world";
String hello2 = "hello from added attribute";
String hello3 = "hello from added attribute 2";
private String myText() {
- return "Hello World from bean3 ";
+ return "Hello World from bean3 xxx";
}
public String getSayHello() {
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml?rev=918115&r1=918114&r2=918115&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml Tue Mar 2 17:22:10 2010
@@ -31,8 +31,6 @@
<param-value>org.apache.myfaces.scripting.servlet.StartupServletContextPluginChainLoader</param-value>
</context-param>
- <!--
-
<context-param>
<description>Additional comma separated loader paths to allow direct editing on the sources directory instead
of the deployment dir
@@ -69,7 +67,6 @@
<param-name>facelets.RESOURCE_RESOLVER</param-name>
<param-value>org.apache.myfaces.scripting.facelet.ReroutingResourceResolver</param-value>
</context-param>
- -->
<!--
<context-param>
<description>a comma separated whitelist of root packages which are compiled those and nothing else
@@ -79,6 +76,7 @@
<param-value>org.apache.myfaces.groovyloader.blog</param-value>
</context-param>
-->
+
<!--
<context-param>
@@ -117,7 +115,9 @@
</context-param>
<context-param>
<param-name>javax.faces.FACELETS_LIBRARIES</param-name>
- <param-value>/WEB-INF/facelets/groovy-taglib.xml;/WEB-INF/facelets/extscripting.taglib.xml;/WEB-INF/facelets/tomahawk.taglib.xml</param-value>
+ <param-value>
+ /WEB-INF/facelets/groovy-taglib.xml;/WEB-INF/facelets/extscripting.taglib.xml;/WEB-INF/facelets/tomahawk.taglib.xml
+ </param-value>
</context-param>