You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by pa...@apache.org on 2020/05/27 20:21:29 UTC
[sling-org-apache-sling-scripting-bundle-tracker-it] 02/02:
SLING-9406 - Add bundled script support to the servlets resolver
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-bundle-tracker-it.git
commit eb6cf4c7c97ef31b39ff6b785ea80151eef40228
Author: Karl Pauls <kp...@adobe.com>
AuthorDate: Wed May 27 22:21:08 2020 +0200
SLING-9406 - Add bundled script support to the servlets resolver
* Update to the latest servlets resolver and adapt the tests to it.
---
.../org-apache-sling-scripting-examplebundle-extend2/pom.xml | 8 +++-----
.../org-apache-sling-scripting-examplebundle-precompiled/pom.xml | 9 ++++-----
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/examples/org-apache-sling-scripting-examplebundle-extend2/pom.xml b/examples/org-apache-sling-scripting-examplebundle-extend2/pom.xml
index 4f0c2e5..8bef09e 100644
--- a/examples/org-apache-sling-scripting-examplebundle-extend2/pom.xml
+++ b/examples/org-apache-sling-scripting-examplebundle-extend2/pom.xml
@@ -45,11 +45,6 @@
<goals>
<goal>metadata</goal>
</goals>
- <configuration>
- <scriptEngineMappings>
- <js>rhino</js>
- </scriptEngineMappings>
- </configuration>
</execution>
</executions>
</plugin>
@@ -70,6 +65,9 @@
SLING-INF/content;overwrite:=true;path:=/content/bundled-scripts/examplebundle-extend2,
SLING-INF/apps/org.apache.sling.scripting.examplebundle.extend2.two/1.0.0;overwrite:=true;path:=/apps/org.apache.sling.scripting.examplebundle.extend2.two/1.0.0
</Sling-Initial-Content>
+ <Sling-Bundle-Resources>
+ /apps/org.apache.sling.scripting.examplebundle.extend2.one/1.0.0/name-provider.js;path:=/javax.script/org.apache.sling.scripting.examplebundle.extend2.one/1.0.0/name-provider.js
+ </Sling-Bundle-Resources>
</instructions>
</configuration>
</plugin>
diff --git a/examples/org-apache-sling-scripting-examplebundle-precompiled/pom.xml b/examples/org-apache-sling-scripting-examplebundle-precompiled/pom.xml
index d3f8305..6a994ac 100644
--- a/examples/org-apache-sling-scripting-examplebundle-precompiled/pom.xml
+++ b/examples/org-apache-sling-scripting-examplebundle-precompiled/pom.xml
@@ -39,11 +39,6 @@
<groupId>org.apache.sling</groupId>
<artifactId>scriptingbundle-maven-plugin</artifactId>
<version>0.1.1-SNAPSHOT</version>
- <configuration>
- <scriptEngineMappings>
- <js>rhino</js>
- </scriptEngineMappings>
- </configuration>
<executions>
<execution>
<phase>prepare-package</phase>
@@ -70,6 +65,10 @@
<Sling-Initial-Content>
SLING-INF/content;overwrite:=true;path:=/content/bundled-scripts/examplebundle-precompiled
</Sling-Initial-Content>
+ <Sling-Bundle-Resources>
+ /apps/org.apache.sling.scripting.examplebundle.precompiled.hello/1.0.0/name-provider.js;path:=/javax.script/org.apache.sling.scripting.examplebundle.precompiled.hello/1.0.0/name-provider.js,
+ /apps/org.apache.sling.scripting.examplebundle.precompiled.hello/1.0.0/use-script.js;path:=/javax.script/org.apache.sling.scripting.examplebundle.precompiled.hello/1.0.0/use-script.js
+ </Sling-Bundle-Resources>
</instructions>
</configuration>
</plugin>