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:07 UTC
[sling-org-apache-sling-scripting-core] 03/04: SLING-9999 - Remove
cyclic dependency between scripting and servlets features
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;