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/28 21:50:14 UTC
svn commit: r1771820 - in
/sling/trunk/launchpad/testing-war/src/main/provisioning: model.txt sling.txt
Author: rombert
Date: Mon Nov 28 21:50:14 2016
New Revision: 1771820
URL: http://svn.apache.org/viewvc?rev=1771820&view=rev
Log:
launchpad/testing-war: move login admin whitelist to sling feature
Added:
sling/trunk/launchpad/testing-war/src/main/provisioning/sling.txt
- copied, changed from r1771808, sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt
Modified:
sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt
Modified: sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt?rev=1771820&r1=1771819&r2=1771820&view=diff
==============================================================================
--- sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt (original)
+++ sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt Mon Nov 28 21:50:14 2016
@@ -31,9 +31,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).*"
-
# Test repository initialization from provisioning model
# No need to test all repoinit statements, this is done
# by the repoinit it module
Copied: sling/trunk/launchpad/testing-war/src/main/provisioning/sling.txt (from r1771808, sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt)
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing-war/src/main/provisioning/sling.txt?p2=sling/trunk/launchpad/testing-war/src/main/provisioning/sling.txt&p1=sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt&r1=1771808&r2=1771820&rev=1771820&view=diff
==============================================================================
--- sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt (original)
+++ sling/trunk/launchpad/testing-war/src/main/provisioning/sling.txt Mon Nov 28 21:50:14 2016
@@ -16,28 +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).*"
-
- # 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