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-spi.git
The following commit(s) were added to refs/heads/master by this push:
new 8b3b76c SLING-9999 - Remove cyclic dependency between scripting and
servlets features
8b3b76c is described below
commit 8b3b76cbe25185c97c5fe674dfa3e006c388af0f
Author: Radu Cotescu <[email protected]>
AuthorDate: Mon Mar 1 17:36:51 2021 +0100
SLING-9999 - Remove cyclic dependency between scripting and servlets
features
* moved API to final location (bundle + API package)
---
README.md | 6 +++---
pom.xml | 12 ++++++------
.../tracker => scripting/spi/bundle}/BundledRenderUnit.java | 2 +-
.../spi/bundle}/BundledRenderUnitCapability.java | 2 +-
.../spi/bundle}/BundledRenderUnitFinder.java | 2 +-
.../tracker => scripting/spi/bundle}/ResourceType.java | 2 +-
.../tracker => scripting/spi/bundle}/TypeProvider.java | 2 +-
.../tracker => scripting/spi/bundle}/package-info.java | 4 ++--
.../tracker => scripting/spi/bundle}/ResourceTypeTest.java | 2 +-
9 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/README.md b/README.md
index 56ec79b..5c2fb30 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
[](https://sling.apache.org)
- [](https://ci-builds.apache.org/job/Sling/job/modules/job/sling-org-apache-sling-servlets-resolver-api/job/master/) [](https://ci-builds.apache.org/job/Sling/job/modules/
[...]
+ [](https://ci-builds.apache.org/job/Sling/job/modules/job/sling-org-apache-sling-scripting-spi/job/master/) [](https://ci-builds.apache.org/job/Sling/job/modules/job/sling-org-apache-sli
[...]
-# Apache Sling Servlets Resolver API
+# Apache Sling Scripting SPI
This module is part of the [Apache Sling](https://sling.apache.org) project.
-The bundle currently provides the
`org.apache.sling.servlets.resolver.bundle.tracker` API, which allows the
+The bundle currently provides the `org.apache.sling.scripting.spi.bundle` SPI,
which allows the
[Apache Sling Servlets
Resolver](https://github.com/apache/sling-org-apache-sling-servlets-resolver)
and the
[Apache Sling Scripting
Core](https://github.com/apache/sling-org-apache-sling-scripting-core) to wire
up and
execute bundled scripts (precompiled or not) in order to render HTTP requests.
diff --git a/pom.xml b/pom.xml
index 483099a..82dea37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,18 +27,18 @@
<relativePath />
</parent>
- <artifactId>org.apache.sling.servlets.resolver.api</artifactId>
+ <artifactId>org.apache.sling.scripting.spi</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <name>Apache Sling Servlets Resolver API</name>
+ <name>Apache Sling Scripting SPI</name>
<description>
- This bundle defines the Apache Sling Servlets Resolver's API
+ This bundle defines the Apache Sling Scripting SPI
</description>
<scm>
-
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver-api.git</connection>
-
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver-api.git</developerConnection>
-
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-servlets-resolver-api.git</url>
+
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-spi.git</connection>
+
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-spi.git</developerConnection>
+
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-scripting-spi.git</url>
<tag>HEAD</tag>
</scm>
diff --git
a/src/main/java/org/apache/sling/servlets/resolver/bundle/tracker/BundledRenderUnit.java
b/src/main/java/org/apache/sling/scripting/spi/bundle/BundledRenderUnit.java
similarity index 99%
rename from
src/main/java/org/apache/sling/servlets/resolver/bundle/tracker/BundledRenderUnit.java
rename to
src/main/java/org/apache/sling/scripting/spi/bundle/BundledRenderUnit.java
index 2c89309..9c7edda 100644
---
a/src/main/java/org/apache/sling/servlets/resolver/bundle/tracker/BundledRenderUnit.java
+++ b/src/main/java/org/apache/sling/scripting/spi/bundle/BundledRenderUnit.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.servlets.resolver.bundle.tracker;
+package org.apache.sling.scripting.spi.bundle;
import java.io.InputStream;
import java.util.Set;
diff --git
a/src/main/java/org/apache/sling/servlets/resolver/bundle/tracker/BundledRenderUnitCapability.java
b/src/main/java/org/apache/sling/scripting/spi/bundle/BundledRenderUnitCapability.java
similarity index 98%
rename from
src/main/java/org/apache/sling/servlets/resolver/bundle/tracker/BundledRenderUnitCapability.java
rename to
src/main/java/org/apache/sling/scripting/spi/bundle/BundledRenderUnitCapability.java
index e0693cb..079646a 100644
---
a/src/main/java/org/apache/sling/servlets/resolver/bundle/tracker/BundledRenderUnitCapability.java
+++
b/src/main/java/org/apache/sling/scripting/spi/bundle/BundledRenderUnitCapability.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.servlets.resolver.bundle.tracker;
+package org.apache.sling.scripting.spi.bundle;
import java.util.List;
import java.util.Set;
diff --git
a/src/main/java/org/apache/sling/servlets/resolver/bundle/tracker/BundledRenderUnitFinder.java
b/src/main/java/org/apache/sling/scripting/spi/bundle/BundledRenderUnitFinder.java
similarity index 98%
rename from
src/main/java/org/apache/sling/servlets/resolver/bundle/tracker/BundledRenderUnitFinder.java
rename to
src/main/java/org/apache/sling/scripting/spi/bundle/BundledRenderUnitFinder.java
index d632ba8..0b0cffc 100644
---
a/src/main/java/org/apache/sling/servlets/resolver/bundle/tracker/BundledRenderUnitFinder.java
+++
b/src/main/java/org/apache/sling/scripting/spi/bundle/BundledRenderUnitFinder.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.servlets.resolver.bundle.tracker;
+package org.apache.sling.scripting.spi.bundle;
import java.util.Set;
diff --git
a/src/main/java/org/apache/sling/servlets/resolver/bundle/tracker/ResourceType.java
b/src/main/java/org/apache/sling/scripting/spi/bundle/ResourceType.java
similarity index 99%
rename from
src/main/java/org/apache/sling/servlets/resolver/bundle/tracker/ResourceType.java
rename to src/main/java/org/apache/sling/scripting/spi/bundle/ResourceType.java
index 0f2929e..e409e2b 100644
---
a/src/main/java/org/apache/sling/servlets/resolver/bundle/tracker/ResourceType.java
+++ b/src/main/java/org/apache/sling/scripting/spi/bundle/ResourceType.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.servlets.resolver.bundle.tracker;
+package org.apache.sling.scripting.spi.bundle;
import java.util.Objects;
import java.util.regex.Pattern;
diff --git
a/src/main/java/org/apache/sling/servlets/resolver/bundle/tracker/TypeProvider.java
b/src/main/java/org/apache/sling/scripting/spi/bundle/TypeProvider.java
similarity index 96%
rename from
src/main/java/org/apache/sling/servlets/resolver/bundle/tracker/TypeProvider.java
rename to src/main/java/org/apache/sling/scripting/spi/bundle/TypeProvider.java
index 7e36d7d..c68f9a7 100644
---
a/src/main/java/org/apache/sling/servlets/resolver/bundle/tracker/TypeProvider.java
+++ b/src/main/java/org/apache/sling/scripting/spi/bundle/TypeProvider.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.servlets.resolver.bundle.tracker;
+package org.apache.sling.scripting.spi.bundle;
import org.jetbrains.annotations.NotNull;
import org.osgi.annotation.versioning.ProviderType;
diff --git
a/src/main/java/org/apache/sling/servlets/resolver/bundle/tracker/package-info.java
b/src/main/java/org/apache/sling/scripting/spi/bundle/package-info.java
similarity index 92%
rename from
src/main/java/org/apache/sling/servlets/resolver/bundle/tracker/package-info.java
rename to src/main/java/org/apache/sling/scripting/spi/bundle/package-info.java
index 91b289b..b2b217f 100644
---
a/src/main/java/org/apache/sling/servlets/resolver/bundle/tracker/package-info.java
+++ b/src/main/java/org/apache/sling/scripting/spi/bundle/package-info.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-@Version("0.2.0")
-package org.apache.sling.servlets.resolver.bundle.tracker;
+@Version("1.0.0")
+package org.apache.sling.scripting.spi.bundle;
import org.osgi.annotation.versioning.Version;
diff --git
a/src/test/java/org/apache/sling/servlets/resolver/bundle/tracker/ResourceTypeTest.java
b/src/test/java/org/apache/sling/scripting/spi/bundle/ResourceTypeTest.java
similarity index 98%
rename from
src/test/java/org/apache/sling/servlets/resolver/bundle/tracker/ResourceTypeTest.java
rename to
src/test/java/org/apache/sling/scripting/spi/bundle/ResourceTypeTest.java
index 5464bd1..149e2f2 100644
---
a/src/test/java/org/apache/sling/servlets/resolver/bundle/tracker/ResourceTypeTest.java
+++ b/src/test/java/org/apache/sling/scripting/spi/bundle/ResourceTypeTest.java
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package org.apache.sling.servlets.resolver.bundle.tracker;
+package org.apache.sling.scripting.spi.bundle;
import org.apache.commons.lang3.StringUtils;
import org.junit.Test;
