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@1297886 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/context/WeavingContext.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/context/WeavingContext.java
index 59c247f..86175e8 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/context/WeavingContext.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/context/WeavingContext.java
@@ -22,7 +22,7 @@
import org.apache.myfaces.extensions.scripting.core.dependencyScan.core.ClassDependencies;
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.monitor.ClassResource;
+import rewrite.org.apache.myfaces.extensions.scripting.core.monitor.ClassResource;
import java.io.IOException;
import java.util.Collection;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/monitor/ClassResource.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java
similarity index 98%
rename from extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/monitor/ClassResource.java
rename to extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java
index 627e8fe..d6506b1 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/monitor/ClassResource.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package rewrite.org.apache.myfaces.extensions.scripting.monitor;
+package rewrite.org.apache.myfaces.extensions.scripting.core.monitor;
import rewrite.org.apache.myfaces.extensions.scripting.common.ScriptingConst;
import rewrite.org.apache.myfaces.extensions.scripting.common.util.ClassUtils;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/monitor/ResourceMonitor.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/monitor/ResourceMonitor.java
similarity index 98%
rename from extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/monitor/ResourceMonitor.java
rename to extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/monitor/ResourceMonitor.java
index ebf8416..47d5cba 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/monitor/ResourceMonitor.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/monitor/ResourceMonitor.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package rewrite.org.apache.myfaces.extensions.scripting.monitor;
+package rewrite.org.apache.myfaces.extensions.scripting.core.monitor;
@@ -24,10 +24,8 @@
import rewrite.org.apache.myfaces.extensions.scripting.context.WeavingContext;
import javax.servlet.ServletContext;
-import java.io.File;
import java.lang.ref.WeakReference;
import java.util.Map;
-import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
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/monitor/WatchedResource.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/monitor/WatchedResource.java
similarity index 93%
rename from extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/monitor/WatchedResource.java
rename to extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/monitor/WatchedResource.java
index 6df78f5..ae9abe5 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/monitor/WatchedResource.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/monitor/WatchedResource.java
@@ -17,9 +17,7 @@
* under the License.
*/
-package rewrite.org.apache.myfaces.extensions.scripting.monitor;
-
-import org.apache.myfaces.extensions.scripting.monitor.RefreshAttribute;
+package rewrite.org.apache.myfaces.extensions.scripting.core.monitor;
import java.io.File;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/startup/StartupServletContextPluginChainLoader.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/startup/StartupServletContextPluginChainLoader.java
index 15f053e..774b574 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/startup/StartupServletContextPluginChainLoader.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/startup/StartupServletContextPluginChainLoader.java
@@ -24,7 +24,7 @@
import rewrite.org.apache.myfaces.extensions.scripting.common.util.ClassUtils;
import rewrite.org.apache.myfaces.extensions.scripting.common.util.ReflectUtil;
import rewrite.org.apache.myfaces.extensions.scripting.context.WeavingContext;
-import rewrite.org.apache.myfaces.extensions.scripting.monitor.ResourceMonitor;
+import rewrite.org.apache.myfaces.extensions.scripting.core.monitor.ResourceMonitor;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
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 48743bc..7700c1a 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
@@ -24,7 +24,7 @@
import rewrite.org.apache.myfaces.extensions.scripting.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.monitor.ClassResource;
+import rewrite.org.apache.myfaces.extensions.scripting.core.monitor.ClassResource;
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 08a7b79..8443b13 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
@@ -25,14 +25,10 @@
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.monitor.ClassResource;
import javax.servlet.ServletContext;
import java.io.File;
import java.util.Collection;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
import java.util.logging.Logger;
import static rewrite.org.apache.myfaces.extensions.scripting.common.ScriptingConst.*;
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/engine/api/ScriptingEngine.java
index 2f154c9..0ea7462 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/engine/api/ScriptingEngine.java
@@ -20,7 +20,7 @@
import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.api.DependencyRegistry;
import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.core.ClassDependencies;
-import rewrite.org.apache.myfaces.extensions.scripting.monitor.ClassResource;
+import rewrite.org.apache.myfaces.extensions.scripting.core.monitor.ClassResource;
import javax.servlet.ServletContext;
import java.util.Collection;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/loaders/ScannerClassloader.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/loaders/ScannerClassloader.java
index dd4fe96..15fb58a 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/loaders/ScannerClassloader.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/loaders/ScannerClassloader.java
@@ -23,7 +23,6 @@
import org.apache.myfaces.extensions.scripting.monitor.RefreshContext;
import rewrite.org.apache.myfaces.extensions.scripting.common.util.ClassUtils;
-import rewrite.org.apache.myfaces.extensions.scripting.monitor.ClassResource;
import java.io.*;
import java.util.HashMap;
