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/15 17:48:26 UTC
svn commit: r899701 - in /myfaces/extensions/scripting/trunk:
core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/
examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloade...
Author: werpu
Date: Fri Jan 15 16:48:25 2010
New Revision: 899701
URL: http://svn.apache.org/viewvc?rev=899701&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-46
simplified the bean proxy, reloading of beans now works again as expected, yiehaa
I assume we are now commit ready
Modified:
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.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
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=899701&r1=899700&r2=899701&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 Fri Jan 15 16:48:25 2010
@@ -48,18 +48,18 @@
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
if (retVal != null && WeavingContext.isDynamic(retVal.getClass())) {
- newRetVal = WeavingContext.getWeaver().reloadScriptingInstance(retVal, ScriptingConst.ARTIFACT_TYPE_MANAGEDBEAN); /*once it was tainted or loaded by
- our classloader we have to recreate all the time to avoid classloader issues*/
+ newRetVal = WeavingContext.getWeaver().reloadScriptingInstance(retVal, ScriptingConst.ARTIFACT_TYPE_MANAGEDBEAN);
if (newRetVal != retVal) {
_delegate.setValue(elContext, base, property, newRetVal);
}
//in case we have an annotation change we have to deal with it differently
- newRetVal = reloadAnnotatedBean(elContext, base, property, newRetVal);
+ //newRetVal = reloadAnnotatedBean(elContext, base, property, newRetVal);
return newRetVal;
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=899701&r1=899700&r2=899701&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 Fri Jan 15 16:48:25 2010
@@ -11,7 +11,8 @@
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.io.IOException;
-
+@ManagedBean(name = "javatestbean")
+@SessionScoped
public class TestBean2 {
String sayHello = "hello world test xxx";
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=899701&r1=899700&r2=899701&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 Fri Jan 15 16:48:25 2010
@@ -16,8 +16,6 @@
import java.nio.CharBuffer;
-@ManagedBean(name = "javatestbean")
-@SessionScoped
public class TestBean3 {
String sayHello = "hello world";
String hello2 = "hello from added attribute";
@@ -28,7 +26,7 @@
private String myText() {
- return "Hello World from bean3";
+ return "Hello World from bean3 ";
}
public String getSayHello() {
@@ -42,7 +40,7 @@
public void setSayHello(String hello) {
this.sayHello = hello;
- System.out.println("hello world xxxx");
+ System.out.println("hello world");
}
public void setResource(String param) {