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 2012/03/13 13:42:33 UTC
svn commit: r1300103 - in
/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore:
engine/compiler/ support/
Author: werpu
Date: Tue Mar 13 12:42:33 2012
New Revision: 1300103
URL: http://svn.apache.org/viewvc?rev=1300103&view=rev
Log:
EXTSCRIPT-154: Code Rewrite/Refactoring, make everything self contained
Removed:
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/support/ContextUtils.java
Modified:
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/engine/compiler/CompilationExceptionTest.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/engine/compiler/CompilationResultTest.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/support/AbstractGeneratorTestCase.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/support/MockServletContext.java
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/engine/compiler/CompilationExceptionTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/engine/compiler/CompilationExceptionTest.java?rev=1300103&r1=1300102&r2=1300103&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/engine/compiler/CompilationExceptionTest.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/engine/compiler/CompilationExceptionTest.java Tue Mar 13 12:42:33 2012
@@ -19,8 +19,8 @@
package rewrite.org.apache.myfaces.extensions.scripting.scanningcore.engine.compiler;
-import org.apache.myfaces.extensions.scripting.api.CompilationException;
import org.junit.Test;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.api.CompilationException;
import static org.junit.Assert.assertTrue;
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/engine/compiler/CompilationResultTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/engine/compiler/CompilationResultTest.java?rev=1300103&r1=1300102&r2=1300103&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/engine/compiler/CompilationResultTest.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/engine/compiler/CompilationResultTest.java Tue Mar 13 12:42:33 2012
@@ -19,9 +19,9 @@
package rewrite.org.apache.myfaces.extensions.scripting.scanningcore.engine.compiler;
-import org.apache.myfaces.extensions.scripting.api.CompilationResult;
import org.junit.Before;
import org.junit.Test;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.api.CompilationResult;
import static junit.framework.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/support/AbstractGeneratorTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/support/AbstractGeneratorTestCase.java?rev=1300103&r1=1300102&r2=1300103&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/support/AbstractGeneratorTestCase.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/support/AbstractGeneratorTestCase.java Tue Mar 13 12:42:33 2012
@@ -19,10 +19,10 @@
package rewrite.org.apache.myfaces.extensions.scripting.scanningcore.support;
import junit.framework.TestCase;
-import org.apache.myfaces.extensions.scripting.api.CompilationException;
-import org.apache.myfaces.extensions.scripting.api.CompilationResult;
-import org.apache.myfaces.extensions.scripting.sandbox.compiler.Compiler;
-import org.apache.myfaces.extensions.scripting.sandbox.compiler.CompilerFactory;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.api.CompilationException;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.api.CompilationResult;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.compiler.JSR199Compiler;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.api.Compiler;
import java.io.File;
import java.io.FileOutputStream;
@@ -115,22 +115,28 @@ public abstract class AbstractGeneratorT
}
}
- protected CompilationResult compileFile(String sourcePath, String targetPath, String fileName, String[] fileContent)
- throws IOException, CompilationException {
- return compileFile(CompilerFactory.createCompiler(),
- new File(buildAbsolutePath(sourcePath)), new File(buildAbsolutePath(targetPath)), fileName, fileContent);
+ /*protected CompilationResult compileFile(String sourcePath, String targetPath, String fileName,
+ String[] fileContent)
+ throws IOException, CompilationException
+ {
+ return compileFile(new JSR199Compiler(),
+ new File(buildAbsolutePath(sourcePath)), new File(buildAbsolutePath(targetPath)), fileName,
+ fileContent);
}
protected CompilationResult compileFile(String sourcePath, String targetPath, String fileName, String[] fileContent, ClassLoader classLoader)
throws IOException, CompilationException {
- return compileFile(CompilerFactory.createCompiler(),
- new File(buildAbsolutePath(sourcePath)), new File(buildAbsolutePath(targetPath)), fileName, fileContent, classLoader);
+ return compileFile(new JSR199Compiler(),
+ new File(buildAbsolutePath(sourcePath)), new File(buildAbsolutePath(targetPath)), fileName,
+ fileContent, classLoader);
}
- protected CompilationResult compileFile(Compiler compiler, String sourcePath, String targetPath, String fileName, String[] fileContent)
+ protected CompilationResult compileFile(Compiler compiler, String sourcePath, String targetPath,
+ String fileName, String[] fileContent)
throws IOException, CompilationException {
- return compileFile(compiler,
- new File(buildAbsolutePath(sourcePath)), new File(buildAbsolutePath(targetPath)), fileName, fileContent);
+ return compileFile(compiler,
+ new File(buildAbsolutePath(sourcePath)), new File(buildAbsolutePath(targetPath)), fileName,
+ fileContent);
}
protected CompilationResult compileFile(Compiler compiler, File sourcePath, File targetPath, String fileName, String[] fileContent)
@@ -146,7 +152,7 @@ public abstract class AbstractGeneratorT
assertFalse("Compilation errors: " + result.getErrors().toString(), result.hasErrors());
return result;
- }
+ } */
/**
* <p>Concatenates the given relative path and the path of the test directory. In doing so
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/support/MockServletContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/support/MockServletContext.java?rev=1300103&r1=1300102&r2=1300103&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/support/MockServletContext.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/support/MockServletContext.java Tue Mar 13 12:42:33 2012
@@ -19,8 +19,9 @@
package rewrite.org.apache.myfaces.extensions.scripting.scanningcore.support;
-import org.apache.myfaces.extensions.scripting.api.ScriptingConst;
-import org.apache.myfaces.extensions.scripting.servlet.StartupServletContextPluginChainLoader;
+
+import rewrite.org.apache.myfaces.extensions.scripting.core.api.ScriptingConst;
+import rewrite.org.apache.myfaces.extensions.scripting.jsf.startup.StartupServletContextPluginChainLoader;
import java.io.File;
import java.util.HashMap;