Author: radu Date: Tue May 12 15:50:01 2015 New Revision: 1678987 URL: http://svn.apache.org/r1678987 Log: SLING-4703 - Add Sightly to the Sling launchpad
* added Sightly and its dependencies to the launchpad and to the main reactor build Modified: sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt sling/trunk/launchpad/builder/src/main/provisioning/sling.txt sling/trunk/pom.xml Modified: sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt?rev=1678987&r1=1678986&r2=1678987&view=diff ============================================================================== --- sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt (original) +++ sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt Tue May 12 15:50:01 2015 @@ -20,13 +20,7 @@ # Dependencies [artifacts] org.apache.sling/org.apache.sling.launchpad/8-SNAPSHOT/slingstart - org.apache.sling/org.apache.sling.i18n/2.2.10 - javax.mail/mail/1.4.7 - org.apache.sling/org.apache.sling.xss/1.0.2 - org.apache.sling/org.apache.sling.scripting.sightly/1.0.3-SNAPSHOT - org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.5-SNAPSHOT org.apache.sling/org.apache.sling.scripting.sightly.testing-content/1.0.5-SNAPSHOT - org.apache.sling/org.apache.sling.scripting.sightly.repl/1.0.0 # additional configuration for testing [configurations] @@ -37,4 +31,4 @@ [settings] sling.system.packages.class.com.vladium.emma.rt.RT=com.vladium.emma.rt - org.apache.sling.commons.log.julenabled=true \ No newline at end of file + org.apache.sling.commons.log.julenabled=true Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1678987&r1=1678986&r2=1678987&view=diff ============================================================================== --- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original) +++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Tue May 12 15:50:01 2015 @@ -60,6 +60,12 @@ org.apache.sling/org.apache.sling.scripting.javascript/2.0.14 org.apache.sling/org.apache.sling.scripting.jsp/2.1.6 org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.2.4 + org.apache.sling/org.apache.sling.i18n/2.4.3-SNAPSHOT + javax.mail/mail/1.4.7 + org.apache.sling/org.apache.sling.xss/1.0.3-SNAPSHOT + org.apache.sling/org.apache.sling.scripting.sightly/1.0.3-SNAPSHOT + org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.5-SNAPSHOT + org.apache.sling/org.apache.sling.scripting.sightly.repl/1.0.1-SNAPSHOT org.apache.geronimo.bundles/jstl/1.2_1 org.apache.sling/org.apache.sling.models.api/1.1.1-SNAPSHOT org.apache.sling/org.apache.sling.models.impl/1.1.1-SNAPSHOT Modified: sling/trunk/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/pom.xml?rev=1678987&r1=1678986&r2=1678987&view=diff ============================================================================== --- sling/trunk/pom.xml (original) +++ sling/trunk/pom.xml Tue May 12 15:50:01 2015 @@ -99,7 +99,7 @@ <module>tooling/maven/archetypes/bundle</module> <module>tooling/maven/archetypes/bundle-for-jcrinstall</module> <module>tooling/maven/archetypes/taglib</module> - + <!-- The Sling API --> <module>bundles/api</module> @@ -129,10 +129,10 @@ <!-- Authentication Support --> <module>bundles/auth/core</module> <module>bundles/auth/form</module> - + <!-- The Sling Engine --> <module>bundles/engine</module> - + <!-- The JCR sub project --> <module>bundles/jcr/api</module> <module>bundles/jcr/base</module> @@ -152,7 +152,7 @@ <module>bundles/jcr/webconsole</module> <module>bundles/jcr/oak-server</module> <module>bundles/jcr/it-jackrabbit-oak</module> - + <!-- Servlets --> <module>bundles/servlets/resolver</module> <module>bundles/servlets/get</module> @@ -166,7 +166,8 @@ <module>bundles/scripting/jsp</module> <module>bundles/scripting/jsp-taglib</module> <module>bundles/scripting/jsp-jstl</module> - + <module>bundles/scripting/sightly</module> + <!-- Extensions --> <module>bundles/extensions/adapter</module> <module>bundles/extensions/bundleresource</module> @@ -192,10 +193,12 @@ <module>bundles/extensions/models/api</module> <module>bundles/extensions/models/impl</module> <module>bundles/extensions/models/integration-tests</module> + <module>bundles/extensions/i18n</module> + <module>bundles/extensions/xss</module> <!-- Testing Support --> <module>testing</module> - + <!-- Installer --> <module>installer/core</module> <module>installer/console</module> @@ -205,14 +208,14 @@ <module>installer/factories/deploymentpck</module> <module>installer/factories/subsystems</module> <module>installer/it</module> - + <!-- Launchpad --> <module>launchpad/api</module> <module>launchpad/base</module> <module>launchpad/installer</module> <module>launchpad/content</module> <module>launchpad/builder</module> - + </modules> <profiles>