This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-core.git
The following commit(s) were added to refs/heads/master by this push:
new 1467cfa SLING-9999 Remove cyclic dependency between scripting and
servlets features
1467cfa is described below
commit 1467cfa6a3fe4c77a628d078f9d944ce4cc42eb1
Author: Oliver Lietz <[email protected]>
AuthorDate: Tue Jan 5 14:10:57 2021 +0100
SLING-9999 Remove cyclic dependency between scripting and servlets features
align package names (rename bundled to bundle)
---
.../core/impl/{bundled => bundle}/AbstractBundledRenderUnit.java | 2 +-
.../core/impl/{bundled => bundle}/BundleRenderUnitFinderImpl.java | 2 +-
.../scripting/core/impl/{bundled => bundle}/BundledScriptContext.java | 2 +-
.../sling/scripting/core/impl/{bundled => bundle}/ExecutableUnit.java | 2 +-
.../sling/scripting/core/impl/{bundled => bundle}/LogWriter.java | 2 +-
.../scripting/core/impl/{bundled => bundle}/PrecompiledScript.java | 2 +-
.../apache/sling/scripting/core/impl/{bundled => bundle}/Script.java | 2 +-
.../scripting/core/impl/{bundled => bundle}/ScriptContextProvider.java | 2 +-
.../scripting/core/impl/{bundled => bundle}/SlingScriptAdapter.java | 2 +-
.../core/impl/{bundled => bundle}/BundledScriptContextTest.java | 3 +--
.../sling/scripting/core/impl/{bundled => bundle}/LogWriterTest.java | 3 +--
11 files changed, 11 insertions(+), 13 deletions(-)
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/bundle/AbstractBundledRenderUnit.java
similarity index 99%
rename from
src/main/java/org/apache/sling/scripting/core/impl/bundled/AbstractBundledRenderUnit.java
rename to
src/main/java/org/apache/sling/scripting/core/impl/bundle/AbstractBundledRenderUnit.java
index ad8de04..1689fc8 100644
---
a/src/main/java/org/apache/sling/scripting/core/impl/bundled/AbstractBundledRenderUnit.java
+++
b/src/main/java/org/apache/sling/scripting/core/impl/bundle/AbstractBundledRenderUnit.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.core.impl.bundled;
+package org.apache.sling.scripting.core.impl.bundle;
import java.io.IOException;
import java.lang.reflect.Array;
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/bundle/BundleRenderUnitFinderImpl.java
similarity index 99%
rename from
src/main/java/org/apache/sling/scripting/core/impl/bundled/BundleRenderUnitFinderImpl.java
rename to
src/main/java/org/apache/sling/scripting/core/impl/bundle/BundleRenderUnitFinderImpl.java
index c6cfe66..b24f7fd 100644
---
a/src/main/java/org/apache/sling/scripting/core/impl/bundled/BundleRenderUnitFinderImpl.java
+++
b/src/main/java/org/apache/sling/scripting/core/impl/bundle/BundleRenderUnitFinderImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
-package org.apache.sling.scripting.core.impl.bundled;
+package org.apache.sling.scripting.core.impl.bundle;
import java.net.URL;
import java.util.ArrayList;
diff --git
a/src/main/java/org/apache/sling/scripting/core/impl/bundled/BundledScriptContext.java
b/src/main/java/org/apache/sling/scripting/core/impl/bundle/BundledScriptContext.java
similarity index 98%
rename from
src/main/java/org/apache/sling/scripting/core/impl/bundled/BundledScriptContext.java
rename to
src/main/java/org/apache/sling/scripting/core/impl/bundle/BundledScriptContext.java
index 30d85be..84068e3 100644
---
a/src/main/java/org/apache/sling/scripting/core/impl/bundled/BundledScriptContext.java
+++
b/src/main/java/org/apache/sling/scripting/core/impl/bundle/BundledScriptContext.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.core.impl.bundled;
+package org.apache.sling.scripting.core.impl.bundle;
import java.io.Reader;
import java.io.Writer;
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/bundle/ExecutableUnit.java
similarity index 97%
rename from
src/main/java/org/apache/sling/scripting/core/impl/bundled/ExecutableUnit.java
rename to
src/main/java/org/apache/sling/scripting/core/impl/bundle/ExecutableUnit.java
index e7a1163..2509815 100644
---
a/src/main/java/org/apache/sling/scripting/core/impl/bundled/ExecutableUnit.java
+++
b/src/main/java/org/apache/sling/scripting/core/impl/bundle/ExecutableUnit.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.core.impl.bundled;
+package org.apache.sling.scripting.core.impl.bundle;
import javax.script.ScriptContext;
import javax.script.ScriptEngine;
diff --git
a/src/main/java/org/apache/sling/scripting/core/impl/bundled/LogWriter.java
b/src/main/java/org/apache/sling/scripting/core/impl/bundle/LogWriter.java
similarity index 98%
rename from
src/main/java/org/apache/sling/scripting/core/impl/bundled/LogWriter.java
rename to
src/main/java/org/apache/sling/scripting/core/impl/bundle/LogWriter.java
index a55b450..8105d19 100644
--- a/src/main/java/org/apache/sling/scripting/core/impl/bundled/LogWriter.java
+++ b/src/main/java/org/apache/sling/scripting/core/impl/bundle/LogWriter.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.core.impl.bundled;
+package org.apache.sling.scripting.core.impl.bundle;
import java.io.Writer;
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/bundle/PrecompiledScript.java
similarity index 98%
rename from
src/main/java/org/apache/sling/scripting/core/impl/bundled/PrecompiledScript.java
rename to
src/main/java/org/apache/sling/scripting/core/impl/bundle/PrecompiledScript.java
index 221ac3b..e3fb680 100644
---
a/src/main/java/org/apache/sling/scripting/core/impl/bundled/PrecompiledScript.java
+++
b/src/main/java/org/apache/sling/scripting/core/impl/bundle/PrecompiledScript.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.core.impl.bundled;
+package org.apache.sling.scripting.core.impl.bundle;
import java.io.StringReader;
import java.util.Set;
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/bundle/Script.java
similarity index 98%
rename from
src/main/java/org/apache/sling/scripting/core/impl/bundled/Script.java
rename to src/main/java/org/apache/sling/scripting/core/impl/bundle/Script.java
index bfb3af0..afe9e11 100644
--- a/src/main/java/org/apache/sling/scripting/core/impl/bundled/Script.java
+++ b/src/main/java/org/apache/sling/scripting/core/impl/bundle/Script.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.core.impl.bundled;
+package org.apache.sling.scripting.core.impl.bundle;
import java.io.IOException;
import java.io.InputStream;
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/bundle/ScriptContextProvider.java
similarity index 99%
rename from
src/main/java/org/apache/sling/scripting/core/impl/bundled/ScriptContextProvider.java
rename to
src/main/java/org/apache/sling/scripting/core/impl/bundle/ScriptContextProvider.java
index 744b39f..840b904 100644
---
a/src/main/java/org/apache/sling/scripting/core/impl/bundled/ScriptContextProvider.java
+++
b/src/main/java/org/apache/sling/scripting/core/impl/bundle/ScriptContextProvider.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.core.impl.bundled;
+package org.apache.sling.scripting.core.impl.bundle;
import java.io.IOException;
import java.util.Arrays;
diff --git
a/src/main/java/org/apache/sling/scripting/core/impl/bundled/SlingScriptAdapter.java
b/src/main/java/org/apache/sling/scripting/core/impl/bundle/SlingScriptAdapter.java
similarity index 97%
rename from
src/main/java/org/apache/sling/scripting/core/impl/bundled/SlingScriptAdapter.java
rename to
src/main/java/org/apache/sling/scripting/core/impl/bundle/SlingScriptAdapter.java
index ca94986..4307058 100644
---
a/src/main/java/org/apache/sling/scripting/core/impl/bundled/SlingScriptAdapter.java
+++
b/src/main/java/org/apache/sling/scripting/core/impl/bundle/SlingScriptAdapter.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.core.impl.bundled;
+package org.apache.sling.scripting.core.impl.bundle;
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/bundled/BundledScriptContextTest.java
b/src/test/java/org/apache/sling/scripting/core/impl/bundle/BundledScriptContextTest.java
similarity index 98%
rename from
src/test/java/org/apache/sling/scripting/core/impl/bundled/BundledScriptContextTest.java
rename to
src/test/java/org/apache/sling/scripting/core/impl/bundle/BundledScriptContextTest.java
index 342c385..e3dccfe 100644
---
a/src/test/java/org/apache/sling/scripting/core/impl/bundled/BundledScriptContextTest.java
+++
b/src/test/java/org/apache/sling/scripting/core/impl/bundle/BundledScriptContextTest.java
@@ -16,14 +16,13 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.core.impl.bundled;
+package org.apache.sling.scripting.core.impl.bundle;
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/bundled/LogWriterTest.java
b/src/test/java/org/apache/sling/scripting/core/impl/bundle/LogWriterTest.java
similarity index 94%
rename from
src/test/java/org/apache/sling/scripting/core/impl/bundled/LogWriterTest.java
rename to
src/test/java/org/apache/sling/scripting/core/impl/bundle/LogWriterTest.java
index 850a0e0..3eb1a3c 100644
---
a/src/test/java/org/apache/sling/scripting/core/impl/bundled/LogWriterTest.java
+++
b/src/test/java/org/apache/sling/scripting/core/impl/bundle/LogWriterTest.java
@@ -16,9 +16,8 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.scripting.core.impl.bundled;
+package org.apache.sling.scripting.core.impl.bundle;
-import org.apache.sling.scripting.core.impl.bundled.LogWriter;
import org.junit.Test;
import org.slf4j.Logger;
