[sling-site] branch asf-site updated: set default charset to utf-8 in .htaccess

[jsedding]

This is an automated email from the ASF dual-hosted git repository.

jsedding pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/sling-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 21fc91b  set default charset to utf-8 in .htaccess
21fc91b is described below

commit 21fc91bbaa77cb1a48dbd55a6ddebfa8246387b7
Author: Julian Sedding <jsedd...@apache.org>
AuthorDate: Thu Oct 12 08:46:35 2017 +0200

set default charset to utf-8 in .htaccess
---
 .htaccess | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.htaccess b/.htaccess
index c967ec0..e1dc6b8 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,3 +1,6 @@
+# Set UTF-8 for text/plain and text/html
+AddDefaultCharset utf-8
+
 # Error pages
 ErrorDocument 403 /errors/403.html
 ErrorDocument 404 /errors/404.html

-- 
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <commits@sling.apache.org>'].

[sling-site] branch master updated: add default encoding utf-8 for html files

[jsedding]

This is an automated email from the ASF dual-hosted git repository.

jsedding pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-site.git


The following commit(s) were added to refs/heads/master by this push:
 new 58517b9  add default encoding utf-8 for html files
58517b9 is described below

commit 58517b91238ee345aa9fc7dec750f140e2981891
Author: Julian Sedding <jsedd...@apache.org>
AuthorDate: Wed Oct 11 15:30:22 2017 +0200

add default encoding utf-8 for html files
---
 src/main/jbake/assets/.htaccess | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/jbake/assets/.htaccess b/src/main/jbake/assets/.htaccess
index c967ec0..e1dc6b8 100644
--- a/src/main/jbake/assets/.htaccess
+++ b/src/main/jbake/assets/.htaccess
@@ -1,3 +1,6 @@
+# Set UTF-8 for text/plain and text/html
+AddDefaultCharset utf-8
+
 # Error pages
 ErrorDocument 403 /errors/403.html
 ErrorDocument 404 /errors/404.html

-- 
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <commits@sling.apache.org>'].

svn propchange: r1771776 - svn:log

[jsedding]

Author: jsedding
Revision: 1771776
Modified property: svn:log

Modified: svn:log at Wed Jun 14 08:08:28 2017
--
(empty)

svn commit: r1790285 - /sling/site/trunk/content/documentation/the-sling-engine/service-authentication.mdtext

[jsedding]

Author: jsedding
Date: Wed Apr  5 14:50:52 2017
New Revision: 1790285

URL: http://svn.apache.org/viewvc?rev=1790285=rev
Log:
SLING-6273 - Document SLING-5135 - whitelist of legit login admin uses

Modified:

sling/site/trunk/content/documentation/the-sling-engine/service-authentication.mdtext

Modified: 
sling/site/trunk/content/documentation/the-sling-engine/service-authentication.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/the-sling-engine/service-authentication.mdtext?rev=1790285=1790284=1790285=diff
==
--- 
sling/site/trunk/content/documentation/the-sling-engine/service-authentication.mdtext
 (original)
+++ 
sling/site/trunk/content/documentation/the-sling-engine/service-authentication.mdtext
 Wed Apr  5 14:50:52 2017
@@ -182,3 +182,55 @@ support for these methods: If the method
 is always thrown from these methods. The JavaDoc of the methods is
 extended with this information.
 
+### Whitelisting bundles for administrative login
+
+In order to be able to manage few (hopefully legit) uses of the above 
deprecated
+methods, a whitelisting mechanism was introduced.
+
+The recommended way to whitelist a bundle for administrative login is via a
+_whitelist fragment configuration_ is recommended. It can be created as an 
OSGi factory
+configuration with the factoryPID 
`org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment`.
+E.g. a typical configuration file might be called
+`org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-myapp.config`
+and could look as follows: 
+
+whitelist.name="myapp"
+whitelist.bundles=[
+"com.myapp.core",
+"com.myapp.commons"
+]
+
+| Property| Type | Default | Description | 
+|-|--|-|-|
+| `whitelist.name`| String   | "[unnamed]" | Purely informational property 
that allows easy identification of different fragments. |
+| `whitelist.bundles` | String[] | []  | An array of bundle symbolic 
names that should be allowed to make use of the administrative login 
functionality. |
+
+All configured whitelist fragments are taken into account. This makes
+it easy to separate whitelists for different application layers and
+purposes.
+
+For example, some Sling bundles need to be whitelisted, which
+could be done in a whitelist fragment named `sling`. In addition `myapp`
+adds a whitelist fragment called `myapp`. For integration tests and
+additional whitelist fragment `myapp-integration-testing` may be added.
+
+Furthermore, there is a global configuration, which should
+only be used in exceptional cases. It has a switch to turn administrative
+login on globally (`whitelist.bypass`) and it allows supplying a regular
+expression to whitelist matching bundle symbolic names 
(`whitelist.bundles.regexp`).
+
+The regular expression is most useful for running PaxExam based tests, where
+bundle symbolic names follow a set pattern but have randomly generated parts.
+
+Example: to whitelist all bundles generated by PaxExam a configuration file 
named `org.apache.sling.jcr.base.internal.LoginAdminWhitelist.config` might 
look as follows:
+
+whitelist.bypass=B"false"
+whitelist.bundles.regexp="^PAXEXAM.*$"
+ 
+The configuration PID is PID 
`org.apache.sling.jcr.base.internal.LoginAdminWhitelist`.
+It supports the following configuration properties.
+ 
+| Property   | Type | Default | Description | 
+||--|-|-|
+| `whitelist.bypass` | Boolean  | false   | Allow all bundles to 
use administrative login. This is __NOT__ recommended for production and 
warnings will be logged. |
+| `whitelist.bundles.regexp` | String   | ""  | A regular expression 
that whitelists all matching bundle symbolic names. This is __NOT__ recommended 
for production and warnings will be logged. |

svn commit: r1788438 - /sling/trunk/launchpad/builder/src/main/provisioning/sling.txt

[jsedding]

Author: jsedding
Date: Fri Mar 24 13:11:08 2017
New Revision: 1788438

URL: http://svn.apache.org/viewvc?rev=1788438=rev
Log:
SLING-6707 - LoginAdminWhitelist.fragment metatype descriptor not as intended

- update launchpad to o.a.s.jcr.base 3.0.1-SNAPSHOT

Modified:
sling/trunk/launchpad/builder/src/main/provisioning/sling.txt

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=1788438=1788437=1788438=diff
==
--- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Fri Mar 24 
13:11:08 2017
@@ -100,7 +100,7 @@
 [artifacts startLevel=15]
 org.apache.sling/org.apache.sling.jcr.jcr-wrapper/2.0.0
 org.apache.sling/org.apache.sling.jcr.api/2.4.0
-org.apache.sling/org.apache.sling.jcr.base/3.0.0
+org.apache.sling/org.apache.sling.jcr.base/3.0.1-SNAPSHOT
 org.apache.sling/org.apache.sling.jcr.registration/1.0.2
 org.apache.jackrabbit/jackrabbit-api/${jackrabbit.version}
 org.apache.jackrabbit/jackrabbit-jcr-commons/${jackrabbit.version}

svn commit: r1788436 - in /sling/trunk/bundles/jcr/base/src: main/java/org/apache/sling/jcr/base/internal/ test/java/org/apache/sling/jcr/base/internal/

[jsedding]

Author: jsedding
Date: Fri Mar 24 13:09:04 2017
New Revision: 1788436

URL: http://svn.apache.org/viewvc?rev=1788436=rev
Log:
SLING-6707 - LoginAdminWhitelist.fragment metatype descriptor not as intended

- add description for whitelist.bundles.regexp
- remove whitelist.bundles.default and whitelist.bundles.additional from 
metatype
  and handle them separately
- refactor handling of backwards compatibility for above properties

Modified:

sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/LoginAdminWhitelist.java

sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/LoginAdminWhitelistConfiguration.java

sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/WhitelistFragment.java

sling/trunk/bundles/jcr/base/src/test/java/org/apache/sling/jcr/base/internal/LoginAdminWhitelistTest.java

Modified: 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/LoginAdminWhitelist.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/LoginAdminWhitelist.java?rev=1788436=1788435=1788436=diff
==
--- 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/LoginAdminWhitelist.java
 (original)
+++ 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/LoginAdminWhitelist.java
 Fri Mar 24 13:09:04 2017
@@ -19,6 +19,8 @@
 package org.apache.sling.jcr.base.internal;
 
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.regex.Pattern;
 
