Nexus: Promotion Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Maven/3.3.9 (Java 1.8.0_121; Windows 10 10.0)""userId" = "sseifert""ip" = "79.238.172.48"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/sling/org.apache.sling.caconfig.spi/1.3.0/org.apache.sling.caconfig.spi-1.3.0-sources.jar(SHA1: ef1e5164867f81e81af2e287f10dbe5c4efdb05a)/org/apache/sling/org.apache.sling.caconfig.spi/1.3.0/org.apache.sling.caconfig.spi-1.3.0-javadoc.jar(SHA1: 5385eebfa04aba50c8de30da507495f291e27607)/org/apache/sling/org.apache.sling.caconfig.spi/1.3.0/org.apache.sling.caconfig.spi-1.3.0-source-release.zip.asc(SHA1: a39a6ec7341c1e04c445efdde4af3e9c1e9d22c3)/org/apache/sling/org.apache.sling.caconfig.spi/1.3.0/org.apache.sling.caconfig.spi-1.3.0.pom.asc(SHA1: 572a77c2a4c7568201b61a49296bfc4ad6be092f)/org/apache/sling/org.apache.sling.caconfig.spi/1.3.0/org.apache.sling.caconfig.spi-1.3.0.jar.asc(SHA1: f51e2cb9b1ed2ab74b21f4dd60b291d15c802261)/org/apache/sling/org.apache.sling.caconfig.spi/1.3.0/org.apache.sling.caconfig.spi-1.3.0-javadoc.jar.asc(SHA1: e8adc7acb41ef5329a2f6f729f968a55c5a092dd)/org/apache/sling/org.apache.sling.caconfig.spi/1.3.0/org.apache.sling.caconfig.spi-1.3.0-source-release.zip(SHA1: 12e6ee0c7e613fabe951157138956ed8a8e64deb)/org/apache/sling/org.apache.sling.caconfig.spi/1.3.0/org.apache.sling.caconfig.spi-1.3.0-sources.jar.asc(SHA1: 6f362816502bd40708260a0f2adf09aff40f57f4)/org/apache/sling/org.apache.sling.caconfig.spi/1.3.0/org.apache.sling.caconfig.spi-1.3.0.jar(SHA1: 1bb18fe1826388b41c43ec7232a6bb7306681304)/org/apache/sling/org.apache.sling.caconfig.spi/1.3.0/org.apache.sling.caconfig.spi-1.3.0.pom(SHA1: 8eb054064da3c362b6cc1ccc66e35d2e0426e200)/org/apache/sling/org.apache.sling.caconfig.impl/1.3.0/org.apache.sling.caconfig.impl-1.3.0.pom.asc(SHA1: 563a46da23569f4ee1486caf25770552652f11ec)/org/apache/sling/org.apache.sling.caconfig.impl/1.3.0/org.apache.sling.caconfig.impl-1.3.0-sources.jar(SHA1: cd4b7d06c55064d71d3dcd84d4698fed7db1dfeb)/org/apache/sling/org.apache.sling.caconfig.impl/1.3.0/org.apache.sling.caconfig.impl-1.3.0-javadoc.jar(SHA1: 4241cd01d22321fa2a2bfe3ae0186776309d0445)/org/apache/sling/org.apache.sling.caconfig.impl/1.3.0/org.apache.sling.caconfig.impl-1.3.0.pom(SHA1: 82cf035fd3c6fcb95280f5ae0b3ecc76ee4a150e)/org/apache/sling/org.apache.sling.caconfig.impl/1.3.0/org.apache.sling.caconfig.impl-1.3.0.jar.asc(SHA1: 5e0025e9326854f660b63e65a46802d933697bec)/org/apache/sling/org.apache.sling.caconfig.impl/1.3.0/org.apache.sling.caconfig.impl-1.3.0.jar(SHA1: dd4b9ef103b62ede7b67ac9b68e06970d20c22ad)/org/apache/sling/org.apache.sling.caconfig.impl/1.3.0/org.apache.sling.caconfig.impl-1.3.0-source-release.zip(SHA1: cde03b559834399c5112046f8e7f545871ecfab2)/org/apache/sling/org.apache.sling.caconfig.impl/1.3.0/org.apache.sling.caconfig.impl-1.3.0-javadoc.jar.asc(SHA1: 68c1b525ce978fad25acdfb60ac5e790f15e4624)/org/apache/sling/org.apache.sling.caconfig.impl/1.3.0/org.apache.sling.caconfig.impl-1.3.0-source-release.zip.asc(SHA1: 60e138ed2940ae831dd38342126f189ac230f449)/org/apache/sling/org.apache.sling.caconfig.impl/1.3.0/org.apache.sling.caconfig.impl-1.3.0-sources.jar.asc(SHA1: 9a17088d672516f832196663df7734ba1f5d1c95)/org/apache/sling/org.apache.sling.testing.caconfig-mock-plugin/1.1.0/org.apache.sling.testing.caconfig-mock-plugin-1.1.0.pom(SHA1: 6bf20110dd8abf8e4c276102604f17995a082981)/org/apache/sling/org.apache.sling.testing.caconfig-mock-plugin/1.1.0/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-source-release.zip(SHA1: 7d0a8fd8121045d67a0e6f395e10610ac4d5e3a8)/org/apache/sling/org.apache.sling.testing.caconfig-mock-plugin/1.1.0/org.apache.sling.testing.caconfig-mock-plugin-1.1.0.pom.asc(SHA1: a653bcd7b2a99584190b2f0192af6e0875dd5524)/org/apache/sling/org.apache.sling.testing.caconfig-mock-plugin/1.1.0/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-javadoc.jar.asc(SHA1: 301ca269b5206935fcc0c26a58ee9c5b67391b6a)/org/apache/sling/org.apache.sling.testing.caconfig-mock-plugin/1.1.0/org.apache.sling.testing.caconfig-mock-plugin-1.1.0.jar.asc(SHA1: 24fd28025e33af11b194ea6dd33819e600625dee)/org/apache/sling/org.apache.sling.testing.caconfig-mock-plugin/1.1.0/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-javadoc.jar(SHA1: 0578c798cd19cbf96fc14b5eef50220ad887f300)/org/apache/sling/org.apache.sling.testing.caconfig-mock-plugin/1.1.0/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-sources.jar.asc(SHA1: c7bba69b250a8b12cef96fbaf3314d1339a55e4e)/org/apache/sling/org.apache.sling.testing.caconfig-mock-plugin/1.1.0/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-source-release.zip.asc(SHA1: c9b255ba51c316af04e8943f50a822264e581e0d)/org/apache/sling/org.apache.sling.testing.caconfig-mock-plugin/1.1.0/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-sources.jar(SHA1: 

svn commit: r1008895 - in /websites/staging/sling/trunk/content: ./ downloads.html news.html

[buildbot]

Author: buildbot
Date: Fri Mar 24 07:54:37 2017
New Revision: 1008895

Log:
Staging update by buildbot for sling

Modified:
websites/staging/sling/trunk/content/   (props changed)
websites/staging/sling/trunk/content/downloads.html
websites/staging/sling/trunk/content/news.html

Propchange: websites/staging/sling/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Fri Mar 24 07:54:37 2017
@@ -1 +1 @@
-1788237
+1788371

Modified: websites/staging/sling/trunk/content/downloads.html
==
--- websites/staging/sling/trunk/content/downloads.html (original)
+++ websites/staging/sling/trunk/content/downloads.html Fri Mar 24 07:54:37 2017
@@ -477,21 +477,21 @@ h2:hover > .headerlink, h3:hover > .head
 
 
 Context-Aware Configuration Impl
