Author: bdelacretaz
Date: Tue Jun 16 14:42:11 2015
New Revision: 1685852
URL: http://svn.apache.org/r1685852
Log:
SLING-4728 - launchpad setup with nested models
Modified:
sling/trunk/contrib/crankstart/launcher/src/test/resources/crankstart-model.txt
sling/trunk/contrib/crankstart/launcher/src/test/resources/sling-launchpad.txt
Modified:
sling/trunk/contrib/crankstart/launcher/src/test/resources/crankstart-model.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/crankstart/launcher/src/test/resources/crankstart-model.txt?rev=1685852&r1=1685851&r2=1685852&view=diff
==============================================================================
---
sling/trunk/contrib/crankstart/launcher/src/test/resources/crankstart-model.txt
(original)
+++
sling/trunk/contrib/crankstart/launcher/src/test/resources/crankstart-model.txt
Tue Jun 16 14:42:11 2015
@@ -25,7 +25,7 @@
felix.framework.version=5.0.0
slf4j.version = 1.6.2
http.port = 8080
- osgi.storage.path = CRANKSTART
+ osgi.storage.path = CRANKSTART/felix
osgi.start.level = 42
[settings]
Modified:
sling/trunk/contrib/crankstart/launcher/src/test/resources/sling-launchpad.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/crankstart/launcher/src/test/resources/sling-launchpad.txt?rev=1685852&r1=1685851&r2=1685852&view=diff
==============================================================================
---
sling/trunk/contrib/crankstart/launcher/src/test/resources/sling-launchpad.txt
(original)
+++
sling/trunk/contrib/crankstart/launcher/src/test/resources/sling-launchpad.txt
Tue Jun 16 14:42:11 2015
@@ -19,10 +19,19 @@
# Start the Sling Launchpad including whatever is required to
# run the Sling integration tests.
-# This model is meant to be used in addition to the base
-# crankstart-model
+#
+# Currently those tests pass with 32 failures and 1 error, out
+# of 529 tests, if starting with
+# java -Dsling.run.modes=:standalone,jackrabbit -Dsling.home=CRANKSTART \
+# -jar target/org.apache.sling.crankstart.launcher-1.9.9-SNAPSHOT.jar \
+# src/test/resources/crankstart-model.txt \
+# src/test/resources/sling-launchpad.txt
+
[feature name=sling.launchpad]
+[variables]
+
nested.models=org.apache.sling.launchpad,org.apache.sling.launchpad.test-bundles
+
[settings]
org.apache.sling.commons.log.julenabled=true
@@ -30,11 +39,14 @@
# karaf bunde provides Sling Launchpad startup services
org.apache.sling/org.apache.sling.launchpad.karaf/0.1.1-SNAPSHOT
+ # artifacts that are usually provided by the Sling launchpad
+ org.apache.sling/org.apache.sling.launchpad.api/1.1.0
+
# The launchpad itself
org.apache.sling/org.apache.sling.launchpad/8-SNAPSHOT/txt/slingfeature
# Sling integration tests support
-
org.apache.sling/org.apache.sling.launchpad.test-bundles/0.0.1-SNAPSHOT/txt/slingstart
+ org.apache.sling/org.apache.sling.launchpad.test-bundles/0.0.1-SNAPSHOT/txt
[configurations]
integrationTestsConfig
