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 2009/12/09 01:05:39 UTC
svn commit: r888650 - in /myfaces/extensions/scripting/trunk:
core/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/
core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/
core/core/src/main/java/org/apache/myfaces/...
Author: werpu
Date: Wed Dec 9 00:05:39 2009
New Revision: 888650
URL: http://svn.apache.org/viewvc?rev=888650&view=rev
Log:
annotation moving now working again
but still we have too many classloader inits but lets leave it for now
Modified:
myfaces/extensions/scripting/trunk/core/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/JSR199Compiler.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/RecompiledClassLoader.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/jdk5/CompilerFacade.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/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/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-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/JSR199Compiler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/JSR199Compiler.java?rev=888650&r1=888649&r2=888650&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/JSR199Compiler.java (original)
+++ myfaces/extensions/scripting/trunk/core/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/JSR199Compiler.java Wed Dec 9 00:05:39 2009
@@ -95,6 +95,7 @@
if (!(oldClassLoader instanceof RecompiledClassLoader)) {
try {
RecompiledClassLoader classLoader = (RecompiledClassLoader) fileManager.getClassLoader(null);
+ classLoader.setSourceRoot(sourceRoot);
Thread.currentThread().setContextClassLoader(classLoader);
ClassUtils.markAsDynamicJava(fileManager.getTempDir().getAbsolutePath(), className);
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=888650&r1=888649&r2=888650&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 Wed Dec 9 00:05:39 2009
@@ -38,6 +38,7 @@
static double _tempMarker = Math.random();
int _scriptingEngine;
+ String sourceRoot;
public RecompiledClassLoader(ClassLoader classLoader, int scriptingEngine) {
super(classLoader);
@@ -122,8 +123,11 @@
retVal = super.defineClass(className, fileContent, 0, fileLength);
ReloadingMetadata reloadingMetaData = new ReloadingMetadata();
reloadingMetaData.setAClass(retVal);
+ //find the source for the given class and then
+ //store the filename
+ String fileName = className.replaceAll("\\.", File.separator)+".java";
- reloadingMetaData.setFileName(target.getAbsolutePath());
+ reloadingMetaData.setFileName(sourceRoot+File.separator+fileName);
reloadingMetaData.setSourcePath("");
reloadingMetaData.setTimestamp(target.lastModified());
reloadingMetaData.setTainted(false);
@@ -151,4 +155,12 @@
public void setTempDir(File tempDir) {
this.tempDir = tempDir;
}
+
+ public String getSourceRoot() {
+ return sourceRoot;
+ }
+
+ public void setSourceRoot(String sourceRoot) {
+ this.sourceRoot = sourceRoot;
+ }
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/jdk5/CompilerFacade.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/jdk5/CompilerFacade.java?rev=888650&r1=888649&r2=888650&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/jdk5/CompilerFacade.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/jdk5/CompilerFacade.java Wed Dec 9 00:05:39 2009
@@ -89,6 +89,7 @@
if (!(oldClassLoader instanceof RecompiledClassLoader)) {
try {
RecompiledClassLoader classLoader = (RecompiledClassLoader) fileManager.getClassLoader();
+ classLoader.setSourceRoot(sourceRoot);
Thread.currentThread().setContextClassLoader(classLoader);
ClassUtils.markAsDynamicJava(fileManager.getTempDir().getAbsolutePath(), className);
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=888650&r1=888649&r2=888650&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 Wed Dec 9 00:05:39 2009
@@ -63,10 +63,7 @@
public String addEntry2 () {
-
-
-
- getLog().info("adding entryxxx");
+ getLog().info("xxxadding entry");
BlogService service = (BlogService) JSFUtil.resolveVariable("javaBlogService");
@@ -99,13 +96,14 @@
*
*/
//service.addEntry(entry);
- executeMethod(service, "addEntry", entry);
+ //executeMethod(service, "addEntry", entry);
+ service.addEntry(entry);
}
- throw new javax.faces.FacesException("bla bla bla");
+
//we stay on the same page
- // return null;
+ return null;
}
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=888650&r1=888649&r2=888650&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 Wed Dec 9 00:05:39 2009
@@ -31,6 +31,7 @@
public class BlogService {
+
/**
* note we cannot cast on dynamically referenced
* and recompiled objects which are shared between beans
@@ -53,7 +54,6 @@
-
public List<Object> getBlogEntries() {
return blogEntries;
}
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=888650&r1=888649&r2=888650&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 Wed Dec 9 00:05:39 2009
@@ -42,13 +42,12 @@
* 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")
-
-public class JavaTestRenderer1 extends HtmlTextRendererBase {
+ @FacesRenderer(componentFamily = "javax.faces.Input", rendererType = "at.irian.JavaTestRenderer")
+ public class JavaTestRenderer1 extends HtmlTextRendererBase {
static Log log = LogFactory.getLog(JavaTestRenderer1.class);
- private static final String MSG2 = "Hello world from Renderer 1 <br /> ";
+ private static final String MSG2 = "Hello world from Renderer 1 aaa ";
@Override
public void encodeBegin(FacesContext context, UIComponent component) throws IOException {
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=888650&r1=888649&r2=888650&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 Wed Dec 9 00:05:39 2009
@@ -32,10 +32,9 @@
* @author Werner Punz (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-
public class JavaTestRenderer2 extends HtmlTextareaRendererBase {
- private static final String MSG = "Hello world from Renderer 2 sasdfasd ";
+ private static final String MSG = "Hello world from Renderer 2 ";
@Override
public void encodeBegin(FacesContext context, UIComponent component) throws IOException {
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=888650&r1=888649&r2=888650&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 Wed Dec 9 00:05:39 2009
@@ -40,7 +40,7 @@
}
public String getResource() throws java.io.IOException {
- ResourceHandler handler = FacesContext.getCurrentInstance().getApplication().getResourceHandler();
+ /* ResourceHandler handler = FacesContext.getCurrentInstance().getApplication().getResourceHandler();
Resource resource = handler.createResource("testResource");
InputStream istr = resource.getInputStream();
BufferedReader rdr = new BufferedReader(new InputStreamReader(istr));
@@ -53,7 +53,8 @@
} catch (IOException ex) {
};
- return strBuf.toString();
+ return strBuf.toString(); */
+ return "hello world";
}
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=888650&r1=888649&r2=888650&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 Wed Dec 9 00:05:39 2009
@@ -18,12 +18,12 @@
@ManagedBean(name = "javatestbean")
@SessionScoped
public class TestBean3 {
- 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 Testbean3 - " + TestClass2.hello2 + hello3;
+ return "Java dynamic bean Testbean3 - " + TestClass2.hello2 + hello3;
}
public String getSayHello2() {