migrated code from whiteboard
diff --git a/main/java/org/apache/sling/scripting/resolver/BundledRenderUnit.java b/main/java/org/apache/sling/scripting/bundle/tracker/BundledRenderUnit.java
similarity index 95%
rename from main/java/org/apache/sling/scripting/resolver/BundledRenderUnit.java
rename to main/java/org/apache/sling/scripting/bundle/tracker/BundledRenderUnit.java
index 01ee566..179a6e1 100644
--- a/main/java/org/apache/sling/scripting/resolver/BundledRenderUnit.java
+++ b/main/java/org/apache/sling/scripting/bundle/tracker/BundledRenderUnit.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.resolver;
+package org.apache.sling.scripting.bundle.tracker;
import javax.script.ScriptContext;
import javax.script.ScriptEngine;
@@ -34,7 +34,7 @@
* </p>
* <p>
* If the current {@link org.apache.sling.api.SlingHttpServletRequest} is served by a {@code BundledRenderUnit}, the
- * {@code org.apache.sling.scripting.resolver} will set the {@code BundledRenderUnit} in the {@link javax.script.Bindings} map associated to the request,
+ * {@code org.apache.sling.scripting.bundle.tracker} will set the {@code BundledRenderUnit} in the {@link javax.script.Bindings} map associated to the request,
* under the {@link #VARIABLE} key.
* </p>
*/
diff --git a/main/java/org/apache/sling/scripting/resolver/internal/AbstractBundledRenderUnit.java b/main/java/org/apache/sling/scripting/bundle/tracker/internal/AbstractBundledRenderUnit.java
similarity index 98%
rename from main/java/org/apache/sling/scripting/resolver/internal/AbstractBundledRenderUnit.java
rename to main/java/org/apache/sling/scripting/bundle/tracker/internal/AbstractBundledRenderUnit.java
index 8cdcf4c..1d552d5 100644
--- a/main/java/org/apache/sling/scripting/resolver/internal/AbstractBundledRenderUnit.java
+++ b/main/java/org/apache/sling/scripting/bundle/tracker/internal/AbstractBundledRenderUnit.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.resolver.internal;
+package org.apache.sling.scripting.bundle.tracker.internal;
import java.lang.reflect.Array;
import java.util.ArrayList;
diff --git a/main/java/org/apache/sling/scripting/resolver/internal/BundledScriptContext.java b/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptContext.java
similarity index 98%
rename from main/java/org/apache/sling/scripting/resolver/internal/BundledScriptContext.java
rename to main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptContext.java
index 464ad4d..311eeae 100644
--- a/main/java/org/apache/sling/scripting/resolver/internal/BundledScriptContext.java
+++ b/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptContext.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.resolver.internal;
+package org.apache.sling.scripting.bundle.tracker.internal;
import java.io.Reader;
import java.io.Writer;
diff --git a/main/java/org/apache/sling/scripting/resolver/internal/BundledScriptFinder.java b/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptFinder.java
similarity index 98%
rename from main/java/org/apache/sling/scripting/resolver/internal/BundledScriptFinder.java
rename to main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptFinder.java
index e81758d..aad44f8 100644
--- a/main/java/org/apache/sling/scripting/resolver/internal/BundledScriptFinder.java
+++ b/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptFinder.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.resolver.internal;
+package org.apache.sling.scripting.bundle.tracker.internal;
import java.net.URL;
import java.util.ArrayList;
diff --git a/main/java/org/apache/sling/scripting/resolver/internal/BundledScriptServlet.java b/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptServlet.java
similarity index 98%
rename from main/java/org/apache/sling/scripting/resolver/internal/BundledScriptServlet.java
rename to main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptServlet.java
index d1b585b..9555dae 100644
--- a/main/java/org/apache/sling/scripting/resolver/internal/BundledScriptServlet.java
+++ b/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptServlet.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.resolver.internal;
+package org.apache.sling.scripting.bundle.tracker.internal;
import java.io.IOException;
import java.util.HashMap;
diff --git a/main/java/org/apache/sling/scripting/resolver/internal/BundledScriptTracker.java b/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTracker.java
similarity index 98%
rename from main/java/org/apache/sling/scripting/resolver/internal/BundledScriptTracker.java
rename to main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTracker.java
index de2c116..d544279 100644
--- a/main/java/org/apache/sling/scripting/resolver/internal/BundledScriptTracker.java
+++ b/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTracker.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.resolver.internal;
+package org.apache.sling.scripting.bundle.tracker.internal;
import java.io.IOException;
import java.util.ArrayList;
@@ -83,7 +83,7 @@
private static final Logger LOGGER = LoggerFactory.getLogger(BundledScriptTracker.class);
private static final String AT_SLING_SELECTORS = "sling.resourceType.selectors";
private static final String AT_SLING_EXTENSIONS = "sling.resourceType.extensions";
- private static final String REGISTERING_BUNDLE = "org.apache.sling.scripting.resolver.internal.BundledScriptTracker.registering_bundle";
+ private static final String REGISTERING_BUNDLE = "org.apache.sling.scripting.bundle.tracker.internal.BundledScriptTracker.registering_bundle";
static final String AT_VERSION = "version";
private static final String AT_EXTENDS = "extends";
diff --git a/main/java/org/apache/sling/scripting/resolver/internal/Executable.java b/main/java/org/apache/sling/scripting/bundle/tracker/internal/Executable.java
similarity index 88%
rename from main/java/org/apache/sling/scripting/resolver/internal/Executable.java
rename to main/java/org/apache/sling/scripting/bundle/tracker/internal/Executable.java
index fd5616c..e9a1b79 100644
--- a/main/java/org/apache/sling/scripting/resolver/internal/Executable.java
+++ b/main/java/org/apache/sling/scripting/bundle/tracker/internal/Executable.java
@@ -16,9 +16,9 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.resolver.internal;
+package org.apache.sling.scripting.bundle.tracker.internal;
-import org.apache.sling.scripting.resolver.BundledRenderUnit;
+import org.apache.sling.scripting.bundle.tracker.BundledRenderUnit;
interface Executable extends BundledRenderUnit {
diff --git a/main/java/org/apache/sling/scripting/resolver/internal/JavaEscapeUtils.java b/main/java/org/apache/sling/scripting/bundle/tracker/internal/JavaEscapeUtils.java
similarity index 98%
rename from main/java/org/apache/sling/scripting/resolver/internal/JavaEscapeUtils.java
rename to main/java/org/apache/sling/scripting/bundle/tracker/internal/JavaEscapeUtils.java
index f5082a0..989f916 100644
--- a/main/java/org/apache/sling/scripting/resolver/internal/JavaEscapeUtils.java
+++ b/main/java/org/apache/sling/scripting/bundle/tracker/internal/JavaEscapeUtils.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.resolver.internal;
+package org.apache.sling.scripting.bundle.tracker.internal;
import java.util.HashSet;
import java.util.Set;
diff --git a/main/java/org/apache/sling/scripting/resolver/internal/LazyBindings.java b/main/java/org/apache/sling/scripting/bundle/tracker/internal/LazyBindings.java
similarity index 97%
rename from main/java/org/apache/sling/scripting/resolver/internal/LazyBindings.java
rename to main/java/org/apache/sling/scripting/bundle/tracker/internal/LazyBindings.java
index 7a45b01..c3c1252 100644
--- a/main/java/org/apache/sling/scripting/resolver/internal/LazyBindings.java
+++ b/main/java/org/apache/sling/scripting/bundle/tracker/internal/LazyBindings.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.resolver.internal;
+package org.apache.sling.scripting.bundle.tracker.internal;
import java.util.AbstractMap;
import java.util.Collections;
diff --git a/main/java/org/apache/sling/scripting/resolver/internal/LogWriter.java b/main/java/org/apache/sling/scripting/bundle/tracker/internal/LogWriter.java
similarity index 98%
rename from main/java/org/apache/sling/scripting/resolver/internal/LogWriter.java
rename to main/java/org/apache/sling/scripting/bundle/tracker/internal/LogWriter.java
index a168d04..4988a2f 100644
--- a/main/java/org/apache/sling/scripting/resolver/internal/LogWriter.java
+++ b/main/java/org/apache/sling/scripting/bundle/tracker/internal/LogWriter.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.resolver.internal;
+package org.apache.sling.scripting.bundle.tracker.internal;
import java.io.Writer;
diff --git a/main/java/org/apache/sling/scripting/resolver/internal/PrecompiledScript.java b/main/java/org/apache/sling/scripting/bundle/tracker/internal/PrecompiledScript.java
similarity index 97%
rename from main/java/org/apache/sling/scripting/resolver/internal/PrecompiledScript.java
rename to main/java/org/apache/sling/scripting/bundle/tracker/internal/PrecompiledScript.java
index 400adbd..caec607 100644
--- a/main/java/org/apache/sling/scripting/resolver/internal/PrecompiledScript.java
+++ b/main/java/org/apache/sling/scripting/bundle/tracker/internal/PrecompiledScript.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.resolver.internal;
+package org.apache.sling.scripting.bundle.tracker.internal;
import java.io.StringReader;
diff --git a/main/java/org/apache/sling/scripting/resolver/internal/ProtectedBindings.java b/main/java/org/apache/sling/scripting/bundle/tracker/internal/ProtectedBindings.java
similarity index 98%
rename from main/java/org/apache/sling/scripting/resolver/internal/ProtectedBindings.java
rename to main/java/org/apache/sling/scripting/bundle/tracker/internal/ProtectedBindings.java
index 19bb55e..3376b48 100644
--- a/main/java/org/apache/sling/scripting/resolver/internal/ProtectedBindings.java
+++ b/main/java/org/apache/sling/scripting/bundle/tracker/internal/ProtectedBindings.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.resolver.internal;
+package org.apache.sling.scripting.bundle.tracker.internal;
import java.util.Collection;
import java.util.Collections;
diff --git a/main/java/org/apache/sling/scripting/resolver/internal/RequestWrapper.java b/main/java/org/apache/sling/scripting/bundle/tracker/internal/RequestWrapper.java
similarity index 98%
rename from main/java/org/apache/sling/scripting/resolver/internal/RequestWrapper.java
rename to main/java/org/apache/sling/scripting/bundle/tracker/internal/RequestWrapper.java
index a0d7243..7a9da1f 100644
--- a/main/java/org/apache/sling/scripting/resolver/internal/RequestWrapper.java
+++ b/main/java/org/apache/sling/scripting/bundle/tracker/internal/RequestWrapper.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.resolver.internal;
+package org.apache.sling.scripting.bundle.tracker.internal;
import java.util.Set;
diff --git a/main/java/org/apache/sling/scripting/resolver/internal/Script.java b/main/java/org/apache/sling/scripting/bundle/tracker/internal/Script.java
similarity index 97%
rename from main/java/org/apache/sling/scripting/resolver/internal/Script.java
rename to main/java/org/apache/sling/scripting/bundle/tracker/internal/Script.java
index 7d2a80d..172c5b4 100644
--- a/main/java/org/apache/sling/scripting/resolver/internal/Script.java
+++ b/main/java/org/apache/sling/scripting/bundle/tracker/internal/Script.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.resolver.internal;
+package org.apache.sling.scripting.bundle.tracker.internal;
import java.io.IOException;
import java.io.StringReader;
diff --git a/main/java/org/apache/sling/scripting/resolver/internal/ScriptContextProvider.java b/main/java/org/apache/sling/scripting/bundle/tracker/internal/ScriptContextProvider.java
similarity index 97%
rename from main/java/org/apache/sling/scripting/resolver/internal/ScriptContextProvider.java
rename to main/java/org/apache/sling/scripting/bundle/tracker/internal/ScriptContextProvider.java
index 326253b..c896768 100644
--- a/main/java/org/apache/sling/scripting/resolver/internal/ScriptContextProvider.java
+++ b/main/java/org/apache/sling/scripting/bundle/tracker/internal/ScriptContextProvider.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.resolver.internal;
+package org.apache.sling.scripting.bundle.tracker.internal;
import java.io.IOException;
import java.util.Arrays;
@@ -40,7 +40,7 @@
import org.apache.sling.scripting.api.BindingsValuesProvidersByContext;
import org.apache.sling.scripting.api.resource.ScriptingResourceResolverProvider;
import org.apache.sling.scripting.core.ScriptHelper;
-import org.apache.sling.scripting.resolver.BundledRenderUnit;
+import org.apache.sling.scripting.bundle.tracker.BundledRenderUnit;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
diff --git a/main/java/org/apache/sling/scripting/resolver/internal/TypeProvider.java b/main/java/org/apache/sling/scripting/bundle/tracker/internal/TypeProvider.java
similarity index 96%
rename from main/java/org/apache/sling/scripting/resolver/internal/TypeProvider.java
rename to main/java/org/apache/sling/scripting/bundle/tracker/internal/TypeProvider.java
index c34fd98..65d71d6 100644
--- a/main/java/org/apache/sling/scripting/resolver/internal/TypeProvider.java
+++ b/main/java/org/apache/sling/scripting/bundle/tracker/internal/TypeProvider.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.resolver.internal;
+package org.apache.sling.scripting.bundle.tracker.internal;
import org.osgi.framework.Bundle;
diff --git a/main/java/org/apache/sling/scripting/resolver/package-info.java b/main/java/org/apache/sling/scripting/bundle/tracker/package-info.java
similarity index 95%
rename from main/java/org/apache/sling/scripting/resolver/package-info.java
rename to main/java/org/apache/sling/scripting/bundle/tracker/package-info.java
index c45b556..3f59450 100644
--- a/main/java/org/apache/sling/scripting/resolver/package-info.java
+++ b/main/java/org/apache/sling/scripting/bundle/tracker/package-info.java
@@ -17,6 +17,6 @@
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@Version("0.1.0")
-package org.apache.sling.scripting.resolver;
+package org.apache.sling.scripting.bundle.tracker;
import org.osgi.annotation.versioning.Version;
diff --git a/test/java/org/apache/sling/scripting/resolver/internal/BundledScriptContextTest.java b/test/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptContextTest.java
similarity index 98%
rename from test/java/org/apache/sling/scripting/resolver/internal/BundledScriptContextTest.java
rename to test/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptContextTest.java
index 04ebdef..0a26503 100644
--- a/test/java/org/apache/sling/scripting/resolver/internal/BundledScriptContextTest.java
+++ b/test/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptContextTest.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.resolver.internal;
+package org.apache.sling.scripting.bundle.tracker.internal;
import javax.script.Bindings;
import javax.script.ScriptContext;
diff --git a/test/java/org/apache/sling/scripting/resolver/internal/BundledScriptTrackerTest.java b/test/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTrackerTest.java
similarity index 96%
rename from test/java/org/apache/sling/scripting/resolver/internal/BundledScriptTrackerTest.java
rename to test/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTrackerTest.java
index 4a0008d..022ff35 100644
--- a/test/java/org/apache/sling/scripting/resolver/internal/BundledScriptTrackerTest.java
+++ b/test/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTrackerTest.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.resolver.internal;
+package org.apache.sling.scripting.bundle.tracker.internal;
import java.util.ArrayList;
import java.util.List;
diff --git a/test/java/org/apache/sling/scripting/resolver/internal/JavaEscapeUtilsTest.java b/test/java/org/apache/sling/scripting/bundle/tracker/internal/JavaEscapeUtilsTest.java
similarity index 95%
rename from test/java/org/apache/sling/scripting/resolver/internal/JavaEscapeUtilsTest.java
rename to test/java/org/apache/sling/scripting/bundle/tracker/internal/JavaEscapeUtilsTest.java
index 67036bc..f193a8c 100644
--- a/test/java/org/apache/sling/scripting/resolver/internal/JavaEscapeUtilsTest.java
+++ b/test/java/org/apache/sling/scripting/bundle/tracker/internal/JavaEscapeUtilsTest.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.resolver.internal;
+package org.apache.sling.scripting.bundle.tracker.internal;
import org.junit.Test;
diff --git a/test/java/org/apache/sling/scripting/resolver/internal/LazyBindingsTest.java b/test/java/org/apache/sling/scripting/bundle/tracker/internal/LazyBindingsTest.java
similarity index 98%
rename from test/java/org/apache/sling/scripting/resolver/internal/LazyBindingsTest.java
rename to test/java/org/apache/sling/scripting/bundle/tracker/internal/LazyBindingsTest.java
index b77c29b..7176ae5 100644
--- a/test/java/org/apache/sling/scripting/resolver/internal/LazyBindingsTest.java
+++ b/test/java/org/apache/sling/scripting/bundle/tracker/internal/LazyBindingsTest.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.resolver.internal;
+package org.apache.sling.scripting.bundle.tracker.internal;
import java.util.AbstractMap;
import java.util.Arrays;
diff --git a/test/java/org/apache/sling/scripting/resolver/internal/LogWriterTest.java b/test/java/org/apache/sling/scripting/bundle/tracker/internal/LogWriterTest.java
similarity index 96%
rename from test/java/org/apache/sling/scripting/resolver/internal/LogWriterTest.java
rename to test/java/org/apache/sling/scripting/bundle/tracker/internal/LogWriterTest.java
index 7b71e9c..bb5fe26 100644
--- a/test/java/org/apache/sling/scripting/resolver/internal/LogWriterTest.java
+++ b/test/java/org/apache/sling/scripting/bundle/tracker/internal/LogWriterTest.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.resolver.internal;
+package org.apache.sling.scripting.bundle.tracker.internal;
import org.junit.Test;
import org.slf4j.Logger;
diff --git a/test/java/org/apache/sling/scripting/resolver/internal/ProtectedBindingsTest.java b/test/java/org/apache/sling/scripting/bundle/tracker/internal/ProtectedBindingsTest.java
similarity index 98%
rename from test/java/org/apache/sling/scripting/resolver/internal/ProtectedBindingsTest.java
rename to test/java/org/apache/sling/scripting/bundle/tracker/internal/ProtectedBindingsTest.java
index 0a2cca7..82d2a9a 100644
--- a/test/java/org/apache/sling/scripting/resolver/internal/ProtectedBindingsTest.java
+++ b/test/java/org/apache/sling/scripting/bundle/tracker/internal/ProtectedBindingsTest.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.resolver.internal;
+package org.apache.sling.scripting.bundle.tracker.internal;
import java.util.Arrays;
import java.util.Collection;