@@ -36,6 +38,8 @@ import org.osgi.service.metatype.annotat
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.sling.commons.osgi.PropertiesUtil.toStringArray;
+
 /**
  * Whitelist that defines which bundles can use the
  * {@link SlingRepository#loginAdministrative} method.
@@ -59,13 +63,15 @@ public class LoginAdminWhitelist {
 
 private volatile ConfigurationState config;
 
-// for backwards compatibility only
-private volatile WhitelistFragment defaultFragment;
+private final List whitelistFragments = new 
CopyOnWriteArrayList();
+
+// for backwards compatibility only (read properties directly to prevent 
them from appearing in the metatype)
+private static final String PROP_WHITELIST_BUNDLES_DEFAULT = 
"whitelist.bundles.default";
 
-// for backwards compatibility only
-private volatile WhitelistFragment additionalFragment;
+private static final String PROP_WHITELIST_BUNDLES_ADDITIONAL = 
"whitelist.bundles.additional";
 
-private final List whitelistFragments = new 
CopyOnWriteArrayList<>();
+private final Map<String, WhitelistFragment> backwardsCompatibleFragments =
+new ConcurrentHashMap<String, WhitelistFragment>();
 
 @Reference(
 cardinality = ReferenceCardinality.MULTIPLE,
@@ -84,9 +90,10 @@ public class LoginAdminWhitelist {
 }
 
 @Activate @Modified @SuppressWarnings("unused")
-void configure(LoginAdminWhitelistConfiguration configuration) {
+void configure(LoginAdminWhitelistConfiguration configuration, Map<String, 
Object> properties) {
 this.config = new ConfigurationState(configuration);
-backwardsCompatibility(configuration);
+ensureBackwardsCompatibility(properties, 
PROP_WHITELIST_BUNDLES_DEFAULT);
+ensureBackwardsCompatibility(properties, 
PROP_WHITELIST_BUNDLES_ADDITIONAL);
 }
 
 public boolean allowLoginAdministrative(Bundle b) {
@@ -130,7 +137,7 @@ public class LoginAdminWhitelist {
 final String regexp = config.whitelist_bundles_regexp();
 if(regexp.trim().length() > 0) {
 whitelistRegexp = Pattern.compile(regexp);
-LOG.warn("A whitelist.bundles.regexp is configured, this is 
NOT RECOMMENDED for production: {}",
+LOG.warn("A 'whitelist.bundles.regexp' is configured, this is 
NOT RECOMMENDED for production: {}",
 whitelistRegexp);
 } else {
 whitelistRegexp = null;
@@ -139,7 +146,7 @@ public class LoginAdminWhitelist {
 bypassWhitelist = config.whitelist_bypass();
 if(bypassWhitelist) {
 LOG.info("bypassWhitelist=true, whitelisted BSNs=");
-LOG.warn("All bundles are allowed to use loginAdministrative 
due to the 'bypass whitelist' " +
+LOG.warn("All bundles are allowed to use loginAdministrative 
due to the 'whitelist.bypass' " +
 "configuration of this service. This is NOT 
RECOMMENDED, for security reasons."
 );
 }
@@ 

svn commit: r1779207 - in /sling/trunk/testing/org.apache.sling.testing.paxexam: pom.xml src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java src/test/resources/test-dependencie

[jsedding]

Author: jsedding
Date: Tue Jan 17 16:26:04 2017
New Revision: 1779207

URL: http://svn.apache.org/viewvc?rev=1779207=rev
Log:
SLING-6473 - Create a VersionResolver that provides versions from provisioning 
model files

- fix oversights: rat warning and make provisioning model dependency optional

Modified:
sling/trunk/testing/org.apache.sling.testing.paxexam/pom.xml

sling/trunk/testing/org.apache.sling.testing.paxexam/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java

sling/trunk/testing/org.apache.sling.testing.paxexam/src/test/resources/test-dependencies.txt

Modified: sling/trunk/testing/org.apache.sling.testing.paxexam/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/pom.xml?rev=1779207=1779206=1779207=diff
==
--- sling/trunk/testing/org.apache.sling.testing.paxexam/pom.xml (original)
+++ sling/trunk/testing/org.apache.sling.testing.paxexam/pom.xml Tue Jan 17 
16:26:04 2017
@@ -108,8 +108,9 @@
 
   org.apache.sling
   org.apache.sling.provisioning.model
-  1.8.0
+  1.0.0
   provided
+  true
 
 
 

Modified: 
sling/trunk/testing/org.apache.sling.testing.paxexam/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java?rev=1779207=1779206=1779207=diff
==
--- 
sling/trunk/testing/org.apache.sling.testing.paxexam/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java
 (original)
+++ 
sling/trunk/testing/org.apache.sling.testing.paxexam/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java
 Tue Jan 17 16:26:04 2017
@@ -24,6 +24,7 @@ import org.ops4j.pax.exam.Option;
 
 import static org.ops4j.pax.exam.CoreOptions.composite;
 import static org.ops4j.pax.exam.CoreOptions.keepCaches;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 
 public abstract class SlingOptionsTestSupport extends TestSupport {
 

Modified: 
sling/trunk/testing/org.apache.sling.testing.paxexam/src/test/resources/test-dependencies.txt
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/test/resources/test-dependencies.txt?rev=1779207=1779206=1779207=diff
==
--- 
sling/trunk/testing/org.apache.sling.testing.paxexam/src/test/resources/test-dependencies.txt
 (original)
+++ 
sling/trunk/testing/org.apache.sling.testing.paxexam/src/test/resources/test-dependencies.txt
 Tue Jan 17 16:26:04 2017
@@ -1,3 +1,21 @@
+#
+#  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=test]
 # Dependencies
 [artifacts]

svn commit: r1779180 - in /sling/trunk/testing/org.apache.sling.testing.paxexam: ./ src/main/java/org/apache/sling/testing/paxexam/ src/test/java/org/apache/sling/testing/paxexam/ src/test/resources/

[jsedding]

Author: jsedding
Date: Tue Jan 17 12:29:56 2017
New Revision: 1779180

URL: http://svn.apache.org/viewvc?rev=1779180=rev
Log:
SLING-6473 - Create a VersionResolver that provides versions from provisioning 
model files

- implementation of a ProvisioningModelVersionResolver that can
  be created by pointing to provisioning model via a URL

Added:

sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/ProvisioningModelVersionResolver.java
   (with props)

sling/trunk/testing/org.apache.sling.testing.paxexam/src/test/java/org/apache/sling/testing/paxexam/ProvisioningModelVersionResolverTest.java
   (with props)
sling/trunk/testing/org.apache.sling.testing.paxexam/src/test/resources/

sling/trunk/testing/org.apache.sling.testing.paxexam/src/test/resources/test-dependencies.txt
   (with props)
Modified:
sling/trunk/testing/org.apache.sling.testing.paxexam/pom.xml

Modified: sling/trunk/testing/org.apache.sling.testing.paxexam/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/pom.xml?rev=1779180=1779179=1779180=diff
==
--- sling/trunk/testing/org.apache.sling.testing.paxexam/pom.xml (original)
+++ sling/trunk/testing/org.apache.sling.testing.paxexam/pom.xml Tue Jan 17 
12:29:56 2017
@@ -105,6 +105,12 @@
   osgi.cmpn
   provided
 
+
+  org.apache.sling
+  org.apache.sling.provisioning.model
+  1.8.0
+  provided
+
 
 
   org.apache.felix
@@ -146,6 +152,12 @@
   ${org.ops4j.pax.exam.version}
   test
 
+
+  org.slf4j
+  slf4j-simple
+  1.7.13
+  test
+
   
 
 

Added: 
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/ProvisioningModelVersionResolver.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/ProvisioningModelVersionResolver.java?rev=1779180=auto
==
--- 
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/ProvisioningModelVersionResolver.java
 (added)
+++ 
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/ProvisioningModelVersionResolver.java
 Tue Jan 17 12:29:56 2017
@@ -0,0 +1,136 @@
+/*
+ * 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.
+ */
+package org.apache.sling.testing.paxexam;
+
+import org.apache.sling.provisioning.model.Artifact;
+import org.apache.sling.provisioning.model.ArtifactGroup;
+import org.apache.sling.provisioning.model.Feature;
+import org.apache.sling.provisioning.model.Model;
+import org.apache.sling.provisioning.model.RunMode;
+import org.apache.sling.provisioning.model.io.ModelReader;
+import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
+import org.ops4j.pax.exam.options.MavenUrlReference.VersionResolver;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+/**
+ * VersionResolver that reads version information from a sling provisioning 
file.
+ * One use-case is to reference Sling's launchpad, which normally references a
+ * (recent) set of compatible bundles, in order to allow running test based on
+ * the versioning information from the Sling launchpad's provisioning model.
+ */
+public class ProvisioningModelVersionResolver implements VersionResolver {
+
+private final Model model;
+
+/**
+ * Adds classifier "slingfeature" and type "txt" to the provided 
MavenArtifactUrlReference
+ * to simplify creation of a VersionResolver based on a slingfeature.
+ *
+ * @param reference Maven coordinates of a module that provides a 
slingfeature.
+ * @return VersionResolver instance backed by the referenced slingfeature.
+ */
+public static VersionResolver fromSlingfeature(MavenArtifactUrlReference 
reference) {
+final String url = 
reference.classifier("slin

svn commit: r1779157 - /sling/trunk/launchpad/builder/src/main/provisioning/scripting.txt

[jsedding]

Author: jsedding
Date: Tue Jan 17 09:32:46 2017
New Revision: 1779157

URL: http://svn.apache.org/viewvc?rev=1779157=rev
Log:
update o.a.s.scripting.jsp to 2.2.4

Modified:
sling/trunk/launchpad/builder/src/main/provisioning/scripting.txt

Modified: sling/trunk/launchpad/builder/src/main/provisioning/scripting.txt
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/scripting.txt?rev=1779157=1779156=1779157=diff
==
--- sling/trunk/launchpad/builder/src/main/provisioning/scripting.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/scripting.txt Tue Jan 
17 09:32:46 2017
@@ -23,7 +23,7 @@
 org.apache.sling/org.apache.sling.scripting.api/2.1.12
 org.apache.sling/org.apache.sling.scripting.core/2.0.44
 org.apache.sling/org.apache.sling.scripting.javascript/2.0.30
-org.apache.sling/org.apache.sling.scripting.jsp/2.2.2
+org.apache.sling/org.apache.sling.scripting.jsp/2.2.4
 org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.2.6
 org.apache.sling/org.apache.sling.scripting.sightly/1.0.28
 org.apache.sling/org.apache.sling.scripting.sightly.compiler/1.0.4

svn commit: r1779010 - in /sling/site/trunk/content: downloads.list news.mdtext

[jsedding]

Author: jsedding
Date: Mon Jan 16 11:10:34 2017
New Revision: 1779010

URL: http://svn.apache.org/viewvc?rev=1779010=rev
Log:
Release Apache Sling JSP 2.2.4

Modified:
sling/site/trunk/content/downloads.list
sling/site/trunk/content/news.mdtext

Modified: sling/site/trunk/content/downloads.list
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1779010=1779009=1779010=diff
==
--- sling/site/trunk/content/downloads.list (original)
+++ sling/site/trunk/content/downloads.list Mon Jan 16 11:10:34 2017
@@ -161,7 +161,7 @@ Scripting Console|org.apache.sling.scrip
 Scripting Core|org.apache.sling.scripting.core|2.0.44
 Scripting Java|org.apache.sling.scripting.java|2.1.2
 Scripting JavaScript|org.apache.sling.scripting.javascript|2.0.30
-Scripting JSP|org.apache.sling.scripting.jsp|2.2.2
+Scripting JSP|org.apache.sling.scripting.jsp|2.2.4
 Scripting JSP Taglib|org.apache.sling.scripting.jsp.taglib|2.2.6
 Scripting JST|org.apache.sling.scripting.jst|2.0.6
 Scripting Groovy|org.apache.sling.scripting.groovy|1.0.2

Modified: sling/site/trunk/content/news.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1779010=1779009=1779010=diff
==
--- sling/site/trunk/content/news.mdtext (original)
+++ sling/site/trunk/content/news.mdtext Mon Jan 16 11:10:34 2017
@@ -1,5 +1,6 @@
 Title: News
 
+* New Release: Apache Sling JSP 2.2.4 (Jan 16th, 2017)
 * New Release: Apache Sling Resource Resolver 1.5.10 (Jan 13th, 2017)
 * New Releases: JUnit Core 1.0.23, JUnit Tests Teleporter 1.0.10, Testing 
Clients 1.0.1, Server Setup Tools 1.0.1, Testing Rules 1.0.1 (Jan 11th, 2017)
 * New Releases: Apache Sling Scripting HTL Compiler 1.0.4, Apache Sling 
Scripting HTL Java Compiler 1.0.6, Apache Sling Scripting HTL Engine 1.0.28, 
Apache Sling Scripting HTL Models Use Provider 1.0.6, Apache Sling Scripting 
HTL JS Use Provider 1.0.18, Apache Sling HTL Maven Plugin 1.0.4 (January 9th, 
2017)

svn commit: r1778103 - /sling/trunk/bundles/scripting/jsp/pom.xml

[jsedding]

Author: jsedding
Date: Tue Jan 10 09:55:18 2017
New Revision: 1778103

URL: http://svn.apache.org/viewvc?rev=1778103=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
sling/trunk/bundles/scripting/jsp/pom.xml

Modified: sling/trunk/bundles/scripting/jsp/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/pom.xml?rev=1778103=1778102=1778103=diff
==
--- sling/trunk/bundles/scripting/jsp/pom.xml (original)
+++ sling/trunk/bundles/scripting/jsp/pom.xml Tue Jan 10 09:55:18 2017
@@ -28,16 +28,16 @@
 
 
 org.apache.sling.scripting.jsp
-2.2.4
+2.2.5-SNAPSHOT
 bundle
 
 Apache Sling Scripting JSP Support
 Support for JSP scripting
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.jsp-2.2.4
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.jsp-2.2.4
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.jsp-2.2.4
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/jsp
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/jsp
+
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp
 
 
 

svn commit: r1778102 - /sling/tags/org.apache.sling.scripting.jsp-2.2.4/

[jsedding]

Author: jsedding
Date: Tue Jan 10 09:55:16 2017
New Revision: 1778102

URL: http://svn.apache.org/viewvc?rev=1778102=rev
Log:
[maven-release-plugin] copy for tag org.apache.sling.scripting.jsp-2.2.4

Added:
sling/tags/org.apache.sling.scripting.jsp-2.2.4/
  - copied from r1778101, sling/trunk/bundles/scripting/jsp/

svn commit: r1778101 - /sling/trunk/bundles/scripting/jsp/pom.xml

[jsedding]

Author: jsedding
Date: Tue Jan 10 09:55:02 2017
New Revision: 1778101

URL: http://svn.apache.org/viewvc?rev=1778101=rev
Log:
[maven-release-plugin] prepare release org.apache.sling.scripting.jsp-2.2.4

Modified:
sling/trunk/bundles/scripting/jsp/pom.xml

Modified: sling/trunk/bundles/scripting/jsp/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/pom.xml?rev=1778101=1778100=1778101=diff
==
--- sling/trunk/bundles/scripting/jsp/pom.xml (original)
+++ sling/trunk/bundles/scripting/jsp/pom.xml Tue Jan 10 09:55:02 2017
@@ -28,16 +28,16 @@
 
 
 org.apache.sling.scripting.jsp
-2.2.3-SNAPSHOT
+2.2.4
 bundle
 
 Apache Sling Scripting JSP Support
 Support for JSP scripting
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/jsp
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/jsp
-
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.jsp-2.2.4
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.jsp-2.2.4
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.jsp-2.2.4
 
 
 

svn commit: r1778009 - in /sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler: Compiler.java JspUtil.java Node.java TagPluginManager.java

[jsedding]

Author: jsedding
Date: Mon Jan  9 16:27:28 2017
New Revision: 1778009

URL: http://svn.apache.org/viewvc?rev=1778009=rev
Log:
SLING-6328 - JSP concurrent compiling issue

- backport changes from original bugzilla issue #45691: 
http://svn.apache.org/r707745

Modified:

sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/Compiler.java

sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JspUtil.java

sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/Node.java

sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/TagPluginManager.java

Modified: 
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/Compiler.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/Compiler.java?rev=1778009=1778008=1778009=diff
==
--- 
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/Compiler.java
 (original)
+++ 
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/Compiler.java
 Mon Jan  9 16:27:28 2017
@@ -159,9 +159,6 @@ public abstract class Compiler {
 writer = new ServletWriter(new PrintWriter(osw));
 ctxt.setWriter(writer);
 
-// Reset the temporary variable counter for the generator.
-JspUtil.resetTemporaryVariableName();
-
 // Parse the file
 ParserController parserCtl = new ParserController(ctxt, this);
 pageNodes = parserCtl.parse(ctxt.getJspFile());

Modified: 
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JspUtil.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JspUtil.java?rev=1778009=1778008=1778009=diff
==
--- 
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JspUtil.java
 (original)
+++ 
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JspUtil.java
 Mon Jan  9 16:27:28 2017
@@ -610,6 +610,7 @@ public class JspUtil {
 /**
  * Resets the temporary variable name.
  * (not thread-safe)
+ * @deprecated
  */
 public static void resetTemporaryVariableName() {
 tempSequenceNumber = 0;
@@ -618,6 +619,7 @@ public class JspUtil {
 /**
  * Generates a new temporary variable name.
  * (not thread-safe)
+ * @deprecated
  */
 public static String nextTemporaryVariableName() {
 return Constants.TEMP_VARIABLE_NAME_PREFIX + (tempSequenceNumber++);
@@ -1141,4 +1143,4 @@ public class JspUtil {
 
 return buf.toString();
 }
-}
\ No newline at end of file
+}

Modified: 
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/Node.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/Node.java?rev=1778009=1778008=1778009=diff
==
--- 
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/Node.java
 (original)
+++ 
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/Node.java
 Mon Jan  9 16:27:28 2017
@@ -39,6 +39,7 @@ import javax.servlet.jsp.tagext.TagVaria
 import javax.servlet.jsp.tagext.TryCatchFinally;
 import javax.servlet.jsp.tagext.VariableInfo;
 
+import org.apache.sling.scripting.jsp.jasper.Constants;
 import org.apache.sling.scripting.jsp.jasper.JasperException;
 import 
org.apache.sling.scripting.jsp.jasper.compiler.tagplugin.TagPluginContext;
 import org.xml.sax.Attributes;
@@ -470,6 +471,11 @@ abstract class Node implements TagConsta
 private boolean isBomPresent;
 
 /*
+ * Sequence number for temporary variables.
+ */
+private int tempSequenceNumber = 0;
+
+/*
  * Constructor.
  */
 Root(Mark start, Node parent, boolean isXmlSyntax) {
@@ -549,6 +555,17 @@ abstract class Node implements TagConsta
 public Root getParentRoot() {
 return parentRoot;
 }
+
+/**
+ * Generates a new temporary variable name.
+ */
+public String nextTemporaryVariableName() {
+if (parentRoot == null) {
+return Constants.TEMP_VARIABLE_NAME_PREFIX + 
(tempSequenceNumber++);
+} else {
+return parentRoot.nextTemporaryVariableName

svn commit: r1775326 - in /sling/site/trunk/content: downloads.list news.mdtext

[jsedding]

Author: jsedding
Date: Tue Dec 20 17:25:21 2016
New Revision: 1775326

URL: http://svn.apache.org/viewvc?rev=1775326=rev
Log:
Release Apache Sling JCR Base 3.0.0

Modified:
sling/site/trunk/content/downloads.list
sling/site/trunk/content/news.mdtext

Modified: sling/site/trunk/content/downloads.list
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1775326=1775325=1775326=diff
==
--- sling/site/trunk/content/downloads.list (original)
+++ sling/site/trunk/content/downloads.list Tue Dec 20 17:25:21 2016
@@ -99,7 +99,7 @@ Installer JCR Provider|org.apache.sling.
 javax activation|org.apache.sling.javax.activation|0.1.0
 JCR API|org.apache.sling.jcr.api|2.4.0
 JCR API Wrapper|org.apache.sling.jcr.jcr-wrapper|2.0.0
-JCR Base|org.apache.sling.jcr.base|2.4.2
+JCR Base|org.apache.sling.jcr.base|3.0.0
 JCR ClassLoader|org.apache.sling.jcr.classloader|3.2.2
 JCR Compiler|org.apache.sling.jcr.compiler|2.1.0
 JCR ContentLoader|org.apache.sling.jcr.contentloader|2.1.10

Modified: sling/site/trunk/content/news.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1775326=1775325=1775326=diff
==
--- sling/site/trunk/content/news.mdtext (original)
+++ sling/site/trunk/content/news.mdtext Tue Dec 20 17:25:21 2016
@@ -1,5 +1,6 @@
 Title: News
 
+* New Releases: Apache Sling JCR Base 3.0.0 (December 20th, 2016)
 * New Releases: Apache Sling Dynamic Include 3.0.0 (December 20th, 2016)
 * New Releases: Apache Sling i18n 2.5.6, Apache Sling JCR RepoInit module 
1.1.2 (December 19th, 2016)
 * New Releases: Apache Sling API 2.16.2 and Slingstart Maven Plugin 1.7.0 
(December 18th, 2016)

svn commit: r1774466 - /sling/tags/org.apache.sling.jcr.base-3.0.0/

[jsedding]

Author: jsedding
Date: Thu Dec 15 14:15:44 2016
New Revision: 1774466

URL: http://svn.apache.org/viewvc?rev=1774466=rev
Log:
[maven-release-plugin] copy for tag org.apache.sling.jcr.base-3.0.0

Added:
sling/tags/org.apache.sling.jcr.base-3.0.0/   (props changed)
  - copied from r1774465, sling/trunk/bundles/jcr/base/

Propchange: sling/tags/org.apache.sling.jcr.base-3.0.0/
--
--- svn:ignore (added)
+++ svn:ignore Thu Dec 15 14:15:44 2016
@@ -0,0 +1,14 @@
+target
+sling
+bin
+logs
+jackrabbit-repository
+derby.log
+*.iml
+*.ipr
+*.iws
+.settings
+.project
+.classpath
+.externalToolBuilders
+maven-eclipse.xml

Propchange: sling/tags/org.apache.sling.jcr.base-3.0.0/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Dec 15 14:15:44 2016
@@ -0,0 +1 @@
+/sling/whiteboard/fmeschbe/deprecate_login_administrative/jcr/base:1458693-1499669

svn commit: r1774467 - /sling/trunk/bundles/jcr/base/pom.xml

[jsedding]

Author: jsedding
Date: Thu Dec 15 14:15:47 2016
New Revision: 1774467

URL: http://svn.apache.org/viewvc?rev=1774467=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
sling/trunk/bundles/jcr/base/pom.xml

Modified: sling/trunk/bundles/jcr/base/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/pom.xml?rev=1774467=1774466=1774467=diff
==
--- sling/trunk/bundles/jcr/base/pom.xml (original)
+++ sling/trunk/bundles/jcr/base/pom.xml Thu Dec 15 14:15:47 2016
@@ -29,7 +29,7 @@
 
 org.apache.sling.jcr.base
 bundle
-3.0.0
+3.0.1-SNAPSHOT
 
 Apache Sling JCR Base Bundle
 
@@ -37,9 +37,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.base-3.0.0
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.base-3.0.0
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.base-3.0.0
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/base
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/base
+http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base
 
 
 

svn commit: r1774465 - /sling/trunk/bundles/jcr/base/pom.xml

[jsedding]

Author: jsedding
Date: Thu Dec 15 14:15:29 2016
New Revision: 1774465

URL: http://svn.apache.org/viewvc?rev=1774465=rev
Log:
[maven-release-plugin] prepare release org.apache.sling.jcr.base-3.0.0

Modified:
sling/trunk/bundles/jcr/base/pom.xml

Modified: sling/trunk/bundles/jcr/base/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/pom.xml?rev=1774465=1774464=1774465=diff
==
--- sling/trunk/bundles/jcr/base/pom.xml (original)
+++ sling/trunk/bundles/jcr/base/pom.xml Thu Dec 15 14:15:29 2016
@@ -29,7 +29,7 @@
 
 org.apache.sling.jcr.base
 bundle
-2.4.3-SNAPSHOT
+3.0.0
 
 Apache Sling JCR Base Bundle
 
@@ -37,9 +37,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/base
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/base
-http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.base-3.0.0
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.base-3.0.0
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.base-3.0.0
 
 
 

svn commit: r1773364 - /sling/trunk/tooling/jenkins/create_jobs.groovy

[jsedding]

Author: jsedding
Date: Fri Dec  9 12:17:16 2016
New Revision: 1773364

URL: http://svn.apache.org/viewvc?rev=1773364=rev
Log:
trivial: back to ubuntu slaves after verifying INFRA-13063

Modified:
sling/trunk/tooling/jenkins/create_jobs.groovy

Modified: sling/trunk/tooling/jenkins/create_jobs.groovy
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/jenkins/create_jobs.groovy?rev=1773364=1773363=1773364=diff
==
--- sling/trunk/tooling/jenkins/create_jobs.groovy (original)
+++ sling/trunk/tooling/jenkins/create_jobs.groovy Fri Dec  9 12:17:16 2016
@@ -824,7 +824,7 @@ def modules = [
 // deployed for maximum compatibility
 def defaultJdks = ["1.7", "1.8"]
 def defaultMvn = "Maven 3.3.9"
-def defaultSlave = "ubuntu-4"
+def defaultSlave = "ubuntu"
 
 def jdkMapping = [
 "1.7": "JDK 1.7 (latest)",

svn commit: r1773348 - /sling/trunk/tooling/jenkins/create_jobs.groovy

[jsedding]

Author: jsedding
Date: Fri Dec  9 09:35:00 2016
New Revision: 1773348

URL: http://svn.apache.org/viewvc?rev=1773348=rev
Log:
trivial: temporarily force ubuntu-4 to verify INFRA-13063 is resolved

Modified:
sling/trunk/tooling/jenkins/create_jobs.groovy

Modified: sling/trunk/tooling/jenkins/create_jobs.groovy
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/jenkins/create_jobs.groovy?rev=1773348=1773347=1773348=diff
==
--- sling/trunk/tooling/jenkins/create_jobs.groovy (original)
+++ sling/trunk/tooling/jenkins/create_jobs.groovy Fri Dec  9 09:35:00 2016
@@ -824,7 +824,7 @@ def modules = [
 // deployed for maximum compatibility
 def defaultJdks = ["1.7", "1.8"]
 def defaultMvn = "Maven 3.3.9"
-def defaultSlave = "ubuntu&&!ubuntu-4" // exclude ubuntu-4 until INFRA-13063 
is fixed
+def defaultSlave = "ubuntu-4"
 
 def jdkMapping = [
 "1.7": "JDK 1.7 (latest)",

svn commit: r1773279 - /sling/trunk/tooling/jenkins/create_jobs.groovy

[jsedding]

Author: jsedding
Date: Thu Dec  8 18:40:49 2016
New Revision: 1773279

URL: http://svn.apache.org/viewvc?rev=1773279=rev
Log:
exclude ubuntu-4 slave until INFRA-13063 is fixed - fix spelling

Modified:
sling/trunk/tooling/jenkins/create_jobs.groovy

Modified: sling/trunk/tooling/jenkins/create_jobs.groovy
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/jenkins/create_jobs.groovy?rev=1773279=1773278=1773279=diff
==
--- sling/trunk/tooling/jenkins/create_jobs.groovy (original)
+++ sling/trunk/tooling/jenkins/create_jobs.groovy Thu Dec  8 18:40:49 2016
@@ -824,7 +824,7 @@ def modules = [
 // deployed for maximum compatibility
 def defaultJdks = ["1.7", "1.8"]
 def defaultMvn = "Maven 3.3.9"
-def defaultSlave = "ubuntu&&!ubuntu4" // exclude ubuntu-4 until INFRA-13063 is 
fixed
+def defaultSlave = "ubuntu&&!ubuntu-4" // exclude ubuntu-4 until INFRA-13063 
is fixed
 
 def jdkMapping = [
 "1.7": "JDK 1.7 (latest)",

svn commit: r1773276 - /sling/trunk/tooling/jenkins/create_jobs.groovy

[jsedding]

Author: jsedding
Date: Thu Dec  8 18:10:36 2016
New Revision: 1773276

URL: http://svn.apache.org/viewvc?rev=1773276=rev
Log:
exclude ubuntu-4 slave until INFRA-13063 is fixed

Modified:
sling/trunk/tooling/jenkins/create_jobs.groovy

Modified: sling/trunk/tooling/jenkins/create_jobs.groovy
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/jenkins/create_jobs.groovy?rev=1773276=1773275=1773276=diff
==
--- sling/trunk/tooling/jenkins/create_jobs.groovy (original)
+++ sling/trunk/tooling/jenkins/create_jobs.groovy Thu Dec  8 18:10:36 2016
@@ -824,7 +824,7 @@ def modules = [
 // deployed for maximum compatibility
 def defaultJdks = ["1.7", "1.8"]
 def defaultMvn = "Maven 3.3.9"
-def defaultSlave = "ubuntu"
+def defaultSlave = "ubuntu&&!ubuntu4" // exclude ubuntu-4 until INFRA-13063 is 
fixed
 
 def jdkMapping = [
 "1.7": "JDK 1.7 (latest)",

svn commit: r1773237 - in /sling/trunk/bundles/jcr/oak-server: pom.xml src/test/java/org/apache/sling/jcr/oak/server/it/LoginAdminBlacklistedIT.java src/test/java/org/apache/sling/jcr/oak/server/it/Lo

[jsedding]

Author: jsedding
Date: Thu Dec  8 14:11:25 2016
New Revision: 1773237

URL: http://svn.apache.org/viewvc?rev=1773237=rev
Log:
SLING-6379 - Unclosed RR in LoginAdminWhitelistedIT

Modified:
sling/trunk/bundles/jcr/oak-server/pom.xml

sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/LoginAdminBlacklistedIT.java

sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/LoginAdminWhitelistedIT.java

Modified: sling/trunk/bundles/jcr/oak-server/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/pom.xml?rev=1773237=1773236=1773237=diff
==
--- sling/trunk/bundles/jcr/oak-server/pom.xml (original)
+++ sling/trunk/bundles/jcr/oak-server/pom.xml Thu Dec  8 14:11:25 2016
@@ -277,7 +277,7 @@
 
   org.apache.sling
   org.apache.sling.resourceresolver
-  1.5.5-SNAPSHOT
+  1.5.7-SNAPSHOT
   test
 
 

Modified: 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/LoginAdminBlacklistedIT.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/LoginAdminBlacklistedIT.java?rev=1773237=1773236=1773237=diff
==
--- 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/LoginAdminBlacklistedIT.java
 (original)
+++ 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/LoginAdminBlacklistedIT.java
 Thu Dec  8 14:11:25 2016
@@ -51,11 +51,11 @@ public class LoginAdminBlacklistedIT ext
 
 @Test(expected = javax.jcr.LoginException.class)
 public void testLoginAdmin() throws Exception {
-repository.loginAdministrative(null);
+repository.loginAdministrative(null).logout();
 }
 
 @Test(expected = org.apache.sling.api.resource.LoginException.class)
 public void testGetAdminResourceResolver() throws Exception {
-resolverFactory.getAdministrativeResourceResolver(null);
+resolverFactory.getAdministrativeResourceResolver(null).close();
 }
 }

Modified: 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/LoginAdminWhitelistedIT.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/LoginAdminWhitelistedIT.java?rev=1773237=1773236=1773237=diff
==
--- 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/LoginAdminWhitelistedIT.java
 (original)
+++ 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/LoginAdminWhitelistedIT.java
 Thu Dec  8 14:11:25 2016
@@ -42,11 +42,11 @@ public class LoginAdminWhitelistedIT ext
 
 @Test
 public void testLoginAdmin() throws Exception {
-repository.loginAdministrative(null);
+repository.loginAdministrative(null).logout();
 }
 
 @Test
 public void testGetAdminResourceResolver() throws Exception {
-resolverFactory.getAdministrativeResourceResolver(null);
+resolverFactory.getAdministrativeResourceResolver(null).close();
 }
 }

svn commit: r1773238 - /sling/trunk/testing/junit/scriptable/src/main/java/org/apache/sling/junit/scriptable/ScriptableTestsProvider.java

[jsedding]

Author: jsedding
Date: Thu Dec  8 14:11:30 2016
New Revision: 1773238

URL: http://svn.apache.org/viewvc?rev=1773238=rev
Log:
SLING-6380 - Unclosed ResourceResolver in ScriptableTestsProvider

Modified:

sling/trunk/testing/junit/scriptable/src/main/java/org/apache/sling/junit/scriptable/ScriptableTestsProvider.java

Modified: 
sling/trunk/testing/junit/scriptable/src/main/java/org/apache/sling/junit/scriptable/ScriptableTestsProvider.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/junit/scriptable/src/main/java/org/apache/sling/junit/scriptable/ScriptableTestsProvider.java?rev=1773238=1773237=1773238=diff
==
--- 
sling/trunk/testing/junit/scriptable/src/main/java/org/apache/sling/junit/scriptable/ScriptableTestsProvider.java
 (original)
+++ 
sling/trunk/testing/junit/scriptable/src/main/java/org/apache/sling/junit/scriptable/ScriptableTestsProvider.java
 Thu Dec  8 14:11:30 2016
@@ -145,7 +145,10 @@ public class ScriptableTestsProvider imp
 }
 
 protected void deactivate(ComponentContext ctx) throws RepositoryException 
{
-resolver = null;
+if (resolver != null) {
+resolver.close();
+resolver = null;
+}
 if(session != null) {
 for(EventListener listener : listeners) {
 
session.getWorkspace().getObservationManager().removeEventListener(listener);

svn commit: r1773236 - /sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java

[jsedding]

Author: jsedding
Date: Thu Dec  8 14:11:15 2016
New Revision: 1773236

URL: http://svn.apache.org/viewvc?rev=1773236=rev
Log:
SLING-6375 - Log a warning in case a resource resolver is closed by the Sling 
RR Finalizer thread

- reorder deactivate sequence in order to allow MapEntries to close its RR 
before it is forcefully closed
- add message to opening stacktrace exception

Modified:

sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java

Modified: 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java?rev=1773236=1773235=1773236=diff
==
--- 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java
 (original)
+++ 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java
 Thu Dec  8 14:11:15 2016
@@ -302,13 +302,6 @@ public class CommonResourceResolverFacto
 }
 this.refQueueThread.interrupt();
 
-// copy and clear before closing
-final Collection references = new 
ArrayList(refs.values());
-refs.clear();
-for(final ResolverReference ref : references) {
-ref.close();
-}
-
 if (plugin != null) {
 plugin.dispose();
 plugin = null;
@@ -319,6 +312,13 @@ public class CommonResourceResolverFacto
 mapEntries = MapEntries.EMPTY;
 }
 resolverStackHolder = null;
+
+// copy and clear map before closing the remaining references
+final Collection references = new 
ArrayList(refs.values());
+refs.clear();
+for(final ResolverReference ref : references) {
+ref.close();
+}
 }
 
 public ResourceDecoratorTracker getResourceDecoratorTracker() {
@@ -463,7 +463,7 @@ public class CommonResourceResolverFacto
 super(referent, q);
 this.control = ctrl;
 this.factory = factory;
-this.openingException = LOG.isInfoEnabled() ? new Exception() : 
null;
+this.openingException = LOG.isInfoEnabled() ? new 
Exception("Opening Stacktrace") : null;
 }
 
 public void close() {

svn commit: r1773217 - /sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java

[jsedding]

Author: jsedding
Date: Thu Dec  8 11:27:29 2016
New Revision: 1773217

URL: http://svn.apache.org/viewvc?rev=1773217=rev
Log:
trivial: minor cleanup and nullability annotations

Modified:

sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java

Modified: 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java?rev=1773217=1773216=1773217=diff
==
--- 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java
 (original)
+++ 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java
 Thu Dec  8 11:27:29 2016
@@ -49,6 +49,8 @@ import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.annotation.Nonnull;
+
 /**
  * The CommonResourceResolverFactoryImpl is a singleton
  * implementing the shared/common functionality of all resource
@@ -84,14 +86,11 @@ public class CommonResourceResolverFacto
 /** Background thread handling disposing of resource resolver instances. */
 private final Thread refQueueThread;
 
-private boolean logResourceResolverClosing = false;
-
 /**
  * Create a new common resource resolver factory.
  */
 public CommonResourceResolverFactoryImpl(final 
ResourceResolverFactoryActivator activator) {
 this.activator = activator;
-this.logResourceResolverClosing = 
activator.shouldLogResourceResolverClosing();
 this.refQueueThread = new Thread("Apache Sling Resource Resolver 
Finalizer Thread") {
 
 @Override
@@ -115,6 +114,7 @@ public class CommonResourceResolverFacto
 /**
  * @see 
org.apache.sling.api.resource.ResourceResolverFactory#getAdministrativeResourceResolver(java.util.Map)
  */
+@Nonnull
 @SuppressWarnings("deprecation")
 @Override
 public ResourceResolver getAdministrativeResourceResolver(final 
Map<String, Object> passedAuthenticationInfo)
@@ -137,6 +137,7 @@ public class CommonResourceResolverFacto
 /**
  * @see 
org.apache.sling.api.resource.ResourceResolverFactory#getResourceResolver(java.util.Map)
  */
+@Nonnull
 @Override
 public ResourceResolver getResourceResolver(final Map<String, Object> 
passedAuthenticationInfo)
 throws LoginException {
@@ -364,6 +365,7 @@ public class CommonResourceResolverFacto
 return this.activator.getResourceAccessSecurityTracker();
 }
 
+@Nonnull
 @Override
 public ResourceResolver getServiceResourceResolver(
 final Map<String, Object> authenticationInfo) throws 
LoginException {
@@ -435,7 +437,7 @@ public class CommonResourceResolverFacto
 }
 
 public boolean shouldLogResourceResolverClosing() {
-return logResourceResolverClosing;
+return activator.shouldLogResourceResolverClosing();
 }
 
 public ResourceProviderTracker getResourceProviderTracker() {

svn commit: r1773070 - /sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java

[jsedding]

Author: jsedding
Date: Wed Dec  7 13:29:17 2016
New Revision: 1773070

URL: http://svn.apache.org/viewvc?rev=1773070=rev
Log:
SLING-6357 - Allow to extend LoginAdminWhitelist with multiple configurations

- always initialize repo asynchronously in order to allow additional services 
to be registered

Modified:

sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java

Modified: 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java?rev=1773070=1773069=1773070=diff
==
--- 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
 (original)
+++ 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
 Wed Dec  7 13:29:17 2016
@@ -22,6 +22,7 @@ import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Dictionary;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 import javax.jcr.Repository;
 
@@ -326,6 +327,15 @@ public abstract class AbstractSlingRepos
 protected final boolean start(final BundleContext bundleContext, final 
String defaultWorkspace,
   final boolean disableLoginAdministrative) {
 start(bundleContext, new Config(defaultWorkspace, 
disableLoginAdministrative));
+long end = System.currentTimeMillis() + 5000; // wait up to 5 seconds 
for repository registration
+while (!isRepositoryServiceRegistered() && end > 
System.currentTimeMillis()) {
+try {
+TimeUnit.MILLISECONDS.sleep(100);
+} catch (InterruptedException e) {
+Thread.currentThread().interrupt();
+break;
+}
+}
 return isRepositoryServiceRegistered();
 }
 
@@ -434,24 +444,20 @@ public abstract class AbstractSlingRepos
 whitelistTracker.open();
 }
 
-if (waitForWhitelist.getCount() > 0) {
-// start repository asynchronously to allow LoginAdminWhitelist to 
become available
-// NOTE: making this conditional allows tests to register a mock 
whitelist before
-// activating the RepositoryManager, so they don't need to deal 
with async startup
-new Thread("Apache Sling Repository Startup Thread") {
-@Override
-public void run() {
-try {
-waitForWhitelist.await();
-initializeAndRegisterRepositoryService();
-} catch (InterruptedException e) {
-throw new RuntimeException("Interrupted while waiting 
for LoginAdminWhitelist", e);
-}
+// start repository asynchronously to allow LoginAdminWhitelist to 
become available
+// NOTE: making this conditional allows tests to register a mock 
whitelist before
+// activating the RepositoryManager, so they don't need to deal with 
async startup
+new Thread("Apache Sling Repository Startup Thread") {
+@Override
+public void run() {
+try {
+waitForWhitelist.await();
+initializeAndRegisterRepositoryService();
+} catch (InterruptedException e) {
+throw new RuntimeException("Interrupted while waiting for 
LoginAdminWhitelist", e);
 }
-}.start();
-} else {
-initializeAndRegisterRepositoryService();
-}
+}
+}.start();
 }
 
 private boolean isRepositoryServiceRegistered() {

svn commit: r1771869 - /sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/sling.txt

[jsedding]

Author: jsedding
Date: Tue Nov 29 09:46:15 2016
New Revision: 1771869

URL: http://svn.apache.org/viewvc?rev=1771869=rev
Log:
trivial: undo temporary change, tests also fail with whitelist.bypass=true

Modified:

sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/sling.txt

Modified: 
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=1771869=1771868=1771869=diff
==
--- 
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/sling.txt
 (original)
+++ 
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/sling.txt
 Tue Nov 29 09:46:15 2016
@@ -23,5 +23,4 @@
 
   # kept in a feature named 'sling' due to SLING-6332
   org.apache.sling.jcr.base.internal.LoginAdminWhitelist [mode=merge]
-whitelist.bypass=B"true"
-#whitelist.bundles.regexp="^org\\.apache\\.sling\\.junit(\\..*)?$"
+whitelist.bundles.regexp="^org\\.apache\\.sling\\.junit(\\..*)?$"

svn commit: r1771865 - /sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/sling.txt

[jsedding]

Author: jsedding
Date: Tue Nov 29 09:19:12 2016
New Revision: 1771865

URL: http://svn.apache.org/viewvc?rev=1771865=rev
Log:
trivial: test if jenkins tests pass when whitelist is bypassed (to rule out 
issues with regexp as the cause)

Modified:

sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/sling.txt

Modified: 
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=1771865=1771864=1771865=diff
==
--- 
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/sling.txt
 (original)
+++ 
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/sling.txt
 Tue Nov 29 09:19:12 2016
@@ -23,4 +23,5 @@
 
   # 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(\\..*)?$"
+whitelist.bypass=B"true"
+#whitelist.bundles.regexp="^org\\.apache\\.sling\\.junit(\\..*)?$"

svn commit: r1771779 - /sling/trunk/contrib/extensions/contextaware-config/integration-tests/pom.xml

[jsedding]

Author: jsedding
Date: Mon Nov 28 17:45:58 2016
New Revision: 1771779

URL: http://svn.apache.org/viewvc?rev=1771779=rev
Log:
trivial: update to latest junit core snapshot

Modified:
sling/trunk/contrib/extensions/contextaware-config/integration-tests/pom.xml

Modified: 
sling/trunk/contrib/extensions/contextaware-config/integration-tests/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/integration-tests/pom.xml?rev=1771779=1771778=1771779=diff
==
--- 
sling/trunk/contrib/extensions/contextaware-config/integration-tests/pom.xml 
(original)
+++ 
sling/trunk/contrib/extensions/contextaware-config/integration-tests/pom.xml 
Mon Nov 28 17:45:58 2016
@@ -216,7 +216,7 @@
 
 org.apache.sling
 org.apache.sling.junit.core
-1.0.18
+1.0.19-SNAPSHOT
 test
 
 

svn propchange: r1771776 - svn:log

[jsedding]

Author: jsedding
Revision: 1771776
Modified property: svn:log

Modified: svn:log at Mon Nov 28 17:31:44 2016
--
--- svn:log (original)
+++ svn:log Mon Nov 28 17:31:44 2016
@@ -1 +1 @@
-Server-Side Tests: Wait until all bundles are started before running tests
+SLING-6334 - Server-Side Tests: Wait until all bundles are started before 
running tests

svn commit: r1771777 - in /sling/trunk/testing/junit/core/src/main/java/org/apache/sling/junit/rules: ServerSideTeleporter.java Service.java ServiceGetter.java

[jsedding]

Author: jsedding
Date: Mon Nov 28 17:30:09 2016
New Revision: 1771777

URL: http://svn.apache.org/viewvc?rev=1771777=rev
Log:
SLING-6335 - Server-Side Tests: Use ServiceTracker to wait for services rather 
than polling

Modified:

sling/trunk/testing/junit/core/src/main/java/org/apache/sling/junit/rules/ServerSideTeleporter.java

sling/trunk/testing/junit/core/src/main/java/org/apache/sling/junit/rules/Service.java

sling/trunk/testing/junit/core/src/main/java/org/apache/sling/junit/rules/ServiceGetter.java

Modified: 
sling/trunk/testing/junit/core/src/main/java/org/apache/sling/junit/rules/ServerSideTeleporter.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/junit/core/src/main/java/org/apache/sling/junit/rules/ServerSideTeleporter.java?rev=1771777=1771776=1771777=diff
==
--- 
sling/trunk/testing/junit/core/src/main/java/org/apache/sling/junit/rules/ServerSideTeleporter.java
 (original)
+++ 
sling/trunk/testing/junit/core/src/main/java/org/apache/sling/junit/rules/ServerSideTeleporter.java
 Mon Nov 28 17:30:09 2016
@@ -23,25 +23,25 @@ import org.apache.sling.junit.Activator;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
-import org.osgi.framework.ServiceReference;
+import org.osgi.framework.InvalidSyntaxException;
 
 /** Server-side variant of the TeleporterRule, which provides
  *  access to OSGi services for convenience, but does not do
  *  much more.
  */
 class ServerSideTeleporter extends TeleporterRule {
-private final List toUnget = new 
ArrayList();
+private final List<ServiceGetter> serviceGettersToClose = new 
ArrayList<ServiceGetter>();
 private final BundleContext bundleContext;
 private final Bundle bundleUnderTest;
-
+
 private static final int WAITFOR_SERVICE_TIMEOUT_DEFAULT_SECONDS = 10;
-
+
 ServerSideTeleporter(Class classUnderTest) {
 bundleContext = Activator.getBundleContext();
 if (bundleContext == null) {
 throw new IllegalStateException("Null BundleContext, should not 
happen when this class is used");
 }
-
+
 Bundle bundle = FrameworkUtil.getBundle(classUnderTest);
 if (bundle == null) {
 bundle = bundleContext.getBundle();
@@ -52,9 +52,9 @@ class ServerSideTeleporter extends Telep
 @Override
 protected void after() {
 super.after();
-for(ServiceReference r : toUnget) {
-if(r != null) {
-bundleContext.ungetService(r);
+for(ServiceGetter serviceGetter : serviceGettersToClose) {
+if(serviceGetter != null) {
+serviceGetter.close();
 }
 }
 }
@@ -68,32 +68,25 @@ class ServerSideTeleporter extends Telep
 configuredTimeout = 
Integer.toString(WAITFOR_SERVICE_TIMEOUT_DEFAULT_SECONDS);
 }
 final long timeout = System.currentTimeMillis() + 
Integer.parseInt(configuredTimeout) * 1000;
-
-while (System.currentTimeMillis() < timeout) {
-try {
-T service = getServiceInternal(serviceClass, ldapFilter);
-if (service != null) {
-return service;
-}
-}
-catch (IllegalStateException ex) {
-// ignore, try again
-}
-try {
-Thread.sleep(50L);
-}
-catch (InterruptedException ex) {
-// ignore
+try {
+T service = getServiceInternal(serviceClass, ldapFilter, timeout);
+if (service != null) {
+return service;
 }
+} catch (InterruptedException e) {
+throw new IllegalStateException(
+"unable to get a service reference before timeout, class=" 
+ serviceClass.getName() + ", filter='" + ldapFilter + "'", e);
+} catch (InvalidSyntaxException e) {
+throw new IllegalArgumentException("Invalid syntax for argument 
ldapFilter", e);
 }
 throw new IllegalStateException(
 "unable to get a service reference, class=" + 
serviceClass.getName() + ", filter='" + ldapFilter + "'");
 }
 
-private  T getServiceInternal (Class serviceClass, String 
ldapFilter) {
-final ServiceGetter sg = new ServiceGetter(bundleContext, 
serviceClass, ldapFilter);
-toUnget.add(sg.serviceReference);
-return serviceClass.cast(sg.service);
+private  T getServiceInternal (Class serviceClass, String 
ldapFilter, long timeoutMs)
+throws InterruptedException, InvalidSyntaxException {
+ServiceGetter serviceGetter = ServiceGetter.create(bundleContext, 
serviceClass, ldapFilter);
+serviceGettersToClose.add(serviceGetter);
+

svn commit: r1771776 - /sling/trunk/testing/junit/core/src/main/java/org/apache/sling/junit/impl/TestsManagerImpl.java

[jsedding]

Author: jsedding
Date: Mon Nov 28 17:27:13 2016
New Revision: 1771776

URL: http://svn.apache.org/viewvc?rev=1771776=rev
Log:
Server-Side Tests: Wait until all bundles are started before running tests

Modified:

sling/trunk/testing/junit/core/src/main/java/org/apache/sling/junit/impl/TestsManagerImpl.java

Modified: 
sling/trunk/testing/junit/core/src/main/java/org/apache/sling/junit/impl/TestsManagerImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/junit/core/src/main/java/org/apache/sling/junit/impl/TestsManagerImpl.java?rev=1771776=1771775=1771776=diff
==
--- 
sling/trunk/testing/junit/core/src/main/java/org/apache/sling/junit/impl/TestsManagerImpl.java
 (original)
+++ 
sling/trunk/testing/junit/core/src/main/java/org/apache/sling/junit/impl/TestsManagerImpl.java
 Mon Nov 28 17:27:13 2016
@@ -19,13 +19,18 @@ package org.apache.sling.junit.impl;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Service;
+import org.apache.sling.junit.Activator;
 import org.apache.sling.junit.Renderer;
 import org.apache.sling.junit.SlingTestContextProvider;
 import org.apache.sling.junit.TestSelector;
@@ -33,7 +38,9 @@ import org.apache.sling.junit.TestsManag
 import org.apache.sling.junit.TestsProvider;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Request;
+import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.util.tracker.ServiceTracker;
@@ -43,9 +50,19 @@ import org.slf4j.LoggerFactory;
 @Component
 @Service
 public class TestsManagerImpl implements TestsManager {
-private final Logger log = LoggerFactory.getLogger(getClass());
+
+private static final Logger log = 
LoggerFactory.getLogger(TestsManagerImpl.class);
+
+// the inactivity timeout is the maximum time after the last bundle became 
active
+// before waiting for more bundles to become active should be aborted
+private static final int DEFAULT_SYSTEM_STARTUP_INACTIVITY_TIMEOUT_SECONDS 
= 10;
+
+private static volatile boolean waitForSystemStartup = true;
+
 private ServiceTracker tracker;
+
 private int lastTrackingCount = -1;
+
 private BundleContext bundleContext;
 
 // List of providers
@@ -170,6 +187,7 @@ public class TestsManagerImpl implements
 
 public void executeTests(Collection testNames, Renderer renderer, 
TestSelector selector) throws Exception {
 renderer.title(2, "Running tests");
+waitForSystemStartup();
 final JUnitCore junit = new JUnitCore();
 
 // Create a test context if we don't have one yet
@@ -212,4 +230,50 @@ public class TestsManagerImpl implements
 renderer.info("note", note);
 renderer.list("testNames", testNames);
 }
+
+
+public static void waitForSystemStartup() {
+if (waitForSystemStartup) {
+waitForSystemStartup = false;
+final BundleContext bundleContext = Activator.getBundleContext();
+final Set bundlesToWaitFor = new HashSet();
+for (final Bundle bundle : bundleContext.getBundles()) {
+if (bundle.getState() != Bundle.ACTIVE && !isFragment(bundle)) 
{
+bundlesToWaitFor.add(bundle);
+}
+}
+
+// wait max inactivityTimeout after the last bundle became active 
before giving up
+long inactivityTimeout = 
TimeUnit.SECONDS.toMillis(DEFAULT_SYSTEM_STARTUP_INACTIVITY_TIMEOUT_SECONDS);
+long lastChange = System.currentTimeMillis();
+while (!bundlesToWaitFor.isEmpty() || (lastChange + 
inactivityTimeout < System.currentTimeMillis())) {
+log.info("Waiting for the following bundles to start: {}", 
bundlesToWaitFor);
+try {
+TimeUnit.SECONDS.sleep(1);
+} catch (InterruptedException e) {
+Thread.currentThread().interrupt();
+}
+Iterator bundles = bundlesToWaitFor.iterator();
+while (bundles.hasNext()) {
+Bundle bundle = bundles.next();
+if (bundle.getState() == Bundle.ACTIVE) {
+bundles.remove();
+log.debug("Bundle {} has become active", 
bundle.getSymbolicName());
+

svn commit: r1771495 - /sling/trunk/bundles/jcr/oak-server/pom.xml

[jsedding]

Author: jsedding
Date: Sat Nov 26 16:05:25 2016
New Revision: 1771495

URL: http://svn.apache.org/viewvc?rev=1771495=rev
Log:
make sure all bundles resolve in pax exam tests

Modified:
sling/trunk/bundles/jcr/oak-server/pom.xml

Modified: sling/trunk/bundles/jcr/oak-server/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/pom.xml?rev=1771495=1771494=1771495=diff
==
--- sling/trunk/bundles/jcr/oak-server/pom.xml (original)
+++ sling/trunk/bundles/jcr/oak-server/pom.xml Sat Nov 26 16:05:25 2016
@@ -283,7 +283,7 @@
 
   org.apache.sling
   org.apache.sling.api
-  2.15.0
+  2.15.1-SNAPSHOT
   test
 
 

svn propchange: r1771350 - svn:log

[jsedding]

Author: jsedding
Revision: 1771350
Modified property: svn:log

Modified: svn:log at Fri Nov 25 17:31:24 2016
--
--- svn:log (original)
+++ svn:log Fri Nov 25 17:31:24 2016
@@ -1 +1 @@
-SLING-6285 + SLING-6327 - update to latest snapshots to enable 
LoginAdminWhitelist for RR#getAdministrativeResourceResolver
+SLING-6285 + SLING-6329 - update to latest snapshots to enable 
LoginAdminWhitelist for RR#getAdministrativeResourceResolver

svn commit: r1771350 - /sling/trunk/launchpad/builder/src/main/provisioning/sling.txt

[jsedding]

Author: jsedding
Date: Fri Nov 25 17:20:19 2016
New Revision: 1771350

URL: http://svn.apache.org/viewvc?rev=1771350=rev
Log:
SLING-6285 + SLING-6327 - update to latest snapshots to enable 
LoginAdminWhitelist for RR#getAdministrativeResourceResolver

Modified:
sling/trunk/launchpad/builder/src/main/provisioning/sling.txt

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=1771350=1771349=1771350=diff
==
--- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Fri Nov 25 
17:20:19 2016
@@ -52,11 +52,11 @@
 org.apache.sling/org.apache.sling.installer.console/1.0.1-SNAPSHOT
 org.apache.sling/org.apache.sling.installer.provider.jcr/3.1.19-SNAPSHOT
 org.apache.sling/org.apache.sling.jcr.contentloader/2.1.11-SNAPSHOT
-org.apache.sling/org.apache.sling.jcr.resource/2.8.1-SNAPSHOT
+org.apache.sling/org.apache.sling.jcr.resource/2.8.3-SNAPSHOT
 org.apache.sling/org.apache.sling.launchpad.content/2.0.9-SNAPSHOT
 org.apache.sling/org.apache.sling.models.api/1.2.2
 org.apache.sling/org.apache.sling.models.impl/1.2.8
-org.apache.sling/org.apache.sling.resourceresolver/1.5.4
+org.apache.sling/org.apache.sling.resourceresolver/1.5.5-SNAPSHOT
 org.apache.sling/org.apache.sling.serviceusermapper/1.2.2
 org.apache.sling/org.apache.sling.servlets.get/2.1.18
 org.apache.sling/org.apache.sling.servlets.post/2.3.14

svn commit: r1771348 - /sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java

[jsedding]

Author: jsedding
Date: Fri Nov 25 17:06:34 2016
New Revision: 1771348

URL: http://svn.apache.org/viewvc?rev=1771348=rev
Log:
trivial: remove unused import

Modified:

sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java

Modified: 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java?rev=1771348=1771347=1771348=diff
==
--- 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
 (original)
+++ 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
 Fri Nov 25 17:06:34 2016
@@ -50,7 +50,6 @@ import static org.junit.Assert.assertNot
 import static org.ops4j.pax.exam.CoreOptions.composite;
 import static org.ops4j.pax.exam.CoreOptions.junitBundles;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.CoreOptions.vmOption;
 import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.newConfiguration;
 
 public abstract class OakServerTestSupport extends TestSupport {

svn commit: r1771347 - in /sling/trunk/bundles/jcr/oak-server: ./ src/test/java/org/apache/sling/jcr/oak/server/internal/ src/test/java/org/apache/sling/jcr/oak/server/it/

[jsedding]

Author: jsedding
Date: Fri Nov 25 17:05:13 2016
New Revision: 1771347

URL: http://svn.apache.org/viewvc?rev=1771347=rev
Log:
SLING-6329 - RR.isResourceType() broken with jcr.resource 2.8.2

- add a test that checks for an inherited resource type using a
  non-admin session, thus triggering creation of a resource-type resource 
resolver

Added:

sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/ResourceTypeResolutionIT.java
   (with props)
Removed:

sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/internal/
Modified:
sling/trunk/bundles/jcr/oak-server/pom.xml

sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java

Modified: sling/trunk/bundles/jcr/oak-server/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/pom.xml?rev=1771347=1771346=1771347=diff
==
--- sling/trunk/bundles/jcr/oak-server/pom.xml (original)
+++ sling/trunk/bundles/jcr/oak-server/pom.xml Fri Nov 25 17:05:13 2016
@@ -277,7 +277,7 @@
 
   org.apache.sling
   org.apache.sling.resourceresolver
-  1.5.2
+  1.5.5-SNAPSHOT
   test
 
 

Modified: 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java?rev=1771347=1771346=1771347=diff
==
--- 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
 (original)
+++ 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
 Fri Nov 25 17:05:13 2016
@@ -50,6 +50,7 @@ import static org.junit.Assert.assertNot
 import static org.ops4j.pax.exam.CoreOptions.composite;
 import static org.ops4j.pax.exam.CoreOptions.junitBundles;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.vmOption;
 import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.newConfiguration;
 
 public abstract class OakServerTestSupport extends TestSupport {

Added: 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/ResourceTypeResolutionIT.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/ResourceTypeResolutionIT.java?rev=1771347=auto
==
--- 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/ResourceTypeResolutionIT.java
 (added)
+++ 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/ResourceTypeResolutionIT.java
 Fri Nov 25 17:05:13 2016
@@ -0,0 +1,82 @@
+/*
+ * 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.
+ */
+package org.apache.sling.jcr.oak.server.it;
+
+import org.apache.jackrabbit.api.JackrabbitSession;
+import org.apache.jackrabbit.api.security.user.User;
+import org.apache.jackrabbit.commons.JcrUtils;
+import 
org.apache.jackrabbit.commons.jackrabbit.authorization.AccessControlUtils;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.api.resource.ResourceResolverFactory;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.jcr.Node;
+import java.util.HashMap;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+
+@RunWith(PaxExam.class)
+public class ResourceTypeResolutionIT extends OakServerTestSupport {
+
+private static final Logger LOG = 
LoggerFactory.getLogger(ResourceTypeResolutionIT.class);
+
+@Test
+public void checkResourceType() throws Exception {
+JackrabbitSession adminSession =

svn commit: r1771346 - /sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControl.java

[jsedding]

Author: jsedding
Date: Fri Nov 25 16:59:29 2016
New Revision: 1771346

URL: http://svn.apache.org/viewvc?rev=1771346=rev
Log:
SLING-6329 - RR.isResourceType() broken with jcr.resource 2.8.2

- pass the resourceresolver bundle along when creating the resource-type 
resource resolver

Modified:

sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControl.java

Modified: 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControl.java?rev=1771346=1771345=1771346=diff
==
--- 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControl.java
 (original)
+++ 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControl.java
 Fri Nov 25 16:59:29 2016
@@ -53,6 +53,8 @@ import org.apache.sling.resourceresolver
 import 
org.apache.sling.resourceresolver.impl.providers.stateful.AuthenticatedResourceProvider;
 import org.apache.sling.resourceresolver.impl.providers.tree.Node;
 import org.apache.sling.spi.resource.provider.ResourceProvider;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.FrameworkUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -693,9 +695,14 @@ public class ResourceResolverControl {
 } else {
 if ( this.resourceTypeResourceResolver == null ) {
 try {
-this.resourceTypeResourceResolver = 
factory.getAdministrativeResourceResolver(null);
+// make sure we're getting the 
resourceTypeResourceResolver on behalf of
+// the resourceresolver bundle
+final Bundle bundle = 
FrameworkUtil.getBundle(ResourceResolverControl.class);
+final Map<String, Object> authenticationInfo =
+Collections.<String, 
Object>singletonMap(ResourceProvider.AUTH_SERVICE_BUNDLE, bundle);
+this.resourceTypeResourceResolver = 
factory.getAdministrativeResourceResolver(authenticationInfo);
 } catch (final LoginException e) {
-// we simply ignore this and return null
+throw new IllegalStateException("Failed to create 
resource-type ResourceResolver", e);
 }
 }
 return this.resourceTypeResourceResolver;

svn commit: r1771122 - /sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java

[jsedding]

Author: jsedding
Date: Thu Nov 24 12:37:30 2016
New Revision: 1771122

URL: http://svn.apache.org/viewvc?rev=1771122=rev
Log:
SLING-6285 - Implement LoginAdminWhitelist in JCR Base

- improve comment for isAllowLoginAdministrativeForBundleOverridden
- slightly simplify boolean expression

Modified:

sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java

Modified: 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java?rev=1771122=1771121=1771122=diff
==
--- 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
 (original)
+++ 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
 Thu Nov 24 12:37:30 2016
@@ -497,14 +497,20 @@ public abstract class AbstractSlingRepos
 }
 
 // find out whether allowLoginAdministrativeForBundle is overridden
+// by iterating through the super classes of the implementation
+// class and search for the class which defines the method
+// "allowLoginAdministrativeForBundle". If we don't find
+// the method before hitting AbstractSlingRepositoryManager
+// we know that our implementation is inherited.
+// Note: clazz.get(Declared)Method(name, 
parameterTypes).getDeclaringClass()
+// does not yield the same results and is therefore no fitting substitute.
 private boolean isAllowLoginAdministrativeForBundleOverridden() {
 Class clazz = getClass();
 while (clazz != AbstractSlingRepositoryManager.class) {
 final Method[] declaredMethods = clazz.getDeclaredMethods();
 for (final Method method : declaredMethods) {
 if 
(method.getName().equals("allowLoginAdministrativeForBundle")
-&& method.getParameterTypes().length == 1
-&& method.getParameterTypes()[0] == Bundle.class) {
+&& Arrays.equals(method.getParameterTypes(), new 
Class[]{Bundle.class})) {
 return true;
 }
 }

svn commit: r1770819 - in /sling/site/trunk/content: downloads.list news.mdtext

[jsedding]

Author: jsedding
Date: Tue Nov 22 10:23:15 2016
New Revision: 1770819

URL: http://svn.apache.org/viewvc?rev=1770819=rev
Log:
Release JCR Resource 2.8.2

Modified:
sling/site/trunk/content/downloads.list
sling/site/trunk/content/news.mdtext

Modified: sling/site/trunk/content/downloads.list
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1770819=1770818=1770819=diff
==
--- sling/site/trunk/content/downloads.list (original)
+++ sling/site/trunk/content/downloads.list Tue Nov 22 10:23:15 2016
@@ -109,7 +109,7 @@ JCR Oak Server|org.apache.sling.jcr.oak.
 JCR Prefs|org.apache.sling.jcr.prefs|1.0.0
 JCR Registration|org.apache.sling.jcr.registration|1.0.2
 JCR Repoinit|org.apache.sling.jcr.repoinit|1.1.0
-JCR Resource|org.apache.sling.jcr.resource|2.8.0
+JCR Resource|org.apache.sling.jcr.resource|2.8.2
 JCR Resource Security|org.apache.sling.jcr.resourcesecurity|1.0.2
 JCR Web Console Plugin|org.apache.sling.jcr.webconsole|1.0.2
 JXM Resource Provider|org.apache.sling.jmx.provider|1.0.2

Modified: sling/site/trunk/content/news.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1770819=1770818=1770819=diff
==
--- sling/site/trunk/content/news.mdtext (original)
+++ sling/site/trunk/content/news.mdtext Tue Nov 22 10:23:15 2016
@@ -1,4 +1,5 @@
 Title: News
+* New Release: Apache Sling JCR Resource 2.8.2 (November 22th, 2016)
 * New Release: Apache Sling Security 1.1.2 (November 22th, 2016)
 * New Release: Apache Sling Resource Resolver 1.5.4, Apache Sling Discovery 
Base 1.1.6, Apache Sling Discovery Commons 1.0.18, Apache Sling Discovery Impl 
1.2.10 and Discovery Oak 1.2.16 (November 21st, 2016)
 * New Releases: Apache Sling Auth Core 1.3.22 (November 15th, 2016)

svn commit: r1770394 - /sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/OakSlingRepositoryManager.java

[jsedding]

Author: jsedding
Date: Fri Nov 18 15:13:20 2016
New Revision: 1770394

URL: http://svn.apache.org/viewvc?rev=1770394=rev
Log:
SLING-6285 - Implement LoginAdminWhitelist in JCR Base

- simplify

Modified:

sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/OakSlingRepositoryManager.java

Modified: 
sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/OakSlingRepositoryManager.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/OakSlingRepositoryManager.java?rev=1770394=1770393=1770394=diff
==
--- 
sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/OakSlingRepositoryManager.java
 (original)
+++ 
sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/OakSlingRepositoryManager.java
 Fri Nov 18 15:13:20 2016
@@ -212,7 +212,7 @@ public class OakSlingRepositoryManager e
 this.threadPool = threadPoolManager.get("oak-observation");
 this.nodeAggregatorRegistration = 
bundleContext.registerService(NodeAggregator.class.getName(), 
getNodeAggregator(), null);
 
-super.start(bundleContext, new 
AbstractSlingRepositoryManager.Config(defaultWorkspace, 
disableLoginAdministrative));
+super.start(bundleContext, new Config(defaultWorkspace, 
disableLoginAdministrative));
 }
 
 @Deactivate

svn commit: r1770393 - in /sling/trunk/bundles/jcr: base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/O

[jsedding]

Author: jsedding
Date: Fri Nov 18 15:11:16 2016
New Revision: 1770393

URL: http://svn.apache.org/viewvc?rev=1770393=rev
Log:
SLING-6285 - Implement LoginAdminWhitelist in JCR Base

- fix access to Config constructor

Modified:

sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java

sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/OakSlingRepositoryManager.java

Modified: 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java?rev=1770393=1770392=1770393=diff
==
--- 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
 (original)
+++ 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
 Fri Nov 18 15:11:16 2016
@@ -348,7 +348,7 @@ public abstract class AbstractSlingRepos
  * @param disableLoginAdministrative Whether to disable the
  *{@code SlingRepository.loginAdministrative} method or 
not.
  */
-protected Config(String defaultWorkspace, boolean 
disableLoginAdministrative) {
+public Config(String defaultWorkspace, boolean 
disableLoginAdministrative) {
 this.defaultWorkspace = defaultWorkspace;
 this.disableLoginAdministrative = disableLoginAdministrative;
 }

Modified: 
sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/OakSlingRepositoryManager.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/OakSlingRepositoryManager.java?rev=1770393=1770392=1770393=diff
==
--- 
sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/OakSlingRepositoryManager.java
 (original)
+++ 
sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/OakSlingRepositoryManager.java
 Fri Nov 18 15:11:16 2016
@@ -212,7 +212,7 @@ public class OakSlingRepositoryManager e
 this.threadPool = threadPoolManager.get("oak-observation");
 this.nodeAggregatorRegistration = 
bundleContext.registerService(NodeAggregator.class.getName(), 
getNodeAggregator(), null);
 
-super.start(bundleContext, defaultWorkspace, 
disableLoginAdministrative);
+super.start(bundleContext, new 
AbstractSlingRepositoryManager.Config(defaultWorkspace, 
disableLoginAdministrative));
 }
 
 @Deactivate

svn commit: r1770390 - in /sling/trunk/bundles/jcr/base/src: main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java test/java/org/apache/sling/jcr/base/MockSlingRepositoryManager.java

[jsedding]

Author: jsedding
Date: Fri Nov 18 15:08:20 2016
New Revision: 1770390

URL: http://svn.apache.org/viewvc?rev=1770390=rev
Log:
SLING-6285 - Implement LoginAdminWhitelist in JCR Base

- switch to async registration of SlingRepository to ensure whitelist is 
available

Modified:

sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java

sling/trunk/bundles/jcr/base/src/test/java/org/apache/sling/jcr/base/MockSlingRepositoryManager.java

Modified: 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java?rev=1770390=1770389=1770390=diff
==
--- 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
 (original)
+++ 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
 Fri Nov 18 15:08:20 2016
@@ -21,6 +21,7 @@ package org.apache.sling.jcr.base;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Dictionary;
+import java.util.concurrent.CountDownLatch;
 
 import javax.jcr.Repository;
 
@@ -103,7 +104,7 @@ public abstract class AbstractSlingRepos
 
 private volatile Loader loader;
 
-private volatile ServiceReference whitelistRef;
+private volatile ServiceTracker<LoginAdminWhitelist, LoginAdminWhitelist> 
whitelistTracker;
 
 private volatile LoginAdminWhitelist whitelist;
 
@@ -300,11 +301,12 @@ public abstract class AbstractSlingRepos
 // - SCR integration 
---
 
 /**
- * This method actually starts the backing repository instannce and
- * registeres the repository service.
+ * This method was deprecated with the introduction of asynchronous 
repository registration. With
+ * asynchronous registration a boolean return value can no longer be 
guaranteed, as registration
+ * may happen after the method returns.
  * 
- * Multiple subsequent calls to this method without calling {@link #stop()}
- * first have no effect.
+ * Instead a {@link org.osgi.framework.ServiceListener} for {@link 
SlingRepository} may be
+ * registered to get informed about its successful registration.
  *
  * @param bundleContext The {@code BundleContext} to register the 
repository
  *service (and optionally more services required to operate the
@@ -315,29 +317,66 @@ public abstract class AbstractSlingRepos
  * @param disableLoginAdministrative Whether to disable the
  *{@code SlingRepository.loginAdministrative} method or not.
  * @return {@code true} if the repository has been started and the service
- * is registered.
+ * is registered; {@code false} if the service has not been 
registered,
+ * which may indicate that startup was unsuccessful OR that it is 
happening
+ * asynchronously. A more reliable way to determin availability of 
the
+ * {@link SlingRepository} as a service is using a
+ * {@link org.osgi.framework.ServiceListener}.
+ * @deprecated use {@link #start(BundleContext, 
AbstractSlingRepositoryManager.Config)} instead.
  */
+@Deprecated
 protected final boolean start(final BundleContext bundleContext, final 
String defaultWorkspace,
-final boolean disableLoginAdministrative) {
+  final boolean disableLoginAdministrative) {
+start(bundleContext, new Config(defaultWorkspace, 
disableLoginAdministrative));
+return isRepositoryServiceRegistered();
+}
+
+/**
+ * Configuration pojo to be passed to the {@link #start(BundleContext, 
Config)} method.
+ */
+protected static final class Config {
+
+protected final String defaultWorkspace;
+
+protected final boolean disableLoginAdministrative;
+
+/**
+ * @param defaultWorkspace The name of the default workspace to use to
+ *login. This may be {@code null} to have the actual 
repository
+ *instance define its own default
+ *
+ * @param disableLoginAdministrative Whether to disable the
+ *{@code SlingRepository.loginAdministrative} method or 
not.
+ */
+protected Config(String defaultWorkspace, boolean 
disableLoginAdministrative) {
+this.defaultWorkspace = defaultWorkspace;
+this.disableLoginAdministrative = disableLoginAdministrative;
+}
+}
+
+/**
+ * This method actually starts the backing repository instannce and
+ * registeres the repository service.
+ * 
+ * Multiple subsequent calls to this method without calling {@link

svn commit: r1770209 - /sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/monitor/impl/MonitoringDistributionPackageBuilder.java

[jsedding]

Author: jsedding
Date: Thu Nov 17 15:11:27 2016
New Revision: 1770209

URL: http://svn.apache.org/viewvc?rev=1770209=rev
Log:
SLING-6299 SCD ClassCastException ServiceRegistration cannot be cast to 
Comparable

Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/monitor/impl/MonitoringDistributionPackageBuilder.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/monitor/impl/MonitoringDistributionPackageBuilder.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/monitor/impl/MonitoringDistributionPackageBuilder.java?rev=1770209=1770208=1770209=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/monitor/impl/MonitoringDistributionPackageBuilder.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/monitor/impl/MonitoringDistributionPackageBuilder.java
 Thu Nov 17 15:11:27 2016
@@ -22,7 +22,7 @@ import java.io.InputStream;
 import java.util.Dictionary;
 import java.util.Hashtable;
 import java.util.Queue;
-import java.util.concurrent.PriorityBlockingQueue;
+import java.util.concurrent.ArrayBlockingQueue;
 
 import javax.management.ObjectName;
 
@@ -50,7 +50,7 @@ public final class MonitoringDistributio
 this.context = context;
 this.queueCapacity = queueCapacity;
 
-mBeans = new PriorityBlockingQueue(queueCapacity);
+mBeans = new ArrayBlockingQueue(queueCapacity);
 }
 
 @Override

svn commit: r1769963 - in /sling/trunk: bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/ contrib/extensions/contextaware-config/integration-tests/src/main/provisio

[jsedding]

Author: jsedding
Date: Wed Nov 16 12:00:01 2016
New Revision: 1769963

URL: http://svn.apache.org/viewvc?rev=1769963=rev
Log:
SLING-6285 - Implement LoginAdminWhitelist in JCR Base

- adjust to moved LoginAdminWhitelist
-minor cleanup

Added:

sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.config
  - copied unchanged from r1769962, 
sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.jcr.oak.server.internal.LoginAdminWhitelist.config
Removed:

sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.jcr.oak.server.internal.LoginAdminWhitelist.config
Modified:

sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrProviderStateFactory.java

sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/integration-tests.txt

sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java
sling/trunk/karaf/org.apache.sling.karaf-configs/pom.xml
sling/trunk/karaf/org.apache.sling.karaf-distribution/pom.xml

sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml
sling/trunk/launchpad/builder/src/main/provisioning/oak.txt
sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
sling/trunk/launchpad/integration-tests/pom.xml
sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt
sling/trunk/launchpad/testing/src/main/provisioning/model.txt

Modified: 
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrProviderStateFactory.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrProviderStateFactory.java?rev=1769963=1769962=1769963=diff
==
--- 
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrProviderStateFactory.java
 (original)
+++ 
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrProviderStateFactory.java
 Wed Nov 16 12:00:01 2016
@@ -104,7 +104,7 @@ public class JcrProviderStateFactory {
 isLoginAdministrative ? "admin" : "service",
 bundle.getSymbolicName(),
 bundle.getBundleId());
-throw new LoginException(); // TODO: correct ??
+throw new LoginException("Repository unavailable"); // 
TODO: correct ??
 }
 
 try {

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=1769963=1769962=1769963=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
 Wed Nov 16 12:00:01 2016
@@ -36,5 +36,5 @@
 org.apache.sling.commons.log.file="logs/sling-contextaware-config.log"
 org.apache.sling.commons.log.level="debug"
 
-  org.apache.sling.jcr.oak.server.internal.LoginAdminWhitelist
+  org.apache.sling.jcr.base.internal.LoginAdminWhitelist
 whitelist.bundles.additional=["org.apache.sling.junit.core"]

Modified: 
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java?rev=1769963=1769962=1769963=diff
==
--- 
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java
 (original)
+++ 
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java
 Wed Nov 16 12:00:01 2016
@@ -124,7 +124,7 @@ public abstract class ThymeleafTestSuppo
 
factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended")
 .put("user.mapping", 
"org.apache.sling.scripting.thy

svn commit: r1769962 - in /sling/trunk/bundles/jcr: base/src/main/java/org/apache/sling/jcr/base/ base/src/main/java/org/apache/sling/jcr/base/internal/ base/src/test/java/org/apache/sling/jcr/base/in

[jsedding]

Author: jsedding
Date: Wed Nov 16 11:56:46 2016
New Revision: 1769962

URL: http://svn.apache.org/viewvc?rev=1769962=rev
Log:
SLING-6285 - Implement LoginAdminWhitelist in JCR Base

- move implementation from o.a.s.jcr.oak.server to o.a.s.jcr.base
- move and refactor tests to work with moved implementation
- support @Modified callback on LoginAdminWhitelist to avoid restarting 
repositories on configuratin change
- improved error handling, i.e. set a message for LoginExceptions

Added:

sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/LoginAdminWhitelist.java
  - copied, changed from r1769656, 
sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/LoginAdminWhitelist.java

sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/LoginAdminWhitelistConfiguration.java
  - copied, changed from r1769656, 
sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/LoginAdminWhitelistConfiguration.java

sling/trunk/bundles/jcr/base/src/test/java/org/apache/sling/jcr/base/internal/LoginAdminWhitelistTest.java
  - copied, changed from r1769656, 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/internal/LoginAdminWhitelistTest.java

sling/trunk/bundles/jcr/base/src/test/java/org/apache/sling/jcr/base/util/ConfigAnnotationUtil.java
   (with props)
Removed:

sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/LoginAdminWhitelist.java

sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/LoginAdminWhitelistConfiguration.java

sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/internal/LoginAdminWhitelistTest.java
Modified:

sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository2.java

sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java

sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/package-info.java
sling/trunk/bundles/jcr/oak-server/pom.xml

sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/OakSlingRepositoryManager.java

sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java

Modified: 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository2.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository2.java?rev=1769962=1769961=1769962=diff
==
--- 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository2.java
 (original)
+++ 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository2.java
 Wed Nov 16 11:56:46 2016
@@ -373,11 +373,12 @@ public abstract class AbstractSlingRepos
 final boolean whitelisted = 
getSlingRepositoryManager().allowLoginAdministrativeForBundle(usingBundle);
 
 if(!whitelisted) {
-logger.error("Bundle {} is NOT whitelisted to use 
SlingRepository.loginAdministrative", usingBundle.getSymbolicName());
-throw new LoginException();
+final String symbolicName = usingBundle.getSymbolicName();
+logger.error("Bundle {} is NOT whitelisted to use 
SlingRepository.loginAdministrative", symbolicName);
+throw new LoginException("Bundle " + symbolicName +" is NOT 
whitelisted");
 } else if 
(this.getSlingRepositoryManager().isDisableLoginAdministrative()) {
 logger.error("SlingRepository.loginAdministrative is disabled. 
Please use SlingRepository.loginService.");
-throw new LoginException();
+throw new LoginException("SlingRepository.loginAdministrative is 
disabled.");
 }
 
 logger.debug("SlingRepository.loginAdministrative is deprecated. 
Please use SlingRepository.loginService.");

Modified: 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java?rev=1769962=1769961=1769962=diff
==
--- 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
 (original)
+++ 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
 Wed Nov 16 11:56:46 2016
@@ -18,6 +18,7 @@
  */
 package org.apache.sling.jcr.base;
 
+import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.uti

svn commit: r1769656 - in /sling/trunk/bundles/jcr/oak-server: pom.xml src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java

[jsedding]

Author: jsedding
Date: Mon Nov 14 15:57:25 2016
New Revision: 1769656

URL: http://svn.apache.org/viewvc?rev=1769656=rev
Log:
revert temporary changes of r1769647

Modified:
sling/trunk/bundles/jcr/oak-server/pom.xml

sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java

Modified: sling/trunk/bundles/jcr/oak-server/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/pom.xml?rev=1769656=1769655=1769656=diff
==
--- sling/trunk/bundles/jcr/oak-server/pom.xml (original)
+++ sling/trunk/bundles/jcr/oak-server/pom.xml Mon Nov 14 15:57:25 2016
@@ -189,7 +189,7 @@
 
   org.apache.sling
   org.apache.sling.testing.paxexam
-  0.0.2
+  0.0.3-SNAPSHOT
   test
 
 
@@ -271,7 +271,7 @@
 
   org.apache.sling
   org.apache.sling.jcr.resource
-  2.8.2
+  2.8.3-SNAPSHOT
   test
 
 

Modified: 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java?rev=1769656=1769655=1769656=diff
==
--- 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
 (original)
+++ 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
 Mon Nov 14 15:57:25 2016
@@ -161,10 +161,10 @@ public abstract class OakServerTestSuppo
 }
 
 protected Option launchpad() {
-SlingOptions.versionResolver.setVersion("org.apache.sling", 
"org.apache.sling.jcr.base", "2.4.2");
-SlingOptions.versionResolver.setVersion("org.apache.sling", 
"org.apache.sling.jcr.resource", "2.8.2");
-SlingOptions.versionResolver.setVersion("org.apache.sling", 
"org.apache.sling.resourceresolver", "1.5.2");
-SlingOptions.versionResolver.setVersion("org.apache.sling", 
"org.apache.sling.api", "2.15.0");
+SlingOptions.versionResolver.setVersionFromProject("org.apache.sling", 
"org.apache.sling.jcr.base");
+SlingOptions.versionResolver.setVersionFromProject("org.apache.sling", 
"org.apache.sling.jcr.resource");
+SlingOptions.versionResolver.setVersionFromProject("org.apache.sling", 
"org.apache.sling.resourceresolver");
+SlingOptions.versionResolver.setVersionFromProject("org.apache.sling", 
"org.apache.sling.api");
 SlingOptions.versionResolver.setVersion("org.apache.felix", 
"org.apache.felix.http.jetty", "3.1.6"); // SLING-6080 – Java 7
 SlingOptions.versionResolver.setVersion("org.apache.felix", 
"org.apache.felix.http.whiteboard", "2.3.2"); // SLING-6080 – Java 7
 final String repoinit = 
String.format("raw:file:%s/src/test/resources/repoinit.txt", 
PathUtils.getBaseDir());

svn commit: r1769652 - /sling/tags/org.apache.sling.jcr.oak.server-1.1.2/

[jsedding]

Author: jsedding
Date: Mon Nov 14 15:36:04 2016
New Revision: 1769652

URL: http://svn.apache.org/viewvc?rev=1769652=rev
Log:
[maven-release-plugin] copy for tag org.apache.sling.jcr.oak.server-1.1.2

Added:
sling/tags/org.apache.sling.jcr.oak.server-1.1.2/
  - copied from r1769651, sling/trunk/bundles/jcr/oak-server/

svn commit: r1769651 - /sling/trunk/bundles/jcr/oak-server/pom.xml

[jsedding]

Author: jsedding
Date: Mon Nov 14 15:35:50 2016
New Revision: 1769651

URL: http://svn.apache.org/viewvc?rev=1769651=rev
Log:
[maven-release-plugin] prepare release org.apache.sling.jcr.oak.server-1.1.2

Modified:
sling/trunk/bundles/jcr/oak-server/pom.xml

Modified: sling/trunk/bundles/jcr/oak-server/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/pom.xml?rev=1769651=1769650=1769651=diff
==
--- sling/trunk/bundles/jcr/oak-server/pom.xml (original)
+++ sling/trunk/bundles/jcr/oak-server/pom.xml Mon Nov 14 15:35:50 2016
@@ -29,17 +29,17 @@
   
 
   org.apache.sling.jcr.oak.server
-  1.1.1-SNAPSHOT
+  1.1.2
   bundle
 
   Apache Sling JCR Oak Repository Server
   This bundle provides a SlingRepository based on Apache 
Jackrabbit Oak.
 
   
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/oak-server
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/oak-server
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.oak.server-1.1.2
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.oak.server-1.1.2
 
-http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.oak.server-1.1.2
   
 
   

svn commit: r1769647 - in /sling/trunk/bundles/jcr/oak-server: pom.xml src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java

[jsedding]

Author: jsedding
Date: Mon Nov 14 15:14:05 2016
New Revision: 1769647

URL: http://svn.apache.org/viewvc?rev=1769647=rev
Log:
prepare oak-server for release, temporarily downgrade paxexam

Modified:
sling/trunk/bundles/jcr/oak-server/pom.xml

sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java

Modified: sling/trunk/bundles/jcr/oak-server/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/pom.xml?rev=1769647=1769646=1769647=diff
==
--- sling/trunk/bundles/jcr/oak-server/pom.xml (original)
+++ sling/trunk/bundles/jcr/oak-server/pom.xml Mon Nov 14 15:14:05 2016
@@ -189,7 +189,7 @@
 
   org.apache.sling
   org.apache.sling.testing.paxexam
-  0.0.3-SNAPSHOT
+  0.0.2
   test
 
 
@@ -271,7 +271,7 @@
 
   org.apache.sling
   org.apache.sling.jcr.resource
-  2.8.1-SNAPSHOT
+  2.8.2
   test
 
 

Modified: 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java?rev=1769647=1769646=1769647=diff
==
--- 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
 (original)
+++ 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
 Mon Nov 14 15:14:05 2016
@@ -161,10 +161,10 @@ public abstract class OakServerTestSuppo
 }
 
 protected Option launchpad() {
-SlingOptions.versionResolver.setVersionFromProject("org.apache.sling", 
"org.apache.sling.jcr.base");
-SlingOptions.versionResolver.setVersionFromProject("org.apache.sling", 
"org.apache.sling.jcr.resource");
-SlingOptions.versionResolver.setVersionFromProject("org.apache.sling", 
"org.apache.sling.resourceresolver");
-SlingOptions.versionResolver.setVersionFromProject("org.apache.sling", 
"org.apache.sling.api");
+SlingOptions.versionResolver.setVersion("org.apache.sling", 
"org.apache.sling.jcr.base", "2.4.2");
+SlingOptions.versionResolver.setVersion("org.apache.sling", 
"org.apache.sling.jcr.resource", "2.8.2");
+SlingOptions.versionResolver.setVersion("org.apache.sling", 
"org.apache.sling.resourceresolver", "1.5.2");
+SlingOptions.versionResolver.setVersion("org.apache.sling", 
"org.apache.sling.api", "2.15.0");
 SlingOptions.versionResolver.setVersion("org.apache.felix", 
"org.apache.felix.http.jetty", "3.1.6"); // SLING-6080 – Java 7
 SlingOptions.versionResolver.setVersion("org.apache.felix", 
"org.apache.felix.http.whiteboard", "2.3.2"); // SLING-6080 – Java 7
 final String repoinit = 
String.format("raw:file:%s/src/test/resources/repoinit.txt", 
PathUtils.getBaseDir());

svn commit: r1769641 - /sling/tags/org.apache.sling.jcr.resource-2.8.2/

[jsedding]

Author: jsedding
Date: Mon Nov 14 14:28:46 2016
New Revision: 1769641

URL: http://svn.apache.org/viewvc?rev=1769641=rev
Log:
[maven-release-plugin] copy for tag org.apache.sling.jcr.resource-2.8.2

Added:
sling/tags/org.apache.sling.jcr.resource-2.8.2/   (props changed)
  - copied from r1769640, sling/trunk/bundles/jcr/resource/

Propchange: sling/tags/org.apache.sling.jcr.resource-2.8.2/
--
--- svn:ignore (added)
+++ svn:ignore Mon Nov 14 14:28:46 2016
@@ -0,0 +1,14 @@
+target
+sling
+bin
+logs
+jackrabbit-repository
+derby.log
+*.iml
+*.ipr
+*.iws
+.settings
+.project
+.classpath
+.externalToolBuilders
+maven-eclipse.xml

Propchange: sling/tags/org.apache.sling.jcr.resource-2.8.2/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Nov 14 14:28:46 2016
@@ -0,0 +1 @@
+/sling/whiteboard/fmeschbe/deprecate_login_administrative/jcr/resource:1459328-1499675

svn commit: r1769642 - /sling/trunk/bundles/jcr/resource/pom.xml

[jsedding]

Author: jsedding
Date: Mon Nov 14 14:28:48 2016
New Revision: 1769642

URL: http://svn.apache.org/viewvc?rev=1769642=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
sling/trunk/bundles/jcr/resource/pom.xml

Modified: sling/trunk/bundles/jcr/resource/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/pom.xml?rev=1769642=1769641=1769642=diff
==
--- sling/trunk/bundles/jcr/resource/pom.xml (original)
+++ sling/trunk/bundles/jcr/resource/pom.xml Mon Nov 14 14:28:48 2016
@@ -27,7 +27,7 @@
 
 
 org.apache.sling.jcr.resource
-2.8.2
+2.8.3-SNAPSHOT
 bundle
 
 Apache Sling JCR Resource Resolver
@@ -37,13 +37,13 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.resource-2.8.2
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/resource
 
 
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.resource-2.8.2
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/resource
 
 
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.resource-2.8.2
+http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource
 
 
 

svn commit: r1769640 - /sling/trunk/bundles/jcr/resource/pom.xml

[jsedding]

Author: jsedding
Date: Mon Nov 14 14:28:32 2016
New Revision: 1769640

URL: http://svn.apache.org/viewvc?rev=1769640=rev
Log:
[maven-release-plugin] prepare release org.apache.sling.jcr.resource-2.8.2

Modified:
sling/trunk/bundles/jcr/resource/pom.xml

Modified: sling/trunk/bundles/jcr/resource/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/pom.xml?rev=1769640=1769639=1769640=diff
==
--- sling/trunk/bundles/jcr/resource/pom.xml (original)
+++ sling/trunk/bundles/jcr/resource/pom.xml Mon Nov 14 14:28:32 2016
@@ -27,7 +27,7 @@
 
 
 org.apache.sling.jcr.resource
-2.8.1-SNAPSHOT
+2.8.2
 bundle
 
 Apache Sling JCR Resource Resolver
@@ -37,13 +37,13 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/resource
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.resource-2.8.2
 
 
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/resource
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.resource-2.8.2
 
 
-http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.resource-2.8.2
 
 
 

svn commit: r1769629 - /sling/trunk/bundles/jcr/oak-server/pom.xml

[jsedding]

Author: jsedding
Date: Mon Nov 14 13:53:58 2016
New Revision: 1769629

URL: http://svn.apache.org/viewvc?rev=1769629=rev
Log:
update snapshot dependency in oak-server to org.apache.sling.jcr.base 2.4.2

Modified:
sling/trunk/bundles/jcr/oak-server/pom.xml

Modified: sling/trunk/bundles/jcr/oak-server/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/pom.xml?rev=1769629=1769628=1769629=diff
==
--- sling/trunk/bundles/jcr/oak-server/pom.xml (original)
+++ sling/trunk/bundles/jcr/oak-server/pom.xml Mon Nov 14 13:53:58 2016
@@ -177,7 +177,7 @@
 
   org.apache.sling
   org.apache.sling.jcr.base
-  2.4.1-SNAPSHOT
+  2.4.2
   provided
 
 

svn commit: r1769607 - in /sling/site/trunk/content: downloads.list news.mdtext

[jsedding]

Author: jsedding
Date: Mon Nov 14 11:57:43 2016
New Revision: 1769607

URL: http://svn.apache.org/viewvc?rev=1769607=rev
Log:
Release JCR Base 2.4.2

Modified:
sling/site/trunk/content/downloads.list
sling/site/trunk/content/news.mdtext

Modified: sling/site/trunk/content/downloads.list
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1769607=1769606=1769607=diff
==
--- sling/site/trunk/content/downloads.list (original)
+++ sling/site/trunk/content/downloads.list Mon Nov 14 11:57:43 2016
@@ -97,7 +97,7 @@ Installer JCR Provider|org.apache.sling.
 javax activation|org.apache.sling.javax.activation|0.1.0
 JCR API|org.apache.sling.jcr.api|2.4.0
 JCR API Wrapper|org.apache.sling.jcr.jcr-wrapper|2.0.0
-JCR Base|org.apache.sling.jcr.base|2.4.0
+JCR Base|org.apache.sling.jcr.base|2.4.2
 JCR ClassLoader|org.apache.sling.jcr.classloader|3.2.2
 JCR Compiler|org.apache.sling.jcr.compiler|2.1.0
 JCR ContentLoader|org.apache.sling.jcr.contentloader|2.1.10

Modified: sling/site/trunk/content/news.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1769607=1769606=1769607=diff
==
--- sling/site/trunk/content/news.mdtext (original)
+++ sling/site/trunk/content/news.mdtext Mon Nov 14 11:57:43 2016
@@ -1,4 +1,5 @@
 Title: News
+* New Releases: Apache Sling JCR Base 2.4.2 (November 14th, 2016)
 * New Releases: Apache Sling Provisioning Model 1.7.0 and Apache Sling 
Slingstart Maven Plugin 1.6.0 (November 13th, 2016)
 * New Releases: Apache Sling JCR Repoinit 1.1.0 and Apache Sling Repoinit 
Parser 1.1.0 (November 12th, 2016)
 * New Release: Apache Sling Slingstart Maven Plugin 1.5.0 (November 11th, 2016)

svn commit: r1769146 - /sling/trunk/bundles/jcr/base/pom.xml

[jsedding]

Author: jsedding
Date: Thu Nov 10 16:14:10 2016
New Revision: 1769146

URL: http://svn.apache.org/viewvc?rev=1769146=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
sling/trunk/bundles/jcr/base/pom.xml

Modified: sling/trunk/bundles/jcr/base/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/pom.xml?rev=1769146=1769145=1769146=diff
==
--- sling/trunk/bundles/jcr/base/pom.xml (original)
+++ sling/trunk/bundles/jcr/base/pom.xml Thu Nov 10 16:14:10 2016
@@ -29,7 +29,7 @@
 
 org.apache.sling.jcr.base
 bundle
-2.4.2
+2.4.3-SNAPSHOT
 
 Apache Sling JCR Base Bundle
 
@@ -37,9 +37,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.base-2.4.2
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.base-2.4.2
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.base-2.4.2
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/base
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/base
+http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base
 
 
 

svn commit: r1769145 - /sling/tags/org.apache.sling.jcr.base-2.4.2/

[jsedding]

Author: jsedding
Date: Thu Nov 10 16:14:08 2016
New Revision: 1769145

URL: http://svn.apache.org/viewvc?rev=1769145=rev
Log:
[maven-release-plugin] copy for tag org.apache.sling.jcr.base-2.4.2

Added:
sling/tags/org.apache.sling.jcr.base-2.4.2/   (props changed)
  - copied from r1769143, sling/trunk/bundles/jcr/base/

Propchange: sling/tags/org.apache.sling.jcr.base-2.4.2/
--
--- svn:ignore (added)
+++ svn:ignore Thu Nov 10 16:14:08 2016
@@ -0,0 +1,14 @@
+target
+sling
+bin
+logs
+jackrabbit-repository
+derby.log
+*.iml
+*.ipr
+*.iws
+.settings
+.project
+.classpath
+.externalToolBuilders
+maven-eclipse.xml

Propchange: sling/tags/org.apache.sling.jcr.base-2.4.2/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Nov 10 16:14:08 2016
@@ -0,0 +1 @@
+/sling/whiteboard/fmeschbe/deprecate_login_administrative/jcr/base:1458693-1499669

svn commit: r1769143 - /sling/trunk/bundles/jcr/base/pom.xml

[jsedding]

Author: jsedding
Date: Thu Nov 10 16:13:53 2016
New Revision: 1769143

URL: http://svn.apache.org/viewvc?rev=1769143=rev
Log:
[maven-release-plugin] prepare release org.apache.sling.jcr.base-2.4.2

Modified:
sling/trunk/bundles/jcr/base/pom.xml

Modified: sling/trunk/bundles/jcr/base/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/pom.xml?rev=1769143=1769142=1769143=diff
==
--- sling/trunk/bundles/jcr/base/pom.xml (original)
+++ sling/trunk/bundles/jcr/base/pom.xml Thu Nov 10 16:13:53 2016
@@ -29,7 +29,7 @@
 
 org.apache.sling.jcr.base
 bundle
-2.4.1-SNAPSHOT
+2.4.2
 
 Apache Sling JCR Base Bundle
 
@@ -37,9 +37,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/base
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/base
-http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.base-2.4.2
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.base-2.4.2
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.base-2.4.2
 
 
 

svn commit: r1769142 - /sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java

[jsedding]

Author: jsedding
Date: Thu Nov 10 16:10:26 2016
New Revision: 1769142

URL: http://svn.apache.org/viewvc?rev=1769142=rev
Log:
make SlingRepositoryInitializerInfo private to avoid creating API

Modified:

sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java

Modified: 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java?rev=1769142=1769141=1769142=diff
==
--- 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
 (original)
+++ 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
 Thu Nov 10 16:10:26 2016
@@ -473,12 +473,12 @@ public abstract class AbstractSlingRepos
 this.bundleContext = null;
 }
 
-public static final class SlingRepositoryInitializerInfo implements 
Comparable {
+private static final class SlingRepositoryInitializerInfo implements 
Comparable {
 
-public final SlingRepositoryInitializer initializer;
-public final ServiceReference ref;
+final SlingRepositoryInitializer initializer;
+final ServiceReference ref;
 
-public SlingRepositoryInitializerInfo(final SlingRepositoryInitializer 
init, ServiceReference ref) {
+SlingRepositoryInitializerInfo(final SlingRepositoryInitializer init, 
ServiceReference ref) {
 this.initializer = init;
 this.ref = ref;
 }

svn commit: r1769141 - /sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml

[jsedding]

Author: jsedding
Date: Thu Nov 10 15:54:01 2016
New Revision: 1769141

URL: http://svn.apache.org/viewvc?rev=1769141=rev
Log:
update repoinit dependencies to make more integration tests pass

Modified:

sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml

Modified: 
sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml?rev=1769141=1769140=1769141=diff
==
--- 
sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml 
(original)
+++ 
sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml 
Thu Nov 10 15:54:01 2016
@@ -341,13 +341,13 @@
 mvn:org.apache.felix/org.apache.felix.jaas/0.0.4
   
   
-
mvn:org.apache.sling/org.apache.sling.jcr.repoinit/1.0.3-SNAPSHOT
+
mvn:org.apache.sling/org.apache.sling.jcr.repoinit/1.1.1-SNAPSHOT
 
 sling
 sling-jcr
 sling-jcr-jackrabbit-security
-mvn:org.apache.sling/org.apache.sling.repoinit.parser/1.0.4
-mvn:org.apache.sling/org.apache.sling.provisioning.model/1.4.4
+mvn:org.apache.sling/org.apache.sling.repoinit.parser/1.1.1-SNAPSHOT
+mvn:org.apache.sling/org.apache.sling.provisioning.model/1.6.0
 pax-url-classpath-sling
   
   

svn commit: r1769116 - in /sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources: org.apache.sling.jcr.base.internal.LoginAdminWhitelistImpl.config org.apache.sling.jcr.oak.server.intern

[jsedding]

Author: jsedding
Date: Thu Nov 10 13:40:53 2016
New Revision: 1769116

URL: http://svn.apache.org/viewvc?rev=1769116=rev
Log:
SLING-5135 - Whitelist legit usages of loginAdministrative and administrative 
ResourceResolver

- rename configuration file to reflect new LoginAdminWhitelist package

Added:

sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.jcr.oak.server.internal.LoginAdminWhitelist.config
  - copied, changed from r1769105, 
sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelistImpl.config
Removed:

sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelistImpl.config

Copied: 
sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.jcr.oak.server.internal.LoginAdminWhitelist.config
 (from r1769105, 
sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelistImpl.config)
URL: 
http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.jcr.oak.server.internal.LoginAdminWhitelist.config?p2=sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.jcr.oak.server.internal.LoginAdminWhitelist.config=sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelistImpl.config=1769105=1769116=1769116=diff
==
(empty)

svn commit: r1769104 - /sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/DefaultWhitelist.java

[jsedding]

Author: jsedding
Date: Thu Nov 10 12:35:05 2016
New Revision: 1769104

URL: http://svn.apache.org/viewvc?rev=1769104=rev
Log:
SLING-5135 - Whitelist legit usages of loginAdministrative and administrative 
ResourceResolver

- remove fixed bundles from DefaultWhitelist

Modified:

sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/DefaultWhitelist.java

Modified: 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/DefaultWhitelist.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/DefaultWhitelist.java?rev=1769104=1769103=1769104=diff
==
--- 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/DefaultWhitelist.java
 (original)
+++ 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/DefaultWhitelist.java
 Thu Nov 10 12:35:05 2016
@@ -24,6 +24,7 @@ package org.apache.sling.jcr.base.intern
  * minimum over time.
  */
 class DefaultWhitelist {
+// TODO: remove bundles as their dependency on admin login is fixed, see 
SLING-5355 for linked issues
 static final String [] WHITELISTED_BSN = {
 "org.apache.sling.discovery.commons",
 "org.apache.sling.discovery.base",
@@ -36,15 +37,11 @@ class DefaultWhitelist {
 "org.apache.sling.jcr.davex",
 "org.apache.sling.jcr.jackrabbit.usermanager",
 "org.apache.sling.jcr.oak.server",
+"org.apache.sling.jcr.repoinit",
 "org.apache.sling.jcr.resource",
 "org.apache.sling.jcr.webconsole",
-"org.apache.sling.jcr.webdav",
-"org.apache.sling.junit.core",
 "org.apache.sling.resourceresolver",
-"org.apache.sling.scripting.core",
-"org.apache.sling.scripting.sightly",
-"org.apache.sling.servlets.post",
-"org.apache.sling.servlets.resolver",
-"org.apache.sling.xss"
+"org.apache.sling.servlets.post", // remove when 2.3.16 is released
+"org.apache.sling.servlets.resolver"
 };
 }
\ No newline at end of file

svn commit: r1769105 - in /sling/trunk: bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/ bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/ bundles/jcr/base/src/test/java/org/

[jsedding]

Author: jsedding
Date: Thu Nov 10 12:35:27 2016
New Revision: 1769105

URL: http://svn.apache.org/viewvc?rev=1769105=rev
Log:
SLING-5135 - Whitelist legit usages of loginAdministrative and administrative 
ResourceResolver

- move LoginAdminWhitelist from o.a.s.jcr.base to o.a.s.jcr.oak-server and do 
NOT export it

Added:

sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/LoginAdminWhitelist.java
   (with props)

sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/LoginAdminWhitelistConfiguration.java
   (with props)

sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/internal/

sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/internal/LoginAdminWhitelistTest.java
   (contents, props changed)
  - copied, changed from r1769104, 
sling/trunk/bundles/jcr/base/src/test/java/org/apache/sling/jcr/base/internal/LoginAdminWhitelistImplTest.java
Removed:

sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/LoginAdminWhitelist.java

sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/DefaultWhitelist.java

sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/LoginAdminWhitelistImpl.java

sling/trunk/bundles/jcr/base/src/test/java/org/apache/sling/jcr/base/MockLoginAdminWhitelist.java

sling/trunk/bundles/jcr/base/src/test/java/org/apache/sling/jcr/base/internal/LoginAdminWhitelistImplTest.java
Modified:

sling/trunk/bundles/jcr/base/src/test/java/org/apache/sling/jcr/base/MockSlingRepositoryManager.java

sling/trunk/bundles/jcr/base/src/test/java/org/apache/sling/jcr/base/internal/WhitelistWiringTest.java
sling/trunk/bundles/jcr/oak-server/pom.xml

sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/OakSlingRepositoryManager.java

sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java

sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java
sling/trunk/karaf/org.apache.sling.karaf-configs/pom.xml
sling/trunk/karaf/org.apache.sling.karaf-distribution/pom.xml

sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml
sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt
sling/trunk/launchpad/testing/src/main/provisioning/model.txt

Modified: 
sling/trunk/bundles/jcr/base/src/test/java/org/apache/sling/jcr/base/MockSlingRepositoryManager.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/src/test/java/org/apache/sling/jcr/base/MockSlingRepositoryManager.java?rev=1769105=1769104=1769105=diff
==
--- 
sling/trunk/bundles/jcr/base/src/test/java/org/apache/sling/jcr/base/MockSlingRepositoryManager.java
 (original)
+++ 
sling/trunk/bundles/jcr/base/src/test/java/org/apache/sling/jcr/base/MockSlingRepositoryManager.java
 Thu Nov 10 12:35:27 2016
@@ -20,8 +20,11 @@ package org.apache.sling.jcr.base;
 
 import static org.junit.Assert.fail;
 
+import java.util.Arrays;
 import java.util.Dictionary;
+import java.util.HashSet;
 import java.util.Hashtable;
+import java.util.Set;
 
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
@@ -33,20 +36,25 @@ import org.osgi.framework.BundleContext;
 /** Minimal AbstractSlingRepositoryManager used for testing */
 public class MockSlingRepositoryManager extends AbstractSlingRepositoryManager 
{
 
-private final Repository repository;
+public static final String WHITELIST_ALL = "*";
+
+public static final String WHITELIST_NONE = "";
 
-private LoginAdminWhitelist loginAdminWhitelist;
+private final Repository repository;
 
 private boolean loginAdminDisabled;
 
+private Set loginAdminWhitelist;
+
 public MockSlingRepositoryManager(Repository repository) {
-this(repository, false, new MockLoginAdminWhitelist(true));
+this(repository, false, WHITELIST_ALL);
 }
 
-public MockSlingRepositoryManager(Repository repository, boolean 
loginAdminDisabled, LoginAdminWhitelist loginAdminWhitelist) {
+public MockSlingRepositoryManager(Repository repository, boolean 
loginAdminDisabled, String... loginAdminWhitelist) {
 this.repository = repository;
 this.loginAdminDisabled = loginAdminDisabled;
-this.loginAdminWhitelist = loginAdminWhitelist;
+this.loginAdminWhitelist = new 
HashSet<>(Arrays.asList(loginAdminWhitelist));
+this.loginAdminWhitelist.remove(WHITELIST_NONE);
 }
 
 @Override
@@ -86,7 +94,7 @@ public class MockSlingRepositoryManager
 
 @Override
 protected boolean allowLoginAdministrativeForBundle(final Bundle

svn commit: r1769103 - in /sling/trunk: bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/ bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/ contrib/scripting/or

[jsedding]

Author: jsedding
Date: Thu Nov 10 12:35:00 2016
New Revision: 1769103

URL: http://svn.apache.org/viewvc?rev=1769103=rev
Log:
SLING-5135 - Whitelist legit usages of loginAdministrative and administrative 
ResourceResolver

- rename configuration properties

Modified:

sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/LoginAdminWhitelistImpl.java

sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java

sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java

sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelistImpl.config
sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt
sling/trunk/launchpad/testing/src/main/provisioning/model.txt

Modified: 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/LoginAdminWhitelistImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/LoginAdminWhitelistImpl.java?rev=1769103=1769102=1769103=diff
==
--- 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/LoginAdminWhitelistImpl.java
 (original)
+++ 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/LoginAdminWhitelistImpl.java
 Thu Nov 10 12:35:00 2016
@@ -70,20 +70,20 @@ public class LoginAdminWhitelistImpl imp
 description="Regular expression for bundle symbolic names for 
which loginAdministrative() is allowed. "
 + " NOT recommended for production use, but useful for testing 
with generated bundles.",
 value = "")
-public static final String PROP_WHITELIST_REGEXP = "whitelist.regexp";
+public static final String PROP_WHITELIST_REGEXP = 
"whitelist.bundles.regexp";
 private Pattern whitelistRegexp;
 
 @Property(
 label="Default whitelisted BSNs",
 description="Default list of bundle symbolic names for which 
loginAdministrative() is allowed",
 value = {})
-public static final String PROP_DEFAULT_WHITELISTED_BSN = 
"default.whitelisted.bundle.symbolic.names";
+public static final String PROP_DEFAULT_WHITELISTED_BSN = 
"whitelist.bundles.default";
 
 @Property(
 label="Additional whitelisted BSNs",
 description="Additional list of bundle symbolic names for which 
loginAdministrative() is allowed",
 value = {})
-public static final String PROP_ADDITIONAL_WHITELISTED_BSN = 
"additional.whitelisted.bundle.symbolic.names";
+public static final String PROP_ADDITIONAL_WHITELISTED_BSN = 
"whitelist.bundles.additional";
 
 private Set whitelistedBsn;
 

Modified: 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java?rev=1769103=1769102=1769103=diff
==
--- 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
 (original)
+++ 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
 Thu Nov 10 12:35:00 2016
@@ -203,7 +203,7 @@ public abstract class OakServerTestSuppo
 
 protected Option getWhitelistRegexpOption() {
 return 
newConfiguration("org.apache.sling.jcr.base.internal.LoginAdminWhitelistImpl")
-.put("whitelist.regexp", "PAXEXAM-PROBE-.*")
+.put("whitelist.bundles.regexp", "PAXEXAM-PROBE-.*")
 .asOption();
 }
 }

Modified: 
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java?rev=1769103=1769102=1769103=diff
==
--- 
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java
 (original)
+++ 
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java
 Thu Nov 10 12:35:00 2016
@@ -125,7 +125,7 @@ public abstract 

svn commit: r1769102 - in /sling/trunk/bundles/jcr/resource: pom.xml src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrProviderStateFactory.java src/main/java/org/apache/sling/jcr/res

[jsedding]

Author: jsedding
Date: Thu Nov 10 12:34:46 2016
New Revision: 1769102

URL: http://svn.apache.org/viewvc?rev=1769102=rev
Log:
SLING-5135 - Whitelist legit usages of loginAdministrative and administrative 
ResourceResolver

- avoid explicit check for LoginAdminWhitelist by using the same
  mechanism for loginAdministrative and loginService to pass
  the "usingBundle" to the AbstractSlingRepository2 instance
- the above allows to remove the dependency to o.a.s.jcr.base
  from o.a.s.jcr.resource

Modified:
sling/trunk/bundles/jcr/resource/pom.xml

sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrProviderStateFactory.java

sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProvider.java

Modified: sling/trunk/bundles/jcr/resource/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/pom.xml?rev=1769102=1769101=1769102=diff
==
--- sling/trunk/bundles/jcr/resource/pom.xml (original)
+++ sling/trunk/bundles/jcr/resource/pom.xml Thu Nov 10 12:34:46 2016
@@ -155,12 +155,6 @@
 
 
 org.apache.sling
-org.apache.sling.jcr.base
-2.4.1-SNAPSHOT
-provided
-
-
-org.apache.sling
 org.apache.sling.api
 2.15.0
 provided

Modified: 
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrProviderStateFactory.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrProviderStateFactory.java?rev=1769102=1769101=1769102=diff
==
--- 
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrProviderStateFactory.java
 (original)
+++ 
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrProviderStateFactory.java
 Thu Nov 10 12:34:46 2016
@@ -24,7 +24,9 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 
+import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.jcr.Credentials;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
@@ -35,7 +37,6 @@ import org.apache.sling.api.resource.Res
 import org.apache.sling.api.resource.ResourceResolverFactory;
 import org.apache.sling.commons.classloader.DynamicClassLoaderManager;
 import org.apache.sling.jcr.api.SlingRepository;
-import org.apache.sling.jcr.base.LoginAdminWhitelist;
 import org.apache.sling.jcr.resource.api.JcrResourceConstants;
 import org.apache.sling.jcr.resource.internal.HelperData;
 import org.apache.sling.spi.resource.provider.ResourceProvider;
@@ -56,121 +57,97 @@ public class JcrProviderStateFactory {
 private final AtomicReference 
dynamicClassLoaderManagerReference;
 
 private final PathMapper pathMapper;
-
-private final LoginAdminWhitelist loginAdminWhitelist;
 
 public JcrProviderStateFactory(final ServiceReference repositoryReference,
 final SlingRepository repository,
 final AtomicReference 
dynamicClassLoaderManagerReference,
-final PathMapper pathMapper,
-final LoginAdminWhitelist loginAdminWhitelist) {
+final PathMapper pathMapper) {
 this.repository = repository;
 this.repositoryReference = repositoryReference;
 this.dynamicClassLoaderManagerReference = 
dynamicClassLoaderManagerReference;
 this.pathMapper = pathMapper;
-this.loginAdminWhitelist = loginAdminWhitelist;
 }
 
 /** Get the calling Bundle from auth info, fail if not provided 
  *  @throws LoginException if no calling bundle info provided
  */
-private Bundle requireCallingBundle(@Nonnull Map<String, Object> 
authenticationInfo) throws LoginException {
+@CheckForNull
+private Bundle extractCallingBundle(@Nonnull Map<String, Object> 
authenticationInfo) throws LoginException {
 final Object obj = 
authenticationInfo.get(ResourceProvider.AUTH_SERVICE_BUNDLE);
-if(obj == null) {
-throw new LoginException("Calling bundle missing in authentication 
info");
-} else if(!(obj instanceof Bundle)) {
+if(obj != null && !(obj instanceof Bundle)) {
 throw new LoginException("Invalid calling bundle object in 
authentication info");
 }
 return (Bundle)obj;
 }
-
-/** Fail if the calling bundle is not whitelisted for loginAdministrative 
- *  @throws LoginException if bundle not whitelisted or no calling bundle 
info provided
- */
-private void ch

svn commit: r1769101 - in /sling/trunk/bundles/jcr: base/src/main/java/org/apache/sling/jcr/base/ base/src/main/java/org/apache/sling/jcr/base/internal/ base/src/test/java/org/apache/sling/jcr/base/ b

[jsedding]

Author: jsedding
Date: Thu Nov 10 12:34:40 2016
New Revision: 1769101

URL: http://svn.apache.org/viewvc?rev=1769101=rev
Log:
SLING-5135 - Whitelist legit usages of loginAdministrative and administrative 
ResourceResolver

- refactor for minimal dependencies to LoginAdminWhitelist support
- cleanup imports and related tests

Modified:

sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository2.java

sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java

sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/DefaultWhitelist.java

sling/trunk/bundles/jcr/base/src/test/java/org/apache/sling/jcr/base/MockLoginAdminWhitelist.java

sling/trunk/bundles/jcr/base/src/test/java/org/apache/sling/jcr/base/MockSlingRepositoryManager.java

sling/trunk/bundles/jcr/base/src/test/java/org/apache/sling/jcr/base/internal/WhitelistWiringTest.java

sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/OakSlingRepositoryManager.java

Modified: 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository2.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository2.java?rev=1769101=1769100=1769101=diff
==
--- 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository2.java
 (original)
+++ 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository2.java
 Thu Nov 10 12:34:40 2016
@@ -370,7 +370,7 @@ public abstract class AbstractSlingRepos
  */
 @Override
 public final Session loginAdministrative(final String workspace) throws 
RepositoryException {
-final boolean whitelisted = 
getSlingRepositoryManager().getLoginAdminWhitelist().allowLoginAdministrative(usingBundle);
+final boolean whitelisted = 
getSlingRepositoryManager().allowLoginAdministrativeForBundle(usingBundle);
 
 if(!whitelisted) {
 logger.error("Bundle {} is NOT whitelisted to use 
SlingRepository.loginAdministrative", usingBundle.getSymbolicName());

Modified: 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java?rev=1769101=1769100=1769101=diff
==
--- 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
 (original)
+++ 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
 Thu Nov 10 12:34:40 2016
@@ -143,11 +143,15 @@ public abstract class AbstractSlingRepos
  */
 protected abstract ServiceUserMapper getServiceUserMapper();
 
-/** Returns the {@code LoginAdminWhitelist} service used to decide whether
- *  to allow bundles to use the {@code loginAdministrative} method.
- * @return the non-null {@code LoginAdminWhitelist} service
+/**
+ * Returns whether or not the provided bundle is allowed to use
+ * {@link SlingRepository#loginAdministrative(String)}.
+ *
+ * @param bundle The bundle requiring access to {@code loginAdministrative}
+ * @return A boolean value indicating whether or not the bundle is allowed
+ * to use {@code loginAdministrative}.
  */
-protected abstract LoginAdminWhitelist getLoginAdminWhitelist();
+protected abstract boolean allowLoginAdministrativeForBundle(final Bundle 
bundle);
 
 /**
  * Creates the backing JCR repository instances. It is expected for this

Modified: 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/DefaultWhitelist.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/DefaultWhitelist.java?rev=1769101=1769100=1769101=diff
==
--- 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/DefaultWhitelist.java
 (original)
+++ 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/DefaultWhitelist.java
 Thu Nov 10 12:34:40 2016
@@ -18,22 +18,6 @@
  */
 package org.apache.sling.jcr.base.internal;
 
-import java.util.Arrays;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.regex.Pattern;
-
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Service;
-import org.apache.sling.commons.osgi.PropertiesUtil;
-import org.apache.sling.jcr.api.SlingRepositor

svn commit: r1768898 - /sling/trunk/bundles/jcr/oak-server/pom.xml

[jsedding]

Author: jsedding
Date: Wed Nov  9 09:48:07 2016
New Revision: 1768898

URL: http://svn.apache.org/viewvc?rev=1768898=rev
Log:
SLING-6262 - oak-server defines two dependencies to org.apache.sling.api

- remove compile dependency (2.3.0)
- leave test dependency (2.15.0), which is required for test compilation and 
pax exam

Modified:
sling/trunk/bundles/jcr/oak-server/pom.xml

Modified: sling/trunk/bundles/jcr/oak-server/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/pom.xml?rev=1768898=1768897=1768898=diff
==
--- sling/trunk/bundles/jcr/oak-server/pom.xml (original)
+++ sling/trunk/bundles/jcr/oak-server/pom.xml Wed Nov  9 09:48:07 2016
@@ -164,12 +164,6 @@
 
 
   org.apache.sling
-  org.apache.sling.api
-  2.3.0
-  provided
-
-
-  org.apache.sling
   org.apache.sling.commons.threads
   3.2.0
   provided

svn commit: r1768780 - /sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java

[jsedding]

Author: jsedding
Date: Tue Nov  8 20:43:56 2016
New Revision: 1768780

URL: http://svn.apache.org/viewvc?rev=1768780=rev
Log:
SLING-6260 - oak-server ITs failing with latest org.apache.sling.jcr.repoinit 
1.0.3-SNAPSHOT

Modified:

sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java

Modified: 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java?rev=1768780=1768779=1768780=diff
==
--- 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
 (original)
+++ 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
 Tue Nov  8 20:43:56 2016
@@ -185,7 +185,7 @@ public abstract class OakServerTestSuppo
 
mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment").version(SlingOptions.versionResolver),
 // repoinit (temp)
 
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.repoinit").version("1.0.3-SNAPSHOT"),
-
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.repoinit.parser").version("1.0.4"),
+
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.repoinit.parser").version("1.0.5-SNAPSHOT"),
 
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.provisioning.model").version("1.4.4"),
 
newConfiguration("org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService")
 .put("repository.home", repositoryHome)

svn commit: r986253 - /websites/production/sling/content/

[jsedding]

Author: jsedding
Date: Thu Apr 21 14:15:34 2016
New Revision: 986253

Log:
Release Apache Sling Scripting JSP-Taglib 2.2.6

Added:
websites/production/sling/content/
  - copied from r986252, websites/staging/sling/trunk/content/

svn commit: r1740321 [2/2] - in /sling/site/trunk/content: downloads.list news.mdtext obr/sling.xml

[jsedding]

Modified: sling/site/trunk/content/obr/sling.xml
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/obr/sling.xml?rev=1740321=1740320=1740321=diff
==
--- sling/site/trunk/content/obr/sling.xml (original)
+++ sling/site/trunk/content/obr/sling.xml Thu Apr 21 14:07:22 2016
@@ -1,4 +1,4 @@
-
+
   
 Provides a web console configuration printer to provide 
details around classloader leaks
 18203
@@ -117,64 +117,6 @@
 Import package 
org.slf4j;version="[1.5,2)"
 Execution Environment 
(|(ee=J2SE-1.5))
   
-  
-The Apache Sling API defines an extension to the Servlet  
  API 2.4 to provide access to content and unified accessto request 
parameters hiding the differences between thedifferent methods of 
transferring parameters from clientto server. Note that the Apache 
Sling API bundle does notinclude the Servlet API but instead requires 
the API tobe provided by the Servlet container in which the Apache  
  Sling framework is running or by another bundle.
-52065
-
http://incubator.apache.org/sling/site/sling-api.html
-
org/apache/sling/org.apache.sling.api/2.0.4-incubator/org.apache.sling.api-2.0.4-incubator-sources.jar
-http://www.apache.org/licenses/LICENSE-2.0.txt
-
-
-  
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-Import package javax.servlet 
;version=2.4.0
-Import package javax.servlet.http 
;version=2.4.0
-Import package 
org.apache.sling.api ;version=2.0.4.incubator
-Import package 
org.apache.sling.api.adapter ;version=2.0.4.incubator
-Import package 
org.apache.sling.api.request ;version=2.0.4.incubator
-Import package 
org.apache.sling.api.resource ;version=2.0.4.incubator
-Import package 
org.apache.sling.api.scripting ;version=2.0.4.incubator
-Import package 
org.apache.sling.api.servlets ;version=2.0.4.incubator
-Import package 
org.apache.sling.api.wrappers ;version=2.0.4.incubator
-Import package org.slf4j
-  
   
 The Apache Sling API defines an extension to the Servlet  
  API 2.4 to provide access to content and unified accessto request 
parameters hiding the differences between thedifferent methods of 
transferring parameters from clientto server. Note that the Apache 
Sling API bundle does notinclude the Servlet API but instead requires 
the API tobe provided by the Servlet container in which the Apache  
  Sling framework is running or by another bundle.
 92496
@@ -360,6 +302,64 @@
 Import package 
org.apache.sling.api.wrappers ;version=2.1.0
 Import package org.slf4j 
;version=1.5.0
   
+  
+The Apache Sling API defines an extension to the Servlet  
  API 2.4 to provide access to content and unified accessto request 
parameters hiding the differences between thedifferent methods of 
transferring parameters from clientto server. Note that the Apache 
Sling API bundle does notinclude the Servlet API but instead requires 
the API tobe provided by the Servlet container in which the Apache  
  Sling framework is running or by another bundle.
+52065
+
http://incubator.apache.org/sling/site/sling-api.html
+
org/apache/sling/org.apache.sling.api/2.0.4-incubator/org.apache.sling.api-2.0.4-incubator-sources.jar
+http://www.apache.org/licenses/LICENSE-2.0.txt
+
+
+  
+  
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+  
+
+Import package javax.servlet 
;version=2.4.0
+Import package javax.servlet.http 
;version=2.4.0
+Import package 
org.apache.sling.api ;version=2.0.4.incubator
+Import package 
org.apache.sling.api.adapter ;version=2.0.4.incubator
+Import package 
org.apache.sling.api.request ;version=2.0.4.incubator
+Import package 
org.apache.sling.api.resource ;version=2.0.4.incubator
+Import package 
org.apache.sling.api.scripting ;version=2.0.4.incubator
+Import package 
org.apache.sling.api.servlets ;version=2.0.4.incubator
+Import package 
org.apache.sling.api.wrappers ;version=2.0.4.incubator
+Import package org.slf4j
+  
   
 Bundle implementing a Sling Authentication Handler which  
  allows for choosing which actual authentication handleris to be used 
delegating the actual credential handlingto concrete handlers. The 
selector handler only presentsHTML forms to provide credential data 
such as usernameand 

svn commit: r1740321 [1/2] - in /sling/site/trunk/content: downloads.list news.mdtext obr/sling.xml

[jsedding]

Author: jsedding
Date: Thu Apr 21 14:07:22 2016
New Revision: 1740321

URL: http://svn.apache.org/viewvc?rev=1740321=rev
Log:
Release Apache Sling Scripting JSP-Taglib version 2.2.6

Modified:
sling/site/trunk/content/downloads.list
sling/site/trunk/content/news.mdtext
sling/site/trunk/content/obr/sling.xml

Modified: sling/site/trunk/content/downloads.list
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1740321=1740320=1740321=diff
==
--- sling/site/trunk/content/downloads.list (original)
+++ sling/site/trunk/content/downloads.list Thu Apr 21 14:07:22 2016
@@ -148,7 +148,7 @@ Scripting Core|org.apache.sling.scriptin
 Scripting Java|org.apache.sling.scripting.java|2.0.14
 Scripting JavaScript|org.apache.sling.scripting.javascript|2.0.28
 Scripting JSP|org.apache.sling.scripting.jsp|2.1.8
-Scripting JSP Taglib|org.apache.sling.scripting.jsp.taglib|2.2.4
+Scripting JSP Taglib|org.apache.sling.scripting.jsp.taglib|2.2.6
 Scripting JST|org.apache.sling.scripting.jst|2.0.6
 Scripting Groovy|org.apache.sling.scripting.groovy|1.0.2
 Scripting Sightly Engine|org.apache.sling.scripting.sightly|1.0.18

Modified: sling/site/trunk/content/news.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1740321=1740320=1740321=diff
==
--- sling/site/trunk/content/news.mdtext (original)
+++ sling/site/trunk/content/news.mdtext Thu Apr 21 14:07:22 2016
@@ -1,5 +1,6 @@
 Title: News
 
+* New Release: Apache Sling Scripting JSP-Taglib version 2.2.6 (April 21st, 
2016) 
 * New Release: Apache Sling Auth Core 1.3.14 (April 12th, 2016)
 * New Release: Apache Sling Servlets Post (April 10th, 2016)
 * New Release: Apache Sling Resource Resolver (April 7th, 2016)

svn commit: r1739060 - /sling/trunk/bundles/scripting/jsp-taglib/pom.xml

[jsedding]

Author: jsedding
Date: Thu Apr 14 11:40:23 2016
New Revision: 1739060

URL: http://svn.apache.org/viewvc?rev=1739060=rev
Log:
[maven-release-plugin] prepare release 
org.apache.sling.scripting.jsp.taglib-2.2.6

Modified:
sling/trunk/bundles/scripting/jsp-taglib/pom.xml

Modified: sling/trunk/bundles/scripting/jsp-taglib/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp-taglib/pom.xml?rev=1739060=1739059=1739060=diff
==
--- sling/trunk/bundles/scripting/jsp-taglib/pom.xml (original)
+++ sling/trunk/bundles/scripting/jsp-taglib/pom.xml Thu Apr 14 11:40:23 2016
@@ -16,11 +16,11 @@
org.apache.sling
sling
26
-   
+   

 
org.apache.sling.scripting.jsp.taglib
-   2.2.5-SNAPSHOT
+   2.2.6
bundle
 
Apache Sling JSP Tag Library
@@ -29,9 +29,9 @@
 
 

-   
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/jsp-taglib
-   
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/jsp-taglib
-   
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp-taglib
+   
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.jsp.taglib-2.2.6
+   
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.jsp.taglib-2.2.6
+   
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.jsp.taglib-2.2.6

 

@@ -103,7 +103,7 @@

org.apache.sling
org.apache.sling.scripting.core
-   2.0.29-SNAPSHOT
+   2.0.36
provided

svn commit: r1739061 - /sling/tags/org.apache.sling.scripting.jsp.taglib-2.2.6/

[jsedding]

Author: jsedding
Date: Thu Apr 14 11:40:37 2016
New Revision: 1739061

URL: http://svn.apache.org/viewvc?rev=1739061=rev
Log:
[maven-release-plugin] copy for tag org.apache.sling.scripting.jsp.taglib-2.2.6

Added:
sling/tags/org.apache.sling.scripting.jsp.taglib-2.2.6/
  - copied from r1739060, sling/trunk/bundles/scripting/jsp-taglib/

svn commit: r1739062 - /sling/trunk/bundles/scripting/jsp-taglib/pom.xml

[jsedding]

Author: jsedding
Date: Thu Apr 14 11:40:39 2016
New Revision: 1739062

URL: http://svn.apache.org/viewvc?rev=1739062=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
sling/trunk/bundles/scripting/jsp-taglib/pom.xml

Modified: sling/trunk/bundles/scripting/jsp-taglib/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp-taglib/pom.xml?rev=1739062=1739061=1739062=diff
==
--- sling/trunk/bundles/scripting/jsp-taglib/pom.xml (original)
+++ sling/trunk/bundles/scripting/jsp-taglib/pom.xml Thu Apr 14 11:40:39 2016
@@ -20,7 +20,7 @@

 
org.apache.sling.scripting.jsp.taglib
-   2.2.6
+   2.2.7-SNAPSHOT
bundle
 
Apache Sling JSP Tag Library
@@ -29,9 +29,9 @@
 
 

-   
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.jsp.taglib-2.2.6
-   
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.jsp.taglib-2.2.6
-   
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.jsp.taglib-2.2.6
+   
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/jsp-taglib
+   
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/jsp-taglib
+   
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp-taglib

 

svn commit: r1738703 - in /sling/trunk: bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/GetPropertyTEI.java launchpad/integration-tests/src/main/resources/integrat

[jsedding]

Author: jsedding
Date: Tue Apr 12 06:47:13 2016
New Revision: 1738703

URL: http://svn.apache.org/viewvc?rev=1738703=rev
Log:
SLING-5658 - getProperty tag fails when returnClass parameter is an expression

Modified:

sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/GetPropertyTEI.java

sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/taglib-test.jsp

Modified: 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/GetPropertyTEI.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/GetPropertyTEI.java?rev=1738703=1738702=1738703=diff
==
--- 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/GetPropertyTEI.java
 (original)
+++ 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/GetPropertyTEI.java
 Tue Apr 12 06:47:13 2016
@@ -26,13 +26,13 @@ public class GetPropertyTEI extends Abst
 @Override
 protected String getClassName(TagData data) {
 final Object defaultValue = data.getAttribute(ATTR_DEFAULT_VALUE);
-final String className = data.getAttributeString(ATTR_RETURN_CLASS);
+final String className = safeGetStringAttribute(data, 
ATTR_RETURN_CLASS, OBJECT_CLASS_NAME);
 if (defaultValue != null) {
 return defaultValue.getClass().getName();
 } else if (className != null){
 return className;
 } else {
-   return Object.class.getName();
+return OBJECT_CLASS_NAME;
 }
 }
 }

Modified: 
sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/taglib-test.jsp
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/taglib-test.jsp?rev=1738703=1738702=1738703=diff
==
--- 
sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/taglib-test.jsp
 (original)
+++ 
sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/taglib-test.jsp
 Tue Apr 12 06:47:13 2016
@@ -58,6 +58,11 @@ Get Property Tag
 
 Test 4: Default Value
 Result: SUCCESSERROR
+
+Test 5: Test adapting when returnClass name is a run-time expression
+
+
+result: SUCCESSERROR
 
 Get Resource Tag
 Test 1: Get Resource

svn commit: r1738701 - in /sling/trunk: bundles/scripting/jsp-taglib/ bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/ bundles/scripting/jsp-taglib/src/test/java/o

[jsedding]

Author: jsedding
Date: Tue Apr 12 06:45:16 2016
New Revision: 1738701

URL: http://svn.apache.org/viewvc?rev=1738701=rev
Log:
SLING-5653 - adaptTo tag fails when adaptTo parameter is an expression

Added:

sling/trunk/bundles/scripting/jsp-taglib/src/test/java/org/apache/sling/scripting/jsp/taglib/tei/

sling/trunk/bundles/scripting/jsp-taglib/src/test/java/org/apache/sling/scripting/jsp/taglib/tei/AdaptToTEITest.java
   (with props)
Modified:
sling/trunk/bundles/scripting/jsp-taglib/pom.xml

sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/AbstractVarTEI.java

sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/AdaptToTEI.java
sling/trunk/launchpad/builder/src/main/provisioning/sling.txt

sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/taglib-test.jsp

Modified: sling/trunk/bundles/scripting/jsp-taglib/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp-taglib/pom.xml?rev=1738701=1738700=1738701=diff
==
--- sling/trunk/bundles/scripting/jsp-taglib/pom.xml (original)
+++ sling/trunk/bundles/scripting/jsp-taglib/pom.xml Tue Apr 12 06:45:16 2016
@@ -53,7 +53,10 @@
 !org.apache.log4j.*,
*

-   
esapi;inline=true
+   
+   esapi;inline=true,
+   
org.apache.sling.scripting.core;inline=org/apache/sling/scripting/core/servlet/CaptureResponseWrapper.class
+   




Modified: 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/AbstractVarTEI.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/AbstractVarTEI.java?rev=1738701=1738700=1738701=diff
==
--- 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/AbstractVarTEI.java
 (original)
+++ 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/AbstractVarTEI.java
 Tue Apr 12 06:45:16 2016
@@ -32,6 +32,8 @@ import javax.servlet.jsp.tagext.Variable
  */
 public abstract class AbstractVarTEI extends TagExtraInfo {
 
+static final String OBJECT_CLASS_NAME = Object.class.getName();
+
 protected static final String ATTR_VAR = "var";
 
 private final String variableNameAttribute;
@@ -69,6 +71,19 @@ public abstract class AbstractVarTEI ext
  */
 protected abstract String getClassName(TagData data);
 
+static String safeGetStringAttribute(TagData data, String attributeName) {
+final Object attribute = data.getAttribute(attributeName);
+if (attribute == TagData.REQUEST_TIME_VALUE) {
+return null;
+}
+return data.getAttributeString(attributeName);
+}
+
+static String safeGetStringAttribute(TagData data, String attributeName, 
String defaultValue) {
+final String attribute = safeGetStringAttribute(data, attributeName);
+return attribute == null ? defaultValue : attribute;
+}
+
 @Override
 public VariableInfo[] getVariableInfo(TagData data) {
 final String variableName = getVariableName(data);

Modified: 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/AdaptToTEI.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/AdaptToTEI.java?rev=1738701=1738700=1738701=diff
==
--- 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/AdaptToTEI.java
 (original)
+++ 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/AdaptToTEI.java
 Tue Apr 12 06:45:16 2016
@@ -23,6 +23,6 @@ public class AdaptToTEI extends Abstract
 
@Override
protected String getClassName(TagData data) {
-   return data.getAttributeString(ATTR_ADAPT_TO);
+   return safeGetStringAttribute(data, ATTR_ADAPT_TO, 
OBJECT_CLASS_NAME);
}
 }

Added: 
sling/trunk/bundles/scripting/jsp-taglib/src/test/java/org/apache/sling/scripting/jsp/taglib/tei/AdaptToTEITest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp-taglib/src/test/java/org/apache/sling/scripting/

svn commit: r1738700 - in /sling/trunk/bundles/scripting/jsp-taglib: ./ src/main/java/org/apache/sling/scripting/jsp/taglib/ src/main/java/org/apache/sling/scripting/jsp/taglib/helpers/ src/main/java/

[jsedding]

Author: jsedding
Date: Tue Apr 12 06:42:15 2016
New Revision: 1738700

URL: http://svn.apache.org/viewvc?rev=1738700=rev
Log:
jsp-taglib - convert export declarations to package-info.java files

Added:

sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/helpers/package-info.java
   (with props)

sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/package-info.java
   (with props)

sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/package-info.java
   (with props)
Modified:
sling/trunk/bundles/scripting/jsp-taglib/pom.xml

Modified: sling/trunk/bundles/scripting/jsp-taglib/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp-taglib/pom.xml?rev=1738700=1738699=1738700=diff
==
--- sling/trunk/bundles/scripting/jsp-taglib/pom.xml (original)
+++ sling/trunk/bundles/scripting/jsp-taglib/pom.xml Tue Apr 12 06:42:15 2016
@@ -42,9 +42,6 @@
true


-   
-   
org.apache.sling.scripting.jsp.taglib.*;version=2.2.0
-   


javax.jcr;resolution:=optional,

javax.servlet.jsp.*;version=2.0,
@@ -140,6 +137,13 @@
compile

 
+   
+   biz.aQute.bnd
+   bndlib
+   2.4.0
+   provided
+   
+


junit

Added: 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/helpers/package-info.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/helpers/package-info.java?rev=1738700=auto
==
--- 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/helpers/package-info.java
 (added)
+++ 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/helpers/package-info.java
 Tue Apr 12 06:42:15 2016
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+@Version("2.2.0")
+package org.apache.sling.scripting.jsp.taglib.helpers;
+
+import aQute.bnd.annotation.Version;
\ No newline at end of file

Propchange: 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/helpers/package-info.java
--
svn:eol-style = native

Added: 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/package-info.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/package-info.java?rev=1738700=auto
==
--- 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/package-info.java
 (added)
+++ 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/package-info.java
 Tue Apr 12 06:42:15 2016
@@ -0,0 +1,22 @@
+/*
+ * 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

svn commit: r1731609 [2/2] - in /sling/site/trunk/content: downloads.list news.mdtext obr/sling.xml

[jsedding]

Modified: sling/site/trunk/content/obr/sling.xml
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/obr/sling.xml?rev=1731609=1731608=1731609=diff
==
--- sling/site/trunk/content/obr/sling.xml (original)
+++ sling/site/trunk/content/obr/sling.xml Mon Feb 22 09:49:26 2016
@@ -1,4 +1,4 @@
-
+
   
 Provides a web console configuration printer to provide 
details around classloader leaks
 18203
@@ -117,64 +117,6 @@
 Import package 
org.slf4j;version="[1.5,2)"
 Execution Environment 
(|(ee=J2SE-1.5))
   
-  
-The Apache Sling API defines an extension to the Servlet  
  API 2.4 to provide access to content and unified accessto request 
parameters hiding the differences between thedifferent methods of 
transferring parameters from clientto server. Note that the Apache 
Sling API bundle does notinclude the Servlet API but instead requires 
the API tobe provided by the Servlet container in which the Apache  
  Sling framework is running or by another bundle.
-52065
-
http://incubator.apache.org/sling/site/sling-api.html
-
org/apache/sling/org.apache.sling.api/2.0.4-incubator/org.apache.sling.api-2.0.4-incubator-sources.jar
-http://www.apache.org/licenses/LICENSE-2.0.txt
-
-
-  
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-Import package javax.servlet 
;version=2.4.0
-Import package javax.servlet.http 
;version=2.4.0
-Import package 
org.apache.sling.api ;version=2.0.4.incubator
-Import package 
org.apache.sling.api.adapter ;version=2.0.4.incubator
-Import package 
org.apache.sling.api.request ;version=2.0.4.incubator
-Import package 
org.apache.sling.api.resource ;version=2.0.4.incubator
-Import package 
org.apache.sling.api.scripting ;version=2.0.4.incubator
-Import package 
org.apache.sling.api.servlets ;version=2.0.4.incubator
-Import package 
org.apache.sling.api.wrappers ;version=2.0.4.incubator
-Import package org.slf4j
-  
   
 The Apache Sling API defines an extension to the Servlet  
  API 2.4 to provide access to content and unified accessto request 
parameters hiding the differences between thedifferent methods of 
transferring parameters from clientto server. Note that the Apache 
Sling API bundle does notinclude the Servlet API but instead requires 
the API tobe provided by the Servlet container in which the Apache  
  Sling framework is running or by another bundle.
 92496
@@ -360,6 +302,64 @@
 Import package 
org.apache.sling.api.wrappers ;version=2.1.0
 Import package org.slf4j 
;version=1.5.0
   
+  
+The Apache Sling API defines an extension to the Servlet  
  API 2.4 to provide access to content and unified accessto request 
parameters hiding the differences between thedifferent methods of 
transferring parameters from clientto server. Note that the Apache 
Sling API bundle does notinclude the Servlet API but instead requires 
the API tobe provided by the Servlet container in which the Apache  
  Sling framework is running or by another bundle.
+52065
+
http://incubator.apache.org/sling/site/sling-api.html
+
org/apache/sling/org.apache.sling.api/2.0.4-incubator/org.apache.sling.api-2.0.4-incubator-sources.jar
+http://www.apache.org/licenses/LICENSE-2.0.txt
+
+
+  
+  
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+  
+
+Import package javax.servlet 
;version=2.4.0
+Import package javax.servlet.http 
;version=2.4.0
+Import package 
org.apache.sling.api ;version=2.0.4.incubator
+Import package 
org.apache.sling.api.adapter ;version=2.0.4.incubator
+Import package 
org.apache.sling.api.request ;version=2.0.4.incubator
+Import package 
org.apache.sling.api.resource ;version=2.0.4.incubator
+Import package 
org.apache.sling.api.scripting ;version=2.0.4.incubator
+Import package 
org.apache.sling.api.servlets ;version=2.0.4.incubator
+Import package 
org.apache.sling.api.wrappers ;version=2.0.4.incubator
+Import package org.slf4j
+  
   
 Bundle implementing a Sling Authentication Handler which  
  allows for choosing which actual authentication handleris to be used 
delegating the actual credential handlingto concrete handlers. The 
selector handler only presentsHTML forms to provide credential data 
such as usernameand 

svn commit: r1731609 [1/2] - in /sling/site/trunk/content: downloads.list news.mdtext obr/sling.xml

[jsedding]

Author: jsedding
Date: Mon Feb 22 09:49:26 2016
New Revision: 1731609

URL: http://svn.apache.org/viewvc?rev=1731609=rev
Log:
Release Internationalization Suppport (I18N) 2.4.6

Modified:
sling/site/trunk/content/downloads.list
sling/site/trunk/content/news.mdtext
sling/site/trunk/content/obr/sling.xml

Modified: sling/site/trunk/content/downloads.list
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1731609=1731608=1731609=diff
==
--- sling/site/trunk/content/downloads.list (original)
+++ sling/site/trunk/content/downloads.list Mon Feb 22 09:49:26 2016
@@ -73,7 +73,7 @@ Feature Flags|org.apache.sling.featurefl
 GWT Integration|org.apache.sling.gwt.servlet|3.0.0
 Thread Dumper|org.apache.sling.extensions.threaddump|0.2.2
 FileSystem Provider|org.apache.sling.fsresource|1.1.4
-I18n|org.apache.sling.i18n|2.4.4
+I18n|org.apache.sling.i18n|2.4.6
 HApi|org.apache.sling.api|1.0.0
 Health Check Annotations|org.apache.sling.hc.annotations|1.0.2
 Health Check Core|org.apache.sling.hc.core|1.2.2

Modified: sling/site/trunk/content/news.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1731609=1731608=1731609=diff
==
--- sling/site/trunk/content/news.mdtext (original)
+++ sling/site/trunk/content/news.mdtext Mon Feb 22 09:49:26 2016
@@ -1,5 +1,6 @@
 Title: News
 
+* New Release: Apache Sling Internationalization Support (I18N) 2.4.6 
(February 22nd, 2016)
 * New Releases: Apache Sling Resource Resolver 1.4.2, Apache Sling JCR 
Resource 2.7.2, and Apache Sling Servlets Resolver 2.4.2 (February 19th, 2016)
 * New Release: Apache Sling JCR Installer 3.1.18 (February 15th, 2016)
 * New Release: Apache Sling Resource Merger 1.3.0 (February 14th, 2016)

svn commit: r1731021 - /sling/trunk/bundles/extensions/i18n/pom.xml

[jsedding]

Author: jsedding
Date: Thu Feb 18 08:47:57 2016
New Revision: 1731021

URL: http://svn.apache.org/viewvc?rev=1731021=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
sling/trunk/bundles/extensions/i18n/pom.xml

Modified: sling/trunk/bundles/extensions/i18n/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/i18n/pom.xml?rev=1731021=1731020=1731021=diff
==
--- sling/trunk/bundles/extensions/i18n/pom.xml (original)
+++ sling/trunk/bundles/extensions/i18n/pom.xml Thu Feb 18 08:47:57 2016
@@ -29,7 +29,7 @@
 
 org.apache.sling.i18n
 bundle
-2.4.6
+2.4.7-SNAPSHOT
 
 Apache Sling Internationalization Support
 
@@ -46,9 +46,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.i18n-2.4.6
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.i18n-2.4.6
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.i18n-2.4.6
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/i18n
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/i18n
+
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/i18n
 
 
 

svn commit: r1731020 - /sling/tags/org.apache.sling.i18n-2.4.6/

[jsedding]

Author: jsedding
Date: Thu Feb 18 08:47:54 2016
New Revision: 1731020

URL: http://svn.apache.org/viewvc?rev=1731020=rev
Log:
[maven-release-plugin] copy for tag org.apache.sling.i18n-2.4.6

Added:
sling/tags/org.apache.sling.i18n-2.4.6/
  - copied from r1731019, sling/trunk/bundles/extensions/i18n/

svn commit: r1731019 - /sling/trunk/bundles/extensions/i18n/pom.xml

[jsedding]

Author: jsedding
Date: Thu Feb 18 08:47:40 2016
New Revision: 1731019

URL: http://svn.apache.org/viewvc?rev=1731019=rev
Log:
[maven-release-plugin] prepare release org.apache.sling.i18n-2.4.6

Modified:
sling/trunk/bundles/extensions/i18n/pom.xml

Modified: sling/trunk/bundles/extensions/i18n/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/i18n/pom.xml?rev=1731019=1731018=1731019=diff
==
--- sling/trunk/bundles/extensions/i18n/pom.xml (original)
+++ sling/trunk/bundles/extensions/i18n/pom.xml Thu Feb 18 08:47:40 2016
@@ -29,7 +29,7 @@
 
 org.apache.sling.i18n
 bundle
-2.4.5-SNAPSHOT
+2.4.6
 
 Apache Sling Internationalization Support
 
@@ -46,9 +46,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/i18n
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/i18n
-
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/i18n
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.i18n-2.4.6
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.i18n-2.4.6
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.i18n-2.4.6
 
 
 

svn commit: r1720101 - /sling/trunk/launchpad/builder/src/main/provisioning/sling.txt

[jsedding]

Author: jsedding
Date: Tue Dec 15 09:47:13 2015
New Revision: 1720101

URL: http://svn.apache.org/viewvc?rev=1720101=rev
Log:
SLING-4676 - Clean up threads or refresh threads when put back into the pool

Modified:
sling/trunk/launchpad/builder/src/main/provisioning/sling.txt

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=1720101=1720100=1720101=diff
==
--- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Tue Dec 15 
09:47:13 2015
@@ -42,7 +42,7 @@
 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.10
-org.apache.sling/org.apache.sling.commons.threads/3.2.0
+org.apache.sling/org.apache.sling.commons.threads/3.2.2
 org.apache.sling/org.apache.sling.commons.fsclassloader/1.0.2
 org.apache.sling/org.apache.sling.discovery.api/1.0.2
 org.apache.sling/org.apache.sling.discovery.support/1.0.0

svn commit: r1720104 - /sling/trunk/launchpad/builder/src/main/provisioning/sling.txt

[jsedding]

Author: jsedding
Date: Tue Dec 15 09:49:59 2015
New Revision: 1720104

URL: http://svn.apache.org/viewvc?rev=1720104=rev
Log:
SLING-4981 - Deadlock involving Scheduler Whiteboard

Modified:
sling/trunk/launchpad/builder/src/main/provisioning/sling.txt

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=1720104=1720103=1720104=diff
==
--- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Tue Dec 15 
09:49:59 2015
@@ -41,7 +41,7 @@
 org.apache.sling/org.apache.sling.commons.mime/2.1.9-SNAPSHOT
 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.10
+org.apache.sling/org.apache.sling.commons.scheduler/2.4.12
 org.apache.sling/org.apache.sling.commons.threads/3.2.2
 org.apache.sling/org.apache.sling.commons.fsclassloader/1.0.2
 org.apache.sling/org.apache.sling.discovery.api/1.0.2

svn commit: r975559 - /websites/production/sling/content/

[jsedding]

Author: jsedding
Date: Mon Dec 14 21:44:33 2015
New Revision: 975559

Log:
Publishing svnmucc operation to sling site by jsedding

Added:
websites/production/sling/content/
  - copied from r975558, websites/staging/sling/trunk/content/

svn commit: r1719407 - /sling/trunk/bundles/commons/scheduler/pom.xml

[jsedding]

Author: jsedding
Date: Fri Dec 11 13:15:42 2015
New Revision: 1719407

URL: http://svn.apache.org/viewvc?rev=1719407=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
sling/trunk/bundles/commons/scheduler/pom.xml

Modified: sling/trunk/bundles/commons/scheduler/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/scheduler/pom.xml?rev=1719407=1719406=1719407=diff
==
--- sling/trunk/bundles/commons/scheduler/pom.xml (original)
+++ sling/trunk/bundles/commons/scheduler/pom.xml Fri Dec 11 13:15:42 2015
@@ -29,7 +29,7 @@
 
 org.apache.sling.commons.scheduler
 bundle
-2.4.12
+2.4.13-SNAPSHOT
 
 Apache Sling Scheduler Support
 
@@ -37,9 +37,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.scheduler-2.4.12
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.scheduler-2.4.12
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.commons.scheduler-2.4.12
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/commons/scheduler
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/scheduler
+
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/scheduler
 
 
 

svn commit: r1719405 - /sling/trunk/bundles/commons/scheduler/pom.xml

[jsedding]

Author: jsedding
Date: Fri Dec 11 13:15:26 2015
New Revision: 1719405

URL: http://svn.apache.org/viewvc?rev=1719405=rev
Log:
[maven-release-plugin] prepare release org.apache.sling.commons.scheduler-2.4.12

Modified:
sling/trunk/bundles/commons/scheduler/pom.xml

Modified: sling/trunk/bundles/commons/scheduler/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/scheduler/pom.xml?rev=1719405=1719404=1719405=diff
==
--- sling/trunk/bundles/commons/scheduler/pom.xml (original)
+++ sling/trunk/bundles/commons/scheduler/pom.xml Fri Dec 11 13:15:26 2015
@@ -29,7 +29,7 @@
 
 org.apache.sling.commons.scheduler
 bundle
-2.4.11-SNAPSHOT
+2.4.12
 
 Apache Sling Scheduler Support
 
@@ -37,9 +37,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/commons/scheduler
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/scheduler
-
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/scheduler
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.scheduler-2.4.12
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.scheduler-2.4.12
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.commons.scheduler-2.4.12
 
 
 

svn commit: r1719406 - /sling/tags/org.apache.sling.commons.scheduler-2.4.12/

[jsedding]

Author: jsedding
Date: Fri Dec 11 13:15:40 2015
New Revision: 1719406

URL: http://svn.apache.org/viewvc?rev=1719406=rev
Log:
[maven-release-plugin] copy for tag org.apache.sling.commons.scheduler-2.4.12

Added:
sling/tags/org.apache.sling.commons.scheduler-2.4.12/
  - copied from r1719405, sling/trunk/bundles/commons/scheduler/

svn commit: r1718272 - in /sling/trunk/bundles/commons/threads/src: main/java/org/apache/sling/commons/threads/impl/ExtendedThreadFactory.java test/java/org/apache/sling/commons/threads/impl/ExtendedT

[jsedding]

Author: jsedding
Date: Mon Dec  7 09:53:29 2015
New Revision: 1718272

URL: http://svn.apache.org/viewvc?rev=1718272=rev
Log:
SLING-5343 - Meaningful thread names

- change thread name format due to mailing list discussions

Modified:

sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/ExtendedThreadFactory.java

sling/trunk/bundles/commons/threads/src/test/java/org/apache/sling/commons/threads/impl/ExtendedThreadFactoryTest.java

Modified: 
sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/ExtendedThreadFactory.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/ExtendedThreadFactory.java?rev=1718272=1718271=1718272=diff
==
--- 
sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/ExtendedThreadFactory.java
 (original)
+++ 
sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/ExtendedThreadFactory.java
 Mon Dec  7 09:53:29 2015
@@ -16,6 +16,7 @@
  */
 package org.apache.sling.commons.threads.impl;
 
+import java.util.Locale;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -30,7 +31,7 @@ import org.apache.sling.commons.threads.
 public final class ExtendedThreadFactory implements ThreadFactory {
 
 /** Template for thread names, for use with String#format() */
-private static final String THREAD_NAME_TEMPLATE = "Sling - %s #%d";
+private static final String THREAD_NAME_TEMPLATE = "sling-%s-%d";
 
 /** The real factory. */
 private final ThreadFactory factory;
@@ -59,12 +60,17 @@ public final class ExtendedThreadFactory
  final ThreadPoolConfig.ThreadPriority 
priority,
  final boolean isDaemon) {
 this.factory = factory;
-this.name = stripPrefixes(name, "Apache Sling ", "Sling ");
+this.name = normalizeName(name);
 this.priority = convertPriority(priority);
 this.isDaemon = isDaemon;
 this.threadCounter = new AtomicInteger(1);
 }
 
+private String normalizeName(final String name) {
+final String n = name.toLowerCase(Locale.ENGLISH).replaceAll("\\s+", 
"-");
+return stripPrefixes(n, "apache-sling-", "sling-");
+}
+
 private int convertPriority(final ThreadPoolConfig.ThreadPriority 
priority) {
 if (priority == null) {
 throw new IllegalStateException("Prioriy must not be null.");

Modified: 
sling/trunk/bundles/commons/threads/src/test/java/org/apache/sling/commons/threads/impl/ExtendedThreadFactoryTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/threads/src/test/java/org/apache/sling/commons/threads/impl/ExtendedThreadFactoryTest.java?rev=1718272=1718271=1718272=diff
==
--- 
sling/trunk/bundles/commons/threads/src/test/java/org/apache/sling/commons/threads/impl/ExtendedThreadFactoryTest.java
 (original)
+++ 
sling/trunk/bundles/commons/threads/src/test/java/org/apache/sling/commons/threads/impl/ExtendedThreadFactoryTest.java
 Mon Dec  7 09:53:29 2015
@@ -33,20 +33,20 @@ public class ExtendedThreadFactoryTest {
 @Test
 public void informativeThreadNames() {
 final ExtendedThreadFactory tf = factory("Test Pool");
-assertEquals("Thread name", "Sling - Test Pool #1", 
tf.newThread(null).getName());
-assertEquals("Thread name", "Sling - Test Pool #2", 
tf.newThread(null).getName());
+assertEquals("Thread name", "sling-test-pool-1", 
tf.newThread(null).getName());
+assertEquals("Thread name", "sling-test-pool-2", 
tf.newThread(null).getName());
 }
 
 @Test
 public void shouldStripSlingPrefixFromThreadNames() {
 final Thread thread = thread("Sling Test Pool");
-assertEquals("Thread name", "Sling - Test Pool #1", thread.getName());
+assertEquals("Thread name", "sling-test-pool-1", thread.getName());
 }
 
 @Test
 public void shouldStripApacheSlingPrefixFromThreadNames() {
 final Thread thread = thread("Apache Sling Test Pool");
-assertEquals("Thread name", "Sling - Test Pool #1", thread.getName());
+assertEquals("Thread name", "sling-test-pool-1", thread.getName());
 }
 
 @Test

svn commit: r1718260 - /sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebDavDoubleSlashTest.java

[jsedding]

Author: jsedding
Date: Mon Dec  7 08:21:38 2015
New Revision: 1718260

URL: http://svn.apache.org/viewvc?rev=1718260=rev
Log:
SLING-5353 - Test failures of WebDavDoubleSlashTest.testEmptyWorkspace

Modified:

sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebDavDoubleSlashTest.java

Modified: 
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebDavDoubleSlashTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebDavDoubleSlashTest.java?rev=1718260=1718259=1718260=diff
==
--- 
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebDavDoubleSlashTest.java
 (original)
+++ 
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebDavDoubleSlashTest.java
 Mon Dec  7 08:21:38 2015
@@ -22,10 +22,12 @@ import java.io.IOException;
 import java.util.UUID;
 
 import org.apache.commons.httpclient.HttpException;
+import org.apache.commons.httpclient.HttpMethod;
 import org.apache.sling.commons.testing.integration.HttpAnyMethod;
 import org.apache.sling.commons.testing.integration.HttpTest;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 import org.junit.After;
 import org.junit.Before;
@@ -51,23 +53,35 @@ public class WebDavDoubleSlashTest {
 }
 
 /** Do a PROPFIND on /dav, adding worskpace name after that as required by 
the Jackrabbit WebDAV modules */
-private int getPropfindStatus(String workspaceName, String nodePath) 
throws HttpException, IOException {
+private void assertPropfindStatus(final int expecetdStatus, final String 
workspace, final String path) throws IOException {
 final String webdavRoot = "/dav";
-final String url = HttpTest.HTTP_BASE_URL + webdavRoot + "/" + 
workspaceName + nodePath;
-final HttpAnyMethod propfind = new HttpAnyMethod("PROPFIND",url);
-return H.getHttpClient().executeMethod(propfind);
+final String url = HttpTest.HTTP_BASE_URL + webdavRoot + "/" + 
workspace + path;
+final HttpAnyMethod propfind = new HttpAnyMethod("PROPFIND", url);
+final int status = H.getHttpClient().executeMethod(propfind);
+
+if (expecetdStatus != status) {
+// print the response body in case of a test failure to help 
debugging
+fail(
+"Status code " + expecetdStatus + " expected, got " + 
status + ".\n" +
+"Response body:\n" +
+propfind.getResponseBodyAsString()
+);
+} else {
+// never fails, but there will be no assertion otherwise
+assertEquals("Status code", expecetdStatus, status);
+}
 }
-
+
 @Test
 public void testDefaultWorkspace() throws HttpException, IOException {
-assertEquals(207, getPropfindStatus("default", testPath));
+assertPropfindStatus(207, "default", testPath);
 }
-
+
 @Test
 public void testEmptyWorkspace() throws HttpException, IOException {
 // An empty JCR workspace name results in a URL like "/dav//test/..."
 // which correctly returns 404 now, but used to work as the WebDAV
 // servlets used the default workspace name in that case.
-assertEquals(404, getPropfindStatus("", testPath));
+assertPropfindStatus(404, "", testPath);
 }
 }

svn commit: r1718266 - /sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPoolManager.java

[jsedding]

Author: jsedding
Date: Mon Dec  7 09:40:26 2015
New Revision: 1718266

URL: http://svn.apache.org/viewvc?rev=1718266=rev
Log:
SLING-5354 - Thread Pool max-thread-age config not taken into account

Modified:

sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPoolManager.java

Modified: 
sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPoolManager.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPoolManager.java?rev=1718266=1718265=1718266=diff
==
--- 
sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPoolManager.java
 (original)
+++ 
sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPoolManager.java
 Mon Dec  7 09:40:26 2015
@@ -98,6 +98,9 @@ public class DefaultThreadPoolManager
 if ( props.get(ModifiableThreadPoolConfig.PROPERTY_QUEUE_SIZE) != null 
) {
 
config.setQueueSize((Integer)props.get(ModifiableThreadPoolConfig.PROPERTY_QUEUE_SIZE));
 }
+if ( props.get(ModifiableThreadPoolConfig.PROPERTY_MAX_THREAD_AGE) != 
null ) {
+
config.setQueueSize((Integer)props.get(ModifiableThreadPoolConfig.PROPERTY_MAX_THREAD_AGE));
+}
 if ( props.get(ModifiableThreadPoolConfig.PROPERTY_KEEP_ALIVE_TIME) != 
null ) {
 
config.setKeepAliveTime((Long)props.get(ModifiableThreadPoolConfig.PROPERTY_KEEP_ALIVE_TIME));
 }

svn commit: r1718289 - /sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPoolManager.java

[jsedding]

Author: jsedding
Date: Mon Dec  7 10:13:26 2015
New Revision: 1718289

URL: http://svn.apache.org/viewvc?rev=1718289=rev
Log:
SLING-5354 - Thread Pool max-thread-age config not taken into account

Modified:

sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPoolManager.java

Modified: 
sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPoolManager.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPoolManager.java?rev=1718289=1718288=1718289=diff
==
--- 
sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPoolManager.java
 (original)
+++ 
sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPoolManager.java
 Mon Dec  7 10:13:26 2015
@@ -99,7 +99,7 @@ public class DefaultThreadPoolManager
 
config.setQueueSize((Integer)props.get(ModifiableThreadPoolConfig.PROPERTY_QUEUE_SIZE));
 }
 if ( props.get(ModifiableThreadPoolConfig.PROPERTY_MAX_THREAD_AGE) != 
null ) {
-
config.setQueueSize((Integer)props.get(ModifiableThreadPoolConfig.PROPERTY_MAX_THREAD_AGE));
+config.setMaxThreadAge((Long) 
props.get(ModifiableThreadPoolConfig.PROPERTY_MAX_THREAD_AGE));
 }
 if ( props.get(ModifiableThreadPoolConfig.PROPERTY_KEEP_ALIVE_TIME) != 
null ) {
 
config.setKeepAliveTime((Long)props.get(ModifiableThreadPoolConfig.PROPERTY_KEEP_ALIVE_TIME));

svn commit: r1717625 - /sling/site/trunk/update-obr.sh

[jsedding]

Author: jsedding
Date: Wed Dec  2 13:25:29 2015
New Revision: 1717625

URL: http://svn.apache.org/viewvc?rev=1717625=rev
Log:
add simple update-obr.sh script (tested on mac only)

Added:
sling/site/trunk/update-obr.sh

Added: sling/site/trunk/update-obr.sh
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/update-obr.sh?rev=1717625=auto
==
--- sling/site/trunk/update-obr.sh (added)
+++ sling/site/trunk/update-obr.sh Wed Dec  2 13:25:29 2015
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+# Note: so far this is only tested on Mac OSX. Please remove this comment
+#   if it works on Linux, or fix if it doesn't.
+
+if [ "$2" == "" ]; then
+echo "Usage: sh $0  "
+echo "   e.g. sh $0 org.apache.sling.commons.threads 3.2.2"
+exit 1
+fi
+
+MODULE=$1
+VERSION=$2
+
+TMP_DIR=tmp-update-obr/$MODULE-$VERSION
+
+URL_PREFIX=https://repo1.maven.org/maven2/org/apache/sling/$MODULE/$VERSION
+JAR_NAME=$MODULE-$VERSION.jar
+POM_NAME=$MODULE-$VERSION.pom
+
+SITE_DIR=$(pwd)
+
+function download {
+FILE=$1
+curl -fO $URL_PREFIX/$FILE 2> /dev/null
+if [ "$?" != "0" ]; then
+echo Failed to download artifact $URL_PREFIX/$FILE
+echo Please verify that the desired artifact is available. 
+exit 1;
+fi
+}
+
+mkdir -p $TMP_DIR
+
+(
+cd $TMP_DIR   
+
+download $POM_NAME
+download $JAR_NAME
+
+mvn org.apache.felix:maven-bundle-plugin:deploy-file \
+-Dfile=$JAR_NAME -DpomFile=$POM_NAME \
+
-DbundleUrl=http://repo1.maven.org/maven2/org/apache/sling/$MODULE/$VERSION/$JAR_NAME
 \
+-Durl=file:///$SITE_DIR/content/obr \
+-DprefixUrl=http://repo1.maven.org/maven2 \
+-DremoteOBR=sling.xml
+)
+
+rm -rf tmp-update-obr/
+echo OBR updated successfully. Please review the changes and commit.
+

svn commit: r1717440 - /sling/trunk/bundles/commons/threads/src/test/java/org/apache/sling/commons/threads/impl/ExtendedThreadFactoryTest.java

[jsedding]

Author: jsedding
Date: Tue Dec  1 14:38:54 2015
New Revision: 1717440

URL: http://svn.apache.org/viewvc?rev=1717440=rev
Log:
SLING-5343 - Meaningful thread names

- additional tests for ExtendedThreadFactory

Modified:

sling/trunk/bundles/commons/threads/src/test/java/org/apache/sling/commons/threads/impl/ExtendedThreadFactoryTest.java

Modified: 
sling/trunk/bundles/commons/threads/src/test/java/org/apache/sling/commons/threads/impl/ExtendedThreadFactoryTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/threads/src/test/java/org/apache/sling/commons/threads/impl/ExtendedThreadFactoryTest.java?rev=1717440=1717439=1717440=diff
==
--- 
sling/trunk/bundles/commons/threads/src/test/java/org/apache/sling/commons/threads/impl/ExtendedThreadFactoryTest.java
 (original)
+++ 
sling/trunk/bundles/commons/threads/src/test/java/org/apache/sling/commons/threads/impl/ExtendedThreadFactoryTest.java
 Tue Dec  1 14:38:54 2015
@@ -2,46 +2,67 @@ package org.apache.sling.commons.threads
 
 import org.apache.sling.commons.threads.ThreadPoolConfig;
 import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.concurrent.Executors;
 
+import static 
org.apache.sling.commons.threads.ThreadPoolConfig.ThreadPriority.MAX;
+import static 
org.apache.sling.commons.threads.ThreadPoolConfig.ThreadPriority.MIN;
+import static 
org.apache.sling.commons.threads.ThreadPoolConfig.ThreadPriority.NORM;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 public class ExtendedThreadFactoryTest {
 
-private static final Logger LOG = 
LoggerFactory.getLogger(ExtendedThreadFactoryTest.class);
-
 @Test
 public void informativeThreadNames() {
-final ExtendedThreadFactory tf = createExtendedThreadFactory("Test 
Pool");
+final ExtendedThreadFactory tf = factory("Test Pool");
 assertEquals("Thread name", "Sling - Test Pool #1", 
tf.newThread(null).getName());
 assertEquals("Thread name", "Sling - Test Pool #2", 
tf.newThread(null).getName());
 }
 
 @Test
 public void shouldStripSlingPrefixFromThreadNames() {
-final Thread thread = getFirstThreadFromNamedPool("Sling Test Pool");
+final Thread thread = thread("Sling Test Pool");
 assertEquals("Thread name", "Sling - Test Pool #1", thread.getName());
 }
 
 @Test
 public void shouldStripApacheSlingPrefixFromThreadNames() {
-final Thread thread = getFirstThreadFromNamedPool("Apache Sling Test 
Pool");
+final Thread thread = thread("Apache Sling Test Pool");
 assertEquals("Thread name", "Sling - Test Pool #1", thread.getName());
 }
 
-private Thread getFirstThreadFromNamedPool(final String poolName) {
-return createExtendedThreadFactory(poolName).newThread(null);
+@Test
+public void shouldSetCorrectPriority() {
+assertEquals("Thread min priority", Thread.MIN_PRIORITY, 
thread("Pool", MIN, false).getPriority());
+assertEquals("Thread normnal priority", Thread.NORM_PRIORITY, 
thread("Pool", NORM, false).getPriority());
+assertEquals("Thread max priority", Thread.MAX_PRIORITY, 
thread("Pool", MAX, false).getPriority());
+}
+
+@Test
+public void shouldSetDaemonStatusCorrectly() {
+assertFalse("Non-daemon thread", thread("Pool", NORM, 
false).isDaemon());
+assertTrue("Daemon thread", thread("Pool", NORM, true).isDaemon());
+}
+
+private Thread thread(final String poolName) {
+return factory(poolName).newThread(null);
+}
+
+private Thread thread(final String poolName,
+  final ThreadPoolConfig.ThreadPriority priority,
+  final boolean isDaemon) {
+return factory(poolName, priority, isDaemon).newThread(null);
+}
+
+private ExtendedThreadFactory factory(final String poolName) {
+return factory(poolName, NORM, false);
 }
 
-private ExtendedThreadFactory createExtendedThreadFactory(final String 
poolName) {
-return new ExtendedThreadFactory(
-Executors.defaultThreadFactory(),
-poolName,
-ThreadPoolConfig.ThreadPriority.NORM,
-false
-);
+private ExtendedThreadFactory factory(final String poolName,
+  final 
ThreadPoolConfig.ThreadPriority priority,
+  final boolean isDaemon) {
+return new ExtendedThreadFactory(Executors.defaultThreadFactory(), 
poolName, priority, isDaemon);
 }
 }

svn commit: r1717441 - /sling/trunk/bundles/commons/threads/src/test/java/org/apache/sling/commons/threads/impl/ExtendedThreadFactoryTest.java

[jsedding]

Author: jsedding
Date: Tue Dec  1 14:55:29 2015
New Revision: 1717441

URL: http://svn.apache.org/viewvc?rev=1717441=rev
Log:
SLING-5343 - Meaningful thread names

- add missing license header

Modified:

sling/trunk/bundles/commons/threads/src/test/java/org/apache/sling/commons/threads/impl/ExtendedThreadFactoryTest.java

Modified: 
sling/trunk/bundles/commons/threads/src/test/java/org/apache/sling/commons/threads/impl/ExtendedThreadFactoryTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/threads/src/test/java/org/apache/sling/commons/threads/impl/ExtendedThreadFactoryTest.java?rev=1717441=1717440=1717441=diff
==
--- 
sling/trunk/bundles/commons/threads/src/test/java/org/apache/sling/commons/threads/impl/ExtendedThreadFactoryTest.java
 (original)
+++ 
sling/trunk/bundles/commons/threads/src/test/java/org/apache/sling/commons/threads/impl/ExtendedThreadFactoryTest.java
 Tue Dec  1 14:55:29 2015
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
 package org.apache.sling.commons.threads.impl;
 
 import org.apache.sling.commons.threads.ThreadPoolConfig;

svn commit: r1717197 - in /sling/site/trunk/content: downloads.list news.mdtext

[jsedding]

Author: jsedding
Date: Mon Nov 30 08:23:57 2015
New Revision: 1717197

URL: http://svn.apache.org/viewvc?rev=1717197=rev
Log:
Release Apache Sling Thread Support 3.2.2

Modified:
sling/site/trunk/content/downloads.list
sling/site/trunk/content/news.mdtext

Modified: sling/site/trunk/content/downloads.list
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1717197=1717196=1717197=diff
==
--- sling/site/trunk/content/downloads.list (original)
+++ sling/site/trunk/content/downloads.list Mon Nov 30 08:23:57 2015
@@ -51,7 +51,7 @@ Commons FileSystem ClassLoader|org.apach
 Commons OSGi|org.apache.sling.commons.osgi|2.3.0
 Commons Scheduler|org.apache.sling.commons.scheduler|2.4.10
 Commons Testing|org.apache.sling.commons.testing|2.0.22
-Commons Threads|org.apache.sling.commons.threads|3.2.0
+Commons Threads|org.apache.sling.commons.threads|3.2.2
 DataSource Provider|org.apache.sling.datasource|1.0.0
 Discovery API|org.apache.sling.discovery.api|1.0.2
 Discovery Impl|org.apache.sling.discovery.impl|1.2.2

Modified: sling/site/trunk/content/news.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1717197=1717196=1717197=diff
==
--- sling/site/trunk/content/news.mdtext (original)
+++ sling/site/trunk/content/news.mdtext Mon Nov 30 08:23:57 2015
@@ -1,5 +1,6 @@
 Title: News
 
+* New Releases: Apache Sling Thread Support 3.2.2 (November 29th, 2015)
 * New Releases: Apache Sling Background Servlets Engine 1.0.2, Apache Sling 
JUnit Core 1.0.14, Apache Sling JUnit Tests Teleporter 1.0.4 (November 23rd, 
2015)
 * New Release: Apache Sling Security 1.0.18 (November 20th, 2015)
 * New Releases: Apache Sling Discovery Commons 1.0.4, Apache Sling Discovery 
Base 1.1.0, Apache Sling Discovery Oak 1.1.0, Apache Sling Discovery Impl 1.2.2 
(November 16th, 2015)

svn commit: r974005 - /websites/production/sling/content/

[jsedding]

Author: jsedding
Date: Mon Nov 30 09:15:28 2015
New Revision: 974005

Log:
Update OBR

Added:
websites/production/sling/content/
  - copied from r974004, websites/staging/sling/trunk/content/

svn commit: r1717201 [1/2] - /sling/site/trunk/content/obr/sling.xml

[jsedding]

Author: jsedding
Date: Mon Nov 30 08:50:33 2015
New Revision: 1717201

URL: http://svn.apache.org/viewvc?rev=1717201=rev
Log:
Update OBR after recent releases

Modified:
sling/site/trunk/content/obr/sling.xml

svn commit: r1717073 - /sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/indexing/FullTextIndexingTest.java

[jsedding]

Author: jsedding
Date: Sun Nov 29 15:15:45 2015
New Revision: 1717073

URL: http://svn.apache.org/viewvc?rev=1717073=rev
Log:
FullTextIndexingTest - assert successful upload

Modified:

sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/indexing/FullTextIndexingTest.java

Modified: 
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/indexing/FullTextIndexingTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/indexing/FullTextIndexingTest.java?rev=1717073=1717072=1717073=diff
==
--- 
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/indexing/FullTextIndexingTest.java
 (original)
+++ 
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/indexing/FullTextIndexingTest.java
 Sun Nov 29 15:15:45 2015
@@ -18,6 +18,7 @@
  */
 package org.apache.sling.launchpad.webapp.integrationtest.indexing;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
 import java.io.InputStream;
@@ -109,7 +110,8 @@ public class FullTextIndexingTest {
 throw new IllegalArgumentException("No resource to upload found at 
" + localPath);
 
 H.getTestClient().mkdirs(HttpTest.WEBDAV_BASE_URL, uploadPath);
-H.getTestClient().upload(HttpTest.WEBDAV_BASE_URL + uploadPath + "/" + 
fileName, resourceToUpload);
+final int status = H.getTestClient().upload(HttpTest.WEBDAV_BASE_URL + 
uploadPath + "/" + fileName, resourceToUpload);
+assertEquals("Upload status code", 201, status);
 
 // Increased the timeout to 45 seconds to avoid failures with Oak - 
indexes not ready??
 new RetryLoop(c, 45, 50);