You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2016/11/25 20:28:04 UTC
svn commit: r1771376 - in
/sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning:
integration-tests.txt sling.txt
Author: sseifert
Date: Fri Nov 25 20:28:04 2016
New Revision: 1771376
URL: http://svn.apache.org/viewvc?rev=1771376&view=rev
Log:
fix admin login whitelisting for integration tests
Added:
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/sling.txt (with props)
Modified:
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/integration-tests.txt
Modified: sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/integration-tests.txt
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/integration-tests.txt?rev=1771376&r1=1771375&r2=1771376&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/integration-tests.txt (original)
+++ sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/integration-tests.txt Fri Nov 25 20:28:04 2016
@@ -36,9 +36,6 @@
org.apache.sling.commons.log.file="logs/sling-contextaware-config.log"
org.apache.sling.commons.log.level="debug"
- org.apache.sling.jcr.base.internal.LoginAdminWhitelist
- whitelist.bundles.additional=["org.apache.sling.junit.core"]
-
org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling-caconfig
user.mapping=[
"org.apache.sling.caconfig.impl\=sling-caconfig"
Added: sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/sling.txt
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/sling.txt?rev=1771376&view=auto
==============================================================================
--- sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/sling.txt (added)
+++ sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/sling.txt Fri Nov 25 20:28:04 2016
@@ -0,0 +1,26 @@
+#
+# 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=sling]
+
+# additional configuration for testing
+[configurations]
+
+ # 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\.junit(\..*)?$"
Propchange: sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/sling.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/sling.txt
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Fri Nov 25 20:28:04 2016
@@ -0,0 +1 @@
+LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Author
Propchange: sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/sling.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain