Author: cziegeler
Date: Tue Sep 30 07:12:00 2014
New Revision: 1628364
URL: http://svn.apache.org/r1628364
Log:
Alternative model
Added:
sling/trunk/launchpad/slingstart/src/main/model/
sling/trunk/launchpad/slingstart/src/main/model/boot.txt (with props)
sling/trunk/launchpad/slingstart/src/main/model/example.txt (with props)
sling/trunk/launchpad/slingstart/src/main/model/main.txt (with props)
sling/trunk/launchpad/slingstart/src/main/model/oak.txt (with props)
Added: 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=1628364&view=auto
==============================================================================
--- sling/trunk/launchpad/slingstart/src/main/model/boot.txt (added)
+++ sling/trunk/launchpad/slingstart/src/main/model/boot.txt Tue Sep 30
07:12:00 2014
@@ -0,0 +1,37 @@
+[variables]
+ ws.version=1.0.2
+
+[runMode names=:base]
+ org.apache.sling/org.apache.sling.launchpad.base/4.4.1-2.5.2/jar
+
+# additional entries for sling.properties
+# ---------------------------------------
+# jackrabbit and oak run modes are mutually exclusive,
+# and cannot be changed after the first startup
+[runMode names=:boot]
+[settings]
+ sling.run.mode.install.options=jackrabbit,oak
+
+[artifacts]
+ org.slf4j/slf4j-api/1.7.6/jar
+ org.apache.sling/org.apache.sling.commons.log/4.0.0/jar
+ org.apache.sling/org.apache.sling.commons.logservice/1.0.2/jar
+ org.slf4j/jcl-over-slf4j/1.7.6/jar
+ org.slf4j/log4j-over-slf4j/1.7.6/jar
+ org.apache.sling/org.apache.sling.settings/1.3.2/jar
+ org.apache.sling/org.apache.sling.fragment.xml/1.0.2/jar
+ org.apache.sling/org.apache.sling.fragment.transaction/1.0.0/jar
+ org.apache.sling/org.apache.sling.javax.activation/0.1.0/jar
+ org.apache.sling/org.apache.sling.fragment.ws/${ws.version}/jar
+ org.apache.sling/org.apache.sling.launchpad.installer/1.2.0/jar
+ org.apache.sling/org.apache.sling.installer.core/3.5.4/jar
+ org.apache.sling/org.apache.sling.installer.provider.file/1.0.4/jar
+ org.apache.felix/org.apache.felix.configadmin/1.6.0/jar
+ 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]
+ 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
Propchange: sling/trunk/launchpad/slingstart/src/main/model/boot.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/launchpad/slingstart/src/main/model/boot.txt
------------------------------------------------------------------------------
svn:keywords = Id
Added: 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=1628364&view=auto
==============================================================================
--- sling/trunk/launchpad/slingstart/src/main/model/example.txt (added)
+++ sling/trunk/launchpad/slingstart/src/main/model/example.txt Tue Sep 30
07:12:00 2014
@@ -0,0 +1,66 @@
+# This is a feature description
+#
+# A feature consists of variables and run mode dependent artifacts.
+#
+# The variables are global and can be used within artifact definitions,
configurations,
+# and settings.
+#
+# Variables
+[variables]
+ ws.version=1.0.2
+
+# Settings, artifacts and configurations belong to a run mode. If none is
specified
+# the default run mode is used. The same goes with the start level for
artifacts
+# Framework properties
+[settings]
+ sling.options=jackrabbit,oak
+
+[artifacts]
+ commons-io/commons-io/1.4/jar
+ commons-fileupload/commons-fileupload/1.3.1/jar
+ commons-collections/commons-collections/3.2.1/jar
+ commons-codec/commons-codec/1.9/jar
+ commons-lang/commons-lang/2.6/jar
+ org.apache.commons/commons-math/2.2/jar
+# Artifacts can have additional information like a SHA1 etc.
+#
+ org.apache.commons/commons-math/2.2/jar {sha1=2353750701ABE}
+
+# A start level can be specified
+[artifacts startLevel=5]
+ org.apache.sling/org.apache.sling.extensions.webconsolebranding/1.0.0/jar
+
org.apache.sling/org.apache.sling.extensions.webconsolesecurityprovider/1.0.0/jar
+
+# And now the configurations section
+# A configuration ends with an empty line and all configurations use the
Apache Felix
+# ConfigAdmin format.
+#
+[configurations]
+# A plain configuration
+org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService
+ name="Default\ NodeStore"
+ repository.home="sling/oak/repository"
+
+# A factory configuration with the alias error
+org.apache.sling.log.LoggerFactory-error
+ name="Test"
+ value="Hallo"
+
+# A configuration using properties format:
+org.apache.sling.another.config {format=properties}
+ test=A
+ 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]
+ org.apache.derby/derby/10.5.3.0_1/jar
+ org.apache.sling/org.apache.sling.jcr.jackrabbit.server/2.1.3-SNAPSHOT/jar
+
+
Propchange: sling/trunk/launchpad/slingstart/src/main/model/example.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/launchpad/slingstart/src/main/model/example.txt
------------------------------------------------------------------------------
svn:keywords = Id
Added: 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=1628364&view=auto
==============================================================================
--- sling/trunk/launchpad/slingstart/src/main/model/main.txt (added)
+++ sling/trunk/launchpad/slingstart/src/main/model/main.txt Tue Sep 30
07:12:00 2014
@@ -0,0 +1,102 @@
+[variables]
+ ws.version=1.0.2
+
+[artifacts]
+ commons-io/commons-io/1.4/jar
+ commons-fileupload/commons-fileupload/1.3.1/jar
+ commons-collections/commons-collections/3.2.1/jar
+ commons-codec/commons-codec/1.9/jar
+ commons-lang/commons-lang/2.6/jar
+ org.apache.commons/commons-math/2.2/jar
+ commons-pool/commons-pool/1.6/jar
+
org.apache.servicemix.bundles/org.apache.servicemix.bundles.concurrent/1.3.4_1/jar
+ org.apache.geronimo.bundles/commons-httpclient/3.1_1/jar
+ org.apache.sling/org.apache.sling.commons.osgi/2.2.2/jar
+ org.apache.sling/org.apache.sling.commons.mime/2.1.8/jar
+ org.apache.sling/org.apache.sling.commons.classloader/1.3.2/jar
+ org.apache.sling/org.apache.sling.commons.compiler/2.2.0/jar
+ org.apache.sling/org.apache.sling.commons.scheduler/2.4.4/jar
+ org.apache.sling/org.apache.sling.commons.threads/3.2.0/jar
+ org.apache.sling/org.apache.sling.discovery.api/1.0.0/jar
+ org.apache.sling/org.apache.sling.discovery.support/1.0.0/jar
+ org.apache.sling/org.apache.sling.discovery.impl/1.0.10/jar
+ org.apache.sling/org.apache.sling.event/3.3.14/jar
+ org.apache.sling/org.apache.sling.api/2.8.0/jar
+ org.apache.sling/org.apache.sling.serviceusermapper/1.0.2/jar
+ org.apache.sling/org.apache.sling.resourceresolver/1.1.3-SNAPSHOT/jar
+ org.apache.sling/org.apache.sling.auth.core/1.2.0/jar
+ org.apache.sling/org.apache.sling.engine/2.3.5-SNAPSHOT/jar
+ org.apache.sling/org.apache.sling.auth.openid/1.0.4/jar
+ org.apache.sling/org.apache.sling.auth.form/1.0.6/jar
+ org.apache.sling/org.apache.sling.auth.selector/1.0.6/jar
+ org.apache.sling/org.apache.sling.adapter/2.1.1-SNAPSHOT/jar
+ org.apache.sling/org.apache.sling.servlets.resolver/2.3.2/jar
+ org.apache.sling/org.apache.sling.servlets.get/2.1.10/jar
+ org.apache.sling/org.apache.sling.servlets.post/2.3.6/jar
+ org.apache.sling/org.apache.sling.jcr.contentloader/2.1.8/jar
+ org.apache.sling/org.apache.sling.jcr.resource/2.3.8/jar
+ org.apache.sling/org.apache.sling.jcr.classloader/3.2.1-SNAPSHOT/jar
+ org.apache.sling/org.apache.sling.bundleresource.impl/2.2.0/jar
+ org.apache.sling/org.apache.sling.fsresource/1.1.4/jar
+ org.apache.sling/org.apache.sling.launchpad.content/2.0.8/jar
+ org.apache.sling/org.apache.sling.scripting.api/2.1.6/jar
+ org.apache.sling/org.apache.sling.scripting.core/2.0.27-SNAPSHOT/jar
+ org.apache.sling/org.apache.sling.scripting.javascript/2.0.12/jar
+ org.apache.sling/org.apache.sling.scripting.jsp/2.1.4/jar
+ org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.2.2/jar
+ org.apache.geronimo.bundles/jstl/1.2_1/jar
+ org.apache.sling/org.apache.sling.models.api/1.1.0/jar
+ org.apache.sling/org.apache.sling.models.impl/1.1.0/jar
+ org.apache.felix/org.apache.felix.http.whiteboard/2.2.0/jar
+ org.apache.sling/org.apache.sling.installer.console/1.0.0/jar
+
org.apache.sling/org.apache.sling.installer.factory.configuration/1.0.14/jar
+ org.apache.sling/org.apache.sling.installer.provider.jcr/3.1.8/jar
+
+[artifacts startLevel=5]
+ org.apache.sling/org.apache.sling.extensions.webconsolebranding/1.0.0/jar
+
org.apache.sling/org.apache.sling.extensions.webconsolesecurityprovider/1.0.0/jar
+ org.apache.felix/org.apache.felix.inventory/1.0.4/jar
+ org.apache.felix/org.apache.felix.prefs/1.0.6/jar
+ org.apache.felix/org.apache.felix.webconsole/4.2.2/jar
+ org.apache.geronimo.bundles/json/20090211_1/jar
+ org.apache.felix/org.apache.felix.webconsole.plugins.ds/1.0.0/jar
+ org.apache.felix/org.apache.felix.webconsole.plugins.packageadmin/1.0.0/jar
+ org.apache.felix/org.apache.felix.webconsole.plugins.event/1.0.2/jar
+ org.apache.felix/org.apache.felix.webconsole.plugins.memoryusage/1.0.4/jar
+ org.apache.sling/org.apache.sling.commons.json/2.0.8/jar
+ org.apache.felix/org.apache.felix.bundlerepository/1.6.4/jar
+ org.apache.sling/org.apache.sling.extensions.threaddump/0.2.2/jar
+ org.apache.sling/org.apache.sling.jcr.webconsole/1.0.1-SNAPSHOT/jar
+ org.apache.sling/org.apache.sling.extensions.explorer/1.0.4/jar
+ org.apache.aries.jmx/org.apache.aries.jmx.api/1.1.0/jar
+ org.apache.aries/org.apache.aries.util/1.1.0/jar
+ org.apache.aries.jmx/org.apache.aries.jmx.core/1.1.1/jar
+ org.apache.aries.jmx/org.apache.aries.jmx.whiteboard/1.0.0/jar
+
+[artifacts startLevel=10]
+ org.apache.felix/org.apache.felix.scr/1.8.2/jar
+ org.apache.felix/org.apache.felix.metatype/1.0.10/jar
+ org.apache.tika/tika-core/1.2/jar
+ org.apache.tika/tika-bundle/1.2/jar
+
+[artifacts startLevel=15]
+ org.apache.sling/org.apache.sling.jcr.jcr-wrapper/2.0.0/jar
+ org.apache.sling/org.apache.sling.jcr.api/2.2.0/jar
+ org.apache.sling/org.apache.sling.jcr.base/2.2.2/jar
+ org.apache.sling/org.apache.sling.jcr.registration/1.0.1-SNAPSHOT/jar
+ org.apache.jackrabbit/jackrabbit-api/2.7.5/jar
+ org.apache.jackrabbit/jackrabbit-jcr-commons/2.7.5/jar
+ org.apache.jackrabbit/jackrabbit-spi/2.7.1/jar
+ org.apache.jackrabbit/jackrabbit-spi-commons/2.7.1/jar
+ org.apache.jackrabbit/jackrabbit-webdav/2.7.1/jar
+ org.apache.jackrabbit/jackrabbit-jcr-rmi/2.7.1/jar
+ org.apache.sling/org.apache.sling.jcr.webdav/2.2.2/jar
+ org.apache.sling/org.apache.sling.jcr.davex/1.2.1-SNAPSHOT/jar
+
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
+
+[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
+
+
Propchange: sling/trunk/launchpad/slingstart/src/main/model/main.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/launchpad/slingstart/src/main/model/main.txt
------------------------------------------------------------------------------
svn:keywords = Id
Added: 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=1628364&view=auto
==============================================================================
--- sling/trunk/launchpad/slingstart/src/main/model/oak.txt (added)
+++ sling/trunk/launchpad/slingstart/src/main/model/oak.txt Tue Sep 30 07:12:00
2014
@@ -0,0 +1,19 @@
+# This is the OAK feature.
+# 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]
+ 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
+ org.apache.jackrabbit/oak-commons/1.0.0/jar
+ org.apache.jackrabbit/oak-mk/1.0.0/jar
+ org.apache.jackrabbit/oak-mk-api/1.0.0/jar
+ org.apache.jackrabbit/oak-mk-remote/1.0.0/jar
+ org.apache.jackrabbit/oak-lucene/1.0.0/jar
+ org.apache.jackrabbit/oak-blob/1.0.0/jar
+
+[configurations]
+ org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService
+ name="Default\ NodeStore"
+ repository.home="sling/oak/repository"
Propchange: sling/trunk/launchpad/slingstart/src/main/model/oak.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/launchpad/slingstart/src/main/model/oak.txt
------------------------------------------------------------------------------
svn:keywords = Id
