Author: cziegeler
Date: Wed Oct 1 17:30:56 2014
New Revision: 1628779
URL: http://svn.apache.org/r1628779
Log:
Update model files to latest launchpad
Added:
sling/trunk/launchpad/slingstart/src/main/models/jackrabbit.txt (with
props)
sling/trunk/launchpad/slingstart/src/main/models/launchpad.txt (with
props)
sling/trunk/launchpad/slingstart/src/main/models/sling.txt (with props)
Removed:
sling/trunk/launchpad/slingstart/src/main/models/example.txt
sling/trunk/launchpad/slingstart/src/main/models/main.txt
Modified:
sling/trunk/launchpad/slingstart/src/main/models/boot.txt
sling/trunk/launchpad/slingstart/src/main/models/oak.txt
Modified: sling/trunk/launchpad/slingstart/src/main/models/boot.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/slingstart/src/main/models/boot.txt?rev=1628779&r1=1628778&r2=1628779&view=diff
==============================================================================
--- sling/trunk/launchpad/slingstart/src/main/models/boot.txt (original)
+++ sling/trunk/launchpad/slingstart/src/main/models/boot.txt Wed Oct 1
17:30:56 2014
@@ -1,10 +1,3 @@
-# The :launchpad feature defines Sling's launchpad version
-# Only a single artifact is allowed within this feature.
-#
-[feature name=:launchpad]
- org.apache.sling/org.apache.sling.launchpad.base/4.4.1-2.5.2/jar
-
-
# The :boot feature contains all things to bootstrap the installation.
#
[feature name=:boot]
@@ -17,24 +10,24 @@
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
+ org.slf4j/slf4j-api/1.7.6
+ org.apache.sling/org.apache.sling.commons.log/4.0.0
+ org.apache.sling/org.apache.sling.commons.logservice/1.0.2
+ org.slf4j/jcl-over-slf4j/1.7.6
+ org.slf4j/log4j-over-slf4j/1.7.6
+ org.apache.sling/org.apache.sling.settings/1.3.2
+ org.apache.sling/org.apache.sling.fragment.xml/1.0.2
+ org.apache.sling/org.apache.sling.fragment.transaction/1.0.0
+ org.apache.sling/org.apache.sling.javax.activation/0.1.0
+ org.apache.sling/org.apache.sling.fragment.ws/1.0.2
+ org.apache.sling/org.apache.sling.launchpad.installer/1.2.0
+ org.apache.sling/org.apache.sling.installer.core/3.5.4
+ org.apache.sling/org.apache.sling.installer.provider.file/1.0.4
+ org.apache.felix/org.apache.felix.configadmin/1.6.0
+ org.apache.felix/org.apache.felix.eventadmin/1.4.2
# Add an a servlet implementation for the standalone case
[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
+ org.apache.felix/org.apache.felix.http.api/2.3.0
+ org.apache.felix/org.apache.felix.http.servlet-api/1.0.0
+ org.apache.felix/org.apache.felix.http.jetty/2.3.0
Added: sling/trunk/launchpad/slingstart/src/main/models/jackrabbit.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/slingstart/src/main/models/jackrabbit.txt?rev=1628779&view=auto
==============================================================================
--- sling/trunk/launchpad/slingstart/src/main/models/jackrabbit.txt (added)
+++ sling/trunk/launchpad/slingstart/src/main/models/jackrabbit.txt Wed Oct 1
17:30:56 2014
@@ -0,0 +1,8 @@
+# The jackrabbit feature for Apache Sling
+[feature name=jackrabbit]
+
+[artifacts startLevel=15 runModes=jackrabbit]
+ org.apache.derby/derby/10.5.3.0_1
+ org.apache.sling/org.apache.sling.jcr.jackrabbit.server/2.2.0
+
+
Propchange: sling/trunk/launchpad/slingstart/src/main/models/jackrabbit.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/launchpad/slingstart/src/main/models/jackrabbit.txt
------------------------------------------------------------------------------
svn:keywords = Id
Added: sling/trunk/launchpad/slingstart/src/main/models/launchpad.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/slingstart/src/main/models/launchpad.txt?rev=1628779&view=auto
==============================================================================
--- sling/trunk/launchpad/slingstart/src/main/models/launchpad.txt (added)
+++ sling/trunk/launchpad/slingstart/src/main/models/launchpad.txt Wed Oct 1
17:30:56 2014
@@ -0,0 +1,5 @@
+# The :launchpad feature defines Sling's launchpad version
+# Only a single artifact is allowed within this feature.
+#
+[feature name=:launchpad]
+ org.apache.sling/org.apache.sling.launchpad.base/4.4.1-2.5.2
Propchange: sling/trunk/launchpad/slingstart/src/main/models/launchpad.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/launchpad/slingstart/src/main/models/launchpad.txt
------------------------------------------------------------------------------
svn:keywords = Id
Modified: sling/trunk/launchpad/slingstart/src/main/models/oak.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/slingstart/src/main/models/oak.txt?rev=1628779&r1=1628778&r2=1628779&view=diff
==============================================================================
--- sling/trunk/launchpad/slingstart/src/main/models/oak.txt (original)
+++ sling/trunk/launchpad/slingstart/src/main/models/oak.txt Wed Oct 1
17:30:56 2014
@@ -3,15 +3,15 @@
# All bundles are defined to be started at start level 15
# The segment node store is used via a configuration
[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
- 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
+ org.apache.sling/org.apache.sling.jcr.oak.server/0.0.2-SNAPSHOT
+ com.google.guava/guava/15.0
+ org.apache.jackrabbit/oak-core/1.0.0
+ org.apache.jackrabbit/oak-commons/1.0.0
+ org.apache.jackrabbit/oak-mk/1.0.0
+ org.apache.jackrabbit/oak-mk-api/1.0.0
+ org.apache.jackrabbit/oak-mk-remote/1.0.0
+ org.apache.jackrabbit/oak-lucene/1.0.0
+ org.apache.jackrabbit/oak-blob/1.0.0
[configurations runModes=oak]
org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService
Added: sling/trunk/launchpad/slingstart/src/main/models/sling.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/slingstart/src/main/models/sling.txt?rev=1628779&view=auto
==============================================================================
--- sling/trunk/launchpad/slingstart/src/main/models/sling.txt (added)
+++ sling/trunk/launchpad/slingstart/src/main/models/sling.txt Wed Oct 1
17:30:56 2014
@@ -0,0 +1,97 @@
+# The feature for Apache Sling
+[feature name=sling]
+
+[artifacts]
+ commons-io/commons-io/1.4
+ commons-fileupload/commons-fileupload/1.3.1
+ commons-collections/commons-collections/3.2.1
+ commons-codec/commons-codec/1.9
+ commons-lang/commons-lang/2.6
+ org.apache.commons/commons-math/2.2
+ commons-pool/commons-pool/1.6
+
org.apache.servicemix.bundles/org.apache.servicemix.bundles.concurrent/1.3.4_1
+ org.apache.geronimo.bundles/commons-httpclient/3.1_1
+ org.apache.sling/org.apache.sling.commons.osgi/2.2.2
+ org.apache.sling/org.apache.sling.commons.mime/2.1.8
+ org.apache.sling/org.apache.sling.commons.classloader/1.3.2
+ org.apache.sling/org.apache.sling.commons.compiler/2.2.0
+ org.apache.sling/org.apache.sling.commons.scheduler/2.4.4
+ org.apache.sling/org.apache.sling.commons.threads/3.2.0
+ org.apache.sling/org.apache.sling.discovery.api/1.0.0
+ org.apache.sling/org.apache.sling.discovery.support/1.0.0
+ org.apache.sling/org.apache.sling.discovery.impl/1.0.10
+ org.apache.sling/org.apache.sling.event/3.3.14
+ org.apache.sling/org.apache.sling.api/2.8.0
+ org.apache.sling/org.apache.sling.serviceusermapper/1.0.2
+ org.apache.sling/org.apache.sling.resourceresolver/1.1.4
+ org.apache.sling/org.apache.sling.auth.core/1.3.0
+ org.apache.sling/org.apache.sling.engine/2.3.6
+ org.apache.sling/org.apache.sling.auth.form/1.0.6
+ org.apache.sling/org.apache.sling.adapter/2.1.2
+ org.apache.sling/org.apache.sling.servlets.resolver/2.3.2
+ org.apache.sling/org.apache.sling.servlets.get/2.1.10
+ org.apache.sling/org.apache.sling.servlets.post/2.3.6
+ org.apache.sling/org.apache.sling.jcr.contentloader/2.1.10
+ org.apache.sling/org.apache.sling.jcr.resource/2.3.8
+ org.apache.sling/org.apache.sling.jcr.classloader/3.2.2
+ org.apache.sling/org.apache.sling.bundleresource.impl/2.2.0
+ org.apache.sling/org.apache.sling.fsresource/1.1.4
+ org.apache.sling/org.apache.sling.launchpad.content/2.0.8
+ org.apache.sling/org.apache.sling.scripting.api/2.1.6
+ org.apache.sling/org.apache.sling.scripting.core/2.0.28
+ org.apache.sling/org.apache.sling.scripting.javascript/2.0.14
+ org.apache.sling/org.apache.sling.scripting.jsp/2.1.4
+ org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.2.4
+ org.apache.geronimo.bundles/jstl/1.2_1
+ org.apache.sling/org.apache.sling.models.api/1.1.0
+ org.apache.sling/org.apache.sling.models.impl/1.1.0
+ org.apache.felix/org.apache.felix.http.whiteboard/2.2.0
+ org.apache.sling/org.apache.sling.installer.console/1.0.0
+ org.apache.sling/org.apache.sling.installer.factory.configuration/1.0.14
+ org.apache.sling/org.apache.sling.installer.provider.jcr/3.1.8
+
+[artifacts startLevel=5]
+ org.apache.sling/org.apache.sling.extensions.webconsolebranding/1.0.0
+
org.apache.sling/org.apache.sling.extensions.webconsolesecurityprovider/1.0.0
+ org.apache.felix/org.apache.felix.inventory/1.0.4
+ org.apache.felix/org.apache.felix.prefs/1.0.6
+ org.apache.felix/org.apache.felix.webconsole/4.2.2
+ org.apache.geronimo.bundles/json/20090211_1
+ org.apache.felix/org.apache.felix.webconsole.plugins.ds/1.0.0
+ org.apache.felix/org.apache.felix.webconsole.plugins.obr/1.0.2
+ org.apache.felix/org.apache.felix.webconsole.plugins.packageadmin/1.0.0
+ org.apache.felix/org.apache.felix.webconsole.plugins.event/1.0.2
+ org.apache.felix/org.apache.felix.webconsole.plugins.memoryusage/1.0.4
+ org.apache.sling/org.apache.sling.commons.json/2.0.8
+ org.apache.felix/org.apache.felix.bundlerepository/1.6.4
+ org.apache.sling/org.apache.sling.extensions.threaddump/0.2.2
+ org.apache.sling/org.apache.sling.jcr.webconsole/1.0.2
+ org.apache.sling/org.apache.sling.extensions.explorer/1.0.4
+ org.apache.aries.jmx/org.apache.aries.jmx.api/1.1.0
+ org.apache.aries/org.apache.aries.util/1.1.0
+ org.apache.aries.jmx/org.apache.aries.jmx.core/1.1.1
+ org.apache.aries.jmx/org.apache.aries.jmx.whiteboard/1.0.0
+
+[artifacts startLevel=10]
+ org.apache.felix/org.apache.felix.scr/1.8.2
+ org.apache.felix/org.apache.felix.metatype/1.0.10
+ org.apache.tika/tika-core/1.2
+ org.apache.tika/tika-bundle/1.2
+
+[artifacts startLevel=15]
+ org.apache.sling/org.apache.sling.jcr.jcr-wrapper/2.0.0
+ org.apache.sling/org.apache.sling.jcr.api/2.2.0
+ org.apache.sling/org.apache.sling.jcr.base/2.2.2
+ org.apache.sling/org.apache.sling.jcr.registration/1.0.2
+ org.apache.jackrabbit/jackrabbit-api/2.7.5
+ org.apache.jackrabbit/jackrabbit-jcr-commons/2.7.5
+ org.apache.jackrabbit/jackrabbit-spi/2.7.1
+ org.apache.jackrabbit/jackrabbit-spi-commons/2.7.1
+ org.apache.jackrabbit/jackrabbit-webdav/2.7.1
+ org.apache.jackrabbit/jackrabbit-jcr-rmi/2.7.1
+ org.apache.sling/org.apache.sling.jcr.webdav/2.2.2
+ org.apache.sling/org.apache.sling.jcr.davex/1.2.2
+ org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.2
+ org.apache.sling/org.apache.sling.jcr.jackrabbit.accessmanager/2.1.2
+
+
Propchange: sling/trunk/launchpad/slingstart/src/main/models/sling.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/launchpad/slingstart/src/main/models/sling.txt
------------------------------------------------------------------------------
svn:keywords = Id
