SLING-9193 - Change the default folder for scripts lookup
* updated project structure based on the scriptingbundle-maven-plugin
new configuration settings
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>