-1.2.0
-Bundle 
(http://www.apache.org/dist/sling/org.apache.sling.caconfig.impl-1.2.0.jar.asc;>asc,
 http://www.apache.org/dist/sling/org.apache.sling.caconfig.impl-1.2.0.jar.md5;>md5)
-Source
 ZIP (http://www.apache.org/dist/sling/org.apache.sling.caconfig.impl-1.2.0-source-release.zip.asc;>asc,
 http://www.apache.org/dist/sling/org.apache.sling.caconfig.impl-1.2.0-source-release.zip.md5;>md5)
+1.3.0
+Bundle 
(http://www.apache.org/dist/sling/org.apache.sling.caconfig.impl-1.3.0.jar.asc;>asc,
 http://www.apache.org/dist/sling/org.apache.sling.caconfig.impl-1.3.0.jar.md5;>md5)
+Source
 ZIP (http://www.apache.org/dist/sling/org.apache.sling.caconfig.impl-1.3.0-source-release.zip.asc;>asc,
 http://www.apache.org/dist/sling/org.apache.sling.caconfig.impl-1.3.0-source-release.zip.md5;>md5)
 
 
 Context-Aware Configuration Mock Plugin
-1.0.0
-Bundle
 (http://www.apache.org/dist/sling/org.apache.sling.testing.caconfig-mock-plugin-1.0.0.jar.asc;>asc,
 http://www.apache.org/dist/sling/org.apache.sling.testing.caconfig-mock-plugin-1.0.0.jar.md5;>md5)
-Source
 ZIP (http://www.apache.org/dist/sling/org.apache.sling.testing.caconfig-mock-plugin-1.0.0-source-release.zip.asc;>asc,
 http://www.apache.org/dist/sling/org.apache.sling.testing.caconfig-mock-plugin-1.0.0-source-release.zip.md5;>md5)
+1.1.0
+Bundle
 (http://www.apache.org/dist/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0.jar.asc;>asc,
 http://www.apache.org/dist/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0.jar.md5;>md5)
+Source
 ZIP (http://www.apache.org/dist/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-source-release.zip.asc;>asc,
 http://www.apache.org/dist/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-source-release.zip.md5;>md5)
 
 
 Context-Aware Configuration SPI
-1.2.0
-Bundle (http://www.apache.org/dist/sling/org.apache.sling.caconfig.spi-1.2.0.jar.asc;>asc,
 http://www.apache.org/dist/sling/org.apache.sling.caconfig.spi-1.2.0.jar.md5;>md5)
-Source
 ZIP (http://www.apache.org/dist/sling/org.apache.sling.caconfig.spi-1.2.0-source-release.zip.asc;>asc,
 http://www.apache.org/dist/sling/org.apache.sling.caconfig.spi-1.2.0-source-release.zip.md5;>md5)
+1.3.0
+Bundle (http://www.apache.org/dist/sling/org.apache.sling.caconfig.spi-1.3.0.jar.asc;>asc,
 http://www.apache.org/dist/sling/org.apache.sling.caconfig.spi-1.3.0.jar.md5;>md5)
+Source
 ZIP (http://www.apache.org/dist/sling/org.apache.sling.caconfig.spi-1.3.0-source-release.zip.asc;>asc,
 http://www.apache.org/dist/sling/org.apache.sling.caconfig.spi-1.3.0-source-release.zip.md5;>md5)
 
 
 Context-Aware Configuration bnd Plugin
@@ -1489,7 +1489,7 @@ h2:hover > .headerlink, h3:hover > .head
 
 
   
-Rev. 1788237 by sseifert on Thu, 23 Mar 2017 13:09:07 +
+Rev. 1788371 by sseifert on Fri, 24 Mar 2017 07:54:15 +
   

 Apache Sling, Sling, Apache, the Apache feather logo, and the Apache 
Sling project

Modified: websites/staging/sling/trunk/content/news.html
==
--- websites/staging/sling/trunk/content/news.html (original)
+++ websites/staging/sling/trunk/content/news.html Fri Mar 24 07:54:37 2017
@@ -115,6 +115,7 @@ h2:hover > .headerlink, h3:hover > .head
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, 
h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, 
dt:hover > .elementid-permalink { visibility: visible }
 
+New Releases: Apache Sling CAConfig SPI 1.3.0, CAConfig Impl 1.3.0, 
CAConfig Mock Plugin 1.1.0 (March 24th, 2017)
 New Releases: Apache Sling JCR Content Parser 1.0.0, Testing OSGi Mock 
2.2.4, Testing OSGi Mock 1.9.4 (March 23th, 2017)
 New Releases: Apache Sling Commons JSON 2.0.20, Apache Sling Karaf 
repoinit 0.2.0, Apache Sling Scripting JSP API Wrapper 1.0.0, Apache Sling 
Scripting JSP EL Wrapper 1.0.0, Apache Sling Scripting JSP 2.3.0, Apache Sling 
Testing PaxExam 0.0.4, Apache Sling JCR Oak Server 1.1.4, Apache Sling 
Scripting Thymeleaf 1.1.0, Apache Sling 

svn commit: r18890 - /release/sling/

[sseifert]

Author: sseifert
Date: Fri Mar 24 07:52:02 2017
New Revision: 18890

Log:
Apache Sling CAConfig SPI 1.3.0, CAConfig Impl 1.3.0, CAConfig Mock Plugin 1.1.0

Added:
release/sling/org.apache.sling.caconfig.impl-1.3.0-javadoc.jar   (with 
props)
release/sling/org.apache.sling.caconfig.impl-1.3.0-javadoc.jar.asc
release/sling/org.apache.sling.caconfig.impl-1.3.0-javadoc.jar.md5
release/sling/org.apache.sling.caconfig.impl-1.3.0-javadoc.jar.sha1
release/sling/org.apache.sling.caconfig.impl-1.3.0-source-release.zip   
(with props)
release/sling/org.apache.sling.caconfig.impl-1.3.0-source-release.zip.asc
release/sling/org.apache.sling.caconfig.impl-1.3.0-source-release.zip.md5
release/sling/org.apache.sling.caconfig.impl-1.3.0-source-release.zip.sha1
release/sling/org.apache.sling.caconfig.impl-1.3.0-sources.jar   (with 
props)
release/sling/org.apache.sling.caconfig.impl-1.3.0-sources.jar.asc
release/sling/org.apache.sling.caconfig.impl-1.3.0-sources.jar.md5
release/sling/org.apache.sling.caconfig.impl-1.3.0-sources.jar.sha1
release/sling/org.apache.sling.caconfig.impl-1.3.0.jar   (with props)
release/sling/org.apache.sling.caconfig.impl-1.3.0.jar.asc
release/sling/org.apache.sling.caconfig.impl-1.3.0.jar.md5
release/sling/org.apache.sling.caconfig.impl-1.3.0.jar.sha1
release/sling/org.apache.sling.caconfig.impl-1.3.0.pom
release/sling/org.apache.sling.caconfig.impl-1.3.0.pom.asc
release/sling/org.apache.sling.caconfig.impl-1.3.0.pom.md5
release/sling/org.apache.sling.caconfig.impl-1.3.0.pom.sha1
release/sling/org.apache.sling.caconfig.spi-1.3.0-javadoc.jar   (with props)
release/sling/org.apache.sling.caconfig.spi-1.3.0-javadoc.jar.asc
release/sling/org.apache.sling.caconfig.spi-1.3.0-javadoc.jar.md5
release/sling/org.apache.sling.caconfig.spi-1.3.0-javadoc.jar.sha1
release/sling/org.apache.sling.caconfig.spi-1.3.0-source-release.zip   
(with props)
release/sling/org.apache.sling.caconfig.spi-1.3.0-source-release.zip.asc
release/sling/org.apache.sling.caconfig.spi-1.3.0-source-release.zip.md5
release/sling/org.apache.sling.caconfig.spi-1.3.0-source-release.zip.sha1
release/sling/org.apache.sling.caconfig.spi-1.3.0-sources.jar   (with props)
release/sling/org.apache.sling.caconfig.spi-1.3.0-sources.jar.asc
release/sling/org.apache.sling.caconfig.spi-1.3.0-sources.jar.md5
release/sling/org.apache.sling.caconfig.spi-1.3.0-sources.jar.sha1
release/sling/org.apache.sling.caconfig.spi-1.3.0.jar   (with props)
release/sling/org.apache.sling.caconfig.spi-1.3.0.jar.asc
release/sling/org.apache.sling.caconfig.spi-1.3.0.jar.md5
release/sling/org.apache.sling.caconfig.spi-1.3.0.jar.sha1
release/sling/org.apache.sling.caconfig.spi-1.3.0.pom
release/sling/org.apache.sling.caconfig.spi-1.3.0.pom.asc
release/sling/org.apache.sling.caconfig.spi-1.3.0.pom.md5
release/sling/org.apache.sling.caconfig.spi-1.3.0.pom.sha1

release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-javadoc.jar   
(with props)

release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-javadoc.jar.asc

release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-javadoc.jar.md5

release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-javadoc.jar.sha1

release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-source-release.zip
   (with props)

release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-source-release.zip.asc

release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-source-release.zip.md5

release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-source-release.zip.sha1

release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-sources.jar   
(with props)

release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-sources.jar.asc

release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-sources.jar.md5

release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-sources.jar.sha1
release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0.jar   
(with props)
release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0.jar.asc
release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0.jar.md5
release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0.jar.sha1
release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0.pom
release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0.pom.asc
release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0.pom.md5
release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0.pom.sha1
Removed:
release/sling/org.apache.sling.caconfig.impl-1.2.0-javadoc.jar
release/sling/org.apache.sling.caconfig.impl-1.2.0-javadoc.jar.asc
release/sling/org.apache.sling.caconfig.impl-1.2.0-javadoc.jar.md5

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

[sseifert]

Author: sseifert
Date: Fri Mar 24 07:54:15 2017
New Revision: 1788371

URL: http://svn.apache.org/viewvc?rev=1788371=rev
Log:
Apache Sling CAConfig SPI 1.3.0, CAConfig Impl 1.3.0, CAConfig Mock Plugin 1.1.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=1788371=1788370=1788371=diff
==
--- sling/site/trunk/content/downloads.list (original)
+++ sling/site/trunk/content/downloads.list Fri Mar 24 07:54:15 2017
@@ -51,9 +51,9 @@ Commons Threads|org.apache.sling.commons
 Content Detection Support|org.apache.sling.commons.contentdetection|1.0.2
 Context-Aware Configuration API|org.apache.sling.caconfig.api|1.1.0
 Context-Aware Configuration bnd 
Plugin|org.apache.sling.caconfig.bnd-plugin|1.0.2
-Context-Aware Configuration Impl|org.apache.sling.caconfig.impl|1.2.0
-Context-Aware Configuration Mock 
Plugin|org.apache.sling.testing.caconfig-mock-plugin|1.0.0
-Context-Aware Configuration SPI|org.apache.sling.caconfig.spi|1.2.0
+Context-Aware Configuration Impl|org.apache.sling.caconfig.impl|1.3.0
+Context-Aware Configuration Mock 
Plugin|org.apache.sling.testing.caconfig-mock-plugin|1.1.0
+Context-Aware Configuration SPI|org.apache.sling.caconfig.spi|1.3.0
 Crankstart API|org.apache.sling.crankstart.api|1.0.0
 Crankstart API Fragment|org.apache.sling.crankstart.api.fragment|1.0.2
 Crankstart Core|org.apache.sling.crankstart.core|1.0.0

Modified: sling/site/trunk/content/news.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1788371=1788370=1788371=diff
==
--- sling/site/trunk/content/news.mdtext (original)
+++ sling/site/trunk/content/news.mdtext Fri Mar 24 07:54:15 2017
@@ -1,5 +1,6 @@
 Title: News
 
+* New Releases: Apache Sling CAConfig SPI 1.3.0, CAConfig Impl 1.3.0, CAConfig 
Mock Plugin 1.1.0 (March 24th, 2017)
 * New Releases: Apache Sling JCR Content Parser 1.0.0, Testing OSGi Mock 
2.2.4, Testing OSGi Mock 1.9.4 (March 23th, 2017)
 * New Releases: Apache Sling Commons JSON 2.0.20, Apache Sling Karaf repoinit 
0.2.0, Apache Sling Scripting JSP API Wrapper 1.0.0, Apache Sling Scripting JSP 
EL Wrapper 1.0.0, Apache Sling Scripting JSP 2.3.0, Apache Sling Testing 
PaxExam 0.0.4, Apache Sling JCR Oak Server 1.1.4, Apache Sling Scripting 
Thymeleaf 1.1.0, Apache Sling Resource Presence 0.0.2 (March 20th, 2017)
 * New Releases: Apache Sling Resource Resolver 1.5.20, Apache Sling JCR 
Repoinit 1.1.4 (March 13th, 2017)

Jenkins build is back to normal : sling-bundles-servlets-post-1.7 #9

[Apache Jenkins Server]

See 

svn commit: r1008899 - in /websites/production/sling/content: ./ components/

[kwin]

Author: kwin
Date: Fri Mar 24 10:01:58 2017
New Revision: 1008899

Log:
Publishing svnmucc operation to sling site by kwin

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

svn commit: r1788407 - in /sling/trunk/bundles/servlets/get: ./ src/main/java/org/apache/sling/servlets/get/impl/helpers/ src/main/java/org/apache/sling/servlets/get/impl/impl/info/

[cziegeler]

Author: cziegeler
Date: Fri Mar 24 11:06:49 2017
New Revision: 1788407

URL: http://svn.apache.org/viewvc?rev=1788407=rev
Log:
SLING-6705 : Make use of java.jcr api optional

Modified:
sling/trunk/bundles/servlets/get/pom.xml

sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/StreamRendererServlet.java

sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/XMLRendererServlet.java

sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/impl/info/SlingInfoServlet.java

Modified: sling/trunk/bundles/servlets/get/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/get/pom.xml?rev=1788407=1788406=1788407=diff
==
--- sling/trunk/bundles/servlets/get/pom.xml (original)
+++ sling/trunk/bundles/servlets/get/pom.xml Fri Mar 24 11:06:49 2017
@@ -53,6 +53,15 @@
 org.apache.felix
 maven-bundle-plugin
 true
+
+
+
+javax.jcr;resolution:=optional,
+javax.jcr.version;resolution:=optional,
+*
+
+
+
 
 
 org.apache.maven.plugins

Modified: 
sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/StreamRendererServlet.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/StreamRendererServlet.java?rev=1788407=1788406=1788407=diff
==
--- 
sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/StreamRendererServlet.java
 (original)
+++ 
sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/StreamRendererServlet.java
 Fri Mar 24 11:06:49 2017
@@ -31,9 +31,6 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.StringTokenizer;
 
-import javax.jcr.Node;
-import javax.jcr.PathNotFoundException;
-import javax.jcr.RepositoryException;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
@@ -50,6 +47,7 @@ import org.apache.sling.api.resource.Res
 import org.apache.sling.api.resource.ResourceNotFoundException;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.resource.ResourceUtil;
+import org.apache.sling.api.resource.ValueMap;
 import org.apache.sling.api.servlets.HttpConstants;
 import org.apache.sling.api.servlets.SlingSafeMethodsServlet;
 import org.slf4j.Logger;
@@ -82,8 +80,6 @@ public class StreamRendererServlet exten
 // Accept-Ranges header value
 private static final String ACCEPT_RANGES_BYTES = "bytes";
 
-
-
 /**
  * Full range marker.
  */
@@ -165,14 +161,9 @@ public class StreamRendererServlet exten
 
 // fall back to plain text rendering if the resource has no stream
 if (resource.getResourceType().equals(JcrConstants.NT_LINKEDFILE)) {
-try {
-String actualResourcePath = 
resource.adaptTo(Node.class).getProperty(JcrConstants.JCR_CONTENT).getNode().getPath();
-resource = 
request.getResourceResolver().getResource(actualResourcePath);
-} catch (PathNotFoundException e) {
-throw new ResourceNotFoundException("No data to render");
-} catch (RepositoryException e) {
-throw new IOException(e);
-}
+final ValueMap vm = resource.adaptTo(ValueMap.class);
+final String actualResourcePath = vm.get(JcrConstants.JCR_CONTENT, 
String.class);
+resource = 
request.getResourceResolver().getResource(actualResourcePath);
 }
 InputStream stream = resource.adaptTo(InputStream.class);
 if (stream != null) {

Modified: 
sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/XMLRendererServlet.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/XMLRendererServlet.java?rev=1788407=1788406=1788407=diff
==
--- 
sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/XMLRendererServlet.java
 (original)
+++ 
sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/XMLRendererServlet.java
 Fri Mar 24 11:06:49 2017
@@ -41,6 +41,8 @@ import org.xml.sax.SAXException;
  */
 public class XMLRendererServlet extends SlingSafeMethodsServlet {
 
+private static final long serialVersionUID = -3520278283206430415L;
+
 public 

svn commit: r1008906 - in /websites/staging/sling/trunk/content: ./ documentation/bundles/models.html

[buildbot]

Author: buildbot
Date: Fri Mar 24 12:04:32 2017
New Revision: 1008906

Log:
Staging update by buildbot for sling

Modified:
websites/staging/sling/trunk/content/   (props changed)
websites/staging/sling/trunk/content/documentation/bundles/models.html

Propchange: websites/staging/sling/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Fri Mar 24 12:04:32 2017
@@ -1 +1 @@
-1788400
+1788419

Modified: websites/staging/sling/trunk/content/documentation/bundles/models.html
==
--- websites/staging/sling/trunk/content/documentation/bundles/models.html 
(original)
+++ websites/staging/sling/trunk/content/documentation/bundles/models.html Fri 
Mar 24 12:04:32 2017
@@ -693,9 +693,12 @@ injectors in http://svn.apache.
 Specifying an 
Alternate Adapter Class (since 1.1.0)
 By default, each model class is registered using its own implementation 
class as adapter. If the class has additional interfaces this is not 
relevant.
 The @Model annotations provides an optional 
adapters attribute which allows specifying under which type(s) the 
model
-implementation should be registered in the Models Adapter Factory. With this 
property it is possible to register the model
+implementation should be registered in the Models Adapter Factory. Prior to 
Sling Models Impl 1.3.10 only the given class names
+are used as adapter classes, since 1.3.10 the implementation class is always 
being registered implicitly as adapter as well (see https://issues.apache.org/jira/browse/SLING-6658;>SLING-6658). 
+With this attribute it is possible to register the model
 to one (or multiple) interfaces, or a superclass. This allows separating the 
model interface from the implementation, which
 makes it easier to provide mock implementations for unit tests as well.
+Prior to Sling Models 1.3.10 by default the model is only registered to the 
ones given in adapters if there. Since 1.3.10
 Example:
 @Model(adaptables = 
Resource.class, adapters 
= MyService.class)
 public class MyModel implements MyService {
@@ -791,7 +794,7 @@ model, exported as a java.lang.Str
 
 
   
-Rev. 1783973 by kwin on Wed, 22 Feb 2017 07:41:19 +
+Rev. 1788419 by kwin on Fri, 24 Mar 2017 12:04:14 +
   

 Apache Sling, Sling, Apache, the Apache feather logo, and the Apache 
Sling project

Jenkins build is back to stable : sling-launchpad-testing-1.8 #1369

[Apache Jenkins Server]

See 

svn commit: r1008901 - in /websites/staging/sling/trunk/content: ./ documentation/bundles/content-loading-jcr-contentloader.html

[buildbot]

Author: buildbot
Date: Fri Mar 24 10:14:56 2017
New Revision: 1008901

Log:
Staging update by buildbot for sling

Modified:
websites/staging/sling/trunk/content/   (props changed)

websites/staging/sling/trunk/content/documentation/bundles/content-loading-jcr-contentloader.html

Propchange: websites/staging/sling/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Fri Mar 24 10:14:56 2017
@@ -1 +1 @@
-1788399
+1788400

Modified: 
websites/staging/sling/trunk/content/documentation/bundles/content-loading-jcr-contentloader.html
==
--- 
websites/staging/sling/trunk/content/documentation/bundles/content-loading-jcr-contentloader.html
 (original)
+++ 
websites/staging/sling/trunk/content/documentation/bundles/content-loading-jcr-contentloader.html
 Fri Mar 24 10:14:56 2017
@@ -192,7 +192,7 @@ h2:hover > .headerlink, h3:hover > .head
 path
 path:=/target/location
 /
-The path directive specifies the target node where initial content will be 
loaded. If the path does not exist yet in the repository, it is created by the 
content loader. The intermediate nodes are of type nt:folder.
+The path directive specifies the target node where initial content will be 
loaded. If the path does not exist yet in the repository, it is created by the 
content loader. The intermediate nodes are of type 
sling:Folder.
 
 
 checkin
@@ -410,7 +410,7 @@ Support for re-registration of node type
 The initial content found in the http://svn.apache.org/repos/asf/sling/trunk/launchpad/content/src/main/resources/content/sling-test;>sling-test
 folder of the launchpad initial content is verified by the http://svn.apache.org/repos/asf/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/InitialContentTest.java;>InitialContentTest
 when running the launchpad/testing integration tests.
 Those tests can be used as verified examples of initial content loading. 
Contributions are welcome to improve the coverage of those tests.
   
-Rev. 1788399 by kwin on Fri, 24 Mar 2017 10:00:44 +
+Rev. 1788400 by kwin on Fri, 24 Mar 2017 10:14:47 +
   

 Apache Sling, Sling, Apache, the Apache feather logo, and the Apache 
Sling project

svn commit: r1788402 - /sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/AbstractPostResponse.java

[kwin]

Author: kwin
Date: Fri Mar 24 10:37:20 2017
New Revision: 1788402

URL: http://svn.apache.org/viewvc?rev=1788402=rev
Log:
SLING-6703 do not hide underlying exception in response (basically reverts 
SLING-4415)

Modified:

sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/AbstractPostResponse.java

Modified: 
sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/AbstractPostResponse.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/AbstractPostResponse.java?rev=1788402=1788401=1788402=diff
==
--- 
sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/AbstractPostResponse.java
 (original)
+++ 
sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/AbstractPostResponse.java
 Fri Mar 24 10:37:20 2017
@@ -22,8 +22,6 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.sling.api.SlingException;
-
 /**
  * The AbstractPostResponse class provides a basic implementation
  * of the {@link PostResponse} interface maintaining properties to be
@@ -218,7 +216,7 @@ public abstract class AbstractPostRespon
 }
 
 public void setError(Throwable error) {
-setProperty(PN_ERROR, new SlingException("Exception during response 
processing.", null));
+setProperty(PN_ERROR, error);
 }
 
 /**

Jenkins build became unstable: sling-launchpad-testing-war-1.8 #1306

[Apache Jenkins Server]

See 

svn commit: r1008898 - in /websites/staging/sling/trunk/content: ./ documentation/bundles/content-loading-jcr-contentloader.html

[buildbot]

Author: buildbot
Date: Fri Mar 24 10:01:02 2017
New Revision: 1008898

Log:
Staging update by buildbot for sling

Modified:
websites/staging/sling/trunk/content/   (props changed)

websites/staging/sling/trunk/content/documentation/bundles/content-loading-jcr-contentloader.html

Propchange: websites/staging/sling/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Fri Mar 24 10:01:02 2017
@@ -1 +1 @@
-1788371
+1788399

Modified: 
websites/staging/sling/trunk/content/documentation/bundles/content-loading-jcr-contentloader.html
==
--- 
websites/staging/sling/trunk/content/documentation/bundles/content-loading-jcr-contentloader.html
 (original)
+++ 
websites/staging/sling/trunk/content/documentation/bundles/content-loading-jcr-contentloader.html
 Fri Mar 24 10:01:02 2017
@@ -117,12 +117,12 @@ h2:hover > .headerlink, h3:hover > .head
 Apache Sling provides support for initial content loading into a repository 
and for registering node types. The sling-jcr-contentloader bundle 
provides loading of content from a bundle into the repository and the 
sling-jcr-base bundle provides node type registration.
 Initial Content Loading
 Bundles can provide initial content, which is loaded into the repository 
when the bundle has entered the started state. Such content is 
expected to be contained in the bundles accessible through the Bundle entry API 
methods. Content to be loaded is declared in the 
Sling-Initial-Content bundle manifest header. This header takes a 
comma-separated list of bundle entry paths. Each entry and all its child 
entries are accessed and entered into starting with the child entries of the 
listed entries.
-Adding this content preserves the paths of the entries as show in this 
table, which assumes a Sling-Initial-Content header entry of 
SLING-INF/content:
+Adding this content preserves the paths of the entries as shown in this 
table, which assumes a Sling-Initial-Content header entry of 
SLING-INF/content (with no further directives):
 
 
 
-Entry
-Repository Path
+Source Entry Paths in Bundle
+Target Repository Path
 
 
 
@@ -134,6 +134,10 @@ h2:hover > .headerlink, h3:hover > .head
 SLING-INF/content/content/playground/en/home
 /content/playground/en/home
 
+
+SLING-INF/someothercontent/playground/en/home
+not installed at all, because not below the 
Sling-Initial-Content header entry
+
 
 
 Bundle entries are installed as follows:
@@ -170,18 +174,18 @@ h2:hover > .headerlink, h3:hover > .head
 overwrite
 overwrite:=(truefalse)
 false
-The overwrite directive specifies if content nodes should be overwritten 
or just initially added.  If this is true, existing nodes are deleted and a new 
node is created in the same place.
+The overwrite directive specifies if content nodes should be overwritten 
(at the target repository path, which is "/" by default) or just initially 
added.  If this is true, existing nodes are deleted and a new node is created 
in the same place. This directive should be used together with the 
path directive to limit overwriting.
 
 
 overwriteProperties
 overwriteProperties:=(truefalse)
 false
-The overwriteProperties directive specifying if content properties should 
be overwritten or just initially added.
+The overwriteProperties directive specifying if content properties should 
be overwritten or just initially added (at the target repository path, which is 
"/" by default). This directive should be used together with the 
path directive to limit overwriting.
 
 
 uninstall
 uninstall:=(truefalse)
-overwrite
+value from overwrite
 The uninstall directive specifies if content should be uninstalled when 
bundle is unregistered. This value defaults to the value of the 
overwrite directive.
 
 
@@ -204,26 +208,26 @@ h2:hover > .headerlink, h3:hover > .head
 
 
 
-Examples of these directives uses could be (assumes a Sling-Initial-Content 
header entry of SLING-INF/content):
+Examples of these directives within Sling-Initial-Content 
header entries:
 
 
 
-Entry
+Sling-Initial-Content header entry
 Behaviour
 
 
 
 
-SLING-INF/content/home;overwrite:=true;uninstall:=true
+SLING-INF/content/home;overwrite:=true;path:=/home
 Overwrites already existing content in /home and uninstalls the 
content when the bundle is unregistered.
 
 
-SLING-INF/content/home;overwriteProperties:=true
+SLING-INF/content/home;overwriteProperties:=true;path:=/home
 Overwrites properties of existing content in /home.
 
 
 SLING-INF/content/home;path:=/sites/sling_website
-if /sites/sling_website exists it loads the content into it. 
Otherwise, it loads the content into root node /.
+This loads the content given in SLING-INF/content/home into 
/sites/sling_website.
 
 
 SLING-INF/content/home;checkin:=true
@@ -406,7 +410,7 @@ Support for re-registration of node type
 The initial content found in the 

svn commit: r1788399 - /sling/site/trunk/content/documentation/bundles/content-loading-jcr-contentloader.mdtext

[kwin]

Author: kwin
Date: Fri Mar 24 10:00:44 2017
New Revision: 1788399

URL: http://svn.apache.org/viewvc?rev=1788399=rev
Log:
SLING-6701 clarify contentloader documentation with regards to target paths

Modified:

sling/site/trunk/content/documentation/bundles/content-loading-jcr-contentloader.mdtext

Modified: 
sling/site/trunk/content/documentation/bundles/content-loading-jcr-contentloader.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/bundles/content-loading-jcr-contentloader.mdtext?rev=1788399=1788398=1788399=diff
==
--- 
sling/site/trunk/content/documentation/bundles/content-loading-jcr-contentloader.mdtext
 (original)
+++ 
sling/site/trunk/content/documentation/bundles/content-loading-jcr-contentloader.mdtext
 Fri Mar 24 10:00:44 2017
@@ -6,38 +6,39 @@ Apache Sling provides support for initia
 
 Bundles can provide initial content, which is loaded into the repository when 
the bundle has entered the *started* state. Such content is expected to be 
contained in the bundles accessible through the Bundle entry API methods. 
Content to be loaded is declared in the `Sling-Initial-Content` bundle manifest 
header. This header takes a comma-separated list of bundle entry paths. Each 
entry and all its child entries are accessed and entered into starting with the 
child entries of the listed entries.
 
-Adding this content preserves the paths of the entries as show in this table, 
which assumes a `Sling-Initial-Content` header entry of `SLING-INF/content`:
+Adding this content preserves the paths of the entries as shown in this table, 
which assumes a `Sling-Initial-Content` header entry of `SLING-INF/content` 
(with no further directives):
 
-| Entry | Repository Path |
-|--|--|
+| Source Entry Paths in Bundle | Target Repository Path |
+|---|---|
 | `SLING-INF/content/home` | `/home` |
 | `SLING-INF/content/content/playground/en/home` | 
`/content/playground/en/home` |
+| `SLING-INF/someothercontent/playground/en/home` | not installed at all, 
because not below the `Sling-Initial-Content` header entry | 
 
 Bundle entries are installed as follows:
 
 | Entry Type | Installation method |
-|--|--|
+|---|---|
 | Directory | Created as a node of type `nt:folder` unless a content 
definition file of the same name exists in the same directory as the directory 
to be installed. Example: A directory `SLING-INF/content/dir` is installed as 
node `/dir` of type `nt:folder` unless a `SLING-INF/content/dir.xml` or 
`SLING-INF/content/dir.json` file exists which defines the content for the 
`/dir` node. |
 | File | Unless the file is a content definition file (see below) an `nt:file` 
node is created for the file and an `nt:resource` node is created as its 
`jcr:content` child node to take the contents of the bundle file. The 
properties of the `nt:resource` node are set from file information as 
available. If the file is a content definition file, the content is created as 
defined in the file. See below for the content definition file specification. |
 
 It is possible to modify the intial content loading default behaviour by using 
certain optional directives. Directives should be specified separated by 
semicolon. They are defined as follows:
 
 | Directive | Definition | Default value | Description |
-|--|--|--|--|
-| `overwrite` | overwrite:=(truefalse) | `false` | The 
overwrite directive specifies if content nodes should be overwritten or just 
initially added.  If this is true, existing nodes are deleted and a new node is 
created in the same place. |
-| `overwriteProperties` | overwriteProperties:=(truefalse) 
| `false` | The overwriteProperties directive specifying if content properties 
should be overwritten or just initially added. |
-| `uninstall` | uninstall:=(truefalse) | `overwrite` | The 
uninstall directive specifies if content should be uninstalled when bundle is 
unregistered. This value defaults to the value of the `overwrite` directive. |
+|---|---|---|---|
+| `overwrite` | overwrite:=(truefalse) | `false` | The 
overwrite directive specifies if content nodes should be overwritten (at the 
target repository path, which is "/" by default) or just initially added.  If 
this is true, existing nodes are deleted and a new node is created in the same 
place. This directive should be used together with the `path` directive to 
limit overwriting. |
+| `overwriteProperties` | overwriteProperties:=(truefalse) 
| `false` | The overwriteProperties directive specifying if content properties 
should be overwritten or just initially added (at the target repository path, 
which is "/" by default). This directive should be used together with the 
`path` directive to limit overwriting. |
+| `uninstall` | uninstall:=(truefalse) | value from 
`overwrite` | The uninstall directive specifies if content should be 
uninstalled when bundle is unregistered. This value defaults to the value of 
the `overwrite` 

Jenkins build is back to stable : sling-launchpad-testing-war-1.8 #1307

[Apache Jenkins Server]

See 

svn commit: r1788420 - /sling/site/trunk/content/documentation/bundles/models.mdtext

[kwin]

Author: kwin
Date: Fri Mar 24 12:05:59 2017
New Revision: 1788420

URL: http://svn.apache.org/viewvc?rev=1788420=rev
Log:
remove obsolete paragraph

Modified:
sling/site/trunk/content/documentation/bundles/models.mdtext

Modified: sling/site/trunk/content/documentation/bundles/models.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/bundles/models.mdtext?rev=1788420=1788419=1788420=diff
==
--- sling/site/trunk/content/documentation/bundles/models.mdtext (original)
+++ sling/site/trunk/content/documentation/bundles/models.mdtext Fri Mar 24 
12:05:59 2017
@@ -429,8 +429,6 @@ With this attribute it is possible to re
 to one (or multiple) interfaces, or a superclass. This allows separating the 
model interface from the implementation, which
 makes it easier to provide mock implementations for unit tests as well.
 
-Prior to Sling Models 1.3.10 by default the model is only registered to the 
ones given in `adapters` if there. Since 1.3.10
-
 Example:
 
 ::java

svn commit: r1008908 - in /websites/staging/sling/trunk/content: ./ documentation/bundles/content-loading-jcr-contentloader.html

[buildbot]

Author: buildbot
Date: Fri Mar 24 12:06:47 2017
New Revision: 1008908

Log:
Staging update by buildbot for sling

Modified:
websites/staging/sling/trunk/content/   (props changed)

websites/staging/sling/trunk/content/documentation/bundles/content-loading-jcr-contentloader.html

Propchange: websites/staging/sling/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Fri Mar 24 12:06:47 2017
@@ -1 +1 @@
-1788420
+1788421

Modified: 
websites/staging/sling/trunk/content/documentation/bundles/content-loading-jcr-contentloader.html
==
--- 
websites/staging/sling/trunk/content/documentation/bundles/content-loading-jcr-contentloader.html
 (original)
+++ 
websites/staging/sling/trunk/content/documentation/bundles/content-loading-jcr-contentloader.html
 Fri Mar 24 12:06:47 2017
@@ -394,7 +394,7 @@ primary node type "nt:file". Underneath
 Extractors
 By default, the sling-jcr-contentloader bundle tries to 
extract certain file types during content loading. These include 
json, xml, zip, and jar 
files. Therefore all available extractors are used for content processing. 
However if some files should be put into the repository unextracted, the 
ignoreImportProviders directive can be used with a comma separated 
list of extensions that should not be extracted, like 
ignoreImportProviders:="jar,zip". Please note that the value needs 
to be put into quotation marks if more than one value is used like in the 
example.
 Workspace Targetting
-By default, initial content will be loaded into the default workspace. To 
override this, add a Sling-Initial-Content-Workspace bundle 
manifest header to specify the manifest. Note that all content from a 
bundle will be loaded into the same workspace. 
+By default, initial content will be loaded into the default workspace. To 
override this, add a Sling-Initial-Content-Workspace bundle 
manifest header to specify the workspace. Note that all content from a 
bundle will be loaded into the same workspace. 
 Declared Node Type Registration
 The sling-jcr-base bundle provides low-level repository 
operations which are at the heart of the functionality of Sling:
  Node Type Definitions* - The class 
org.apache.sling.content.jcr.base.NodeTypeLoader provides methods 
to register custom node types with a repository given a repository session and 
a node type definition file in CND format. This class is also used by this 
bundle to register node types on behalf of other bundles.
@@ -410,7 +410,7 @@ Support for re-registration of node type
 The initial content found in the http://svn.apache.org/repos/asf/sling/trunk/launchpad/content/src/main/resources/content/sling-test;>sling-test
 folder of the launchpad initial content is verified by the http://svn.apache.org/repos/asf/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/InitialContentTest.java;>InitialContentTest
 when running the launchpad/testing integration tests.
 Those tests can be used as verified examples of initial content loading. 
Contributions are welcome to improve the coverage of those tests.
   
-Rev. 1788400 by kwin on Fri, 24 Mar 2017 10:14:47 +
+Rev. 1788421 by kwin on Fri, 24 Mar 2017 12:06:38 +
   

 Apache Sling, Sling, Apache, the Apache feather logo, and the Apache 
Sling project

svn commit: r1008907 - in /websites/staging/sling/trunk/content: ./ documentation/bundles/models.html

[buildbot]

Author: buildbot
Date: Fri Mar 24 12:06:07 2017
New Revision: 1008907

Log:
Staging update by buildbot for sling

Modified:
websites/staging/sling/trunk/content/   (props changed)
websites/staging/sling/trunk/content/documentation/bundles/models.html

Propchange: websites/staging/sling/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Fri Mar 24 12:06:07 2017
@@ -1 +1 @@
-1788419
+1788420

Modified: websites/staging/sling/trunk/content/documentation/bundles/models.html
==
--- websites/staging/sling/trunk/content/documentation/bundles/models.html 
(original)
+++ websites/staging/sling/trunk/content/documentation/bundles/models.html Fri 
Mar 24 12:06:07 2017
@@ -698,7 +698,6 @@ are used as adapter classes, since 1.3.1
 With this attribute it is possible to register the model
 to one (or multiple) interfaces, or a superclass. This allows separating the 
model interface from the implementation, which
 makes it easier to provide mock implementations for unit tests as well.
-Prior to Sling Models 1.3.10 by default the model is only registered to the 
ones given in adapters if there. Since 1.3.10
 Example:
 @Model(adaptables = 
Resource.class, adapters 
= MyService.class)
 public class MyModel implements MyService {
@@ -794,7 +793,7 @@ model, exported as a java.lang.Str
 
 
   
-Rev. 1788419 by kwin on Fri, 24 Mar 2017 12:04:14 +
+Rev. 1788420 by kwin on Fri, 24 Mar 2017 12:05:59 +
   

 Apache Sling, Sling, Apache, the Apache feather logo, and the Apache 
Sling project

svn commit: r1008909 - in /websites/production/sling/content: ./ components/

[kwin]

Author: kwin
Date: Fri Mar 24 12:07:25 2017
New Revision: 1008909

Log:
Publishing svnmucc operation to sling site by kwin

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

svn commit: r1788421 - /sling/site/trunk/content/documentation/bundles/content-loading-jcr-contentloader.mdtext

[kwin]

Author: kwin
Date: Fri Mar 24 12:06:38 2017
New Revision: 1788421

URL: http://svn.apache.org/viewvc?rev=1788421=rev
Log:
fix typo

Modified:

sling/site/trunk/content/documentation/bundles/content-loading-jcr-contentloader.mdtext

Modified: 
sling/site/trunk/content/documentation/bundles/content-loading-jcr-contentloader.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/bundles/content-loading-jcr-contentloader.mdtext?rev=1788421=1788420=1788421=diff
==
--- 
sling/site/trunk/content/documentation/bundles/content-loading-jcr-contentloader.mdtext
 (original)
+++ 
sling/site/trunk/content/documentation/bundles/content-loading-jcr-contentloader.mdtext
 Fri Mar 24 12:06:38 2017
@@ -216,7 +216,7 @@ By default, the `sling-jcr-contentloader
 
 ### Workspace Targetting
 
-By default, initial content will be loaded into the default workspace. To 
override this, add a `Sling-Initial-Content-Workspace` bundle manifest header 
to specify the manifest. Note that *all* content from a bundle will be loaded 
into the same workspace. 
+By default, initial content will be loaded into the default workspace. To 
override this, add a `Sling-Initial-Content-Workspace` bundle manifest header 
to specify the workspace. Note that *all* content from a bundle will be loaded 
into the same workspace. 
 
 ## Declared Node Type Registration
 

Jenkins build is back to stable : sling-launchpad-testing-war-1.8 #1309

[Apache Jenkins Server]

See 

Jenkins build became unstable: sling-launchpad-testing-1.8 #1362

[Apache Jenkins Server]

See 

svn commit: r1788403 - in /sling/trunk/bundles/servlets/get: ./ src/main/java/org/apache/sling/servlets/get/impl/ src/main/java/org/apache/sling/servlets/get/impl/helpers/ src/main/java/org/apache/sli

[cziegeler]

Author: cziegeler
Date: Fri Mar 24 10:39:52 2017
New Revision: 1788403

URL: http://svn.apache.org/viewvc?rev=1788403=rev
Log:
SLING-6704 : Migrate to R6 annotations, clean up dependencies

Removed:
sling/trunk/bundles/servlets/get/src/main/resources/OSGI-INF/
Modified:
sling/trunk/bundles/servlets/get/pom.xml

sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/DefaultGetServlet.java

sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/RedirectServlet.java

sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/HeadServletResponse.java

sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/StreamRendererServlet.java

sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/impl/info/SlingInfoServlet.java

sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/version/VersionInfoServlet.java

Modified: sling/trunk/bundles/servlets/get/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/get/pom.xml?rev=1788403=1788402=1788403=diff
==
--- sling/trunk/bundles/servlets/get/pom.xml (original)
+++ sling/trunk/bundles/servlets/get/pom.xml Fri Mar 24 10:39:52 2017
@@ -23,7 +23,7 @@
 
 org.apache.sling
 sling
-26
+30
 
 
 
@@ -51,19 +51,8 @@
 
 
 org.apache.felix
-maven-scr-plugin
-
-
-org.apache.felix
 maven-bundle-plugin
 true
-
-
-
-org.apache.sling.servlets.get.*
-
-
-
 
 
 org.apache.maven.plugins
@@ -79,7 +68,7 @@
 
 
 javax.servlet
-servlet-api
+javax.servlet-api
 
 
 javax.jcr
@@ -98,12 +87,6 @@
 provided
 
 
-org.apache.sling
-org.apache.sling.commons.osgi
-2.0.6
-provided
-
-
 org.apache.jackrabbit
 jackrabbit-jcr-commons
 2.2.9
@@ -111,20 +94,12 @@
 
 
 org.osgi
-org.osgi.core
-
-
-org.osgi
-org.osgi.compendium
+osgi.core
 
 
 org.slf4j
 slf4j-api
 
- 
-org.apache.felix
-org.apache.felix.scr.annotations
-
 
 
 junit

Modified: 
sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/DefaultGetServlet.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/DefaultGetServlet.java?rev=1788403=1788402=1788403=diff
==
--- 
sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/DefaultGetServlet.java
 (original)
+++ 
sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/DefaultGetServlet.java
 Fri Mar 24 10:39:52 2017
@@ -17,7 +17,6 @@
 package org.apache.sling.servlets.get.impl;
 
 import java.io.IOException;
-import java.util.Dictionary;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.StringTokenizer;
@@ -26,90 +25,115 @@ import javax.servlet.Servlet;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Properties;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Service;
 import org.apache.sling.api.SlingConstants;
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.SlingHttpServletResponse;
 import org.apache.sling.api.resource.ResourceNotFoundException;
 import org.apache.sling.api.resource.ResourceUtil;
 import org.apache.sling.api.servlets.SlingSafeMethodsServlet;
-import org.apache.sling.commons.osgi.OsgiUtil;
+import org.apache.sling.servlets.get.impl.helpers.HeadServletResponse;
 import org.apache.sling.servlets.get.impl.helpers.HtmlRendererServlet;
 import org.apache.sling.servlets.get.impl.helpers.JsonRendererServlet;
 import org.apache.sling.servlets.get.impl.helpers.PlainTextRendererServlet;
 import org.apache.sling.servlets.get.impl.helpers.StreamRendererServlet;
 import org.apache.sling.servlets.get.impl.helpers.XMLRendererServlet;
-import org.apache.sling.servlets.get.impl.helpers.HeadServletResponse;
-import org.osgi.service.component.ComponentContext;
+import 

svn commit: r1788406 - /sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ContentType.java

[kwin]

Author: kwin
Date: Fri Mar 24 11:02:17 2017
New Revision: 1788406

URL: http://svn.apache.org/viewvc?rev=1788406=rev
Log:
clarified JCR_XML format description

Modified:

sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ContentType.java

Modified: 
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ContentType.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ContentType.java?rev=1788406=1788405=1788406=diff
==
--- 
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ContentType.java
 (original)
+++ 
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ContentType.java
 Fri Mar 24 11:02:17 2017
@@ -32,7 +32,11 @@ public enum ContentType {
 JSON("json"),
 
 /**
- * JCR XML content (FileVault XML).
+ * JCR XML content (FileVault XML). Also known as extended document view 
XML.
+ * Extends the regular document view as specified by JCR 2.0 by specifics 
like
+ * multivalue and typing information. Is used by Jackrabbit FileVault.
+ * @see https://docs.adobe.com/content/docs/en/spec/jcr/2.0/7_Export.html#7.3%20Document%20View;>JCR
 2.0, 7.3 Document View
+ * @see http://jackrabbit.apache.org/filevault/;>Jackrabbit 
FileVault
  */
 JCR_XML("jcr.xml");
 

svn commit: r1788408 - /sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/RedirectServlet.java

[cziegeler]

Author: cziegeler
Date: Fri Mar 24 11:18:28 2017
New Revision: 1788408

URL: http://svn.apache.org/viewvc?rev=1788408=rev
Log:
SLING-6064 : Redirect servlet should encode url for redirecting

Modified:

sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/RedirectServlet.java

Modified: 
sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/RedirectServlet.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/RedirectServlet.java?rev=1788408=1788407=1788408=diff
==
--- 
sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/RedirectServlet.java
 (original)
+++ 
sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/RedirectServlet.java
 Fri Mar 24 11:18:28 2017
@@ -169,7 +169,7 @@ public class RedirectServlet extends Sli
 // into an absolute URI.
 response.reset();
 response.setStatus(status);
-response.setHeader("Location", targetPath);
+response.setHeader("Location", 
response.encodeRedirectURL(targetPath));
 response.flushBuffer();
 
 return;

svn commit: r1788419 - /sling/site/trunk/content/documentation/bundles/models.mdtext

[kwin]

Author: kwin
Date: Fri Mar 24 12:04:14 2017
New Revision: 1788419

URL: http://svn.apache.org/viewvc?rev=1788419=rev
Log:
SLING-6658 document implicit adapter class

Modified:
sling/site/trunk/content/documentation/bundles/models.mdtext

Modified: sling/site/trunk/content/documentation/bundles/models.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/bundles/models.mdtext?rev=1788419=1788418=1788419=diff
==
--- sling/site/trunk/content/documentation/bundles/models.mdtext (original)
+++ sling/site/trunk/content/documentation/bundles/models.mdtext Fri Mar 24 
12:04:14 2017
@@ -423,10 +423,14 @@ injectors in [Subversion](http://svn.apa
 By default, each model class is registered using its own implementation class 
as adapter. If the class has additional interfaces this is not relevant.
 
 The `@Model` annotations provides an optional `adapters` attribute which 
allows specifying under which type(s) the model
-implementation should be registered in the Models Adapter Factory. With this 
property it is possible to register the model
+implementation should be registered in the Models Adapter Factory. Prior to 
*Sling Models Impl 1.3.10* only the given class names
+are used as adapter classes, since 1.3.10 the implementation class is always 
being registered implicitly as adapter as well (see 
[SLING-6658](https://issues.apache.org/jira/browse/SLING-6658)). 
+With this attribute it is possible to register the model
 to one (or multiple) interfaces, or a superclass. This allows separating the 
model interface from the implementation, which
 makes it easier to provide mock implementations for unit tests as well.
 
+Prior to Sling Models 1.3.10 by default the model is only registered to the 
ones given in `adapters` if there. Since 1.3.10
+
 Example:
 
 ::java

Jenkins build is back to stable : sling-launchpad-testing-1.8 #1363

[Apache Jenkins Server]

See 

svn commit: r1008902 - in /websites/production/sling/content: ./ components/

[kwin]

Author: kwin
Date: Fri Mar 24 10:15:19 2017
New Revision: 1008902

Log:
Publishing svnmucc operation to sling site by kwin

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

svn commit: r1788409 - in /sling/trunk/bundles/extensions/serviceusermapper: pom.xml src/main/java/org/apache/sling/serviceusermapping/ServiceUserValidator.java

[cziegeler]

Author: cziegeler
Date: Fri Mar 24 11:23:56 2017
New Revision: 1788409

URL: http://svn.apache.org/viewvc?rev=1788409=rev
Log:
Remove unused SCR plugin, fix javadoc

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

sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/ServiceUserValidator.java

Modified: sling/trunk/bundles/extensions/serviceusermapper/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/serviceusermapper/pom.xml?rev=1788409=1788408=1788409=diff
==
--- sling/trunk/bundles/extensions/serviceusermapper/pom.xml (original)
+++ sling/trunk/bundles/extensions/serviceusermapper/pom.xml Fri Mar 24 
11:23:56 2017
@@ -49,10 +49,6 @@
 
 
 org.apache.felix
-maven-scr-plugin
-
-
-org.apache.felix
 maven-bundle-plugin
 true
 
@@ -70,6 +66,15 @@
 
 
 
+
+org.apache.maven.plugins
+maven-javadoc-plugin
+
+
+org.apache.sling.serviceusermapping.impl
+
+
+
 
 
 
@@ -102,11 +107,6 @@
 osgi.core
 
 
-org.apache.felix
-org.apache.felix.scr.annotations
-provided
-
-
 org.osgi
 org.osgi.service.event
 1.3.1

Modified: 
sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/ServiceUserValidator.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/ServiceUserValidator.java?rev=1788409=1788408=1788409=diff
==
--- 
sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/ServiceUserValidator.java
 (original)
+++ 
sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/ServiceUserValidator.java
 Fri Mar 24 11:23:56 2017
@@ -29,6 +29,8 @@ public interface ServiceUserValidator {
  * Validates the configured service user ID.
  *
  * @param serviceUserId The ID of the configured service user.
+ * @param serviceName The name of the service
+ * @param subServiceName The optional sub service name.
  * @return {@code true} if the configured service user is valid; {@code 
false} otherwise.
  */
 boolean isValid(String serviceUserId, String serviceName, String 
subServiceName);

Jenkins build became unstable: sling-launchpad-testing-1.8 #1368

[Apache Jenkins Server]

See 

Jenkins build became unstable: sling-launchpad-testing-war-1.8 #1308

[Apache Jenkins Server]

See 

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}

Jenkins build is back to stable : sling-launchpad-testing-war-1.8 #1323

[Apache Jenkins Server]

See 

Jenkins build became unstable: sling-bundles-extensions-caconfig-integration-tests-1.8 #8891

[Apache Jenkins Server]

See 

Jenkins build became unstable: sling-launchpad-testing-war-1.8 #1322

[Apache Jenkins Server]

See 

svn commit: r1788498 - /sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesTest.java

[cziegeler]

Author: cziegeler
Date: Fri Mar 24 16:27:37 2017
New Revision: 1788498

URL: http://svn.apache.org/viewvc?rev=1788498=rev
Log:
SLING-6710 : Vanity Path might get removed if a resource is updated

Modified:

sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesTest.java

Modified: 
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesTest.java?rev=1788498=1788497=1788498=diff
==
--- 
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesTest.java
 (original)
+++ 
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesTest.java
 Fri Mar 24 16:27:37 2017
@@ -57,6 +57,8 @@ import org.apache.sling.api.resource.Res
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.resource.ResourceUtil;
 import org.apache.sling.api.resource.ValueMap;
+import org.apache.sling.api.resource.observation.ResourceChange;
+import org.apache.sling.api.resource.observation.ResourceChange.ChangeType;
 import org.apache.sling.api.resource.path.Path;
 import org.apache.sling.api.wrappers.ValueMapDecorator;
 import org.apache.sling.resourceresolver.impl.ResourceResolverImpl;
@@ -297,6 +299,78 @@ public class MapEntriesTest {
 
 }
 
+@Test
+public void test_vanity_path_updates() throws Exception {
+Resource parent = mock(Resource.class, "parent");
+when(parent.getPath()).thenReturn("/foo/parent");
+when(parent.getName()).thenReturn("parent");
+when(parent.getValueMap()).thenReturn(new 
ValueMapDecorator(Collections.emptyMap()));
+
when(resourceResolver.getResource(parent.getPath())).thenReturn(parent);
+
+Resource child = mock(Resource.class, "jcrcontent");
+when(child.getPath()).thenReturn("/foo/parent/jcr:content");
+when(child.getName()).thenReturn("jcr:content");
+when(child.getValueMap()).thenReturn(buildValueMap("sling:vanityPath", 
"/target/found"));
+when(child.getParent()).thenReturn(parent);
+when(parent.getChild(child.getName())).thenReturn(child);
+when(resourceResolver.getResource(child.getPath())).thenReturn(child);
+
+when(resourceResolver.findResources(anyString(), 
eq("sql"))).thenAnswer(new Answer() {
+
+@Override
+public Iterator answer(InvocationOnMock invocation) 
throws Throwable {
+return Collections. emptySet().iterator();
+}
+});
+
+mapEntries.doInit();
+mapEntries.initializeVanityPaths();
+
+// map entries should have no alias atm
+assertTrue( mapEntries.getResolveMaps().isEmpty());
+
+// add parent
+mapEntries.onChange(Arrays.asList(new ResourceChange(ChangeType.ADDED, 
parent.getPath(), false)));
+assertTrue( mapEntries.getResolveMaps().isEmpty());
+
+// add child
+mapEntries.onChange(Arrays.asList(new ResourceChange(ChangeType.ADDED, 
child.getPath(), false)));
+
+// two entries for the vanity path
+List entries = mapEntries.getResolveMaps();
+assertEquals(2, entries.size());
+for (MapEntry entry : entries) {
+assertTrue(entry.getPattern().contains("/target/found"));
+}
+
+// update parent - no change
+mapEntries.onChange(Arrays.asList(new 
ResourceChange(ChangeType.CHANGED, parent.getPath(), false)));
+entries = mapEntries.getResolveMaps();
+assertEquals(2, entries.size());
+for (MapEntry entry : entries) {
+assertTrue(entry.getPattern().contains("/target/found"));
+}
+
+// update child - no change
+mapEntries.onChange(Arrays.asList(new 
ResourceChange(ChangeType.CHANGED, child.getPath(), false)));
+entries = mapEntries.getResolveMaps();
+assertEquals(2, entries.size());
+for (MapEntry entry : entries) {
+assertTrue(entry.getPattern().contains("/target/found"));
+}
+
+// remove child - empty again
+when(resourceResolver.getResource(child.getPath())).thenReturn(null);
+when(parent.getChild(child.getName())).thenReturn(null);
+mapEntries.onChange(Arrays.asList(new 
ResourceChange(ChangeType.REMOVED, child.getPath(), false)));
+assertTrue( mapEntries.getResolveMaps().isEmpty());
+
+// remove parent - still empty
+when(resourceResolver.getResource(parent.getPath())).thenReturn(null);
+mapEntries.onChange(Arrays.asList(new 
ResourceChange(ChangeType.REMOVED, parent.getPath(), false)));
+assertTrue( 

svn commit: r1788471 - /sling/trunk/contrib/scripting/esx/.gitignore

[bdelacretaz]

Author: bdelacretaz
Date: Fri Mar 24 15:27:04 2017
New Revision: 1788471

URL: http://svn.apache.org/viewvc?rev=1788471=rev
Log:
SLING-6680 - gitignore

Added:
sling/trunk/contrib/scripting/esx/.gitignore

Added: sling/trunk/contrib/scripting/esx/.gitignore
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/esx/.gitignore?rev=1788471=auto
==
--- sling/trunk/contrib/scripting/esx/.gitignore (added)
+++ sling/trunk/contrib/scripting/esx/.gitignore Fri Mar 24 15:27:04 2017
@@ -0,0 +1,6 @@
+target
+.settings
+.classpath
+.project
+settings.xml
+node_modules

svn commit: r1788470 - /sling/trunk/contrib/scripting/esx/pom.xml

[bdelacretaz]

Author: bdelacretaz
Date: Fri Mar 24 15:21:00 2017
New Revision: 1788470

URL: http://svn.apache.org/viewvc?rev=1788470=rev
Log:
SLING-6680 - start with a low release number

Modified:
sling/trunk/contrib/scripting/esx/pom.xml

Modified: sling/trunk/contrib/scripting/esx/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/esx/pom.xml?rev=1788470=1788469=1788470=diff
==
--- sling/trunk/contrib/scripting/esx/pom.xml (original)
+++ sling/trunk/contrib/scripting/esx/pom.xml Fri Mar 24 15:21:00 2017
@@ -30,7 +30,7 @@
 org.apache.sling
 org.apache.sling.scripting.esx
 bundle
-1.0.0-SNAPSHOT
+0.1.0-SNAPSHOT
 Apache Sling Scripting ESX
 Support NodeJS like scripting and module 
resolution
 

svn commit: r1788472 - /sling/trunk/contrib/scripting/esx/README.md

[bdelacretaz]

Author: bdelacretaz
Date: Fri Mar 24 15:30:06 2017
New Revision: 1788472

URL: http://svn.apache.org/viewvc?rev=1788472=rev
Log:
SLING-6680 - mark this experimental

Modified:
sling/trunk/contrib/scripting/esx/README.md

Modified: sling/trunk/contrib/scripting/esx/README.md
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/esx/README.md?rev=1788472=1788471=1788472=diff
==
--- sling/trunk/contrib/scripting/esx/README.md (original)
+++ sling/trunk/contrib/scripting/esx/README.md Fri Mar 24 15:30:06 2017
@@ -20,6 +20,8 @@
 
 A Node JS (like) module loader for Apache Sling.
 
+This module is considered **experimental** for now.
+
 ## Description
 This module implements a Nashorn Apache Sling Script Engine for the "esx" 
extension.
 
@@ -138,4 +140,4 @@ var calculator = require("./helper/calcu
 exports.render = function () {
   return calculator.math(2,2);
 }
-```
\ No newline at end of file
+```

Nexus: Promotion Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Maven/3.3.9 (Java 1.8.0_121; Windows 10 10.0)""userId" = "sseifert""ip" = "80.150.190.130"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/sling/maven-sling-plugin/2.2.0/maven-sling-plugin-2.2.0-source-release.zip(SHA1: c66c290020ac335ca31ce318dfa618b696b08b40)/org/apache/sling/maven-sling-plugin/2.2.0/maven-sling-plugin-2.2.0-sources.jar.asc(SHA1: 10f5fc631b076b5c0d91d9bb0217b492206cebad)/org/apache/sling/maven-sling-plugin/2.2.0/maven-sling-plugin-2.2.0.jar.asc(SHA1: 0256cd8387f14cc590a591ad5b56488b49bd0ac0)/org/apache/sling/maven-sling-plugin/2.2.0/maven-sling-plugin-2.2.0-javadoc.jar.asc(SHA1: 9ec0d7773edac146882330ada5d4c69517a75926)/org/apache/sling/maven-sling-plugin/2.2.0/maven-sling-plugin-2.2.0.pom(SHA1: a178f9f5148feec34b22aba1b8a25b6ff27c2463)/org/apache/sling/maven-sling-plugin/2.2.0/maven-sling-plugin-2.2.0.jar(SHA1: 86c344823bb3bc3d6cdb8494508ad197fb17f3ae)/org/apache/sling/maven-sling-plugin/2.2.0/maven-sling-plugin-2.2.0.pom.asc(SHA1: 6f04491c4808ec0f7045be44f507c9ca6ddedce9)/org/apache/sling/maven-sling-plugin/2.2.0/maven-sling-plugin-2.2.0-javadoc.jar(SHA1: 4eef373b677f635f0741ac3c2d14464cc04eea49)/org/apache/sling/maven-sling-plugin/2.2.0/maven-sling-plugin-2.2.0-source-release.zip.asc(SHA1: 5c137db45605fc121046438b77a5cb8c49c9d9ec)/org/apache/sling/maven-sling-plugin/2.2.0/maven-sling-plugin-2.2.0-sources.jar(SHA1: e1f49f5c83dd19c268eff10964feb071a7cfd430)Action performed by Stefan Seifert (sseifert)

svn commit: r18895 - /release/sling/

[sseifert]

Author: sseifert
Date: Fri Mar 24 15:47:59 2017
New Revision: 18895

Log:
Apache Sling Maven Sling Plugin 2.2.0

Added:
release/sling/maven-sling-plugin-2.2.0-javadoc.jar   (with props)
release/sling/maven-sling-plugin-2.2.0-javadoc.jar.asc
release/sling/maven-sling-plugin-2.2.0-javadoc.jar.md5
release/sling/maven-sling-plugin-2.2.0-javadoc.jar.sha1
release/sling/maven-sling-plugin-2.2.0-source-release.zip   (with props)
release/sling/maven-sling-plugin-2.2.0-source-release.zip.asc
release/sling/maven-sling-plugin-2.2.0-source-release.zip.md5
release/sling/maven-sling-plugin-2.2.0-source-release.zip.sha1
release/sling/maven-sling-plugin-2.2.0-sources.jar   (with props)
release/sling/maven-sling-plugin-2.2.0-sources.jar.asc
release/sling/maven-sling-plugin-2.2.0-sources.jar.md5
release/sling/maven-sling-plugin-2.2.0-sources.jar.sha1
release/sling/maven-sling-plugin-2.2.0.jar   (with props)
release/sling/maven-sling-plugin-2.2.0.jar.asc
release/sling/maven-sling-plugin-2.2.0.jar.md5
release/sling/maven-sling-plugin-2.2.0.jar.sha1
release/sling/maven-sling-plugin-2.2.0.pom
release/sling/maven-sling-plugin-2.2.0.pom.asc
release/sling/maven-sling-plugin-2.2.0.pom.md5
release/sling/maven-sling-plugin-2.2.0.pom.sha1
Removed:
release/sling/maven-sling-plugin-2.1.10-javadoc.jar
release/sling/maven-sling-plugin-2.1.10-javadoc.jar.asc
release/sling/maven-sling-plugin-2.1.10-javadoc.jar.md5
release/sling/maven-sling-plugin-2.1.10-javadoc.jar.sha1
release/sling/maven-sling-plugin-2.1.10-source-release.zip
release/sling/maven-sling-plugin-2.1.10-source-release.zip.asc
release/sling/maven-sling-plugin-2.1.10-source-release.zip.md5
release/sling/maven-sling-plugin-2.1.10-source-release.zip.sha1
release/sling/maven-sling-plugin-2.1.10-sources.jar
release/sling/maven-sling-plugin-2.1.10-sources.jar.asc
release/sling/maven-sling-plugin-2.1.10-sources.jar.md5
release/sling/maven-sling-plugin-2.1.10-sources.jar.sha1
release/sling/maven-sling-plugin-2.1.10.jar
release/sling/maven-sling-plugin-2.1.10.jar.asc
release/sling/maven-sling-plugin-2.1.10.jar.md5
release/sling/maven-sling-plugin-2.1.10.jar.sha1
release/sling/maven-sling-plugin-2.1.10.pom
release/sling/maven-sling-plugin-2.1.10.pom.asc
release/sling/maven-sling-plugin-2.1.10.pom.md5
release/sling/maven-sling-plugin-2.1.10.pom.sha1

Added: release/sling/maven-sling-plugin-2.2.0-javadoc.jar
==
Binary file - no diff available.

Propchange: release/sling/maven-sling-plugin-2.2.0-javadoc.jar
--
svn:mime-type = application/octet-stream

Added: release/sling/maven-sling-plugin-2.2.0-javadoc.jar.asc
==
--- release/sling/maven-sling-plugin-2.2.0-javadoc.jar.asc (added)
+++ release/sling/maven-sling-plugin-2.2.0-javadoc.jar.asc Fri Mar 24 15:47:59 
2017
@@ -0,0 +1,11 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1
+
+iQEcBAABAgAGBQJY0QIMAAoJEM4rf/Z1146SI+AIAIdyGWk6nxqwEhytf3I7v7EV
+PihHyjuQsCN2SsrjXeYwph84+KMpHd8Sunwi2q2lmAe0T4m03WCup/jLyQusHWR9
+NGWZT+UYH+MaZ/RcH/5Q+ThdjWGomFpzvIw0skZDh1ff/j0QEQnUEPyReaQUDZCF
+qbbN9u7bPiOneEealTK6CWArSbP2D1XY90MCp3iC4iZzbyk+DN2quvCUvZdAyWBs
+3g/dhYO38jIdy5NxQZCpJisQgjslPzMsaYIRhQk+46eBWsflouit/UuY+LfIONQ4
+YiDPzfNAmASDcJDOkKW9dE5Vp048FumFTTXG9GFDdvYH5dW9rVbyS6WDDHq0X1o=
+=qQxF
+-END PGP SIGNATURE-

Added: release/sling/maven-sling-plugin-2.2.0-javadoc.jar.md5
==
--- release/sling/maven-sling-plugin-2.2.0-javadoc.jar.md5 (added)
+++ release/sling/maven-sling-plugin-2.2.0-javadoc.jar.md5 Fri Mar 24 15:47:59 
2017
@@ -0,0 +1 @@
+a85d579448f373ce0aafc3f4ab08a8ef
\ No newline at end of file

Added: release/sling/maven-sling-plugin-2.2.0-javadoc.jar.sha1
==
--- release/sling/maven-sling-plugin-2.2.0-javadoc.jar.sha1 (added)
+++ release/sling/maven-sling-plugin-2.2.0-javadoc.jar.sha1 Fri Mar 24 15:47:59 
2017
@@ -0,0 +1 @@
+4eef373b677f635f0741ac3c2d14464cc04eea49
\ No newline at end of file

Added: release/sling/maven-sling-plugin-2.2.0-source-release.zip
==
Binary file - no diff available.

Propchange: release/sling/maven-sling-plugin-2.2.0-source-release.zip
--
svn:mime-type = application/octet-stream

Propchange: release/sling/maven-sling-plugin-2.2.0-source-release.zip
--
svn:needs-lock = *

Added: release/sling/maven-sling-plugin-2.2.0-source-release.zip.asc

svn commit: r1008918 - in /websites/production/sling/content/components: maven-sling-plugin-archives/maven-sling-plugin-2.2.0/ maven-sling-plugin/

[sseifert]

Author: sseifert
Date: Fri Mar 24 15:49:30 2017
New Revision: 1008918

Log:
Apache Sling Maven Sling Plugin 2.2.0

Added:
websites/production/sling/content/components/maven-sling-plugin/
  - copied from r1008917, 
websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-2.2.0/
Removed:

websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-2.2.0/

svn commit: r1008919 - in /websites/staging/sling/trunk/content: ./ downloads.html news.html

[buildbot]

Author: buildbot
Date: Fri Mar 24 15:50:30 2017
New Revision: 1008919

Log:
Staging update by buildbot for sling

Modified:
websites/staging/sling/trunk/content/   (props changed)
websites/staging/sling/trunk/content/downloads.html
websites/staging/sling/trunk/content/news.html

Propchange: websites/staging/sling/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Fri Mar 24 15:50:30 2017
@@ -1 +1 @@
-1788421
+1788488

Modified: websites/staging/sling/trunk/content/downloads.html
==
--- websites/staging/sling/trunk/content/downloads.html (original)
+++ websites/staging/sling/trunk/content/downloads.html Fri Mar 24 15:50:30 2017
@@ -1480,16 +1480,16 @@ h2:hover > .headerlink, h3:hover > .head
 
 
 Maven Sling Plugin
-2.1.10
-Maven Plugin 
(http://www.apache.org/dist/sling/maven-sling-plugin-2.1.10.jar.asc;>asc,
 http://www.apache.org/dist/sling/maven-sling-plugin-2.1.10.jar.md5;>md5)
-Source 
ZIP (http://www.apache.org/dist/sling/maven-sling-plugin-2.1.10-source-release.zip.asc;>asc,
 http://www.apache.org/dist/sling/maven-sling-plugin-2.1.10-source-release.zip.md5;>md5)
+2.2.0
+Maven Plugin 
(http://www.apache.org/dist/sling/maven-sling-plugin-2.2.0.jar.asc;>asc,
 http://www.apache.org/dist/sling/maven-sling-plugin-2.2.0.jar.md5;>md5)
+Source 
ZIP (http://www.apache.org/dist/sling/maven-sling-plugin-2.2.0-source-release.zip.asc;>asc,
 http://www.apache.org/dist/sling/maven-sling-plugin-2.2.0-source-release.zip.md5;>md5)
 
 
 
 
 
   
-Rev. 1788371 by sseifert on Fri, 24 Mar 2017 07:54:15 +
+Rev. 1788488 by sseifert on Fri, 24 Mar 2017 15:50:14 +
   

 Apache Sling, Sling, Apache, the Apache feather logo, and the Apache 
Sling project

Modified: websites/staging/sling/trunk/content/news.html
==
--- websites/staging/sling/trunk/content/news.html (original)
+++ websites/staging/sling/trunk/content/news.html Fri Mar 24 15:50:30 2017
@@ -115,7 +115,7 @@ h2:hover > .headerlink, h3:hover > .head
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, 
h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, 
dt:hover > .elementid-permalink { visibility: visible }
 
-New Releases: Apache Sling CAConfig SPI 1.3.0, CAConfig Impl 1.3.0, 
CAConfig Mock Plugin 1.1.0 (March 24th, 2017)
+New Releases: Apache Sling CAConfig SPI 1.3.0, CAConfig Impl 1.3.0, 
CAConfig Mock Plugin 1.1.0, Apache Sling Maven Sling Plugin 2.2.0 (March 24th, 
2017)
 New Releases: Apache Sling JCR Content Parser 1.0.0, Testing OSGi Mock 
2.2.4, Testing OSGi Mock 1.9.4 (March 23th, 2017)
 New Releases: Apache Sling Commons JSON 2.0.20, Apache Sling Karaf 
repoinit 0.2.0, Apache Sling Scripting JSP API Wrapper 1.0.0, Apache Sling 
Scripting JSP EL Wrapper 1.0.0, Apache Sling Scripting JSP 2.3.0, Apache Sling 
Testing PaxExam 0.0.4, Apache Sling JCR Oak Server 1.1.4, Apache Sling 
Scripting Thymeleaf 1.1.0, Apache Sling Resource Presence 0.0.2 (March 20th, 
2017)
 New Releases: Apache Sling Resource Resolver 1.5.20, Apache Sling JCR 
Repoinit 1.1.4 (March 13th, 2017)
@@ -565,7 +565,7 @@ Apache Sling Scripting Sightly JS Use Pr
 Apache Sling has graduated into a top level project! (June 17, 2009)
 
   
-Rev. 1788371 by sseifert on Fri, 24 Mar 2017 07:54:15 +
+Rev. 1788488 by sseifert on Fri, 24 Mar 2017 15:50:14 +
   

 Apache Sling, Sling, Apache, the Apache feather logo, and the Apache 
Sling project

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

[sseifert]

Author: sseifert
Date: Fri Mar 24 15:50:14 2017
New Revision: 1788488

URL: http://svn.apache.org/viewvc?rev=1788488=rev
Log:
Apache Sling Maven Sling Plugin 2.2.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=1788488=1788487=1788488=diff
==
--- sling/site/trunk/content/downloads.list (original)
+++ sling/site/trunk/content/downloads.list Fri Mar 24 15:50:14 2017
@@ -218,6 +218,6 @@ XSS Protection|org.apache.sling.xss|1.0.
 # Format: title|artifactId|version[|classifier[|extension]]
 Maven JSPC Plugin|maven-jspc-plugin|2.0.8
 Maven Launchpad Plugin|maven-launchpad-plugin|2.3.4
-Maven Sling Plugin|maven-sling-plugin|2.1.10
+Maven Sling Plugin|maven-sling-plugin|2.2.0
 Slingstart Maven Plugin|slingstart-maven-plugin|1.7.2
 HTL Maven Plugin|htl-maven-plugin|1.0.6

Modified: sling/site/trunk/content/news.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1788488=1788487=1788488=diff
==
--- sling/site/trunk/content/news.mdtext (original)
+++ sling/site/trunk/content/news.mdtext Fri Mar 24 15:50:14 2017
@@ -1,6 +1,6 @@
 Title: News
 
-* New Releases: Apache Sling CAConfig SPI 1.3.0, CAConfig Impl 1.3.0, CAConfig 
Mock Plugin 1.1.0 (March 24th, 2017)
+* New Releases: Apache Sling CAConfig SPI 1.3.0, CAConfig Impl 1.3.0, CAConfig 
Mock Plugin 1.1.0, Apache Sling Maven Sling Plugin 2.2.0 (March 24th, 2017)
 * New Releases: Apache Sling JCR Content Parser 1.0.0, Testing OSGi Mock 
2.2.4, Testing OSGi Mock 1.9.4 (March 23th, 2017)
 * New Releases: Apache Sling Commons JSON 2.0.20, Apache Sling Karaf repoinit 
0.2.0, Apache Sling Scripting JSP API Wrapper 1.0.0, Apache Sling Scripting JSP 
EL Wrapper 1.0.0, Apache Sling Scripting JSP 2.3.0, Apache Sling Testing 
PaxExam 0.0.4, Apache Sling JCR Oak Server 1.1.4, Apache Sling Scripting 
Thymeleaf 1.1.0, Apache Sling Resource Presence 0.0.2 (March 20th, 2017)
 * New Releases: Apache Sling Resource Resolver 1.5.20, Apache Sling JCR 
Repoinit 1.1.4 (March 13th, 2017)

svn commit: r1788490 - in /sling/trunk/bundles/resourceresolver/src: main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java test/java/org/apache/sling/resourceresolver/impl/mapping/M

[cziegeler]

Author: cziegeler
Date: Fri Mar 24 15:59:58 2017
New Revision: 1788490

URL: http://svn.apache.org/viewvc?rev=1788490=rev
Log:
SLING-6710 : Vanity Path might get removed if a resource is updated

Modified:

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

sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesTest.java

Modified: 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java?rev=1788490=1788489=1788490=diff
==
--- 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
 (original)
+++ 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
 Fri Mar 24 15:59:58 2017
@@ -61,6 +61,7 @@ import org.apache.sling.api.resource.obs
 import org.apache.sling.api.resource.observation.ResourceChange;
 import org.apache.sling.api.resource.observation.ResourceChangeListener;
 import org.apache.sling.api.resource.path.Path;
+import org.apache.sling.resourceresolver.impl.ResourceResolverFactoryImpl;
 import org.apache.sling.resourceresolver.impl.ResourceResolverImpl;
 import 
org.apache.sling.resourceresolver.impl.mapping.MapConfigurationProvider.VanityPathConfig;
 import org.osgi.framework.BundleContext;
@@ -155,7 +156,7 @@ public class MapEntries implements
 
 doInit();
 
-final Dictionary props = new Hashtable();
+final Dictionary props = new Hashtable<>();
 final String[] paths = new 
String[factory.getObservationPaths().length];
 for(int i=0 ; i < paths.length; i++) {
 paths[i] = factory.getObservationPaths()[i].getPath();
@@ -186,7 +187,7 @@ public class MapEntries implements
 return;
 }
 
-final Map newResolveMapsMap = new 
ConcurrentHashMap();
+final Map newResolveMapsMap = new 
ConcurrentHashMap<>();
 
 //optimization made in SLING-2521
 if (this.factory.isOptimizeAliasResolutionEnabled()) {
@@ -268,12 +269,8 @@ public class MapEntries implements
 this.refreshResolverIfNecessary(resolverRefreshed);
 final Resource resource = resolver.getResource(path);
 if (resource != null) {
-boolean changed = false;
-final ValueMap props = resource.getValueMap();
-if (props.containsKey(PROP_VANITY_PATH)) {
-changed |= doAddVanity(resource, props);
-}
-if (this.factory.isOptimizeAliasResolutionEnabled() && 
props.containsKey(ResourceResolverImpl.PROP_ALIAS)) {
+boolean changed = doAddVanity(resource);
+if (this.factory.isOptimizeAliasResolutionEnabled() && 
resource.getValueMap().containsKey(ResourceResolverImpl.PROP_ALIAS)) {
 changed |= doAddAlias(resource);
 }
 return changed;
@@ -286,31 +283,39 @@ public class MapEntries implements
 }
 
 private boolean updateResource(final String path, final AtomicBoolean 
resolverRefreshed) {
-this.initializing.lock();
-
-try {
-this.refreshResolverIfNecessary(resolverRefreshed);
-final Resource resource = resolver.getResource(path);
-if (resource != null) {
-boolean changed = false;
-final ValueMap props = resource.getValueMap();
+final boolean isValidVanityPath =  this.isValidVanityPath(path);
+if ( this.factory.isOptimizeAliasResolutionEnabled() || 
isValidVanityPath) {
+this.initializing.lock();
 
-changed |= doRemoveVanity(path);
-if (props.containsKey(PROP_VANITY_PATH)) {
-changed |= doAddVanity(resource, props);
-}
+try {
+this.refreshResolverIfNecessary(resolverRefreshed);
+final Resource resource = resolver.getResource(path);
+if (resource != null) {
+boolean changed = false;
+if ( isValidVanityPath ) {
+// we remove the old vanity path first
+changed |= doRemoveVanity(path);
+
+// add back vanity path
+Resource contentRsrc = null;
+if ( !resource.getName().equals(JCR_CONTENT)) {
+// there might be a JCR_CONTENT child resource
+contentRsrc = 

Jenkins build became unstable: sling-launchpad-testing-1.8 #1376

[Apache Jenkins Server]

See 

svn commit: r1788462 - /sling/trunk/bundles/engine/pom.xml

[cziegeler]

Author: cziegeler
Date: Fri Mar 24 14:54:17 2017
New Revision: 1788462

URL: http://svn.apache.org/viewvc?rev=1788462=rev
Log:
SLING-6706 : Migrate to R6 annotations, clean up dependencies

Modified:
sling/trunk/bundles/engine/pom.xml

Modified: sling/trunk/bundles/engine/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/pom.xml?rev=1788462=1788461=1788462=diff
==
--- sling/trunk/bundles/engine/pom.xml (original)
+++ sling/trunk/bundles/engine/pom.xml Fri Mar 24 14:54:17 2017
@@ -132,6 +132,12 @@
 provided
 
 
+org.apache.sling
+org.apache.sling.commons.osgi
+2.1.0
+provided
+
+
 commons-fileupload
 commons-fileupload
 1.3

svn commit: r1788466 - in /sling/trunk/contrib/scripting/esx: ./ src/main/resources/libs/esx/demo/

[bdelacretaz]

Author: bdelacretaz
Date: Fri Mar 24 15:11:41 2017
New Revision: 1788466

URL: http://svn.apache.org/viewvc?rev=1788466=rev
Log:
SLING-6680 - svn:ignore

Modified:
sling/trunk/contrib/scripting/esx/   (props changed)
sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/   
(props changed)

Propchange: sling/trunk/contrib/scripting/esx/
--
--- svn:ignore (original)
+++ svn:ignore Fri Mar 24 15:11:41 2017
@@ -2,4 +2,3 @@ target
 .settings
 .classpath
 .project
-node_modules

Propchange: sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/
--
--- svn:ignore (added)
+++ svn:ignore Fri Mar 24 15:11:41 2017
@@ -0,0 +1 @@
+node_modules

svn commit: r1788469 - in /sling/trunk/contrib/scripting/esx: pom.xml src/main/java/org/apache/sling/scripting/esx/Require.java

[bdelacretaz]

Author: bdelacretaz
Date: Fri Mar 24 15:14:38 2017
New Revision: 1788469

URL: http://svn.apache.org/viewvc?rev=1788469=rev
Log:
SLING-6680 - pom tweaks and remove @author tag that we don't use in Sling code

Modified:
sling/trunk/contrib/scripting/esx/pom.xml

sling/trunk/contrib/scripting/esx/src/main/java/org/apache/sling/scripting/esx/Require.java

Modified: sling/trunk/contrib/scripting/esx/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/esx/pom.xml?rev=1788469=1788468=1788469=diff
==
--- sling/trunk/contrib/scripting/esx/pom.xml (original)
+++ sling/trunk/contrib/scripting/esx/pom.xml Fri Mar 24 15:14:38 2017
@@ -30,10 +30,16 @@
 org.apache.sling
 org.apache.sling.scripting.esx
 bundle
-1.0-SNAPSHOT
+1.0.0-SNAPSHOT
 Apache Sling Scripting ESX
 Support NodeJS like scripting and module 
resolution
 
+
+UTF-8
+
UTF-8
+8
+
+
 
 
 
@@ -163,7 +169,6 @@
 2.0.19-SNAPSHOT
 provided
 
-
 
 org.slf4j
 slf4j-api
@@ -189,30 +194,4 @@
 jar
 
 
-
-UTF-8
-
UTF-8
-8
-
-
-
-autoInstallBundle
-
-
-
-org.apache.sling
-maven-sling-plugin
-
-
-install-bundle
-
-install
-
-
-
-
-
-
-
-
 

Modified: 
sling/trunk/contrib/scripting/esx/src/main/java/org/apache/sling/scripting/esx/Require.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/esx/src/main/java/org/apache/sling/scripting/esx/Require.java?rev=1788469=1788468=1788469=diff
==
--- 
sling/trunk/contrib/scripting/esx/src/main/java/org/apache/sling/scripting/esx/Require.java
 (original)
+++ 
sling/trunk/contrib/scripting/esx/src/main/java/org/apache/sling/scripting/esx/Require.java
 Fri Mar 24 15:14:38 2017
@@ -19,11 +19,6 @@ package org.apache.sling.scripting.esx;
 import java.io.IOException;
 import javax.script.ScriptException;
 
-/**
- *
- * @author stas
- */
-@FunctionalInterface
 public interface Require {
 public Object require(String id) throws ScriptException, IOException;
-}
\ No newline at end of file
+}

Jenkins build is back to stable : sling-launchpad-testing-1.8 #1377

[Apache Jenkins Server]

See 

svn commit: r1788464 [1/2] - in /sling/trunk/contrib/scripting/esx: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/sling/ src/main/java/org/apac

[bdelacretaz]

Author: bdelacretaz
Date: Fri Mar 24 15:09:46 2017
New Revision: 1788464

URL: http://svn.apache.org/viewvc?rev=1788464=rev
Log:
SLING-6680 - new esx/Nashorn script engine, contributed by Senol Tas, thanks!

Added:
sling/trunk/contrib/scripting/esx/   (with props)
sling/trunk/contrib/scripting/esx/README.md
sling/trunk/contrib/scripting/esx/pom.xml
sling/trunk/contrib/scripting/esx/src/
sling/trunk/contrib/scripting/esx/src/main/
sling/trunk/contrib/scripting/esx/src/main/java/
sling/trunk/contrib/scripting/esx/src/main/java/org/
sling/trunk/contrib/scripting/esx/src/main/java/org/apache/
sling/trunk/contrib/scripting/esx/src/main/java/org/apache/sling/
sling/trunk/contrib/scripting/esx/src/main/java/org/apache/sling/scripting/

sling/trunk/contrib/scripting/esx/src/main/java/org/apache/sling/scripting/esx/

sling/trunk/contrib/scripting/esx/src/main/java/org/apache/sling/scripting/esx/EsxScriptEngine.java

sling/trunk/contrib/scripting/esx/src/main/java/org/apache/sling/scripting/esx/EsxScriptEngineFactory.java

sling/trunk/contrib/scripting/esx/src/main/java/org/apache/sling/scripting/esx/Module.java

sling/trunk/contrib/scripting/esx/src/main/java/org/apache/sling/scripting/esx/ModuleScript.java

sling/trunk/contrib/scripting/esx/src/main/java/org/apache/sling/scripting/esx/Require.java

sling/trunk/contrib/scripting/esx/src/main/java/org/apache/sling/scripting/esx/ScriptModuleCache.java

sling/trunk/contrib/scripting/esx/src/main/java/org/apache/sling/scripting/esx/globals/

sling/trunk/contrib/scripting/esx/src/main/java/org/apache/sling/scripting/esx/plugins/

sling/trunk/contrib/scripting/esx/src/main/java/org/apache/sling/scripting/esx/plugins/ConsoleLog.java

sling/trunk/contrib/scripting/esx/src/main/java/org/apache/sling/scripting/esx/plugins/SimpleResource.java

sling/trunk/contrib/scripting/esx/src/main/java/org/apache/sling/scripting/esx/plugins/SimpleResourceAdapterFactory.java

sling/trunk/contrib/scripting/esx/src/main/java/org/apache/sling/scripting/esx/services/

sling/trunk/contrib/scripting/esx/src/main/java/org/apache/sling/scripting/esx/services/ScriptModuleCache.java

sling/trunk/contrib/scripting/esx/src/main/java/org/apache/sling/scripting/esx/services/impl/

sling/trunk/contrib/scripting/esx/src/main/java/org/apache/sling/scripting/esx/services/impl/RepositoryModuleCache.java
sling/trunk/contrib/scripting/esx/src/main/resources/
sling/trunk/contrib/scripting/esx/src/main/resources/libs/
sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/
sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/
sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/README.md

sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/

sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/esx_modules/

sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/esx_modules/BlogComponent/

sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/esx_modules/BlogComponent/index.js

sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/esx_modules/calculator/

sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/esx_modules/calculator/index.js

sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/hbstemplates/

sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/hbstemplates/content.html

sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/hbstemplates/layout.html

sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/page/

sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/page/helper/

sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/page/helper/calculator/

sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/page/helper/calculator/index.js

sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/page/helper/pathinfo/

sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/page/helper/pathinfo/index.js

sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/page/page.esx

sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/page/templates/

sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/page/templates/listing.html

sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/page/templates/mobile.html

sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/post/

sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/post/post.esx

svn commit: r1788464 [2/2] - in /sling/trunk/contrib/scripting/esx: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/sling/ src/main/java/org/apac

[bdelacretaz]

Added: 
sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/page/helper/pathinfo/index.js
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/page/helper/pathinfo/index.js?rev=1788464=auto
==
--- 
sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/page/helper/pathinfo/index.js
 (added)
+++ 
sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/page/helper/pathinfo/index.js
 Fri Mar 24 15:09:46 2017
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+var _ = require('underscore');
+var pathInfo = sling.request.requestPathInfo;
+
+/**
+ *
+ * @param {string} selector to be searched for
+ * @return {boolean}
+ */
+function hasSelector(selector) {
+return _.contains(pathInfo.selectors, selector);
+}
+
+exports.extension = pathInfo.extension;
+exports.hasSelector = hasSelector;
\ No newline at end of file

Added: 
sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/page/page.esx
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/page/page.esx?rev=1788464=auto
==
--- 
sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/page/page.esx
 (added)
+++ 
sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/page/page.esx
 Fri Mar 24 15:09:46 2017
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+var math = require("calculator");
+var pathInfo = require("./helper/pathinfo");
+var moment = require("moment");
+var _ = require('underscore');
+
+var BlogComponent = require("BlogComponent");
+
+function PageComponent() {
+BlogComponent.call(this);
+this.partialContentTemplateURL = __dirname + "/templates/listing.html"
+}
+PageComponent.prototype = Object.create(BlogComponent.prototype);
+
+PageComponent.prototype.init = function () {
+var list = [];
+var posts = require("resource!" + this.basePath + 
"/posts").simpleResource.children;
+for each(var post in posts) {
+var blogPostModel = {};
+var createdAt = parseInt(post.getDateTimeProperty("jcr:created"));
+blogPostModel.content = 
this.transformMarkdown(post.properties.content);
+blogPostModel.properties = post.properties;
+blogPostModel.path = post.path;
+blogPostModel.date = moment(createdAt).format(' Do , h:mm:ss 
a');
+list.push(blogPostModel);
+}
+
+this.model.posts = list;
+}
+
+module.exports = new PageComponent();
\ No newline at end of file

Added: 
sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/page/templates/listing.html
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/page/templates/listing.html?rev=1788464=auto
==
--- 
sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/page/templates/listing.html
 (added)
+++ 
sling/trunk/contrib/scripting/esx/src/main/resources/libs/esx/demo/components/page/templates/listing.html
 Fri Mar 24 15:09:46 2017
@@ -0,0 +1,29 @@
+{{!--/*
+ * Licensed to the Apache Software Foundation 

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 backwardsCompatibleFragments =
+new ConcurrentHashMap();
 
 @Reference(
 cardinality = ReferenceCardinality.MULTIPLE,
@@ -84,9 +90,10 @@ public class LoginAdminWhitelist {
 }
 
 @Activate @Modified @SuppressWarnings("unused")
-void configure(LoginAdminWhitelistConfiguration configuration) {
+void configure(LoginAdminWhitelistConfiguration configuration, Map 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."
 );
 }
@@ -147,25 +154,19 @@ public class LoginAdminWhitelist {
 }
 
 @SuppressWarnings("deprecated")
-private void 

svn commit: r1788461 - in /sling/trunk/bundles/engine: ./ src/main/java/org/apache/sling/engine/impl/ src/main/java/org/apache/sling/engine/impl/log/ src/main/java/org/apache/sling/engine/impl/paramet

[cziegeler]

Author: cziegeler
Date: Fri Mar 24 14:51:22 2017
New Revision: 1788461

URL: http://svn.apache.org/viewvc?rev=1788461=rev
Log:
SLING-6706 : Migrate to R6 annotations, clean up dependencies

Removed:
sling/trunk/bundles/engine/src/main/resources/
Modified:
sling/trunk/bundles/engine/pom.xml

sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java

sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingSettingsServiceImpl.java

sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLogger.java

sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerService.java

sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/RequestParameterSupportConfigurer.java

sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/request/RequestData.java

Modified: sling/trunk/bundles/engine/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/pom.xml?rev=1788461=1788460=1788461=diff
==
--- sling/trunk/bundles/engine/pom.xml (original)
+++ sling/trunk/bundles/engine/pom.xml Fri Mar 24 14:51:22 2017
@@ -23,7 +23,7 @@
 
 org.apache.sling
 sling
-29
+30
 
 
 
@@ -51,10 +51,6 @@
 
 
 org.apache.felix
-maven-scr-plugin
-
-
-org.apache.felix
 maven-bundle-plugin
 true
 
@@ -132,13 +128,7 @@
 
 org.apache.sling
 org.apache.sling.commons.mime
-2.0.2-incubator
-provided
-
-
-org.apache.sling
-org.apache.sling.commons.osgi
-2.1.0
+2.1.2
 provided
 
 
@@ -165,10 +155,6 @@
 test
 
 
-org.apache.felix
-org.apache.felix.scr.annotations
-
-
 com.sun.japex
 japex
 1.2.3

Modified: 
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java?rev=1788461=1788460=1788461=diff
==
--- 
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
 (original)
+++ 
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
 Fri Mar 24 14:51:22 2017
@@ -34,23 +34,12 @@ import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.felix.scr.annotations.Activate;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Deactivate;
-import org.apache.felix.scr.annotations.Properties;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.PropertyUnbounded;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.apache.felix.scr.annotations.ReferencePolicy;
-import org.apache.felix.scr.annotations.References;
 import org.apache.sling.api.adapter.AdapterManager;
 import org.apache.sling.api.request.SlingRequestEvent;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.servlets.ServletResolver;
 import org.apache.sling.auth.core.AuthenticationSupport;
 import org.apache.sling.commons.mime.MimeTypeService;
-import org.apache.sling.commons.osgi.PropertiesUtil;
 import org.apache.sling.engine.SlingRequestProcessor;
 import org.apache.sling.engine.impl.filter.ServletFilterManager;
 import org.apache.sling.engine.impl.helper.ClientAbortException;
@@ -64,58 +53,84 @@ import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.framework.Version;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.osgi.service.component.annotations.ReferencePolicy;
 import org.osgi.service.http.context.ServletContextHelper;
 import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
+import org.osgi.service.metatype.annotations.AttributeDefinition;
+import org.osgi.service.metatype.annotations.Designate;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * The SlingMainServlet TODO
+ * The