You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2021/01/29 10:20:04 UTC
[sling-org-apache-sling-scripting-core] branch master updated
(b10a28f -> 83f51ac)
This is an automated email from the ASF dual-hosted git repository.
radu pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-core.git.
from b10a28f SLING-9999 Remove cyclic dependency between scripting and servlets features
new 98a69df SLING-9999 - Remove cyclic dependency between scripting and servlets features
new c0b238c SLING-9999 Remove cyclic dependency between scripting and servlets features
new b95b871 SLING-9999 - Remove cyclic dependency between scripting and servlets features
new 83f51ac SLING-9999 - Remove cyclic dependency between scripting and servlets features
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
bnd.bnd | 1 +
pom.xml | 18 +++++++++++++++---
.../{bundle => bundled}/AbstractBundledRenderUnit.java | 4 ++--
.../BundleRenderUnitFinderImpl.java | 12 ++++++------
.../impl/{bundle => bundled}/BundledScriptContext.java | 2 +-
.../core/impl/{bundle => bundled}/ExecutableUnit.java | 4 ++--
.../core/impl/{bundle => bundled}/LogWriter.java | 2 +-
.../impl/{bundle => bundled}/PrecompiledScript.java | 4 ++--
.../core/impl/{bundle => bundled}/Script.java | 4 ++--
.../{bundle => bundled}/ScriptContextProvider.java | 4 ++--
.../impl/{bundle => bundled}/SlingScriptAdapter.java | 2 +-
.../{bundle => bundled}/BundledScriptContextTest.java | 3 ++-
.../core/impl/{bundle => bundled}/LogWriterTest.java | 3 ++-
.../scripting/core/it/ScriptingCoreTestSupport.java | 3 ++-
14 files changed, 41 insertions(+), 25 deletions(-)
rename src/main/java/org/apache/sling/scripting/core/impl/{bundle => bundled}/AbstractBundledRenderUnit.java (98%)
rename src/main/java/org/apache/sling/scripting/core/impl/{bundle => bundled}/BundleRenderUnitFinderImpl.java (94%)
rename src/main/java/org/apache/sling/scripting/core/impl/{bundle => bundled}/BundledScriptContext.java (98%)
rename src/main/java/org/apache/sling/scripting/core/impl/{bundle => bundled}/ExecutableUnit.java (95%)
rename src/main/java/org/apache/sling/scripting/core/impl/{bundle => bundled}/LogWriter.java (98%)
rename src/main/java/org/apache/sling/scripting/core/impl/{bundle => bundled}/PrecompiledScript.java (95%)
rename src/main/java/org/apache/sling/scripting/core/impl/{bundle => bundled}/Script.java (97%)
rename src/main/java/org/apache/sling/scripting/core/impl/{bundle => bundled}/ScriptContextProvider.java (98%)
rename src/main/java/org/apache/sling/scripting/core/impl/{bundle => bundled}/SlingScriptAdapter.java (97%)
rename src/test/java/org/apache/sling/scripting/core/impl/{bundle => bundled}/BundledScriptContextTest.java (98%)
rename src/test/java/org/apache/sling/scripting/core/impl/{bundle => bundled}/LogWriterTest.java (94%)
[sling-org-apache-sling-scripting-core] 04/04: SLING-9999 - Remove
cyclic dependency between scripting and servlets features
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-core.git
commit 83f51ac4516e29ea5dd4c91313f5e2221ec6c586
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Fri Jan 29 11:19:44 2021 +0100
SLING-9999 - Remove cyclic dependency between scripting and servlets features
* moved the o.a.s.servlets.resolver.bundle.tracker API to a dedicated bundle
---
pom.xml | 18 +++++++++++++++---
.../scripting/core/it/ScriptingCoreTestSupport.java | 3 ++-
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6e2e9c6..6791b69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,7 +139,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.22.0</version>
+ <version>2.23.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -162,6 +162,12 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.servlets.resolver.api</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.threads</artifactId>
<version>3.1.0</version>
<scope>provided</scope>
@@ -361,8 +367,14 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.servlets.resolver</artifactId>
- <version>2.7.0</version>
- <scope>provided</scope>
+ <version>2.7.13-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.johnzon</artifactId>
+ <version>1.2.6</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
diff --git a/src/test/java/org/apache/sling/scripting/core/it/ScriptingCoreTestSupport.java b/src/test/java/org/apache/sling/scripting/core/it/ScriptingCoreTestSupport.java
index 625671a..be30f41 100644
--- a/src/test/java/org/apache/sling/scripting/core/it/ScriptingCoreTestSupport.java
+++ b/src/test/java/org/apache/sling/scripting/core/it/ScriptingCoreTestSupport.java
@@ -60,7 +60,8 @@ public class ScriptingCoreTestSupport extends TestSupport {
mavenBundle().groupId("org.jsoup").artifactId("jsoup").versionAsInProject(),
mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.hamcrest").versionAsInProject(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.compiler").versionAsInProject(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.servlets.resolver").versionAsInProject(),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.johnzon").versionAsInProject(),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.servlets.resolver.api").versionAsInProject(),
junitBundles(),
awaitility(),
vmOption(System.getProperty("jacoco.command"))
[sling-org-apache-sling-scripting-core] 03/04: SLING-9999 - Remove
cyclic dependency between scripting and servlets features
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-core.git
commit b95b8714cd5f67580e8a1eda73ad7538852b8d2c
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Jan 28 15:52:21 2021 +0100
SLING-9999 - Remove cyclic dependency between scripting and servlets features
* This reverts commit b2f368a90a087979c34d8072fe529675971234fe
---
pom.xml | 6 +++---
.../scripting/core/impl/bundled/AbstractBundledRenderUnit.java | 2 +-
.../core/impl/bundled/BundleRenderUnitFinderImpl.java | 10 +++++-----
.../sling/scripting/core/impl/bundled/ExecutableUnit.java | 2 +-
.../sling/scripting/core/impl/bundled/PrecompiledScript.java | 2 +-
.../org/apache/sling/scripting/core/impl/bundled/Script.java | 2 +-
.../scripting/core/impl/bundled/ScriptContextProvider.java | 2 +-
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index 706bbaa..6e2e9c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,7 +139,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.23.1-SNAPSHOT</version>
+ <version>2.22.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -157,7 +157,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.api</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.1.12</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -362,7 +362,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.servlets.resolver</artifactId>
<version>2.7.0</version>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>
diff --git a/src/main/java/org/apache/sling/scripting/core/impl/bundled/AbstractBundledRenderUnit.java b/src/main/java/org/apache/sling/scripting/core/impl/bundled/AbstractBundledRenderUnit.java
index ad8de04..1492a8b 100644
--- a/src/main/java/org/apache/sling/scripting/core/impl/bundled/AbstractBundledRenderUnit.java
+++ b/src/main/java/org/apache/sling/scripting/core/impl/bundled/AbstractBundledRenderUnit.java
@@ -34,9 +34,9 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
-import org.apache.sling.scripting.api.bundle.TypeProvider;
import org.apache.sling.scripting.core.impl.helper.OnDemandReaderRequest;
import org.apache.sling.scripting.core.impl.helper.OnDemandWriterResponse;
+import org.apache.sling.servlets.resolver.bundle.tracker.TypeProvider;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.osgi.framework.Bundle;
diff --git a/src/main/java/org/apache/sling/scripting/core/impl/bundled/BundleRenderUnitFinderImpl.java b/src/main/java/org/apache/sling/scripting/core/impl/bundled/BundleRenderUnitFinderImpl.java
index c6cfe66..900d47d 100644
--- a/src/main/java/org/apache/sling/scripting/core/impl/bundled/BundleRenderUnitFinderImpl.java
+++ b/src/main/java/org/apache/sling/scripting/core/impl/bundled/BundleRenderUnitFinderImpl.java
@@ -26,12 +26,12 @@ import java.util.List;
import java.util.Set;
import org.apache.commons.lang3.StringUtils;
-import org.apache.sling.api.resource.type.ResourceType;
import org.apache.sling.commons.compiler.source.JavaEscapeHelper;
-import org.apache.sling.scripting.api.bundle.BundledRenderUnit;
-import org.apache.sling.scripting.api.bundle.BundledRenderUnitCapability;
-import org.apache.sling.scripting.api.bundle.BundledRenderUnitFinder;
-import org.apache.sling.scripting.api.bundle.TypeProvider;
+import org.apache.sling.servlets.resolver.bundle.tracker.BundledRenderUnit;
+import org.apache.sling.servlets.resolver.bundle.tracker.BundledRenderUnitCapability;
+import org.apache.sling.servlets.resolver.bundle.tracker.BundledRenderUnitFinder;
+import org.apache.sling.servlets.resolver.bundle.tracker.ResourceType;
+import org.apache.sling.servlets.resolver.bundle.tracker.TypeProvider;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.osgi.framework.Bundle;
diff --git a/src/main/java/org/apache/sling/scripting/core/impl/bundled/ExecutableUnit.java b/src/main/java/org/apache/sling/scripting/core/impl/bundled/ExecutableUnit.java
index e7a1163..3e33ad5 100644
--- a/src/main/java/org/apache/sling/scripting/core/impl/bundled/ExecutableUnit.java
+++ b/src/main/java/org/apache/sling/scripting/core/impl/bundled/ExecutableUnit.java
@@ -22,7 +22,7 @@ import javax.script.ScriptContext;
import javax.script.ScriptEngine;
import javax.script.ScriptException;
-import org.apache.sling.scripting.api.bundle.BundledRenderUnit;
+import org.apache.sling.servlets.resolver.bundle.tracker.BundledRenderUnit;
import org.jetbrains.annotations.NotNull;
interface ExecutableUnit extends BundledRenderUnit
diff --git a/src/main/java/org/apache/sling/scripting/core/impl/bundled/PrecompiledScript.java b/src/main/java/org/apache/sling/scripting/core/impl/bundled/PrecompiledScript.java
index 221ac3b..01f64c7 100644
--- a/src/main/java/org/apache/sling/scripting/core/impl/bundled/PrecompiledScript.java
+++ b/src/main/java/org/apache/sling/scripting/core/impl/bundled/PrecompiledScript.java
@@ -26,7 +26,7 @@ import javax.script.ScriptEngine;
import javax.script.ScriptException;
import org.apache.commons.lang3.StringUtils;
-import org.apache.sling.scripting.api.bundle.TypeProvider;
+import org.apache.sling.servlets.resolver.bundle.tracker.TypeProvider;
import org.jetbrains.annotations.NotNull;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
diff --git a/src/main/java/org/apache/sling/scripting/core/impl/bundled/Script.java b/src/main/java/org/apache/sling/scripting/core/impl/bundled/Script.java
index bfb3af0..5776290 100644
--- a/src/main/java/org/apache/sling/scripting/core/impl/bundled/Script.java
+++ b/src/main/java/org/apache/sling/scripting/core/impl/bundled/Script.java
@@ -34,7 +34,7 @@ import javax.script.ScriptEngine;
import javax.script.ScriptException;
import org.apache.commons.io.IOUtils;
-import org.apache.sling.scripting.api.bundle.TypeProvider;
+import org.apache.sling.servlets.resolver.bundle.tracker.TypeProvider;
import org.apache.sling.scripting.core.ScriptNameAwareReader;
import org.jetbrains.annotations.NotNull;
import org.osgi.framework.Bundle;
diff --git a/src/main/java/org/apache/sling/scripting/core/impl/bundled/ScriptContextProvider.java b/src/main/java/org/apache/sling/scripting/core/impl/bundled/ScriptContextProvider.java
index 744b39f..79fbeb1 100644
--- a/src/main/java/org/apache/sling/scripting/core/impl/bundled/ScriptContextProvider.java
+++ b/src/main/java/org/apache/sling/scripting/core/impl/bundled/ScriptContextProvider.java
@@ -39,9 +39,9 @@ import org.apache.sling.api.scripting.SlingBindings;
import org.apache.sling.api.scripting.SlingScriptConstants;
import org.apache.sling.scripting.api.BindingsValuesProvider;
import org.apache.sling.scripting.api.BindingsValuesProvidersByContext;
-import org.apache.sling.scripting.api.bundle.BundledRenderUnit;
import org.apache.sling.scripting.api.resource.ScriptingResourceResolverProvider;
import org.apache.sling.scripting.core.impl.helper.ProtectedBindings;
+import org.apache.sling.servlets.resolver.bundle.tracker.BundledRenderUnit;
import org.apache.sling.scripting.core.ScriptHelper;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
[sling-org-apache-sling-scripting-core] 01/04: SLING-9999 - Remove
cyclic dependency between scripting and servlets features
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-core.git
commit 98a69df56614710acfdff0a7dc05ab0d72559e41
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Jan 28 15:51:11 2021 +0100
SLING-9999 - Remove cyclic dependency between scripting and servlets features
* This reverts commit b10a28fd169b26617a72dcac82d6fb7bfb44be8a
---
bnd.bnd | 1 +
1 file changed, 1 insertion(+)
diff --git a/bnd.bnd b/bnd.bnd
index cc0b359..07c06f2 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -1,5 +1,6 @@
Import-Package:\
org.apache.felix.webconsole;resolution:=optional,\
+ org.apache.sling.servlets.resolver.bundle.tracker;resolution:=optional,\
*
Conditional-Package:\
[sling-org-apache-sling-scripting-core] 02/04: SLING-9999 Remove
cyclic dependency between scripting and servlets features
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-core.git
commit c0b238cc654e0d4d5e2dd4be5c26896b0fe2a398
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Jan 28 15:51:35 2021 +0100
SLING-9999 Remove cyclic dependency between scripting and servlets features
* This reverts commit 1467cfa6a3fe4c77a628d078f9d944ce4cc42eb1
---
.../core/impl/{bundle => bundled}/AbstractBundledRenderUnit.java | 2 +-
.../core/impl/{bundle => bundled}/BundleRenderUnitFinderImpl.java | 2 +-
.../scripting/core/impl/{bundle => bundled}/BundledScriptContext.java | 2 +-
.../sling/scripting/core/impl/{bundle => bundled}/ExecutableUnit.java | 2 +-
.../sling/scripting/core/impl/{bundle => bundled}/LogWriter.java | 2 +-
.../scripting/core/impl/{bundle => bundled}/PrecompiledScript.java | 2 +-
.../apache/sling/scripting/core/impl/{bundle => bundled}/Script.java | 2 +-
.../scripting/core/impl/{bundle => bundled}/ScriptContextProvider.java | 2 +-
.../scripting/core/impl/{bundle => bundled}/SlingScriptAdapter.java | 2 +-
.../core/impl/{bundle => bundled}/BundledScriptContextTest.java | 3 ++-
.../sling/scripting/core/impl/{bundle => bundled}/LogWriterTest.java | 3 ++-
11 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/apache/sling/scripting/core/impl/bundle/AbstractBundledRenderUnit.java b/src/main/java/org/apache/sling/scripting/core/impl/bundled/AbstractBundledRenderUnit.java
similarity index 99%
rename from src/main/java/org/apache/sling/scripting/core/impl/bundle/AbstractBundledRenderUnit.java
rename to src/main/java/org/apache/sling/scripting/core/impl/bundled/AbstractBundledRenderUnit.java
index 1689fc8..ad8de04 100644
--- a/src/main/java/org/apache/sling/scripting/core/impl/bundle/AbstractBundledRenderUnit.java
+++ b/src/main/java/org/apache/sling/scripting/core/impl/bundled/AbstractBundledRenderUnit.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.core.impl.bundle;
+package org.apache.sling.scripting.core.impl.bundled;
import java.io.IOException;
import java.lang.reflect.Array;
diff --git a/src/main/java/org/apache/sling/scripting/core/impl/bundle/BundleRenderUnitFinderImpl.java b/src/main/java/org/apache/sling/scripting/core/impl/bundled/BundleRenderUnitFinderImpl.java
similarity index 99%
rename from src/main/java/org/apache/sling/scripting/core/impl/bundle/BundleRenderUnitFinderImpl.java
rename to src/main/java/org/apache/sling/scripting/core/impl/bundled/BundleRenderUnitFinderImpl.java
index b24f7fd..c6cfe66 100644
--- a/src/main/java/org/apache/sling/scripting/core/impl/bundle/BundleRenderUnitFinderImpl.java
+++ b/src/main/java/org/apache/sling/scripting/core/impl/bundled/BundleRenderUnitFinderImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
-package org.apache.sling.scripting.core.impl.bundle;
+package org.apache.sling.scripting.core.impl.bundled;
import java.net.URL;
import java.util.ArrayList;
diff --git a/src/main/java/org/apache/sling/scripting/core/impl/bundle/BundledScriptContext.java b/src/main/java/org/apache/sling/scripting/core/impl/bundled/BundledScriptContext.java
similarity index 98%
rename from src/main/java/org/apache/sling/scripting/core/impl/bundle/BundledScriptContext.java
rename to src/main/java/org/apache/sling/scripting/core/impl/bundled/BundledScriptContext.java
index 84068e3..30d85be 100644
--- a/src/main/java/org/apache/sling/scripting/core/impl/bundle/BundledScriptContext.java
+++ b/src/main/java/org/apache/sling/scripting/core/impl/bundled/BundledScriptContext.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.core.impl.bundle;
+package org.apache.sling.scripting.core.impl.bundled;
import java.io.Reader;
import java.io.Writer;
diff --git a/src/main/java/org/apache/sling/scripting/core/impl/bundle/ExecutableUnit.java b/src/main/java/org/apache/sling/scripting/core/impl/bundled/ExecutableUnit.java
similarity index 97%
rename from src/main/java/org/apache/sling/scripting/core/impl/bundle/ExecutableUnit.java
rename to src/main/java/org/apache/sling/scripting/core/impl/bundled/ExecutableUnit.java
index 2509815..e7a1163 100644
--- a/src/main/java/org/apache/sling/scripting/core/impl/bundle/ExecutableUnit.java
+++ b/src/main/java/org/apache/sling/scripting/core/impl/bundled/ExecutableUnit.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.core.impl.bundle;
+package org.apache.sling.scripting.core.impl.bundled;
import javax.script.ScriptContext;
import javax.script.ScriptEngine;
diff --git a/src/main/java/org/apache/sling/scripting/core/impl/bundle/LogWriter.java b/src/main/java/org/apache/sling/scripting/core/impl/bundled/LogWriter.java
similarity index 98%
rename from src/main/java/org/apache/sling/scripting/core/impl/bundle/LogWriter.java
rename to src/main/java/org/apache/sling/scripting/core/impl/bundled/LogWriter.java
index 8105d19..a55b450 100644
--- a/src/main/java/org/apache/sling/scripting/core/impl/bundle/LogWriter.java
+++ b/src/main/java/org/apache/sling/scripting/core/impl/bundled/LogWriter.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.core.impl.bundle;
+package org.apache.sling.scripting.core.impl.bundled;
import java.io.Writer;
diff --git a/src/main/java/org/apache/sling/scripting/core/impl/bundle/PrecompiledScript.java b/src/main/java/org/apache/sling/scripting/core/impl/bundled/PrecompiledScript.java
similarity index 98%
rename from src/main/java/org/apache/sling/scripting/core/impl/bundle/PrecompiledScript.java
rename to src/main/java/org/apache/sling/scripting/core/impl/bundled/PrecompiledScript.java
index e3fb680..221ac3b 100644
--- a/src/main/java/org/apache/sling/scripting/core/impl/bundle/PrecompiledScript.java
+++ b/src/main/java/org/apache/sling/scripting/core/impl/bundled/PrecompiledScript.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.core.impl.bundle;
+package org.apache.sling.scripting.core.impl.bundled;
import java.io.StringReader;
import java.util.Set;
diff --git a/src/main/java/org/apache/sling/scripting/core/impl/bundle/Script.java b/src/main/java/org/apache/sling/scripting/core/impl/bundled/Script.java
similarity index 98%
rename from src/main/java/org/apache/sling/scripting/core/impl/bundle/Script.java
rename to src/main/java/org/apache/sling/scripting/core/impl/bundled/Script.java
index afe9e11..bfb3af0 100644
--- a/src/main/java/org/apache/sling/scripting/core/impl/bundle/Script.java
+++ b/src/main/java/org/apache/sling/scripting/core/impl/bundled/Script.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.core.impl.bundle;
+package org.apache.sling.scripting.core.impl.bundled;
import java.io.IOException;
import java.io.InputStream;
diff --git a/src/main/java/org/apache/sling/scripting/core/impl/bundle/ScriptContextProvider.java b/src/main/java/org/apache/sling/scripting/core/impl/bundled/ScriptContextProvider.java
similarity index 99%
rename from src/main/java/org/apache/sling/scripting/core/impl/bundle/ScriptContextProvider.java
rename to src/main/java/org/apache/sling/scripting/core/impl/bundled/ScriptContextProvider.java
index 840b904..744b39f 100644
--- a/src/main/java/org/apache/sling/scripting/core/impl/bundle/ScriptContextProvider.java
+++ b/src/main/java/org/apache/sling/scripting/core/impl/bundled/ScriptContextProvider.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.core.impl.bundle;
+package org.apache.sling.scripting.core.impl.bundled;
import java.io.IOException;
import java.util.Arrays;
diff --git a/src/main/java/org/apache/sling/scripting/core/impl/bundle/SlingScriptAdapter.java b/src/main/java/org/apache/sling/scripting/core/impl/bundled/SlingScriptAdapter.java
similarity index 97%
rename from src/main/java/org/apache/sling/scripting/core/impl/bundle/SlingScriptAdapter.java
rename to src/main/java/org/apache/sling/scripting/core/impl/bundled/SlingScriptAdapter.java
index 4307058..ca94986 100644
--- a/src/main/java/org/apache/sling/scripting/core/impl/bundle/SlingScriptAdapter.java
+++ b/src/main/java/org/apache/sling/scripting/core/impl/bundled/SlingScriptAdapter.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.core.impl.bundle;
+package org.apache.sling.scripting.core.impl.bundled;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
diff --git a/src/test/java/org/apache/sling/scripting/core/impl/bundle/BundledScriptContextTest.java b/src/test/java/org/apache/sling/scripting/core/impl/bundled/BundledScriptContextTest.java
similarity index 98%
rename from src/test/java/org/apache/sling/scripting/core/impl/bundle/BundledScriptContextTest.java
rename to src/test/java/org/apache/sling/scripting/core/impl/bundled/BundledScriptContextTest.java
index e3dccfe..342c385 100644
--- a/src/test/java/org/apache/sling/scripting/core/impl/bundle/BundledScriptContextTest.java
+++ b/src/test/java/org/apache/sling/scripting/core/impl/bundled/BundledScriptContextTest.java
@@ -16,13 +16,14 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.core.impl.bundle;
+package org.apache.sling.scripting.core.impl.bundled;
import javax.script.Bindings;
import javax.script.ScriptContext;
import javax.script.SimpleBindings;
import org.apache.sling.api.scripting.SlingScriptConstants;
+import org.apache.sling.scripting.core.impl.bundled.BundledScriptContext;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/apache/sling/scripting/core/impl/bundle/LogWriterTest.java b/src/test/java/org/apache/sling/scripting/core/impl/bundled/LogWriterTest.java
similarity index 94%
rename from src/test/java/org/apache/sling/scripting/core/impl/bundle/LogWriterTest.java
rename to src/test/java/org/apache/sling/scripting/core/impl/bundled/LogWriterTest.java
index 3eb1a3c..850a0e0 100644
--- a/src/test/java/org/apache/sling/scripting/core/impl/bundle/LogWriterTest.java
+++ b/src/test/java/org/apache/sling/scripting/core/impl/bundled/LogWriterTest.java
@@ -16,8 +16,9 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.core.impl.bundle;
+package org.apache.sling.scripting.core.impl.bundled;
+import org.apache.sling.scripting.core.impl.bundled.LogWriter;
import org.junit.Test;
import org.slf4j.Logger;