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 2020/03/10 18:25:39 UTC
[sling-org-apache-sling-scripting-bundle-tracker-it] branch master
updated: SLING-9193 - Change the default folder for scripts lookup
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-bundle-tracker-it.git
The following commit(s) were added to refs/heads/master by this push:
new 07ac071 SLING-9193 - Change the default folder for scripts lookup
07ac071 is described below
commit 07ac0714c827d1f59e28e356bde3b6541f47d5fe
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Tue Mar 10 19:24:47 2020 +0100
SLING-9193 - Change the default folder for scripts lookup
* updated project structure based on the scriptingbundle-maven-plugin
new configuration settings
---
examples/org-apache-sling-scripting-examplebundle-precompiled/pom.xml | 4 ----
.../1.0.0/h.html | 0
.../1.0.0/hello.html | 0
.../1.0.0/w.html | 0
.../2.0.0/h.html | 0
.../2.0.0/hello.html | 0
.../2.0.0/w.html | 0
examples/org-apache-sling-scripting-examplebundle.hi/pom.xml | 3 +++
examples/org-apache-sling-scripting-examplebundle.ohhi/pom.xml | 3 +++
examples/org-apache-sling-scripting-examplebundle/pom.xml | 3 +++
10 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/examples/org-apache-sling-scripting-examplebundle-precompiled/pom.xml b/examples/org-apache-sling-scripting-examplebundle-precompiled/pom.xml
index 99b8bc2..a736c60 100644
--- a/examples/org-apache-sling-scripting-examplebundle-precompiled/pom.xml
+++ b/examples/org-apache-sling-scripting-examplebundle-precompiled/pom.xml
@@ -39,9 +39,6 @@
<groupId>org.apache.sling</groupId>
<artifactId>scriptingbundle-maven-plugin</artifactId>
<version>0.1.1-SNAPSHOT</version>
- <configuration>
- <scriptsDirectory>src/main/scripts/javax.script</scriptsDirectory>
- </configuration>
<executions>
<execution>
<phase>prepare-package</phase>
@@ -84,7 +81,6 @@
</goals>
<phase>generate-sources</phase>
<configuration>
- <sourceDirectory>src/main/scripts/javax.script</sourceDirectory>
<generateJavaClasses>true</generateJavaClasses>
</configuration>
</execution>
diff --git a/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/javax.script/org.apache.sling.scripting.examplebundle.precompiled.hello/1.0.0/h.html b/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/org.apache.sling.scripting.examplebundle.precompiled.hello/1.0.0/h.html
similarity index 100%
rename from examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/javax.script/org.apache.sling.scripting.examplebundle.precompiled.hello/1.0.0/h.html
rename to examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/org.apache.sling.scripting.examplebundle.precompiled.hello/1.0.0/h.html
diff --git a/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/javax.script/org.apache.sling.scripting.examplebundle.precompiled.hello/1.0.0/hello.html b/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/org.apache.sling.scripting.examplebundle.precompiled.hello/1.0.0/hello.html
similarity index 100%
rename from examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/javax.script/org.apache.sling.scripting.examplebundle.precompiled.hello/1.0.0/hello.html
rename to examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/org.apache.sling.scripting.examplebundle.precompiled.hello/1.0.0/hello.html
diff --git a/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/javax.script/org.apache.sling.scripting.examplebundle.precompiled.hello/1.0.0/w.html b/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/org.apache.sling.scripting.examplebundle.precompiled.hello/1.0.0/w.html
similarity index 100%
rename from examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/javax.script/org.apache.sling.scripting.examplebundle.precompiled.hello/1.0.0/w.html
rename to examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/org.apache.sling.scripting.examplebundle.precompiled.hello/1.0.0/w.html
diff --git a/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/javax.script/org.apache.sling.scripting.examplebundle.precompiled.hello/2.0.0/h.html b/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/org.apache.sling.scripting.examplebundle.precompiled.hello/2.0.0/h.html
similarity index 100%
rename from examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/javax.script/org.apache.sling.scripting.examplebundle.precompiled.hello/2.0.0/h.html
rename to examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/org.apache.sling.scripting.examplebundle.precompiled.hello/2.0.0/h.html
diff --git a/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/javax.script/org.apache.sling.scripting.examplebundle.precompiled.hello/2.0.0/hello.html b/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/org.apache.sling.scripting.examplebundle.precompiled.hello/2.0.0/hello.html
similarity index 100%
rename from examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/javax.script/org.apache.sling.scripting.examplebundle.precompiled.hello/2.0.0/hello.html
rename to examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/org.apache.sling.scripting.examplebundle.precompiled.hello/2.0.0/hello.html
diff --git a/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/javax.script/org.apache.sling.scripting.examplebundle.precompiled.hello/2.0.0/w.html b/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/org.apache.sling.scripting.examplebundle.precompiled.hello/2.0.0/w.html
similarity index 100%
rename from examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/javax.script/org.apache.sling.scripting.examplebundle.precompiled.hello/2.0.0/w.html
rename to examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/org.apache.sling.scripting.examplebundle.precompiled.hello/2.0.0/w.html
diff --git a/examples/org-apache-sling-scripting-examplebundle.hi/pom.xml b/examples/org-apache-sling-scripting-examplebundle.hi/pom.xml
index 83ea267..5a5a429 100644
--- a/examples/org-apache-sling-scripting-examplebundle.hi/pom.xml
+++ b/examples/org-apache-sling-scripting-examplebundle.hi/pom.xml
@@ -45,6 +45,9 @@
<goals>
<goal>metadata</goal>
</goals>
+ <configuration>
+ <sourceDirectory>src/main/resources/javax.script</sourceDirectory>
+ </configuration>
</execution>
</executions>
</plugin>
diff --git a/examples/org-apache-sling-scripting-examplebundle.ohhi/pom.xml b/examples/org-apache-sling-scripting-examplebundle.ohhi/pom.xml
index b3a83dc..10ab06a 100644
--- a/examples/org-apache-sling-scripting-examplebundle.ohhi/pom.xml
+++ b/examples/org-apache-sling-scripting-examplebundle.ohhi/pom.xml
@@ -45,6 +45,9 @@
<goals>
<goal>metadata</goal>
</goals>
+ <configuration>
+ <sourceDirectory>src/main/resources/javax.script</sourceDirectory>
+ </configuration>
</execution>
</executions>
</plugin>
diff --git a/examples/org-apache-sling-scripting-examplebundle/pom.xml b/examples/org-apache-sling-scripting-examplebundle/pom.xml
index 1cf97bd..8de70fa 100644
--- a/examples/org-apache-sling-scripting-examplebundle/pom.xml
+++ b/examples/org-apache-sling-scripting-examplebundle/pom.xml
@@ -45,6 +45,9 @@
<goals>
<goal>metadata</goal>
</goals>
+ <configuration>
+ <sourceDirectory>src/main/resources/javax.script</sourceDirectory>
+ </configuration>
</execution>
</executions>
</plugin>