EXTSCRIPT-154: Code Rewrite/Refactoring, moving packages into core to get a cleaner submodule distinction
git-svn-id: https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk@1297894 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/context/Configuration.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/context/Configuration.java
index 99f4d59..c81f1f5 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/context/Configuration.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/context/Configuration.java
@@ -20,8 +20,8 @@
package rewrite.org.apache.myfaces.extensions.scripting.core.context;
import org.apache.myfaces.extensions.scripting.core.util.FileUtils;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.api.ScriptingEngine;
import rewrite.org.apache.myfaces.extensions.scripting.engine.FactoryEngines;
-import rewrite.org.apache.myfaces.extensions.scripting.engine.api.ScriptingEngine;
import javax.servlet.ServletContext;
import java.io.File;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/context/WeavingContext.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/context/WeavingContext.java
index 942c29f..f91d334 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/context/WeavingContext.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/context/WeavingContext.java
@@ -20,8 +20,8 @@
package rewrite.org.apache.myfaces.extensions.scripting.core.context;
import org.apache.myfaces.extensions.scripting.core.dependencyScan.core.ClassDependencies;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.api.ScriptingEngine;
import rewrite.org.apache.myfaces.extensions.scripting.engine.FactoryEngines;
-import rewrite.org.apache.myfaces.extensions.scripting.engine.api.ScriptingEngine;
import rewrite.org.apache.myfaces.extensions.scripting.core.monitor.ClassResource;
import java.io.IOException;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/api/CompilationException.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/api/CompilationException.java
similarity index 97%
rename from extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/api/CompilationException.java
rename to extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/api/CompilationException.java
index 6fd8d11..4b17084 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/api/CompilationException.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/api/CompilationException.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package rewrite.org.apache.myfaces.extensions.scripting.engine.api;
+package rewrite.org.apache.myfaces.extensions.scripting.core.engine.api;
/**
* <p>This exception will usually be thrown if an error occurred while compiling a
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/api/CompilationResult.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/api/CompilationResult.java
similarity index 98%
rename from extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/api/CompilationResult.java
rename to extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/api/CompilationResult.java
index a28f8e7..2d7fca6 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/api/CompilationResult.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/api/CompilationResult.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package rewrite.org.apache.myfaces.extensions.scripting.engine.api;
+package rewrite.org.apache.myfaces.extensions.scripting.core.engine.api;
import java.util.ArrayList;
import java.util.List;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/api/Compiler.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/api/Compiler.java
similarity index 91%
rename from extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/api/Compiler.java
rename to extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/api/Compiler.java
index 142bc23..34f8fcd 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/api/Compiler.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/api/Compiler.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package rewrite.org.apache.myfaces.extensions.scripting.engine.api;
+package rewrite.org.apache.myfaces.extensions.scripting.core.engine.api;
import java.io.File;
@@ -37,7 +37,7 @@
* @param targetPath the path to the target directory
* @param classLoader the class loader for dependent classes
* @return the compilation result, i.e. the compiler output, a list of errors and a list of warnings
- * @throws rewrite.org.apache.myfaces.extensions.scripting.engine.api.CompilationException
+ * @throws CompilationException
* if a severe error occurred while trying to compile a file
*/
public CompilationResult compile(File sourcePath, File targetPath, ClassLoader classLoader)
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/api/CompilerConst.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/api/CompilerConst.java
similarity index 96%
rename from extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/api/CompilerConst.java
rename to extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/api/CompilerConst.java
index 59e79da..1b8b55d 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/api/CompilerConst.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/api/CompilerConst.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package rewrite.org.apache.myfaces.extensions.scripting.engine.api;
+package rewrite.org.apache.myfaces.extensions.scripting.core.engine.api;
/**
* Various constants shared over the various compiler implementations
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/api/ScriptingEngine.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/api/ScriptingEngine.java
similarity index 94%
rename from extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/api/ScriptingEngine.java
rename to extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/api/ScriptingEngine.java
index 0ea7462..e06ad0c 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/api/ScriptingEngine.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/api/ScriptingEngine.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package rewrite.org.apache.myfaces.extensions.scripting.engine.api;
+package rewrite.org.apache.myfaces.extensions.scripting.core.engine.api;
-import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.api.DependencyRegistry;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.dependencyScan.api.DependencyRegistry;
import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.core.ClassDependencies;
import rewrite.org.apache.myfaces.extensions.scripting.core.monitor.ClassResource;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/compiler/ContainerFileManager.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/compiler/ContainerFileManager.java
similarity index 97%
rename from extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/compiler/ContainerFileManager.java
rename to extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/compiler/ContainerFileManager.java
index b67d783..68ac293 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/compiler/ContainerFileManager.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/compiler/ContainerFileManager.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package rewrite.org.apache.myfaces.extensions.scripting.engine.compiler;
+package rewrite.org.apache.myfaces.extensions.scripting.core.engine.compiler;
import org.apache.myfaces.extensions.scripting.loaders.java.RecompiledClassLoader;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/compiler/GroovyCompiler.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/compiler/GroovyCompiler.java
similarity index 95%
rename from extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/compiler/GroovyCompiler.java
rename to extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/compiler/GroovyCompiler.java
index 17136cb..0cbce45 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/compiler/GroovyCompiler.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/compiler/GroovyCompiler.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package rewrite.org.apache.myfaces.extensions.scripting.engine.compiler;
+package rewrite.org.apache.myfaces.extensions.scripting.core.engine.compiler;
import org.codehaus.groovy.control.CompilationFailedException;
import org.codehaus.groovy.control.CompilationUnit;
@@ -30,8 +30,7 @@
import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.FileUtils;
import rewrite.org.apache.myfaces.extensions.scripting.core.context.Configuration;
import rewrite.org.apache.myfaces.extensions.scripting.core.context.WeavingContext;
-import rewrite.org.apache.myfaces.extensions.scripting.engine.api.CompilationResult;
-import rewrite.org.apache.myfaces.extensions.scripting.engine.api.Compiler;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.api.CompilationResult;
import java.io.File;
import java.io.PrintWriter;
@@ -43,7 +42,8 @@
/**
* <p>A compiler implementation that can be used to compile Groovy source files.</p>
*/
-public class GroovyCompiler implements Compiler {
+public class GroovyCompiler implements rewrite.org.apache.myfaces.extensions.scripting.core.engine.api.Compiler
+{
/**
* The logger instance for this class.
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/compiler/JSR199Compiler.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/compiler/JSR199Compiler.java
similarity index 95%
rename from extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/compiler/JSR199Compiler.java
rename to extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/compiler/JSR199Compiler.java
index 6913312..279e410 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/compiler/JSR199Compiler.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/compiler/JSR199Compiler.java
@@ -17,14 +17,13 @@
* under the License.
*/
-package rewrite.org.apache.myfaces.extensions.scripting.engine.compiler;
+package rewrite.org.apache.myfaces.extensions.scripting.core.engine.compiler;
import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.FileUtils;
import rewrite.org.apache.myfaces.extensions.scripting.core.context.Configuration;
import rewrite.org.apache.myfaces.extensions.scripting.core.context.WeavingContext;
-import rewrite.org.apache.myfaces.extensions.scripting.engine.api.CompilationException;
-import rewrite.org.apache.myfaces.extensions.scripting.engine.api.CompilationResult;
-import rewrite.org.apache.myfaces.extensions.scripting.engine.api.Compiler;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.api.CompilationException;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.api.CompilationResult;
import javax.tools.Diagnostic;
import javax.tools.DiagnosticCollector;
@@ -38,7 +37,7 @@
import java.util.logging.Logger;
import static rewrite.org.apache.myfaces.extensions.scripting.core.common.ScriptingConst.ENGINE_TYPE_JSF_JAVA;
-import static rewrite.org.apache.myfaces.extensions.scripting.engine.api.CompilerConst.*;
+import static rewrite.org.apache.myfaces.extensions.scripting.core.engine.api.CompilerConst.*;
/**
* @author Werner Punz (latest modification by $Author$)
@@ -47,7 +46,7 @@
* a JSR 199 based compiler which implements
* our simplified compiler interface
*/
-public class JSR199Compiler implements Compiler
+public class JSR199Compiler implements rewrite.org.apache.myfaces.extensions.scripting.core.engine.api.Compiler
{
javax.tools.JavaCompiler javaCompiler = ToolProvider.getSystemJavaCompiler();
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/api/ClassFilter.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/dependencyScan/api/ClassFilter.java
similarity index 93%
rename from extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/api/ClassFilter.java
rename to extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/dependencyScan/api/ClassFilter.java
index f5bc3bd..5749bd0 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/api/ClassFilter.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/dependencyScan/api/ClassFilter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.api;
+package rewrite.org.apache.myfaces.extensions.scripting.core.engine.dependencyScan.api;
/**
* Generic filter pattern interface
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/api/DependencyRegistry.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/dependencyScan/api/DependencyRegistry.java
similarity index 95%
rename from extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/api/DependencyRegistry.java
rename to extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/dependencyScan/api/DependencyRegistry.java
index 0da6c62..83c80cb 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/api/DependencyRegistry.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/dependencyScan/api/DependencyRegistry.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.api;
+package rewrite.org.apache.myfaces.extensions.scripting.core.engine.dependencyScan.api;
/**
* General contractual interface for a dependency registry
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/api/DependencyScanner.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/dependencyScan/api/DependencyScanner.java
similarity index 94%
rename from extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/api/DependencyScanner.java
rename to extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/dependencyScan/api/DependencyScanner.java
index 5f73c5b..d23c5a2 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/api/DependencyScanner.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/dependencyScan/api/DependencyScanner.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.api;
+package rewrite.org.apache.myfaces.extensions.scripting.core.engine.dependencyScan.api;
/**
* Standard dependency scanner interface
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/BaseEngine.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/BaseEngine.java
index 2e799c0..def5c76 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/BaseEngine.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/BaseEngine.java
@@ -21,7 +21,7 @@
import org.apache.commons.io.FilenameUtils;
import org.apache.myfaces.extensions.scripting.core.util.FileUtils;
import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.ClassUtils;
-import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.api.DependencyRegistry;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.dependencyScan.api.DependencyRegistry;
import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.core.ClassDependencies;
import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.registry.DependencyRegistryImpl;
import rewrite.org.apache.myfaces.extensions.scripting.core.monitor.ClassResource;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/EngineGroovy.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/EngineGroovy.java
index e67bd97..826385c 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/EngineGroovy.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/EngineGroovy.java
@@ -22,8 +22,8 @@
import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.ClassUtils;
import rewrite.org.apache.myfaces.extensions.scripting.core.context.Configuration;
import rewrite.org.apache.myfaces.extensions.scripting.core.context.WeavingContext;
-import rewrite.org.apache.myfaces.extensions.scripting.engine.api.ScriptingEngine;
-import rewrite.org.apache.myfaces.extensions.scripting.engine.compiler.GroovyCompiler;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.api.ScriptingEngine;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.compiler.GroovyCompiler;
import javax.servlet.ServletContext;
import java.io.File;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/EngineJava.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/EngineJava.java
index c6ba7d4..f121b27 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/EngineJava.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/EngineJava.java
@@ -22,9 +22,9 @@
import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.ClassUtils;
import rewrite.org.apache.myfaces.extensions.scripting.core.context.Configuration;
import rewrite.org.apache.myfaces.extensions.scripting.core.context.WeavingContext;
-import rewrite.org.apache.myfaces.extensions.scripting.engine.api.CompilationException;
-import rewrite.org.apache.myfaces.extensions.scripting.engine.api.ScriptingEngine;
-import rewrite.org.apache.myfaces.extensions.scripting.engine.compiler.JSR199Compiler;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.api.CompilationException;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.api.ScriptingEngine;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.compiler.JSR199Compiler;
import javax.servlet.ServletContext;
import java.io.File;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/FactoryEngines.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/FactoryEngines.java
index 0b1708f..3fb4cb9 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/FactoryEngines.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/FactoryEngines.java
@@ -22,7 +22,7 @@
import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.FileStrategy;
import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.FileUtils;
import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.ReflectUtil;
-import rewrite.org.apache.myfaces.extensions.scripting.engine.api.ScriptingEngine;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.api.ScriptingEngine;
import java.io.File;
import java.io.IOException;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/JavaDependencyScanner.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/JavaDependencyScanner.java
index 9e9ffb4..f3bfb21 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/JavaDependencyScanner.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/JavaDependencyScanner.java
@@ -23,9 +23,9 @@
import org.apache.myfaces.extensions.scripting.api.ClassScanner;
import rewrite.org.apache.myfaces.extensions.scripting.core.common.ScriptingConst;
import rewrite.org.apache.myfaces.extensions.scripting.core.context.WeavingContext;
-import rewrite.org.apache.myfaces.extensions.scripting.engine.api.ScriptingEngine;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.api.ScriptingEngine;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.dependencyScan.api.DependencyScanner;
import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.StandardDependencyScanner;
-import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.api.DependencyScanner;
import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.filter.WhitelistFilter;
import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.loaders.ScannerClassloader;
import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.registry.ExternalFilterDependencyRegistry;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/StandardDependencyScanner.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/StandardDependencyScanner.java
index 9e0920a..9c52b34 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/StandardDependencyScanner.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/StandardDependencyScanner.java
@@ -19,8 +19,8 @@
package rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan;
import org.objectweb.asm.ClassReader;
-import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.api.DependencyRegistry;
-import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.api.DependencyScanner;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.dependencyScan.api.DependencyRegistry;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.dependencyScan.api.DependencyScanner;
import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.core.ClassScanUtils;
import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.core.ClassScanVisitor;
import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.core.ExtendedClassReader;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/core/ClassScanVisitor.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/core/ClassScanVisitor.java
index 76821d9..41ceac9 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/core/ClassScanVisitor.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/core/ClassScanVisitor.java
@@ -20,7 +20,7 @@
import org.objectweb.asm.*;
import org.objectweb.asm.signature.SignatureReader;
-import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.api.DependencyRegistry;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.dependencyScan.api.DependencyRegistry;
import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.registry.ExternalFilterDependencyRegistry;
import java.util.logging.Level;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/core/DependencySignatureVisitor.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/core/DependencySignatureVisitor.java
index 6349aac..36a35e2 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/core/DependencySignatureVisitor.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/core/DependencySignatureVisitor.java
@@ -21,7 +21,7 @@
import org.objectweb.asm.Type;
import org.objectweb.asm.signature.SignatureVisitor;
-import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.api.DependencyRegistry;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.dependencyScan.api.DependencyRegistry;
import java.util.logging.Level;
import java.util.logging.Logger;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/core/MethodScanVisitor.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/core/MethodScanVisitor.java
index d2f50d5..a22140a 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/core/MethodScanVisitor.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/core/MethodScanVisitor.java
@@ -20,7 +20,7 @@
import org.objectweb.asm.*;
import org.objectweb.asm.signature.SignatureReader;
-import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.api.DependencyRegistry;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.dependencyScan.api.DependencyRegistry;
import java.util.logging.Level;
import java.util.logging.Logger;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/filter/ScanIdentifierFilter.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/filter/ScanIdentifierFilter.java
index b3a2cc6..2015cf5 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/filter/ScanIdentifierFilter.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/filter/ScanIdentifierFilter.java
@@ -18,7 +18,7 @@
*/
package rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.filter;
-import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.api.ClassFilter;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.dependencyScan.api.ClassFilter;
import java.util.Arrays;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/filter/StandardNamespaceFilter.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/filter/StandardNamespaceFilter.java
index 31668ab..856ab07 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/filter/StandardNamespaceFilter.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/filter/StandardNamespaceFilter.java
@@ -18,7 +18,7 @@
*/
package rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.filter;
-import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.api.ClassFilter;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.dependencyScan.api.ClassFilter;
import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.core.ClassScanUtils;
/**
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/filter/WhitelistFilter.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/filter/WhitelistFilter.java
index 8611773..75b4038 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/filter/WhitelistFilter.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/filter/WhitelistFilter.java
@@ -18,7 +18,7 @@
*/
package rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.filter;
-import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.api.ClassFilter;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.dependencyScan.api.ClassFilter;
import java.util.Collection;
import java.util.Map;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/registry/DependencyRegistryImpl.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/registry/DependencyRegistryImpl.java
index f53d7c2..375c05e 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/registry/DependencyRegistryImpl.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/registry/DependencyRegistryImpl.java
@@ -20,7 +20,7 @@
import org.apache.myfaces.extensions.scripting.api.ScriptingConst;
import org.apache.myfaces.extensions.scripting.core.util.StringUtils;
-import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.api.ClassFilter;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.dependencyScan.api.ClassFilter;
import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.core.ClassDependencies;
import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.filter.ScanIdentifierFilter;
import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.filter.StandardNamespaceFilter;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/registry/ExternalFilterDependencyRegistry.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/registry/ExternalFilterDependencyRegistry.java
index 8ea5aa6..cf8718b 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/registry/ExternalFilterDependencyRegistry.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/registry/ExternalFilterDependencyRegistry.java
@@ -18,8 +18,8 @@
*/
package rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.registry;
-import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.api.ClassFilter;
-import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.api.DependencyRegistry;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.dependencyScan.api.ClassFilter;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.dependencyScan.api.DependencyRegistry;
/**
* General contractual interface for a dependency registry with external filters
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/registry/MasterDependencyRegistry.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/registry/MasterDependencyRegistry.java
index a560702..34e4052 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/registry/MasterDependencyRegistry.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/registry/MasterDependencyRegistry.java
@@ -18,7 +18,7 @@
*/
package rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.registry;
-import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.api.DependencyRegistry;
+import rewrite.org.apache.myfaces.extensions.scripting.core.engine.dependencyScan.api.DependencyRegistry;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
