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/08 16:06:28 UTC
svn commit: r920344 - 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/api/
core/core/src/main/java/org/apache/myfaces/scripting...
Author: werpu
Date: Mon Mar 8 15:06:27 2010
New Revision: 920344
URL: http://svn.apache.org/viewvc?rev=920344&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-77
little bit of refactoring to centralize the classpath resolution in the classpathutils,
adding the additional classpath handling to the mix
Added:
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/CompilationResult.java (contents, props changed)
- copied, changed from r920332, myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/compiler/CompilationResult.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/ClassLoaderUtils.java (contents, props changed)
- copied, changed from r920332, myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/loader/ClassLoaderUtils.java
Removed:
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/compiler/CompilationResult.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/loader/ClassLoaderUtils.java
Modified:
myfaces/extensions/scripting/trunk/core/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/ContainerFileManager.java
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/api/Compiler.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponentRenderer.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/WeavingContext.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/compiler/GroovyCompiler.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/compiler/GroovyCompilerFacade.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/compiler/CompilerFacade.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/compiler/JavacCompiler.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/compiler/Compiler.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/compiler/GroovyCompiler.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/compiler/JavacCompiler.java
myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/extensions/scripting/AbstractGeneratorTestCase.java
myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/extensions/scripting/groovyCompiler/GroovyCompilerTest.java
myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/scripting/sandbox/AbstractJavaCompilerTestCase.java
myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/scripting/sandbox/GroovyCompilerTest.java
myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/scripting/sandbox/ReloadingClassLoaderTest.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/TaintHistoryRenderer.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java
Modified: myfaces/extensions/scripting/trunk/core/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/ContainerFileManager.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/ContainerFileManager.java?rev=920344&r1=920343&r2=920344&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/ContainerFileManager.java (original)
+++ myfaces/extensions/scripting/trunk/core/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/ContainerFileManager.java Mon Mar 8 15:06:27 2010
@@ -18,7 +18,9 @@
*/
package org.apache.myfaces.scripting.loaders.java.jsr199;
+import org.apache.commons.lang.StringUtils;
import org.apache.myfaces.scripting.api.ScriptingConst;
+import org.apache.myfaces.scripting.core.util.ClassLoaderUtils;
import org.apache.myfaces.scripting.core.util.ClassUtils;
import org.apache.myfaces.scripting.core.util.WeavingContext;
import org.apache.myfaces.scripting.loaders.java.RecompiledClassLoader;
@@ -31,6 +33,8 @@
import java.io.IOException;
import java.net.URL;
import java.net.URLClassLoader;
+import java.util.Collection;
+import java.util.Iterator;
/**
* @author Werner Punz (latest modification by $Author$)
@@ -48,7 +52,6 @@
_delegate = standardJavaFileManager;
}
-
@Override
public JavaFileObject getJavaFileForOutput(Location location, String s, JavaFileObject.Kind kind, FileObject fileObject) throws IOException {
return super.getJavaFileForOutput(location, s, kind, fileObject);
@@ -79,27 +82,8 @@
if (_classPath != null) {
return _classPath;
}
- ClassLoader cls = getClassLoader(null);
-
- StringBuilder retVal = new StringBuilder(500);
- while (cls != null) {
- if (cls instanceof URLClassLoader) {
- URL[] urls = ((URLClassLoader) cls).getURLs();
- int len = urls.length;
-
- for (int cnt = 0; cnt < len; cnt++) {
-
- retVal.append(urls[cnt].getFile());
- if (cnt < len - 1) {
- retVal.append(File.pathSeparator);
- }
- }
- }
-
- cls = cls.getParent();
- }
- String retStr = retVal.toString();
+ String retStr = ClassLoaderUtils.buildClasspath(getClassLoader(null));
return (_classPath = retStr);
}
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=920344&r1=920343&r2=920344&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 Mon Mar 8 15:06:27 2010
@@ -23,7 +23,7 @@
import org.apache.myfaces.scripting.api.ScriptingConst;
import org.apache.myfaces.scripting.core.util.FileUtils;
import org.apache.myfaces.scripting.core.util.WeavingContext;
-import org.apache.myfaces.scripting.sandbox.compiler.CompilationResult;
+import org.apache.myfaces.scripting.api.CompilationResult;
import javax.tools.*;
import java.io.File;
Copied: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/CompilationResult.java (from r920332, myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/compiler/CompilationResult.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/CompilationResult.java?p2=myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/CompilationResult.java&p1=myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/compiler/CompilationResult.java&r1=920332&r2=920344&rev=920344&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/compiler/CompilationResult.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/CompilationResult.java Mon Mar 8 15:06:27 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.scripting.sandbox.compiler;
+package org.apache.myfaces.scripting.api;
import java.util.ArrayList;
import java.util.List;
Propchange: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/CompilationResult.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/CompilationResult.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/Compiler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/Compiler.java?rev=920344&r1=920343&r2=920344&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/Compiler.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/Compiler.java Mon Mar 8 15:06:27 2010
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.scripting.api;
-import org.apache.myfaces.scripting.sandbox.compiler.CompilationResult;
+import org.apache.myfaces.scripting.api.CompilationResult;
import java.io.File;
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponentRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponentRenderer.java?rev=920344&r1=920343&r2=920344&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponentRenderer.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponentRenderer.java Mon Mar 8 15:06:27 2010
@@ -19,9 +19,9 @@
package org.apache.myfaces.scripting.components;
import org.apache.commons.lang.StringUtils;
+import org.apache.myfaces.scripting.api.CompilationResult;
import org.apache.myfaces.scripting.api.ScriptingConst;
import org.apache.myfaces.scripting.core.util.WeavingContext;
-import org.apache.myfaces.scripting.sandbox.compiler.CompilationResult;
import org.apache.myfaces.shared_impl.renderkit.html.HtmlTextRendererBase;
import javax.faces.component.UIComponent;
Copied: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/ClassLoaderUtils.java (from r920332, myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/loader/ClassLoaderUtils.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/ClassLoaderUtils.java?p2=myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/ClassLoaderUtils.java&p1=myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/loader/ClassLoaderUtils.java&r1=920332&r2=920344&rev=920344&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/loader/ClassLoaderUtils.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/ClassLoaderUtils.java Mon Mar 8 15:06:27 2010
@@ -16,14 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.scripting.sandbox.loader;
+package org.apache.myfaces.scripting.core.util;
+
+import org.apache.commons.lang.StringUtils;
import java.io.File;
+import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.logging.Level;
import java.util.logging.Logger;
/**
@@ -40,6 +44,7 @@
// ------------------------------------------ Public methods
/**
+ * CompilationResult
* <p>Returns the default class loader to use.</p>
*
* @return the default class loader to use
@@ -76,6 +81,8 @@
* classpath. This method, however, returns the classpath as a String, where each
* classpath entry is separated by a ';', i.e. it returns the classpath in a format
* that Java tools usually expect it to be.</p>
+ * <p/>
+ * it also adds the additional classpaths issued by our configuration to the list
*
* @param classLoader the class loader which you want to resolve the class path for
* @return the final classpath
@@ -93,7 +100,11 @@
classpath.append(File.pathSeparatorChar);
}
- return classpath.toString();
+ String retVal = classpath.toString();
+ if (retVal.endsWith(File.pathSeparator)) {
+ retVal = retVal.substring(0, retVal.length() - 1);
+ }
+ return retVal;
}
/**
@@ -109,6 +120,11 @@
ClassLoader classLoader = parent;
// Walk up the hierachy of class loaders in order to determine the current classpath.
+ File target = WeavingContext.getConfiguration().getCompileTarget();
+ if (target != null) {
+ addFile(classpath, target);
+ }
+
while (classLoader != null) {
if (classLoader instanceof URLClassLoader) {
URLClassLoader urlClassLoader = (URLClassLoader) classLoader;
@@ -132,7 +148,26 @@
classLoader = classLoader.getParent();
}
+ List<String> additionalClassPaths = WeavingContext.getConfiguration().getAdditionalClassPath();
+ if (!(additionalClassPaths == null || additionalClassPaths.isEmpty())) {
+ for (String additionalClassPath : additionalClassPaths) {
+ File additionalPath = new File(additionalClassPath);
+ addFile(classpath, additionalPath);
+ }
+ }
+
return classpath.toArray(new URL[classpath.size()]);
}
+ private static void addFile(List<URL> classpath, File additionalPath) {
+ if (additionalPath.exists()) {
+ try {
+ classpath.add(additionalPath.toURI().toURL());
+ } catch (MalformedURLException e) {
+ Logger log = Logger.getLogger(ClassLoaderUtils.class.getName());
+ log.log(Level.SEVERE, "Additionalclasspath wrong url", e);
+ }
+ }
+ }
+
}
Propchange: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/ClassLoaderUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/ClassLoaderUtils.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/WeavingContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/WeavingContext.java?rev=920344&r1=920343&r2=920344&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/WeavingContext.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/WeavingContext.java Mon Mar 8 15:06:27 2010
@@ -18,15 +18,12 @@
*/
package org.apache.myfaces.scripting.core.util;
-import org.apache.myfaces.scripting.api.Configuration;
-import org.apache.myfaces.scripting.api.Decorated;
-import org.apache.myfaces.scripting.api.ScriptingConst;
-import org.apache.myfaces.scripting.api.ScriptingWeaver;
+import org.apache.myfaces.scripting.api.*;
import org.apache.myfaces.scripting.core.DummyWeaver;
import org.apache.myfaces.scripting.core.MethodLevelReloadingHandler;
import org.apache.myfaces.scripting.refresh.FileChangedDaemon;
import org.apache.myfaces.scripting.refresh.RefreshContext;
-import org.apache.myfaces.scripting.sandbox.compiler.CompilationResult;
+import org.apache.myfaces.scripting.api.CompilationResult;
import javax.servlet.ServletContext;
import java.lang.reflect.InvocationHandler;
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/compiler/GroovyCompiler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/compiler/GroovyCompiler.java?rev=920344&r1=920343&r2=920344&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/compiler/GroovyCompiler.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/compiler/GroovyCompiler.java Mon Mar 8 15:06:27 2010
@@ -20,10 +20,10 @@
import org.apache.myfaces.scripting.api.CompilationException;
import org.apache.myfaces.scripting.api.ScriptingConst;
+import org.apache.myfaces.scripting.core.util.ClassLoaderUtils;
import org.apache.myfaces.scripting.core.util.FileUtils;
import org.apache.myfaces.scripting.core.util.WeavingContext;
-import org.apache.myfaces.scripting.sandbox.compiler.CompilationResult;
-import org.apache.myfaces.scripting.sandbox.loader.ClassLoaderUtils;
+import org.apache.myfaces.scripting.api.CompilationResult;
import org.codehaus.groovy.control.CompilationFailedException;
import org.codehaus.groovy.control.CompilationUnit;
import org.codehaus.groovy.control.CompilerConfiguration;
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/compiler/GroovyCompilerFacade.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/compiler/GroovyCompilerFacade.java?rev=920344&r1=920343&r2=920344&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/compiler/GroovyCompilerFacade.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/compiler/GroovyCompilerFacade.java Mon Mar 8 15:06:27 2010
@@ -18,13 +18,13 @@
*/
package org.apache.myfaces.extensions.scripting.loaders.groovy.compiler;
+import org.apache.myfaces.scripting.api.CompilationResult;
import org.apache.myfaces.scripting.api.DynamicCompiler;
import org.apache.myfaces.scripting.api.ScriptingConst;
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.loaders.groovy.GroovyRecompiledClassloader;
-import org.apache.myfaces.scripting.sandbox.compiler.CompilationResult;
import org.apache.myfaces.scripting.sandbox.compiler.GroovyCompiler;
import java.io.File;
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/compiler/CompilerFacade.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/compiler/CompilerFacade.java?rev=920344&r1=920343&r2=920344&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/compiler/CompilerFacade.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/compiler/CompilerFacade.java Mon Mar 8 15:06:27 2010
@@ -19,13 +19,13 @@
package org.apache.myfaces.scripting.loaders.java.compiler;
import org.apache.myfaces.scripting.api.CompilationException;
+import org.apache.myfaces.scripting.api.CompilationResult;
import org.apache.myfaces.scripting.api.DynamicCompiler;
import org.apache.myfaces.scripting.api.ScriptingConst;
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.loaders.java.RecompiledClassLoader;
-import org.apache.myfaces.scripting.sandbox.compiler.CompilationResult;
import java.io.File;
import java.util.logging.Level;
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/compiler/JavacCompiler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/compiler/JavacCompiler.java?rev=920344&r1=920343&r2=920344&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/compiler/JavacCompiler.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/compiler/JavacCompiler.java Mon Mar 8 15:06:27 2010
@@ -19,13 +19,13 @@
package org.apache.myfaces.scripting.loaders.java.compiler;
import org.apache.myfaces.scripting.api.CompilationException;
+import org.apache.myfaces.scripting.api.CompilationResult;
import org.apache.myfaces.scripting.api.CompilerConst;
import org.apache.myfaces.scripting.api.ScriptingConst;
+import org.apache.myfaces.scripting.core.util.ClassLoaderUtils;
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.sandbox.compiler.CompilationResult;
-import org.apache.myfaces.scripting.sandbox.loader.ClassLoaderUtils;
import java.io.File;
import java.io.PrintWriter;
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/compiler/Compiler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/compiler/Compiler.java?rev=920344&r1=920343&r2=920344&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/compiler/Compiler.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/compiler/Compiler.java Mon Mar 8 15:06:27 2010
@@ -19,6 +19,7 @@
package org.apache.myfaces.scripting.sandbox.compiler;
import org.apache.myfaces.scripting.api.CompilationException;
+import org.apache.myfaces.scripting.api.CompilationResult;
import java.io.File;
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/compiler/GroovyCompiler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/compiler/GroovyCompiler.java?rev=920344&r1=920343&r2=920344&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/compiler/GroovyCompiler.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/compiler/GroovyCompiler.java Mon Mar 8 15:06:27 2010
@@ -19,10 +19,11 @@
package org.apache.myfaces.scripting.sandbox.compiler;
import org.apache.myfaces.scripting.api.CompilationException;
+import org.apache.myfaces.scripting.api.CompilationResult;
import org.apache.myfaces.scripting.api.ScriptingConst;
+import org.apache.myfaces.scripting.core.util.ClassLoaderUtils;
import org.apache.myfaces.scripting.core.util.FileUtils;
import org.apache.myfaces.scripting.core.util.WeavingContext;
-import org.apache.myfaces.scripting.sandbox.loader.ClassLoaderUtils;
import org.codehaus.groovy.control.CompilationFailedException;
import org.codehaus.groovy.control.CompilationUnit;
import org.codehaus.groovy.control.CompilerConfiguration;
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/compiler/JavacCompiler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/compiler/JavacCompiler.java?rev=920344&r1=920343&r2=920344&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/compiler/JavacCompiler.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/compiler/JavacCompiler.java Mon Mar 8 15:06:27 2010
@@ -19,7 +19,8 @@
package org.apache.myfaces.scripting.sandbox.compiler;
import org.apache.myfaces.scripting.api.CompilationException;
-import org.apache.myfaces.scripting.sandbox.loader.ClassLoaderUtils;
+import org.apache.myfaces.scripting.api.CompilationResult;
+import org.apache.myfaces.scripting.core.util.ClassLoaderUtils;
import java.io.File;
import java.io.PrintWriter;
Modified: myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/extensions/scripting/AbstractGeneratorTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/extensions/scripting/AbstractGeneratorTestCase.java?rev=920344&r1=920343&r2=920344&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/extensions/scripting/AbstractGeneratorTestCase.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/extensions/scripting/AbstractGeneratorTestCase.java Mon Mar 8 15:06:27 2010
@@ -20,7 +20,7 @@
import junit.framework.TestCase;
import org.apache.myfaces.scripting.api.CompilationException;
-import org.apache.myfaces.scripting.sandbox.compiler.CompilationResult;
+import org.apache.myfaces.scripting.api.CompilationResult;
import org.apache.myfaces.scripting.sandbox.compiler.Compiler;
import org.apache.myfaces.scripting.sandbox.compiler.CompilerFactory;
Modified: myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/extensions/scripting/groovyCompiler/GroovyCompilerTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/extensions/scripting/groovyCompiler/GroovyCompilerTest.java?rev=920344&r1=920343&r2=920344&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/extensions/scripting/groovyCompiler/GroovyCompilerTest.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/extensions/scripting/groovyCompiler/GroovyCompilerTest.java Mon Mar 8 15:06:27 2010
@@ -20,10 +20,10 @@
import org.apache.commons.io.FilenameUtils;
import org.apache.myfaces.scripting.api.CompilationException;
+import org.apache.myfaces.scripting.api.CompilationResult;
import org.apache.myfaces.scripting.api.Configuration;
import org.apache.myfaces.scripting.api.ScriptingConst;
import org.apache.myfaces.scripting.core.util.WeavingContext;
-import org.apache.myfaces.scripting.sandbox.compiler.CompilationResult;
import org.apache.myfaces.scripting.sandbox.compiler.GroovyCompiler;
import org.apache.myfaces.scripting.core.util.FileUtils;
import org.junit.Test;
Modified: myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/scripting/sandbox/AbstractJavaCompilerTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/scripting/sandbox/AbstractJavaCompilerTestCase.java?rev=920344&r1=920343&r2=920344&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/scripting/sandbox/AbstractJavaCompilerTestCase.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/scripting/sandbox/AbstractJavaCompilerTestCase.java Mon Mar 8 15:06:27 2010
@@ -21,7 +21,7 @@
import java.io.File;
import org.apache.myfaces.extensions.scripting.AbstractGeneratorTestCase;
-import org.apache.myfaces.scripting.sandbox.compiler.*;
+import org.apache.myfaces.scripting.api.CompilationResult;
import org.apache.myfaces.scripting.sandbox.compiler.Compiler;
import org.junit.Ignore;
@@ -86,7 +86,7 @@
" ",
"import java.io.File; ",
"import org.apache.myfaces.scripting.sandbox.compiler.Compiler; ",
- "import org.apache.myfaces.scripting.sandbox.compiler.CompilationResult; ",
+ "import org.apache.myfaces.scripting.api.CompilationResult; ",
" ",
"public class DummyCompiler implements Compiler { ",
" ",
@@ -118,7 +118,7 @@
" ",
"import java.io.File; ",
"import org.apache.myfaces.scripting.sandbox.compiler.Compiler; ",
- "import org.apache.myfaces.scripting.sandbox.compiler.CompilationResult; ",
+ "import org.apache.myfaces.scripting.api.CompilationResult; ",
" ",
"public class DummyCompiler implements Compiler { ",
" ",
Modified: myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/scripting/sandbox/GroovyCompilerTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/scripting/sandbox/GroovyCompilerTest.java?rev=920344&r1=920343&r2=920344&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/scripting/sandbox/GroovyCompilerTest.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/scripting/sandbox/GroovyCompilerTest.java Mon Mar 8 15:06:27 2010
@@ -19,8 +19,12 @@
package org.apache.myfaces.scripting.sandbox;
import org.apache.myfaces.extensions.scripting.AbstractGeneratorTestCase;
+import org.apache.myfaces.scripting.api.CompilationResult;
+import org.apache.myfaces.scripting.api.Configuration;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import org.apache.myfaces.scripting.sandbox.compiler.*;
import org.apache.myfaces.scripting.sandbox.compiler.Compiler;
+import org.junit.Ignore;
import java.io.File;
@@ -28,10 +32,17 @@
* <p>Test class for
* <code>org.apache.myfaces.scripting.sandbox.compiler.GroovyCompiler</code></p>
*/
+
public class GroovyCompilerTest extends AbstractGeneratorTestCase {
// ------------------------------------------ Test methods
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ WeavingContext.setConfiguration(new Configuration());
+ }
+
/**
* <p>Tests whether it is possible to compile a dynamically generated Groovy source file.</p>
*
@@ -100,7 +111,7 @@
" ",
"import java.io.File; ",
"import org.apache.myfaces.scripting.sandbox.compiler.Compiler; ",
- "import org.apache.myfaces.scripting.sandbox.compiler.CompilationResult; ",
+ "import org.apache.myfaces.scripting.api.CompilationResult; ",
" ",
"def class DummyCompiler implements Compiler { ",
" ",
Modified: myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/scripting/sandbox/ReloadingClassLoaderTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/scripting/sandbox/ReloadingClassLoaderTest.java?rev=920344&r1=920343&r2=920344&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/scripting/sandbox/ReloadingClassLoaderTest.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/scripting/sandbox/ReloadingClassLoaderTest.java Mon Mar 8 15:06:27 2010
@@ -198,7 +198,7 @@
" ",
"import java.io.File; ",
"import org.apache.myfaces.scripting.sandbox.compiler.Compiler; ",
- "import org.apache.myfaces.scripting.sandbox.compiler.CompilationResult; ",
+ "import org.apache.myfaces.scripting.api.CompilationResult; ",
" ",
"public class DummyCompiler implements Compiler { ",
" ",
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/TaintHistoryRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/TaintHistoryRenderer.java?rev=920344&r1=920343&r2=920344&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/TaintHistoryRenderer.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/TaintHistoryRenderer.java Mon Mar 8 15:06:27 2010
@@ -20,16 +20,15 @@
package org.apache.myfaces.javaloader.componentTest;
import org.apache.commons.lang.StringUtils;
+import org.apache.myfaces.scripting.api.CompilationResult;
import org.apache.myfaces.scripting.components.CompilerComponent;
import org.apache.myfaces.scripting.core.util.WeavingContext;
import org.apache.myfaces.scripting.refresh.ReloadingMetadata;
-import org.apache.myfaces.scripting.sandbox.compiler.CompilationResult;
import org.apache.myfaces.shared_impl.renderkit.html.HtmlTextRendererBase;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import javax.faces.event.*;
import javax.faces.render.FacesRenderer;
import java.io.IOException;
import java.text.DateFormat;
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=920344&r1=920343&r2=920344&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 Mon Mar 8 15:06:27 2010
@@ -24,38 +24,36 @@
import javax.faces.bean.ManagedProperty;
import javax.faces.event.ComponentSystemEvent;
+import javax.el.ELContext;
@ManagedBean(name = "javatestbean")
@RequestScoped
public class TestBean2 {
+ int cnt = 0;
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="#{javatestbean4xxx}")
+ @ManagedProperty(value = "#{javatestbean4xxx}")
TestBean3 bean3;
- @ManagedProperty(value="#{javatestbean4}")
+ @ManagedProperty(value = "#{javatestbean4}")
TestBean4 bean4;
public void validate(ComponentSystemEvent e) {
System.out.println("Validating");
}
-
public String getSayHello() {
System.out.println("cnt++:" + cnt++);
-
- return bean4.getHello();
+
+ return bean4.getHello();
}
-
public String getSayHello2() {
return hello2;
}