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:46:12 UTC
svn commit: r899698 - in /myfaces/extensions/scripting/trunk:
core/core/src/main/java/org/apache/myfaces/scripting/api/
core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/
core/core/src/main/java/org/apache/myfaces/scripting/loade...
Author: werpu
Date: Fri Jan 15 16:46:12 2010
New Revision: 899698
URL: http://svn.apache.org/viewvc?rev=899698&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-46
adding different scanner for the dependencies, the reload now works on all artefacts
except annotated beans, or maybe session beans in general, the dump and reload is not triggered for whatever reason
this has to be investigated with the next commit
Added:
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/ScannerClassloader.java (with props)
Modified:
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/DefaultDependencyScanner.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/GroovyDependencyScanner.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaDependencyScanner.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/RecompiledClassLoader.java
myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/servlet/StartupServletContextPluginChainLoader.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java
myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java
myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogEntry.java
myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java
myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java
myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestClass2.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestComponent.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestComponent2.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestRenderer1.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestRenderer2.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/TestConverter1.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/TestConverter2.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/TestValidator2.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/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java?rev=899698&r1=899697&r2=899698&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java Fri Jan 15 16:46:12 2010
@@ -591,6 +591,9 @@
private void recompileRefresh() {
synchronized (RefreshContext.COMPILE_SYNC_MONITOR) {
fullRecompile();
+ //we update our dependencies and annotation info prior to going
+ //into the refresh cycle
+ fullClassScan();
}
refreshAllManagedBeans();
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/DefaultDependencyScanner.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/DefaultDependencyScanner.java?rev=899698&r1=899697&r2=899698&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/DefaultDependencyScanner.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/DefaultDependencyScanner.java Fri Jan 15 16:46:12 2010
@@ -72,6 +72,9 @@
try {
Class toCheck = loader.loadClass(className);
+ if(toCheck == null) {
+ return;
+ }
scanCurrentClass(loader, retVal, className, whiteList);
Class parent = toCheck.getSuperclass();
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/GroovyDependencyScanner.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/GroovyDependencyScanner.java?rev=899698&r1=899697&r2=899698&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/GroovyDependencyScanner.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/GroovyDependencyScanner.java Fri Jan 15 16:46:12 2010
@@ -1,11 +1,10 @@
package org.apache.myfaces.scripting.loaders.groovy;
-import groovy.lang.GroovyClassLoader;
import org.apache.myfaces.scripting.api.ScriptingConst;
import org.apache.myfaces.scripting.api.ScriptingWeaver;
-import org.apache.myfaces.scripting.core.util.WeavingContext;
import org.apache.myfaces.scripting.loaders.java.JavaDependencyScanner;
import org.apache.myfaces.scripting.loaders.java.RecompiledClassLoader;
+import org.apache.myfaces.scripting.loaders.java.ScannerClassloader;
/**
*
@@ -18,11 +17,17 @@
@Override
protected ClassLoader getClassLoader() {
- return new GroovyRecompiledClassloader(Thread.currentThread().getContextClassLoader(), ScriptingConst.ENGINE_TYPE_GROOVY, ScriptingConst.FILE_EXTENSION_GROOVY);
+ //TODO move the temp dir handling into the configuration
+ return new ScannerClassloader(Thread.currentThread().getContextClassLoader(), ScriptingConst.ENGINE_TYPE_GROOVY, ScriptingConst.FILE_EXTENSION_GROOVY, RecompiledClassLoader.tempDir);
}
@Override
protected int getEngineType() {
return ScriptingConst.ENGINE_TYPE_GROOVY;
}
+
+ @Override
+ public void scanPaths() {
+ super.scanPaths(); //To change body of overridden methods use File | Settings | File Templates.
+ }
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaDependencyScanner.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaDependencyScanner.java?rev=899698&r1=899697&r2=899698&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaDependencyScanner.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaDependencyScanner.java Fri Jan 15 16:46:12 2010
@@ -98,7 +98,7 @@
protected ClassLoader getClassLoader() {
- return new RecompiledClassLoader(Thread.currentThread().getContextClassLoader(), getEngineType(), ".java");
+ return new ScannerClassloader(Thread.currentThread().getContextClassLoader(), getEngineType(), ".java", RecompiledClassLoader.tempDir);
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/RecompiledClassLoader.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/RecompiledClassLoader.java?rev=899698&r1=899697&r2=899698&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/RecompiledClassLoader.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/RecompiledClassLoader.java Fri Jan 15 16:46:12 2010
@@ -41,10 +41,11 @@
*/
@JavaThrowAwayClassloader
public class RecompiledClassLoader extends ClassLoader {
- static File tempDir = null;
+ public static File tempDir = null;
static double _tempMarker = Math.random();
int _scriptingEngine;
String _engineExtension;
+ boolean _unTaintClasses = true;
String sourceRoot;
@@ -63,6 +64,12 @@
_engineExtension = engineExtension;
}
+ public RecompiledClassLoader(ClassLoader classLoader, int scriptingEngine, String engineExtension, boolean untaint) {
+ this(classLoader,scriptingEngine, engineExtension);
+ _unTaintClasses = untaint;
+ }
+
+
RecompiledClassLoader() {
}
@@ -117,11 +124,13 @@
}
// Erzeugt aus dem byte Feld ein Class Object.
Class retVal = null;
+
+
//we have to do it here because just in case
//a dependend class is loaded as well we run into classcast exceptions
if (data != null) {
- data.setTainted(false);
+ data.setTainted(false);
//storeReloadableDefinitions(className, target, fileLength, fileContent)
retVal = super.defineClass(className, fileContent, 0, fileLength);
Added: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/ScannerClassloader.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/ScannerClassloader.java?rev=899698&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/ScannerClassloader.java (added)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/ScannerClassloader.java Fri Jan 15 16:46:12 2010
@@ -0,0 +1,107 @@
+package org.apache.myfaces.scripting.loaders.java;
+
+import org.apache.myfaces.scripting.core.util.ClassUtils;
+import org.apache.myfaces.scripting.core.util.FileUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
+import org.apache.myfaces.scripting.refresh.RefreshContext;
+import org.apache.myfaces.scripting.refresh.ReloadingMetadata;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A specialized non tainting classloader for our scanners
+ */
+public class ScannerClassloader extends ClassLoader {
+
+ File tempDir = null;
+ int _scriptingEngine;
+ String _engineExtension;
+
+ static Map<String, Class> _alreadyScanned = new HashMap<String, Class>();
+
+ public ScannerClassloader(ClassLoader classLoader, int scriptingEngine, String engineExtension, File tempDir) {
+ super(classLoader);
+
+ this.tempDir = tempDir;
+ _scriptingEngine = scriptingEngine;
+ _engineExtension = engineExtension;
+ }
+
+ @Override
+ public InputStream getResourceAsStream(String name) {
+ File resource = new File(tempDir.getAbsolutePath() + File.separator + name);
+ if (resource.exists()) {
+ try {
+ return new FileInputStream(resource);
+ } catch (FileNotFoundException e) {
+ return super.getResourceAsStream(name);
+ }
+ }
+ return super.getResourceAsStream(name);
+ }
+
+ public File getClassFile(String className) {
+ return ClassUtils.classNameToFile(tempDir.getAbsolutePath(), className);
+ }
+
+ @Override
+ public Class<?> loadClass(String className) throws ClassNotFoundException {
+ //check if our class exists in the tempDir
+
+ if (_alreadyScanned.containsKey(className)) {
+ return _alreadyScanned.get(className);
+ }
+
+ File target = getClassFile(className);
+ if (!target.exists()) {
+ return super.loadClass(className);
+ }
+
+
+ ReloadingMetadata data = WeavingContext.getFileChangedDaemon().getClassMap().get(className);
+ if (data != null && !data.isTainted()) {
+ return data.getAClass();
+ }
+
+ FileInputStream iStream = null;
+
+ int fileLength = -1;
+ byte[] fileContent = null;
+ try {
+ //we cannot load while a compile is in progress
+ //we have to wait until it is one
+ synchronized (RefreshContext.COMPILE_SYNC_MONITOR) {
+ fileLength = (int) target.length();
+ fileContent = new byte[fileLength];
+ iStream = new FileInputStream(target);
+ iStream.read(fileContent);
+ }
+ // Erzeugt aus dem byte Feld ein Class Object.
+ Class retVal = null;
+
+ //we have to do it here because just in case
+ //a dependend class is loaded as well we run into classcast exceptions
+
+ //storeReloadableDefinitions(className, target, fileLength, fileContent)
+ retVal = super.defineClass(className, fileContent, 0, fileLength);
+ _alreadyScanned.put(className, retVal);
+ return retVal;
+ } catch (Exception e) {
+ throw new ClassNotFoundException(e.toString());
+ } finally {
+ if (iStream != null) {
+ try {
+ iStream.close();
+ } catch (Exception e) {
+ }
+ }
+ }
+
+ }
+}
+
Propchange: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/ScannerClassloader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/ScannerClassloader.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/servlet/StartupServletContextPluginChainLoader.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/servlet/StartupServletContextPluginChainLoader.java?rev=899698&r1=899697&r2=899698&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/servlet/StartupServletContextPluginChainLoader.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/servlet/StartupServletContextPluginChainLoader.java Fri Jan 15 16:46:12 2010
@@ -75,7 +75,7 @@
private void initInitialCompileAndScan(ScriptingWeaver weaver) {
log.info("[EXT-SCRIPTING] Compiling all sources for the first time");
weaver.requestRefresh();
- weaver.fullClassScan();
+ //weaver.fullClassScan();
}
/**
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=899698&r1=899697&r2=899698&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:46:12 2010
@@ -46,6 +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;
if (retVal != null && WeavingContext.isDynamic(retVal.getClass())) {
@@ -61,6 +62,8 @@
newRetVal = reloadAnnotatedBean(elContext, base, property, newRetVal);
return newRetVal;
+
+
} else if (retVal == null) {
retVal = reloadAnnotatedBean(elContext, base, property, null);
}
Modified: myfaces/extensions/scripting/trunk/examples/myfaces12-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/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java?rev=899698&r1=899697&r2=899698&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java Fri Jan 15 16:46:12 2010
@@ -31,7 +31,7 @@
public class Blog {
- String title = "Hello to the myfaces dynamic blogging example";
+ String title = "Hello to the MyFaces dynamic Java blogging example";
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";
@@ -91,7 +91,7 @@
* the same behavior you get from scripting engines!
*
*/
- service.addEntry(entry);
+ service.addEntry2(entry);
//executeMethod(service, "addEntry", entry);
}
Modified: myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogEntry.java?rev=899698&r1=899697&r2=899698&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogEntry.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogEntry.java Fri Jan 15 16:46:12 2010
@@ -30,6 +30,7 @@
String lastName = "";
String topic = "";
String content = "";
+
public String getFirstName() {
return firstName;
Modified: myfaces/extensions/scripting/trunk/examples/myfaces12-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/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java?rev=899698&r1=899697&r2=899698&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java Fri Jan 15 16:46:12 2010
@@ -45,7 +45,7 @@
*/
List<Object> blogEntries = Collections.synchronizedList(new LinkedList<Object>());
- public void addEntry(BlogEntry entry) {
+ public void addEntry2(BlogEntry entry) {
if (entry != null) {
blogEntries.add(entry);
}
Modified: myfaces/extensions/scripting/trunk/examples/myfaces12-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/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java?rev=899698&r1=899697&r2=899698&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java Fri Jan 15 16:46:12 2010
@@ -2,12 +2,12 @@
public class TestBean2 {
- String sayHello = "hello worldgggg";
+ String sayHello = "hello world ";
String hello2 = "hello from added attribute";
String hello3 = "hello from added attribute 2";
public String getSayHello() {
- return " Java dynamic bean - "+TestClass2.hello2 + hello3;
+ return "Hello from Java dynamic bean - "+TestClass2.hello2 + hello3;
}
public String getSayHello2() {
Modified: myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestClass2.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestClass2.java?rev=899698&r1=899697&r2=899698&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestClass2.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestClass2.java Fri Jan 15 16:46:12 2010
@@ -2,5 +2,5 @@
public class TestClass2 {
- public static String hello2 = "hello world from testClass2";
+ public static String hello2 = "hello world from testClass2 ";
}
\ No newline at end of file
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestComponent.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestComponent.java?rev=899698&r1=899697&r2=899698&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestComponent.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestComponent.java Fri Jan 15 16:46:12 2010
@@ -30,6 +30,7 @@
* Simple component to be picked up by
*/
@FacesComponent("at.irian.JavaTestComponent")
+
public class JavaTestComponent extends UIInput implements Markable {
enum PropertyKeys {
@@ -41,7 +42,7 @@
}
public String getMarker() {
- return "Component 1 marker";
+ return "<h1>Component 1 marker</h1>";
}
public void setMarker() {
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestComponent2.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestComponent2.java?rev=899698&r1=899697&r2=899698&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestComponent2.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestComponent2.java Fri Jan 15 16:46:12 2010
@@ -25,6 +25,7 @@
* @author Werner Punz (latest modification by $Author$)
* @version $Revision$ $Date$
*/
+
public class JavaTestComponent2 extends UIInput implements Markable {
public JavaTestComponent2() {
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestRenderer1.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestRenderer1.java?rev=899698&r1=899697&r2=899698&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestRenderer1.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestRenderer1.java Fri Jan 15 16:46:12 2010
@@ -42,8 +42,8 @@
* the annotation is dynamic you can change it on the fly or move it from one
* class to the other
*/
-@FacesRenderer(componentFamily = "javax.faces.Input", rendererType = "at.irian.JavaTestRenderer")
+@FacesRenderer(componentFamily = "javax.faces.Input", rendererType = "at.irian.JavaTestRenderer")
public class JavaTestRenderer1 extends HtmlTextRendererBase {
static Log log = LogFactory.getLog(JavaTestRenderer1.class);
@@ -52,11 +52,12 @@
public void encodeBegin(FacesContext context, UIComponent component) throws IOException {
super.encodeBegin(context, component);
- JavaTestComponent myComponent = (JavaTestComponent) component;
+ //JavaTestComponent myComponent = (JavaTestComponent) component;
ResponseWriter writer = context.getResponseWriter();
writer.write(MSG2);
writer.write((String) ReflectUtil.executeMethod(component, "getMarker"));
+
writer.flush();
}
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestRenderer2.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestRenderer2.java?rev=899698&r1=899697&r2=899698&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestRenderer2.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestRenderer2.java Fri Jan 15 16:46:12 2010
@@ -31,7 +31,6 @@
* @author Werner Punz (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-
public class JavaTestRenderer2 extends HtmlTextareaRendererBase {
private static final String MSG = "aaa Hello world from Renderer 2 ";
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/TestConverter1.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/TestConverter1.java?rev=899698&r1=899697&r2=899698&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/TestConverter1.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/TestConverter1.java Fri Jan 15 16:46:12 2010
@@ -28,7 +28,7 @@
* @author Werner Punz (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-
+@FacesConverter(value="at.irian.CustomConverter")
public class TestConverter1 implements Converter {
public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException {
return "hello from converter1"; //To change body of implemented methods use File | Settings | File Templates.
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/TestConverter2.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/TestConverter2.java?rev=899698&r1=899697&r2=899698&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/TestConverter2.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/TestConverter2.java Fri Jan 15 16:46:12 2010
@@ -28,7 +28,6 @@
* @author Werner Punz (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-@FacesConverter(value="at.irian.CustomConverter")
public class TestConverter2 implements Converter {
public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException {
return "hello from converter 2";
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/TestValidator2.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/TestValidator2.java?rev=899698&r1=899697&r2=899698&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/TestValidator2.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/TestValidator2.java Fri Jan 15 16:46:12 2010
@@ -32,6 +32,7 @@
* @version $Revision$ $Date$
*/
@FacesValidator(value = "at.irian.CustomValidator")
+
public class TestValidator2 implements Validator {
public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException {
Log log = LogFactory.getLog(TestValidator1.class);
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=899698&r1=899697&r2=899698&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:46:12 2010
@@ -13,7 +13,6 @@
import java.io.IOException;
-
public class TestBean2 {
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=899698&r1=899697&r2=899698&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:46:12 2010
@@ -24,9 +24,10 @@
String hello3 = "hello from added attribute 2";
-
+
private String myText() {
- return "hello world from bean3 from the new method";
+
+ return "Hello World from bean3";
}
public String getSayHello() {
@@ -40,7 +41,7 @@
public void setSayHello(String hello) {
this.sayHello = hello;
- System.out.println("hello world");
+ System.out.println("hello world xxxx");
}
public void setResource(String param) {