You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2016/11/25 14:49:45 UTC
svn commit: r1771326 - in /sling/trunk/launchpad:
builder/src/main/provisioning/composum.txt
builder/src/main/provisioning/sling.txt
testing/src/main/provisioning/model.txt
testing/src/main/provisioning/sling.txt
Author: rombert
Date: Fri Nov 25 14:49:44 2016
New Revision: 1771326
URL: http://svn.apache.org/viewvc?rev=1771326&view=rev
Log:
SLING-6330 - Replace Sling Explorer with Composum
Add composum to the launchpad
Added:
sling/trunk/launchpad/builder/src/main/provisioning/composum.txt
sling/trunk/launchpad/testing/src/main/provisioning/sling.txt
- copied, changed from r1771325, sling/trunk/launchpad/testing/src/main/provisioning/model.txt
Modified:
sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
sling/trunk/launchpad/testing/src/main/provisioning/model.txt
Added: sling/trunk/launchpad/builder/src/main/provisioning/composum.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/composum.txt?rev=1771326&view=auto
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/composum.txt (added)
+++ sling/trunk/launchpad/builder/src/main/provisioning/composum.txt Fri Nov 25 14:49:44 2016
@@ -0,0 +1,29 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+[feature name=composum-console]
+[variables]
+ composum.version=1.6.0
+
+[artifacts startLevel=20]
+
+ com.composum.sling.core/composum-sling-core-commons/${composum.version}
+ com.composum.sling.core/composum-sling-core-console/${composum.version}
+ com.composum.sling.core/composum-sling-core-jslibs/${composum.version}
+ com.composum.sling.core/composum-sling-user-management/${composum.version}
+ com.composum.sling.core/composum-sling-package-manager/${composum.version}
+ org.apache.jackrabbit.vault/org.apache.jackrabbit.vault/3.1.30
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=1771326&r1=1771325&r2=1771326&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Fri Nov 25 14:49:44 2016
@@ -145,6 +145,10 @@
org.apache.sling.commons.log.file="logs/request.log"
org.apache.sling.commons.log.level="info"
+ # whitelist composum bundles
+ org.apache.sling.jcr.base.internal.LoginAdminWhitelist
+ whitelist.bundles.additional=["com.composum.core.commons"]
+
# WebDAV servlet requires config now
org.apache.sling.jcr.webdav.impl.servlets.SimpleWebDavServlet
dav.root="/dav"
@@ -161,4 +165,4 @@
org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-jcr-install
user.mapping=[
"org.apache.sling.installer.provider.jcr\=sling-jcr-install"
- ]
\ No newline at end of file
+ ]
Modified: sling/trunk/launchpad/testing/src/main/provisioning/model.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/src/main/provisioning/model.txt?rev=1771326&r1=1771325&r2=1771326&view=diff
==============================================================================
--- sling/trunk/launchpad/testing/src/main/provisioning/model.txt (original)
+++ sling/trunk/launchpad/testing/src/main/provisioning/model.txt Fri Nov 25 14:49:44 2016
@@ -32,9 +32,6 @@
# Set the servlet resolver's cache size to zero for testing
servletresolver.cacheSize=I"0"
- org.apache.sling.jcr.base.internal.LoginAdminWhitelist
- whitelist.bundles.regexp="org.apache.sling.(launchpad|junit).*"
-
[settings]
org.apache.sling.commons.log.julenabled=true
Copied: sling/trunk/launchpad/testing/src/main/provisioning/sling.txt (from r1771325, sling/trunk/launchpad/testing/src/main/provisioning/model.txt)
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/src/main/provisioning/sling.txt?p2=sling/trunk/launchpad/testing/src/main/provisioning/sling.txt&p1=sling/trunk/launchpad/testing/src/main/provisioning/model.txt&r1=1771325&r2=1771326&rev=1771326&view=diff
==============================================================================
--- sling/trunk/launchpad/testing/src/main/provisioning/model.txt (original)
+++ sling/trunk/launchpad/testing/src/main/provisioning/sling.txt Fri Nov 25 14:49:44 2016
@@ -16,32 +16,10 @@
# specific language governing permissions and limitations
# under the License.
#
-[feature name=launchpad-testing]
-# Dependencies
-[artifacts]
- org.apache.sling/org.apache.sling.launchpad/9-SNAPSHOT/slingstart
- org.apache.sling/org.apache.sling.launchpad.test-bundles/0.0.1-SNAPSHOT/slingfeature
-
-
+[feature name=sling]
# additional configuration for testing
[configurations]
- integrationTestsConfig
- message="This test config should be loaded at startup"
-
- org.apache.sling.servlets.resolver.SlingServletResolver
- # Set the servlet resolver's cache size to zero for testing
- servletresolver.cacheSize=I"0"
- org.apache.sling.jcr.base.internal.LoginAdminWhitelist
+ # kept in a feature named 'sling' due to SLING-6332
+ org.apache.sling.jcr.base.internal.LoginAdminWhitelist [mode=merge]
whitelist.bundles.regexp="org.apache.sling.(launchpad|junit).*"
-
-[settings]
- org.apache.sling.commons.log.julenabled=true
-
- # Test repository initialization from provisioning model
- # No need to test all repoinit statements, this is done
- # by the repoinit it module
- [:repoinit]
-create path /repoinit/provisioningModelTest
-
-create service user provisioningModelUser