Author: cziegeler
Date: Wed Oct 1 16:45:48 2014
New Revision: 1628765
URL: http://svn.apache.org/r1628765
Log:
Update model files
Modified:
sling/trunk/launchpad/slingstart/src/main/model/boot.txt
sling/trunk/launchpad/slingstart/src/main/model/example.txt
sling/trunk/launchpad/slingstart/src/main/model/main.txt
sling/trunk/launchpad/slingstart/src/main/model/oak.txt
Modified: sling/trunk/launchpad/slingstart/src/main/model/boot.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/slingstart/src/main/model/boot.txt?rev=1628765&r1=1628764&r2=1628765&view=diff
==============================================================================
--- sling/trunk/launchpad/slingstart/src/main/model/boot.txt (original)
+++ sling/trunk/launchpad/slingstart/src/main/model/boot.txt Wed Oct 1
16:45:48 2014
@@ -34,8 +34,7 @@
org.apache.felix/org.apache.felix.eventadmin/1.4.2/jar
# Add an a servlet implementation for the standalone case
-[runMode names=:standalone]
-[artifacts startLevel=5]
+[artifacts startLevel=5 runModes=:standalone]
org.apache.felix/org.apache.felix.http.api/2.3.0/jar
org.apache.felix/org.apache.felix.http.servlet-api/1.0.0/jar
org.apache.felix/org.apache.felix.http.jetty/2.3.0/jar
Modified: sling/trunk/launchpad/slingstart/src/main/model/example.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/slingstart/src/main/model/example.txt?rev=1628765&r1=1628764&r2=1628765&view=diff
==============================================================================
--- sling/trunk/launchpad/slingstart/src/main/model/example.txt (original)
+++ sling/trunk/launchpad/slingstart/src/main/model/example.txt Wed Oct 1
16:45:48 2014
@@ -2,6 +2,7 @@
#
# A feature consists of variables and run mode dependent artifacts.
#
+[feature name=example]
# The variables are global and can be used within artifact definitions,
configurations,
# and settings.
#
@@ -52,14 +53,11 @@ org.apache.sling.another.config [format=
value=5
-# If artifacts should only be available for a specific run mode, a new section
needs
-# to be started:
-[runMode names=jackrabbit]
# Now artifacts, configurations and settings can be specified. All of them
belong to
# the previous runMode definition
#
-[artifacts startLevel=15]
+[artifacts startLevel=15 runModes=jackrabbit]
org.apache.derby/derby/10.5.3.0_1/jar
org.apache.sling/org.apache.sling.jcr.jackrabbit.server/2.1.3-SNAPSHOT/jar
Modified: sling/trunk/launchpad/slingstart/src/main/model/main.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/slingstart/src/main/model/main.txt?rev=1628765&r1=1628764&r2=1628765&view=diff
==============================================================================
--- sling/trunk/launchpad/slingstart/src/main/model/main.txt (original)
+++ sling/trunk/launchpad/slingstart/src/main/model/main.txt Wed Oct 1
16:45:48 2014
@@ -1,3 +1,5 @@
+[feature name=main]
+
[variables]
ws.version=1.0.2
@@ -95,8 +97,7 @@
org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.1-SNAPSHOT/jar
org.apache.sling/org.apache.sling.jcr.jackrabbit.accessmanager/2.1.1-SNAPSHOT/jar
-[runMode names=jackrabbit]
-[artifacts startLevel=15]
+[artifacts startLevel=15 runModes=jackrabbit]
org.apache.derby/derby/10.5.3.0_1/jar
org.apache.sling/org.apache.sling.jcr.jackrabbit.server/2.1.3-SNAPSHOT/jar
Modified: sling/trunk/launchpad/slingstart/src/main/model/oak.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/slingstart/src/main/model/oak.txt?rev=1628765&r1=1628764&r2=1628765&view=diff
==============================================================================
--- sling/trunk/launchpad/slingstart/src/main/model/oak.txt (original)
+++ sling/trunk/launchpad/slingstart/src/main/model/oak.txt Wed Oct 1 16:45:48
2014
@@ -1,8 +1,8 @@
# This is the OAK feature.
+[feature name=oak]
# All bundles are defined to be started at start level 15
# The segment node store is used via a configuration
-[runMode names=oak]
-[artifacts startLevel=15]
+[artifacts startLevel=15 runModes=oak]
org.apache.sling/org.apache.sling.jcr.oak.server/0.0.2-SNAPSHOT/jar
com.google.guava/guava/15.0/jar
org.apache.jackrabbit/oak-core/1.0.0/jar
@@ -13,7 +13,7 @@
org.apache.jackrabbit/oak-lucene/1.0.0/jar
org.apache.jackrabbit/oak-blob/1.0.0/jar
-[configurations]
+[configurations runModes=oak]
org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService
name="Default\ NodeStore"
repository.home="sling/oak/repository"
