svn commit: r1793892 - /sling/trunk/bundles/extensions/fsresource/pom.xml

[sseifert]

Author: sseifert
Date: Thu May  4 20:23:36 2017
New Revision: 1793892

URL: http://svn.apache.org/viewvc?rev=1793892=rev
Log:
update to next development version until release version is available on maven 
central

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

Modified: sling/trunk/bundles/extensions/fsresource/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/pom.xml?rev=1793892=1793891=1793892=diff
==
--- sling/trunk/bundles/extensions/fsresource/pom.xml (original)
+++ sling/trunk/bundles/extensions/fsresource/pom.xml Thu May  4 20:23:36 2017
@@ -146,7 +146,7 @@
 
 org.apache.sling
 org.apache.sling.jcr.contentparser
-1.1.0
+1.1.1-SNAPSHOT
 compile
 
 

svn commit: r1793894 - /sling/branches/fsresource-1.x/pom.xml

[sseifert]

Author: sseifert
Date: Thu May  4 20:23:47 2017
New Revision: 1793894

URL: http://svn.apache.org/viewvc?rev=1793894=rev
Log:
update to next development version until release version is available on maven 
central

Modified:
sling/branches/fsresource-1.x/pom.xml

Modified: sling/branches/fsresource-1.x/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/branches/fsresource-1.x/pom.xml?rev=1793894=1793893=1793894=diff
==
--- sling/branches/fsresource-1.x/pom.xml (original)
+++ sling/branches/fsresource-1.x/pom.xml Thu May  4 20:23:47 2017
@@ -148,7 +148,7 @@
 
 org.apache.sling
 org.apache.sling.jcr.contentparser
-1.1.0
+1.1.1-SNAPSHOT
 compile
 
 

Nexus: Staging 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.142.169.118"Details:The following artifacts have been staged/org/apache/sling/org.apache.sling.fsresource/2.1.0/org.apache.sling.fsresource-2.1.0.jar(SHA1: efaa6a8b99624438d28bf79b8f9f1a8f152b82bd)/org/apache/sling/org.apache.sling.fsresource/2.1.0/org.apache.sling.fsresource-2.1.0.jar.asc(SHA1: 0c7e7a6a5520bccc42ffa001396472f8eeaaf937)/org/apache/sling/org.apache.sling.fsresource/2.1.0/org.apache.sling.fsresource-2.1.0-javadoc.jar(SHA1: 7c9a82889f1829c0278026586bae8e71547fe855)/org/apache/sling/org.apache.sling.fsresource/2.1.0/org.apache.sling.fsresource-2.1.0.pom.asc(SHA1: 7898c5c79152d9d0c787f1372c248781d1cebb86)/org/apache/sling/org.apache.sling.fsresource/2.1.0/org.apache.sling.fsresource-2.1.0-javadoc.jar.asc(SHA1: 2cbe95eafeac0335084cbe763fd990e73fbca6bf)/org/apache/sling/org.apache.sling.fsresource/2.1.0/org.apache.sling.fsresource-2.1.0-sources.jar(SHA1: cdde10056f70c4685c76483d84f7d2aa32902839)/org/apache/sling/org.apache.sling.fsresource/2.1.0/org.apache.sling.fsresource-2.1.0-source-release.zip.asc(SHA1: 3c1fd4ebb4abb465becee6a55d5a42d32baad8bc)/org/apache/sling/org.apache.sling.fsresource/2.1.0/org.apache.sling.fsresource-2.1.0.pom(SHA1: 41415c874e5d87019f866c3dda617dbbbec6d1ea)/org/apache/sling/org.apache.sling.fsresource/2.1.0/org.apache.sling.fsresource-2.1.0-sources.jar.asc(SHA1: a63c1e23030a563e80f3f55d56a81bac69d0c13b)/org/apache/sling/org.apache.sling.fsresource/2.1.0/org.apache.sling.fsresource-2.1.0-source-release.zip(SHA1: 58cc5390eba75985a09687491293e9635b621f51)/org/apache/sling/org.apache.sling.fsresource/1.4.0/org.apache.sling.fsresource-1.4.0-source-release.zip(SHA1: 334de82cade2d0ce65c1f87e2c12a63c037bfb61)/org/apache/sling/org.apache.sling.fsresource/1.4.0/org.apache.sling.fsresource-1.4.0.pom(SHA1: b6851b367b8ccd13e5420f90048b3f309f0493ec)/org/apache/sling/org.apache.sling.fsresource/1.4.0/org.apache.sling.fsresource-1.4.0.jar(SHA1: 231c191877f4a9a8479f101a017be645c41afd57)/org/apache/sling/org.apache.sling.fsresource/1.4.0/org.apache.sling.fsresource-1.4.0-sources.jar.asc(SHA1: b8ad98b0b541cc2c4a349c7b80fd4b96feb4a266)/org/apache/sling/org.apache.sling.fsresource/1.4.0/org.apache.sling.fsresource-1.4.0-source-release.zip.asc(SHA1: be9b28a79c467e3f204605d27005c586bac5b518)/org/apache/sling/org.apache.sling.fsresource/1.4.0/org.apache.sling.fsresource-1.4.0.pom.asc(SHA1: d31f6cd546de53d82d51543c163b6f4aacdf8644)/org/apache/sling/org.apache.sling.fsresource/1.4.0/org.apache.sling.fsresource-1.4.0.jar.asc(SHA1: 16dfcd9f8f523b4c3566201285e72c2af5247a56)/org/apache/sling/org.apache.sling.fsresource/1.4.0/org.apache.sling.fsresource-1.4.0-javadoc.jar.asc(SHA1: 1d58e8a20cd90d82abcd2794bf137345894df37d)/org/apache/sling/org.apache.sling.fsresource/1.4.0/org.apache.sling.fsresource-1.4.0-javadoc.jar(SHA1: 7f6468f94186c15a7b5163ce729f9dd167e9c862)/org/apache/sling/org.apache.sling.fsresource/1.4.0/org.apache.sling.fsresource-1.4.0-sources.jar(SHA1: 5e7eddbade2341df4a7f379f30d75d997aa76b3f)/org/apache/sling/org.apache.sling.jcr.contentparser/1.1.0/org.apache.sling.jcr.contentparser-1.1.0.pom.asc(SHA1: dbfb672186df684ae527749a60d1725685d0b251)/org/apache/sling/org.apache.sling.jcr.contentparser/1.1.0/org.apache.sling.jcr.contentparser-1.1.0.jar.asc(SHA1: 8362c95563ff9956a04e0dff04b1e57548fe01f7)/org/apache/sling/org.apache.sling.jcr.contentparser/1.1.0/org.apache.sling.jcr.contentparser-1.1.0-javadoc.jar(SHA1: b2d938f77edce1fea8e5aecd43039dc3ebd35cb7)/org/apache/sling/org.apache.sling.jcr.contentparser/1.1.0/org.apache.sling.jcr.contentparser-1.1.0-javadoc.jar.asc(SHA1: 92519ecee9b613f85fff1161e747296ab66a3db3)/org/apache/sling/org.apache.sling.jcr.contentparser/1.1.0/org.apache.sling.jcr.contentparser-1.1.0-source-release.zip(SHA1: 8f3a0cf99df6091db4a1242e02d1b26b18506013)/org/apache/sling/org.apache.sling.jcr.contentparser/1.1.0/org.apache.sling.jcr.contentparser-1.1.0-sources.jar(SHA1: c8add5f9d98f62753315a6c20ffe30ba325c2fe4)/org/apache/sling/org.apache.sling.jcr.contentparser/1.1.0/org.apache.sling.jcr.contentparser-1.1.0-sources.jar.asc(SHA1: 2d15be4ac86f526cc43e63be670070ee2469930c)/org/apache/sling/org.apache.sling.jcr.contentparser/1.1.0/org.apache.sling.jcr.contentparser-1.1.0.pom(SHA1: 122034be533312509d697667ce7a1e8247c552c9)/org/apache/sling/org.apache.sling.jcr.contentparser/1.1.0/org.apache.sling.jcr.contentparser-1.1.0.jar(SHA1: c3dfe000e903c93185082563c62c9e5cdadc27a0)/org/apache/sling/org.apache.sling.jcr.contentparser/1.1.0/org.apache.sling.jcr.contentparser-1.1.0-source-release.zip.asc(SHA1: a6b8be971f9bbf78ce8f3cc8a29ea867814a01bc)Action performed by Stefan Seifert (sseifert)

svn commit: r1793885 - /sling/tags/org.apache.sling.fsresource-1.4.0/

[sseifert]

Author: sseifert
Date: Thu May  4 20:19:48 2017
New Revision: 1793885

URL: http://svn.apache.org/viewvc?rev=1793885=rev
Log:
[maven-release-plugin] copy for tag org.apache.sling.fsresource-1.4.0

Added:
sling/tags/org.apache.sling.fsresource-1.4.0/
  - copied from r1793884, sling/branches/fsresource-1.x/

svn commit: r1793886 - /sling/branches/fsresource-1.x/pom.xml

[sseifert]

Author: sseifert
Date: Thu May  4 20:19:50 2017
New Revision: 1793886

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

Modified:
sling/branches/fsresource-1.x/pom.xml

Modified: sling/branches/fsresource-1.x/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/branches/fsresource-1.x/pom.xml?rev=1793886=1793885=1793886=diff
==
--- sling/branches/fsresource-1.x/pom.xml (original)
+++ sling/branches/fsresource-1.x/pom.xml Thu May  4 20:19:50 2017
@@ -28,7 +28,7 @@
 
 org.apache.sling.fsresource
 bundle
-1.4.0
+1.4.1-SNAPSHOT
 
 Apache Sling File System Resource Provider
 
@@ -36,9 +36,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.fsresource-1.4.0
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.fsresource-1.4.0
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.fsresource-1.4.0
+
scm:svn:http://svn.apache.org/repos/asf/sling/branches/fsresource-1.x
+
scm:svn:https://svn.apache.org/repos/asf/sling/branches/fsresource-1.x
+http://svn.apache.org/viewvc/sling/branches/fsresource-1.x
 
 
 

svn commit: r1793884 - /sling/branches/fsresource-1.x/pom.xml

[sseifert]

Author: sseifert
Date: Thu May  4 20:19:35 2017
New Revision: 1793884

URL: http://svn.apache.org/viewvc?rev=1793884=rev
Log:
[maven-release-plugin] prepare release org.apache.sling.fsresource-1.4.0

Modified:
sling/branches/fsresource-1.x/pom.xml

Modified: sling/branches/fsresource-1.x/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/branches/fsresource-1.x/pom.xml?rev=1793884=1793883=1793884=diff
==
--- sling/branches/fsresource-1.x/pom.xml (original)
+++ sling/branches/fsresource-1.x/pom.xml Thu May  4 20:19:35 2017
@@ -28,7 +28,7 @@
 
 org.apache.sling.fsresource
 bundle
-1.3.1-SNAPSHOT
+1.4.0
 
 Apache Sling File System Resource Provider
 
@@ -36,9 +36,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/branches/fsresource-1.x
-
scm:svn:https://svn.apache.org/repos/asf/sling/branches/fsresource-1.x
-http://svn.apache.org/viewvc/sling/branches/fsresource-1.x
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.fsresource-1.4.0
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.fsresource-1.4.0
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.fsresource-1.4.0
 
 
 

svn commit: r1793882 - /sling/tags/org.apache.sling.fsresource-2.1.0/

[sseifert]

Author: sseifert
Date: Thu May  4 20:18:02 2017
New Revision: 1793882

URL: http://svn.apache.org/viewvc?rev=1793882=rev
Log:
[maven-release-plugin] copy for tag org.apache.sling.fsresource-2.1.0

Added:
sling/tags/org.apache.sling.fsresource-2.1.0/
  - copied from r1793881, sling/trunk/bundles/extensions/fsresource/

svn commit: r1793883 - /sling/trunk/bundles/extensions/fsresource/pom.xml

[sseifert]

Author: sseifert
Date: Thu May  4 20:18:05 2017
New Revision: 1793883

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

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

Modified: sling/trunk/bundles/extensions/fsresource/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/pom.xml?rev=1793883=1793882=1793883=diff
==
--- sling/trunk/bundles/extensions/fsresource/pom.xml (original)
+++ sling/trunk/bundles/extensions/fsresource/pom.xml Thu May  4 20:18:05 2017
@@ -28,7 +28,7 @@
 
 org.apache.sling.fsresource
 bundle
-2.1.0
+2.1.1-SNAPSHOT
 
 Apache Sling File System Resource Provider
 
@@ -36,9 +36,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.fsresource-2.1.0
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.fsresource-2.1.0
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.fsresource-2.1.0
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource
+
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource
 
 
 

svn commit: r1793881 - /sling/trunk/bundles/extensions/fsresource/pom.xml

[sseifert]

Author: sseifert
Date: Thu May  4 20:17:49 2017
New Revision: 1793881

URL: http://svn.apache.org/viewvc?rev=1793881=rev
Log:
[maven-release-plugin] prepare release org.apache.sling.fsresource-2.1.0

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

Modified: sling/trunk/bundles/extensions/fsresource/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/pom.xml?rev=1793881=1793880=1793881=diff
==
--- sling/trunk/bundles/extensions/fsresource/pom.xml (original)
+++ sling/trunk/bundles/extensions/fsresource/pom.xml Thu May  4 20:17:49 2017
@@ -28,7 +28,7 @@
 
 org.apache.sling.fsresource
 bundle
-2.0.1-SNAPSHOT
+2.1.0
 
 Apache Sling File System Resource Provider
 
@@ -36,9 +36,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource
-
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.fsresource-2.1.0
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.fsresource-2.1.0
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.fsresource-2.1.0
 
 
 

svn commit: r1793879 - /sling/branches/fsresource-1.x/pom.xml

[sseifert]

Author: sseifert
Date: Thu May  4 20:16:59 2017
New Revision: 1793879

URL: http://svn.apache.org/viewvc?rev=1793879=rev
Log:
update dependency

Modified:
sling/branches/fsresource-1.x/pom.xml

Modified: sling/branches/fsresource-1.x/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/branches/fsresource-1.x/pom.xml?rev=1793879=1793878=1793879=diff
==
--- sling/branches/fsresource-1.x/pom.xml (original)
+++ sling/branches/fsresource-1.x/pom.xml Thu May  4 20:16:59 2017
@@ -148,7 +148,7 @@
 
 org.apache.sling
 org.apache.sling.jcr.contentparser
-1.0.1-SNAPSHOT
+1.1.0
 compile
 
 

svn commit: r1793880 - /sling/trunk/bundles/extensions/fsresource/pom.xml

[sseifert]

Author: sseifert
Date: Thu May  4 20:17:07 2017
New Revision: 1793880

URL: http://svn.apache.org/viewvc?rev=1793880=rev
Log:
update dependency

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

Modified: sling/trunk/bundles/extensions/fsresource/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/pom.xml?rev=1793880=1793879=1793880=diff
==
--- sling/trunk/bundles/extensions/fsresource/pom.xml (original)
+++ sling/trunk/bundles/extensions/fsresource/pom.xml Thu May  4 20:17:07 2017
@@ -146,7 +146,7 @@
 
 org.apache.sling
 org.apache.sling.jcr.contentparser
-1.0.1-SNAPSHOT
+1.1.0
 compile
 
 

Jenkins build is back to normal : sling-bundles-jcr-contentloader-1.8 #17

[Apache Jenkins Server]

See 

Jenkins build is back to normal : sling-bundles-jcr-contentloader-1.7 #17

[Apache Jenkins Server]

See 

svn commit: r1793876 - /sling/tags/org.apache.sling.jcr.contentparser-1.1.0/

[sseifert]

Author: sseifert
Date: Thu May  4 20:12:35 2017
New Revision: 1793876

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

Added:
sling/tags/org.apache.sling.jcr.contentparser-1.1.0/
  - copied from r1793875, sling/trunk/bundles/jcr/contentparser/

svn commit: r1793877 - /sling/trunk/bundles/jcr/contentparser/pom.xml

[sseifert]

Author: sseifert
Date: Thu May  4 20:12:37 2017
New Revision: 1793877

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

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

Modified: sling/trunk/bundles/jcr/contentparser/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser/pom.xml?rev=1793877=1793876=1793877=diff
==
--- sling/trunk/bundles/jcr/contentparser/pom.xml (original)
+++ sling/trunk/bundles/jcr/contentparser/pom.xml Thu May  4 20:12:37 2017
@@ -28,7 +28,7 @@
 
 org.apache.sling.jcr.contentparser
 bundle
-1.1.0
+1.1.1-SNAPSHOT
 
 Apache Sling JCR Content Parser
 
@@ -36,9 +36,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.contentparser-1.1.0
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.contentparser-1.1.0
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.contentparser-1.1.0
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/contentparser
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/contentparser
+
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser
 
 
 

svn commit: r1793875 - /sling/trunk/bundles/jcr/contentparser/pom.xml

[sseifert]

Author: sseifert
Date: Thu May  4 20:12:23 2017
New Revision: 1793875

URL: http://svn.apache.org/viewvc?rev=1793875=rev
Log:
[maven-release-plugin] prepare release org.apache.sling.jcr.contentparser-1.1.0

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

Modified: sling/trunk/bundles/jcr/contentparser/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser/pom.xml?rev=1793875=1793874=1793875=diff
==
--- sling/trunk/bundles/jcr/contentparser/pom.xml (original)
+++ sling/trunk/bundles/jcr/contentparser/pom.xml Thu May  4 20:12:23 2017
@@ -28,7 +28,7 @@
 
 org.apache.sling.jcr.contentparser
 bundle
-1.0.1-SNAPSHOT
+1.1.0
 
 Apache Sling JCR Content Parser
 
@@ -36,9 +36,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/contentparser
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/contentparser
-
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.contentparser-1.1.0
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.contentparser-1.1.0
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.contentparser-1.1.0
 
 
 

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

[sseifert]

Author: sseifert
Date: Thu May  4 20:11:10 2017
New Revision: 1793874

URL: http://svn.apache.org/viewvc?rev=1793874=rev
Log:
fix javadoc errors

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=1793874=1793873=1793874=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
 Thu May  4 20:11:10 2017
@@ -28,13 +28,13 @@ public enum ContentType {
 
 /**
  * JSON content descriptor file.
- * @see 
https://sling.apache.org/documentation/bundles/content-loading-jcr-contentloader.html#json-descriptor-files
+ * @see https://sling.apache.org/documentation/bundles/content-loading-jcr-contentloader.html#json-descriptor-files;>JCR
 ContentLoader JSON descriptor files
  */
 JSON("json"),
 
 /**
  * XML content descriptor file.
- * @see 
https://sling.apache.org/documentation/bundles/content-loading-jcr-contentloader.html#xml-descriptor-files
+ * @see https://sling.apache.org/documentation/bundles/content-loading-jcr-contentloader.html#xml-descriptor-files;>JCR
 ContentLoader XML descriptor files
  */
 XML("xml"),
 

svn commit: r1793872 - /sling/trunk/bundles/jcr/contentloader/pom.xml

[sseifert]

Author: sseifert
Date: Thu May  4 20:05:25 2017
New Revision: 1793872

URL: http://svn.apache.org/viewvc?rev=1793872=rev
Log:
update to next development version until release version is available on maven 
central

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

Modified: sling/trunk/bundles/jcr/contentloader/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/pom.xml?rev=1793872=1793871=1793872=diff
==
--- sling/trunk/bundles/jcr/contentloader/pom.xml (original)
+++ sling/trunk/bundles/jcr/contentloader/pom.xml Thu May  4 20:05:25 2017
@@ -312,7 +312,7 @@
 
   org.apache.sling
   org.apache.sling.paxexam.util
-  1.0.4
+  1.0.5-SNAPSHOT
   test
 
 

Build failed in Jenkins: sling-bundles-jcr-contentloader-1.7 #16

[Apache Jenkins Server]

See 


Changes:

[sseifert] [maven-release-plugin] prepare for next development iteration

[sseifert] [maven-release-plugin] prepare release 
org.apache.sling.jcr.contentloader-2.2.0

[sseifert] update dependency

--
Started by upstream project "sling-testing-sling-pax-util-1.7" build number 4
originally caused by:
 Started by an SCM change
[EnvInject] - Loading node environment variables.
Building remotely on ubuntu-4 (ubuntu trusty) in workspace 

Checking out a fresh workspace because there's no workspace at 

Cleaning local Directory .
Checking out 
https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/contentloader at 
revision '2017-05-04T20:02:55.448 +'
A src
A src/test
A src/test/java
A src/test/java/org
A src/test/java/org/apache
A src/test/java/org/apache/sling
A src/test/java/org/apache/sling/jcr
A src/test/java/org/apache/sling/jcr/contentloader
A src/test/java/org/apache/sling/jcr/contentloader/internal
A 
src/test/java/org/apache/sling/jcr/contentloader/internal/ContentLoaderServiceTest.java
A src/test/java/org/apache/sling/jcr/contentloader/internal/readers
A 
src/test/java/org/apache/sling/jcr/contentloader/internal/readers/OrderedJsonReaderTest.java
AU
src/test/java/org/apache/sling/jcr/contentloader/internal/readers/XmlReaderTest.java
A 
src/test/java/org/apache/sling/jcr/contentloader/internal/CreateNodeTest.java
A 
src/test/java/org/apache/sling/jcr/contentloader/internal/BundleContentLoaderTest.java
AU
src/test/java/org/apache/sling/jcr/contentloader/internal/JsonReaderTest.java
A 
src/test/java/org/apache/sling/jcr/contentloader/internal/ImportOptionsFactory.java
A 
src/test/java/org/apache/sling/jcr/contentloader/internal/PathEntryTest.java
AU
src/test/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreatorTest.java
A src/test/java/org/apache/sling/jcr/contentloader/it
A 
src/test/java/org/apache/sling/jcr/contentloader/it/ContentBundleTestBase.java
A 
src/test/java/org/apache/sling/jcr/contentloader/it/PaxExamUtilities.java
AU
src/test/java/org/apache/sling/jcr/contentloader/it/I18nInitialContentIT.java
A 
src/test/java/org/apache/sling/jcr/contentloader/it/BasicInitialContentIT.java
A 
src/test/java/org/apache/sling/jcr/contentloader/it/OrderedInitialContentIT.java
A src/test/resources
A src/test/resources/SLING-INF
A src/test/resources/SLING-INF/libs
A src/test/resources/SLING-INF/libs/app.xml
A src/test/resources/initial-content
A src/test/resources/initial-content/ordered-content.ordered-json
AUsrc/test/resources/initial-content/folder-with-descriptor.json
A src/test/resources/initial-content/i18n
AUsrc/test/resources/initial-content/i18n/en.json.xml
AUsrc/test/resources/initial-content/i18n/en.json
A src/test/resources/initial-content/folder-with-descriptor
AUsrc/test/resources/initial-content/folder-with-descriptor/test2.txt
A src/test/resources/initial-content/basic-content.json
A src/test/resources/initial-content/simple-folder
AUsrc/test/resources/initial-content/simple-folder/test1.txt
A src/test/resources/reader
AUsrc/test/resources/reader/sample.xsl
A src/test/resources/reader/testfile.txt
A src/test/resources/reader/datefallbacksample.xml
A src/test/resources/reader/filesample.xml
AUsrc/test/resources/reader/sample.xml
A src/main
A src/main/java
A src/main/java/org
A src/main/java/org/apache
A src/main/java/org/apache/sling
A src/main/java/org/apache/sling/jcr
A src/main/java/org/apache/sling/jcr/contentloader
A src/main/java/org/apache/sling/jcr/contentloader/package-info.java
AUsrc/main/java/org/apache/sling/jcr/contentloader/ImportOptions.java
AUsrc/main/java/org/apache/sling/jcr/contentloader/ContentCreator.java
A src/main/java/org/apache/sling/jcr/contentloader/ContentTypeUtil.java
AU
src/main/java/org/apache/sling/jcr/contentloader/ContentImportListener.java
AUsrc/main/java/org/apache/sling/jcr/contentloader/ContentImporter.java
A src/main/java/org/apache/sling/jcr/contentloader/internal
AU
src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreator.java
AU
src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentImporter.java
A 
src/main/java/org/apache/sling/jcr/contentloader/internal/JcrXmlImporter.java
AU

Nexus: Staging Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDescription:Apache Sling JCR ContentLoader 2.2.0, Pax Exam Utilities 1.0.4Deployer properties:"userAgent" = "Apache-Maven/3.3.9 (Java 1.8.0_121; Windows 10 10.0)""userId" = "sseifert""ip" = "80.142.169.118"Details:The following artifacts have been staged/org/apache/sling/org.apache.sling.jcr.contentloader/2.2.0/org.apache.sling.jcr.contentloader-2.2.0-source-release.zip(SHA1: 4e567283d5af440c9fa4f56bf425a339cbf3795b)/org/apache/sling/org.apache.sling.jcr.contentloader/2.2.0/org.apache.sling.jcr.contentloader-2.2.0.pom.asc(SHA1: 2042a4af10595a096d62b907bbe7720b15e60f70)/org/apache/sling/org.apache.sling.jcr.contentloader/2.2.0/org.apache.sling.jcr.contentloader-2.2.0-source-release.zip.asc(SHA1: 774c14a5bff6966ebae848b1ab9d39b7ffb50326)/org/apache/sling/org.apache.sling.jcr.contentloader/2.2.0/org.apache.sling.jcr.contentloader-2.2.0.jar(SHA1: 0845c9d38ad537afb1e248b8253b0f48aed5fd9e)/org/apache/sling/org.apache.sling.jcr.contentloader/2.2.0/org.apache.sling.jcr.contentloader-2.2.0-sources.jar.asc(SHA1: ae064cc5046af3e2ca7431a19bb95efc665184c9)/org/apache/sling/org.apache.sling.jcr.contentloader/2.2.0/org.apache.sling.jcr.contentloader-2.2.0-javadoc.jar(SHA1: b40be4bed9317b8155ae915a83c029f7d8b8516f)/org/apache/sling/org.apache.sling.jcr.contentloader/2.2.0/org.apache.sling.jcr.contentloader-2.2.0-sources.jar(SHA1: 8e5338cb550a807a38bd5ac89df2a4acbd253ee4)/org/apache/sling/org.apache.sling.jcr.contentloader/2.2.0/org.apache.sling.jcr.contentloader-2.2.0.pom(SHA1: 1ca56f02a3a9275995985ad1eba48b3579dab5cb)/org/apache/sling/org.apache.sling.jcr.contentloader/2.2.0/org.apache.sling.jcr.contentloader-2.2.0-javadoc.jar.asc(SHA1: 1fcd62723790621bb0411753d91121f3fe871231)/org/apache/sling/org.apache.sling.jcr.contentloader/2.2.0/org.apache.sling.jcr.contentloader-2.2.0.jar.asc(SHA1: 9c3063b9f6bf8ea1a9544e9c058b5f0e6c658837)/org/apache/sling/org.apache.sling.paxexam.util/1.0.4/org.apache.sling.paxexam.util-1.0.4.pom(SHA1: b5dd8d626be624156e5653ec5313246111e3afed)/org/apache/sling/org.apache.sling.paxexam.util/1.0.4/org.apache.sling.paxexam.util-1.0.4.jar(SHA1: a8d30599c727c02d76c4917394f7666c49ec67aa)/org/apache/sling/org.apache.sling.paxexam.util/1.0.4/org.apache.sling.paxexam.util-1.0.4-javadoc.jar.asc(SHA1: 9f04dd4729bd481fa8772366ad200a9bfd854a52)/org/apache/sling/org.apache.sling.paxexam.util/1.0.4/org.apache.sling.paxexam.util-1.0.4-sources.jar.asc(SHA1: 5b3a2bae5bbbf43aa87649ba24f659648947bd9f)/org/apache/sling/org.apache.sling.paxexam.util/1.0.4/org.apache.sling.paxexam.util-1.0.4.jar.asc(SHA1: 1abfb92ba4ddc06a9848fe8d0a5bfc89093ff741)/org/apache/sling/org.apache.sling.paxexam.util/1.0.4/org.apache.sling.paxexam.util-1.0.4-sources.jar(SHA1: a88ba12eecfa78f59664d44ac1b92f4718ed0be3)/org/apache/sling/org.apache.sling.paxexam.util/1.0.4/org.apache.sling.paxexam.util-1.0.4-source-release.zip.asc(SHA1: 6a3ee6bd0a2b9bcaebe8052c5690f4d355d9d999)/org/apache/sling/org.apache.sling.paxexam.util/1.0.4/org.apache.sling.paxexam.util-1.0.4.pom.asc(SHA1: 6b5e42913864421c73d7b247b0e074f3d81b867f)/org/apache/sling/org.apache.sling.paxexam.util/1.0.4/org.apache.sling.paxexam.util-1.0.4-source-release.zip(SHA1: 292ff0348c17915ba12770ba8e4b9d7c572a27db)/org/apache/sling/org.apache.sling.paxexam.util/1.0.4/org.apache.sling.paxexam.util-1.0.4-javadoc.jar(SHA1: 12da795ef40af0d75d808659963983c7020bdd5b)Action performed by Stefan Seifert (sseifert)

Build failed in Jenkins: sling-bundles-jcr-contentloader-1.8 #16

[Apache Jenkins Server]

See 


Changes:

[sseifert] [maven-release-plugin] prepare for next development iteration

[sseifert] [maven-release-plugin] prepare release 
org.apache.sling.jcr.contentloader-2.2.0

[sseifert] update dependency

--
Started by an SCM change
[EnvInject] - Loading node environment variables.
Building remotely on ubuntu-1 (ubuntu trusty) in workspace 

Updating https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/contentloader 
at revision '2017-05-04T19:59:11.934 +'
U pom.xml
At revision 1793871

Parsing POMs
Modules changed, recalculating dependency graph
Established TCP socket on 49709
maven33-agent.jar already up to date
maven33-interceptor.jar already up to date
maven3-interceptor-commons.jar already up to date
[sling-bundles-jcr-contentloader-1.8] $ 
/home/jenkins/tools/java/latest1.8/bin/java -Xmx2g -Xms256m -cp 
/home/jenkins/jenkins-slave/maven33-agent.jar:/home/jenkins/tools/maven/apache-maven-3.3.9/boot/plexus-classworlds-2.5.2.jar:/home/jenkins/tools/maven/apache-maven-3.3.9/conf/logging
 jenkins.maven3.agent.Maven33Main /home/jenkins/tools/maven/apache-maven-3.3.9 
/home/jenkins/jenkins-slave/slave.jar 
/home/jenkins/jenkins-slave/maven33-interceptor.jar 
/home/jenkins/jenkins-slave/maven3-interceptor-commons.jar 49709
<===[JENKINS REMOTING CAPACITY]===>   channel started
Executing Maven:  -B -f 
 
-Dmaven.repo.local=/home/jenkins/jenkins-slave/maven-repositories/0 -U clean 
verify
[INFO] Scanning for projects...
[INFO] 
[INFO] 
[INFO] Building Apache Sling Initial Content Loader 2.2.1-SNAPSHOT
[INFO] 
[INFO] Downloading: 
https://repo.maven.apache.org/maven2/org/apache/sling/org.apache.sling.paxexam.util/1.0.4/org.apache.sling.paxexam.util-1.0.4.pom
[WARNING] The POM for org.apache.sling:org.apache.sling.paxexam.util:jar:1.0.4 
is missing, no dependency information available
[INFO] Downloading: 
https://repo.maven.apache.org/maven2/org/apache/sling/org.apache.sling.paxexam.util/1.0.4/org.apache.sling.paxexam.util-1.0.4.jar
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled[INFO] 

[INFO] BUILD FAILURE
[INFO] 
[INFO] Total time: 7.300 s
[INFO] Finished at: 2017-05-04T20:00:07+00:00

[INFO] Final Memory: 20M/322M
[INFO] 
Waiting for Jenkins to finish collecting data[ERROR] Failed to execute goal on 
project org.apache.sling.jcr.contentloader: Could not resolve dependencies for 
project 
org.apache.sling:org.apache.sling.jcr.contentloader:bundle:2.2.1-SNAPSHOT: 
Could not find artifact 
org.apache.sling:org.apache.sling.paxexam.util:jar:1.0.4 in central 
(https://repo.maven.apache.org/maven2) -> [Help 1]
[ERROR] 
[ERROR] To see the full stack trace of the errors, re-run Maven with the -e 
switch.
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR] 
[ERROR] For more information about the errors and possible solutions, please 
read the following articles:
[ERROR] [Help 1] 
http://cwiki.apache.org/confluence/display/MAVEN/DependencyResolutionException

channel stopped
Recording test results
ERROR: Step ?Publish JUnit test result report? failed: Test reports were found 
but none of them are new. Did tests run? 
For example, 

 is 5 min 42 sec old

svn commit: r1793870 - /sling/tags/org.apache.sling.jcr.contentloader-2.2.0/

[sseifert]

Author: sseifert
Date: Thu May  4 19:58:42 2017
New Revision: 1793870

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

Added:
sling/tags/org.apache.sling.jcr.contentloader-2.2.0/
  - copied from r1793869, sling/trunk/bundles/jcr/contentloader/

svn commit: r1793871 - /sling/trunk/bundles/jcr/contentloader/pom.xml

[sseifert]

Author: sseifert
Date: Thu May  4 19:58:45 2017
New Revision: 1793871

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

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

Modified: sling/trunk/bundles/jcr/contentloader/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/pom.xml?rev=1793871=1793870=1793871=diff
==
--- sling/trunk/bundles/jcr/contentloader/pom.xml (original)
+++ sling/trunk/bundles/jcr/contentloader/pom.xml Thu May  4 19:58:45 2017
@@ -29,7 +29,7 @@
   
 
   org.apache.sling.jcr.contentloader
-  2.2.0
+  2.2.1-SNAPSHOT
   bundle
 
   Apache Sling Initial Content Loader
@@ -48,9 +48,9 @@
   
 
   
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.contentloader-2.2.0
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.contentloader-2.2.0
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.contentloader-2.2.0
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/contentloader
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/contentloader
+
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader
   
 
   

svn commit: r1793868 - /sling/trunk/bundles/jcr/contentloader/pom.xml

[sseifert]

Author: sseifert
Date: Thu May  4 19:57:07 2017
New Revision: 1793868

URL: http://svn.apache.org/viewvc?rev=1793868=rev
Log:
update dependency

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

Modified: sling/trunk/bundles/jcr/contentloader/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/pom.xml?rev=1793868=1793867=1793868=diff
==
--- sling/trunk/bundles/jcr/contentloader/pom.xml (original)
+++ sling/trunk/bundles/jcr/contentloader/pom.xml Thu May  4 19:57:07 2017
@@ -312,7 +312,7 @@
 
   org.apache.sling
   org.apache.sling.paxexam.util
-  1.0.3-SNAPSHOT
+  1.0.4
   test
 
 

svn commit: r1793865 - /sling/trunk/testing/sling-pax-util/pom.xml

[sseifert]

Author: sseifert
Date: Thu May  4 19:55:15 2017
New Revision: 1793865

URL: http://svn.apache.org/viewvc?rev=1793865=rev
Log:
[maven-release-plugin] prepare release org.apache.sling.paxexam.util-1.0.4

Modified:
sling/trunk/testing/sling-pax-util/pom.xml

Modified: sling/trunk/testing/sling-pax-util/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/sling-pax-util/pom.xml?rev=1793865=1793864=1793865=diff
==
--- sling/trunk/testing/sling-pax-util/pom.xml (original)
+++ sling/trunk/testing/sling-pax-util/pom.xml Thu May  4 19:55:15 2017
@@ -1,179 +1,179 @@
-
-
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
-
-4.0.0
-
-
-org.apache.sling
-sling
-30
-
-
-
-org.apache.sling
-org.apache.sling.paxexam.util
-1.0.3-SNAPSHOT
-jar
-
-Apache Sling Pax Exam Utilities
-
-
-Utilities that make it easier to test Sling code with Pax Exam.
-See this module's tests for usage examples.
-
-
-
-UTF-8
-3.0.3
-1.5.2
-INFO
--Xmx256M -XX:MaxPermSize=256m
-
-
-
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util
- 
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util
-
http://svn.apache.org/viewvc/sling/trunk/testing/sling-pax-util
-
-
-
-
-   
-org.apache.rat
-apache-rat-plugin
-
-
-derby.log
-jackrabbit/**
-
-
-
-
-maven-clean-plugin
-
-
-
-${basedir}
-
-derby.log
-jackrabbit/**
-coverage.ec
-
-
-
-
-
-
-org.apache.maven.plugins
-maven-surefire-plugin
-
-${pax.vm.options}
-
-
-pax.exam.log.level
-${pax.exam.log.level}
-
-
-java.protocol.handler.pkgs
-org.ops4j.pax.url
-
-
-
-
-
-
-
-
-
-org.osgi
-osgi.cmpn
-
-
-org.ops4j.pax.exam
-pax-exam-container-native
-${exam.version}
-test
-
-
-org.ops4j.pax.exam
-pax-exam-junit4
-${exam.version}
-
-
-org.ops4j.pax.exam
-pax-exam-link-mvn
-${exam.version}
-test
-
-
-org.ops4j.pax.url
-pax-url-aether
-${url.version}
-test
-
-
-org.apache.felix
-org.apache.felix.framework
-5.6.2
-test
-
-
-org.apache.sling
-maven-launchpad-plugin
-2.2.0
-maven-plugin
-
-
-org.apache.sling
-org.apache.sling.launchpad.api
-1.1.0
-test
-
-
-org.apache.sling
-org.apache.sling.api
-2.4.2
-test
-
-
-org.apache.sling
-org.apache.sling.jcr.api
-2.1.0
-test
-
-
-org.apache.sling
-org.apache.sling.settings
-1.3.0
-test
-
-
-javax.jcr
-jcr
-test
-
-
-junit
-junit
-
-
-org.slf4j
-slf4j-api
-
-
-org.slf4j
-slf4j-simple
-
-
-
-
+
+
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
+
+4.0.0
+
+
+org.apache.sling
+sling
+30
+
+
+
+org.apache.sling
+org.apache.sling.paxexam.util
+1.0.4
+jar
+
+Apache Sling Pax Exam Utilities
+
+
+Utilities that make it easier to test Sling code with Pax Exam.
+See this module's tests for usage 

svn commit: r1793864 - in /sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader: ./ internal/ internal/readers/

[sseifert]

Author: sseifert
Date: Thu May  4 19:50:39 2017
New Revision: 1793864

URL: http://svn.apache.org/viewvc?rev=1793864=rev
Log:
fix javadoc errors

Modified:

sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/ContentCreator.java

sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/PathEntry.java

sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/JsonReader.java

sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/OrderedJsonReader.java

sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/XmlReader.java

Modified: 
sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/ContentCreator.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/ContentCreator.java?rev=1793864=1793863=1793864=diff
==
--- 
sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/ContentCreator.java
 (original)
+++ 
sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/ContentCreator.java
 Thu May  4 19:50:39 2017
@@ -153,6 +153,7 @@ public interface ContentCreator {
  * @param order specifies the position of the ACE in the 
containing ACL. (may be null)
  *  Value should be one of these:
  *  
+ *  Values
  *  firstPlace the target ACE as 
the first amongst its siblings
  *  lastPlace the target ACE as 
the last amongst its siblings
  *  before xyzPlace the target 
ACE immediately before the sibling whose name is xyz

Modified: 
sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/PathEntry.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/PathEntry.java?rev=1793864=1793863=1793864=diff
==
--- 
sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/PathEntry.java
 (original)
+++ 
sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/PathEntry.java
 Thu May  4 19:50:39 2017
@@ -74,9 +74,9 @@ public class PathEntry extends ImportOpt
 public static final String AUTOCHECKOUT_DIRECTIVE = "autoCheckout";
 
 /**
- * The ignore content readers directive specifying whether the available 
{@link ContentReader}s
- * should be used during content loading. This is a string value that 
defaults to the empty
- * string..
+ * The ignore content readers directive specifying whether the available 
+ * {@link org.apache.sling.jcr.contentloader.ContentReader}s should be 
used during
+ * content loading. This is a string value that defaults to the 
emptystring.
  * @since 2.0.4
  */
 public static final String IGNORE_CONTENT_READERS_DIRECTIVE = 
"ignoreImportProviders";

Modified: 
sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/JsonReader.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/JsonReader.java?rev=1793864=1793863=1793864=diff
==
--- 
sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/JsonReader.java
 (original)
+++ 
sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/JsonReader.java
 Thu May  4 19:50:39 2017
@@ -336,6 +336,9 @@ public class JsonReader implements Conte
  * ],
  *  }
  *  
+ *  @param obj Object
+ *  @param contentCreator Content creator
+ *  @throws RepositoryException Repository exception
  */
 protected void createPrincipals(Object obj, ContentCreator contentCreator) 
throws RepositoryException {
if (obj instanceof JsonObject) {

Modified: 
sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/OrderedJsonReader.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/OrderedJsonReader.java?rev=1793864=1793863=1793864=diff
==
--- 

svn commit: r1793861 - /sling/trunk/testing/sling-pax-util/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java

[sseifert]

Author: sseifert
Date: Thu May  4 19:45:37 2017
New Revision: 1793861

URL: http://svn.apache.org/viewvc?rev=1793861=rev
Log:
fix javadoc errors

Modified:

sling/trunk/testing/sling-pax-util/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java

Modified: 
sling/trunk/testing/sling-pax-util/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/sling-pax-util/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java?rev=1793861=1793860=1793861=diff
==
--- 
sling/trunk/testing/sling-pax-util/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java
 (original)
+++ 
sling/trunk/testing/sling-pax-util/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java
 Thu May  4 19:45:37 2017
@@ -44,11 +44,12 @@ import org.ops4j.pax.exam.options.Defaul
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/** Pax exam options and utilities to test Sling applications
- *  The basic idea is to get a vanilla Sling launchpad instance
- *  setup with a minimal amount of boilerplate code.
- *  See {@link SlingSetupTest} for an example.
- * */
+/**
+ * Pax exam options and utilities to test Sling applications
+ * The basic idea is to get a vanilla Sling launchpad instance
+ * setup with a minimal amount of boilerplate code.
+ * See SlingSetupTest for an example.
+ */
 public class SlingPaxOptions {
 private static final Logger log = 
LoggerFactory.getLogger(SlingPaxOptions.class);
 public static final int DEFAULT_SLING_START_LEVEL = 30;
@@ -68,8 +69,11 @@ public class SlingPaxOptions {
 return result;
 }
 
-/** When reading bundle lists, ignore bundles which have symbolic names
- *  starting with one of the supplied prefixes */
+/**
+ * When reading bundle lists, ignore bundles which have symbolic names
+ * starting with one of the supplied prefixes
+ * @param symbolicNamePrefix Symbolic name prefixes
+ */
 public static void setIgnoredBundles(String ... symbolicNamePrefix) {
 if(symbolicNamePrefix == null || symbolicNamePrefix.length == 0) {
 ignoredBundlePrefixes = new String[] {};
@@ -78,13 +82,20 @@ public class SlingPaxOptions {
 }
 }
 
-/** Get run modes to use for our tests, as set by the sling.run.modes 
property */
+/**
+ * Get run modes to use for our tests, as set by the sling.run.modes 
property
+ * @return Run modes
+ */
 public static Collection getTestRunModes() {
 final String runModes = System.getProperty("sling.run.modes", 
DEFAULT_RUN_MODES);
 return Arrays.asList(runModes.split(","));
 }
 
-/** @param launchpadVersion null means use the latest */
+/**
+ * Set default launchpad options
+ * @param launchpadVersion null means use the latest
+ * @return Composite option
+ */
 public static CompositeOption defaultLaunchpadOptions(String 
launchpadVersion) {
 final String paxLogLevel = System.getProperty("pax.exam.log.level", 
"INFO");
 
@@ -219,7 +230,10 @@ public class SlingPaxOptions {
 return slingBundleList("org.apache.sling", 
"org.apache.sling.launchpad", version, "xml", "bundlelist");
 }
 
-/** @param version can be null, to use default */ 
+/**
+ * Felix remote shell bundles
+ * @return Composite option
+ */ 
 public static CompositeOption felixRemoteShellBundles() {
 final String gogoVersion = "0.10.0";
 return new DefaultCompositeOption(

Jenkins build is back to stable : sling-bundles-extensions-fsresource-1.7 #45

[Apache Jenkins Server]

See 

svn commit: r1793832 - in /sling/branches/fsresource-1.x/src/test/java/org/apache/sling/fsprovider/internal: JcrXmlContentTest.java JsonContentTest.java ResourcePathComparator.java

[sseifert]

Author: sseifert
Date: Thu May  4 16:28:48 2017
New Revision: 1793832

URL: http://svn.apache.org/viewvc?rev=1793832=rev
Log:
SLING-6829 make unit tests independent of resource child order

Added:

sling/branches/fsresource-1.x/src/test/java/org/apache/sling/fsprovider/internal/ResourcePathComparator.java
   (with props)
Modified:

sling/branches/fsresource-1.x/src/test/java/org/apache/sling/fsprovider/internal/JcrXmlContentTest.java

sling/branches/fsresource-1.x/src/test/java/org/apache/sling/fsprovider/internal/JsonContentTest.java

Modified: 
sling/branches/fsresource-1.x/src/test/java/org/apache/sling/fsprovider/internal/JcrXmlContentTest.java
URL: 
http://svn.apache.org/viewvc/sling/branches/fsresource-1.x/src/test/java/org/apache/sling/fsprovider/internal/JcrXmlContentTest.java?rev=1793832=1793831=1793832=diff
==
--- 
sling/branches/fsresource-1.x/src/test/java/org/apache/sling/fsprovider/internal/JcrXmlContentTest.java
 (original)
+++ 
sling/branches/fsresource-1.x/src/test/java/org/apache/sling/fsprovider/internal/JcrXmlContentTest.java
 Thu May  4 16:28:48 2017
@@ -27,6 +27,7 @@ import static org.junit.Assert.assertNot
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThat;
 
+import java.util.Collections;
 import java.util.List;
 
 import javax.jcr.Node;
@@ -45,7 +46,7 @@ import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
 
 /**
  * Test access to files and folders from file system.
@@ -155,7 +156,8 @@ public class JcrXmlContentTest {
 @Test
 public void testFolder3ChildNodes() throws RepositoryException {
 Resource folder3 = fsroot.getChild("folder3");
-List children = ImmutableList.copyOf(folder3.listChildren());
+List children = Lists.newArrayList(folder3.listChildren());
+Collections.sort(children, new ResourcePathComparator());
 
 assertEquals(2, children.size());
 Resource child1 = children.get(0);

Modified: 
sling/branches/fsresource-1.x/src/test/java/org/apache/sling/fsprovider/internal/JsonContentTest.java
URL: 
http://svn.apache.org/viewvc/sling/branches/fsresource-1.x/src/test/java/org/apache/sling/fsprovider/internal/JsonContentTest.java?rev=1793832=1793831=1793832=diff
==
--- 
sling/branches/fsresource-1.x/src/test/java/org/apache/sling/fsprovider/internal/JsonContentTest.java
 (original)
+++ 
sling/branches/fsresource-1.x/src/test/java/org/apache/sling/fsprovider/internal/JsonContentTest.java
 Thu May  4 16:28:48 2017
@@ -29,6 +29,7 @@ import static org.junit.Assert.assertTha
 import static org.junit.Assert.assertTrue;
 
 import java.math.BigDecimal;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -55,8 +56,8 @@ import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
 
 /**
  * Test access to files and folders and JSON content from file system.
@@ -250,7 +251,8 @@ public class JsonContentTest {
 @Test
 public void testFolder2ChildNodes() throws RepositoryException {
 Resource folder2 = fsroot.getChild("folder2");
-List children = ImmutableList.copyOf(folder2.listChildren());
+List children = Lists.newArrayList(folder2.listChildren());
+Collections.sort(children, new ResourcePathComparator());
 
 assertEquals(2, children.size());
 Resource child1 = children.get(0);

Added: 
sling/branches/fsresource-1.x/src/test/java/org/apache/sling/fsprovider/internal/ResourcePathComparator.java
URL: 
http://svn.apache.org/viewvc/sling/branches/fsresource-1.x/src/test/java/org/apache/sling/fsprovider/internal/ResourcePathComparator.java?rev=1793832=auto
==
--- 
sling/branches/fsresource-1.x/src/test/java/org/apache/sling/fsprovider/internal/ResourcePathComparator.java
 (added)
+++ 
sling/branches/fsresource-1.x/src/test/java/org/apache/sling/fsprovider/internal/ResourcePathComparator.java
 Thu May  4 16:28:48 2017
@@ -0,0 +1,32 @@
+/*
+ * 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,
+ * 

svn commit: r1793831 - in /sling/trunk/bundles/extensions/fsresource/src/test/java/org/apache/sling/fsprovider/internal: JcrXmlContentTest.java JsonContentTest.java ResourcePathComparator.java

[sseifert]

Author: sseifert
Date: Thu May  4 16:27:29 2017
New Revision: 1793831

URL: http://svn.apache.org/viewvc?rev=1793831=rev
Log:
SLING-6829 make unit tests independent of resource child order

Added:

sling/trunk/bundles/extensions/fsresource/src/test/java/org/apache/sling/fsprovider/internal/ResourcePathComparator.java
   (with props)
Modified:

sling/trunk/bundles/extensions/fsresource/src/test/java/org/apache/sling/fsprovider/internal/JcrXmlContentTest.java

sling/trunk/bundles/extensions/fsresource/src/test/java/org/apache/sling/fsprovider/internal/JsonContentTest.java

Modified: 
sling/trunk/bundles/extensions/fsresource/src/test/java/org/apache/sling/fsprovider/internal/JcrXmlContentTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/src/test/java/org/apache/sling/fsprovider/internal/JcrXmlContentTest.java?rev=1793831=1793830=1793831=diff
==
--- 
sling/trunk/bundles/extensions/fsresource/src/test/java/org/apache/sling/fsprovider/internal/JcrXmlContentTest.java
 (original)
+++ 
sling/trunk/bundles/extensions/fsresource/src/test/java/org/apache/sling/fsprovider/internal/JcrXmlContentTest.java
 Thu May  4 16:27:29 2017
@@ -27,6 +27,7 @@ import static org.junit.Assert.assertNot
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThat;
 
+import java.util.Collections;
 import java.util.List;
 
 import javax.jcr.Node;
@@ -43,7 +44,7 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
 
 /**
  * Test access to files and folders from file system.
@@ -152,7 +153,8 @@ public class JcrXmlContentTest {
 @Test
 public void testFolder3ChildNodes() throws RepositoryException {
 Resource folder3 = fsroot.getChild("folder3");
-List children = ImmutableList.copyOf(folder3.listChildren());
+List children = Lists.newArrayList(folder3.listChildren());
+Collections.sort(children, new ResourcePathComparator());
 
 assertEquals(2, children.size());
 Resource child1 = children.get(0);

Modified: 
sling/trunk/bundles/extensions/fsresource/src/test/java/org/apache/sling/fsprovider/internal/JsonContentTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/src/test/java/org/apache/sling/fsprovider/internal/JsonContentTest.java?rev=1793831=1793830=1793831=diff
==
--- 
sling/trunk/bundles/extensions/fsresource/src/test/java/org/apache/sling/fsprovider/internal/JsonContentTest.java
 (original)
+++ 
sling/trunk/bundles/extensions/fsresource/src/test/java/org/apache/sling/fsprovider/internal/JsonContentTest.java
 Thu May  4 16:27:29 2017
@@ -29,6 +29,7 @@ import static org.junit.Assert.assertTha
 import static org.junit.Assert.assertTrue;
 
 import java.math.BigDecimal;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -53,8 +54,8 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
 
 /**
  * Test access to files and folders and JSON content from file system.
@@ -247,7 +248,8 @@ public class JsonContentTest {
 @Test
 public void testFolder2ChildNodes() throws RepositoryException {
 Resource folder2 = fsroot.getChild("folder2");
-List children = ImmutableList.copyOf(folder2.listChildren());
+List children = Lists.newArrayList(folder2.listChildren());
+Collections.sort(children, new ResourcePathComparator());
 
 assertEquals(2, children.size());
 Resource child1 = children.get(0);

Added: 
sling/trunk/bundles/extensions/fsresource/src/test/java/org/apache/sling/fsprovider/internal/ResourcePathComparator.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/src/test/java/org/apache/sling/fsprovider/internal/ResourcePathComparator.java?rev=1793831=auto
==
--- 
sling/trunk/bundles/extensions/fsresource/src/test/java/org/apache/sling/fsprovider/internal/ResourcePathComparator.java
 (added)
+++ 
sling/trunk/bundles/extensions/fsresource/src/test/java/org/apache/sling/fsprovider/internal/ResourcePathComparator.java
 Thu May  4 16:27:29 2017
@@ -0,0 +1,32 @@
+/*
+ * 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 

Jenkins build became unstable: sling-bundles-extensions-fsresource-1.8 #47

[Apache Jenkins Server]

See 

Jenkins build became unstable: sling-bundles-extensions-fsresource-1.7 #44

[Apache Jenkins Server]

See 

svn commit: r1793827 - in /sling/branches/fsresource-1.x: ./ src/main/java/org/apache/sling/fsprovider/internal/ src/main/java/org/apache/sling/fsprovider/internal/mapper/ src/main/java/org/apache/sli

[sseifert]

Author: sseifert
Date: Thu May  4 16:10:35 2017
New Revision: 1793827

URL: http://svn.apache.org/viewvc?rev=1793827=rev
Log:
SLING-6829 FSResource: Support node descriptor files for folders and binary 
files

Added:

sling/branches/fsresource-1.x/src/test/resources/fs-test/folder2/folder21.xml   
(with props)

sling/branches/fsresource-1.x/src/test/resources/fs-test/folder2/folder21/file21a.txt.xml
   (with props)
Modified:
sling/branches/fsresource-1.x/pom.xml

sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/ContentFileExtensions.java

sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java

sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/mapper/ContentFileResourceMapper.java

sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/mapper/FileResource.java

sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/mapper/FileResourceMapper.java

sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileParserUtil.java

sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileTypes.java

sling/branches/fsresource-1.x/src/test/java/org/apache/sling/fsprovider/internal/JsonContentTest.java

sling/branches/fsresource-1.x/src/test/java/org/apache/sling/fsprovider/internal/parser/ContentFileParserUtilTest.java

Modified: sling/branches/fsresource-1.x/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/branches/fsresource-1.x/pom.xml?rev=1793827=1793826=1793827=diff
==
--- sling/branches/fsresource-1.x/pom.xml (original)
+++ sling/branches/fsresource-1.x/pom.xml Thu May  4 16:10:35 2017
@@ -148,7 +148,7 @@
 
 org.apache.sling
 org.apache.sling.jcr.contentparser
-1.0.0
+1.0.1-SNAPSHOT
 compile
 
 

Modified: 
sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/ContentFileExtensions.java
URL: 
http://svn.apache.org/viewvc/sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/ContentFileExtensions.java?rev=1793827=1793826=1793827=diff
==
--- 
sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/ContentFileExtensions.java
 (original)
+++ 
sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/ContentFileExtensions.java
 Thu May  4 16:10:35 2017
@@ -18,6 +18,9 @@
  */
 package org.apache.sling.fsprovider.internal;
 
+import static 
org.apache.sling.fsprovider.internal.parser.ContentFileTypes.JCR_XML_SUFFIX;
+import static 
org.apache.sling.fsprovider.internal.parser.ContentFileTypes.XML_SUFFIX;
+
 import java.io.File;
 import java.util.Collection;
 import java.util.List;
@@ -43,8 +46,15 @@ public final class ContentFileExtensions
 public String getSuffix(File file) {
 String fileName = "/" + file.getName();
 for (String suffix : contentFileSuffixes) {
-if (StringUtils.endsWith(fileName, suffix)) {
-return suffix;
+if (StringUtils.equals(suffix, XML_SUFFIX)) {
+if (StringUtils.endsWith(fileName, XML_SUFFIX) && 
!StringUtils.endsWith(fileName, JCR_XML_SUFFIX)) {
+return suffix;
+}
+}
+else {
+if (StringUtils.endsWith(fileName, suffix)) {
+return suffix;
+}
 }
 }
 return null;

Modified: 
sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
URL: 
http://svn.apache.org/viewvc/sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java?rev=1793827=1793826=1793827=diff
==
--- 
sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
 (original)
+++ 
sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
 Thu May  4 16:10:35 2017
@@ -40,6 +40,7 @@ import org.apache.sling.fsprovider.inter
 import org.apache.sling.fsprovider.internal.mapper.FileVaultResourceMapper;
 import org.apache.sling.fsprovider.internal.parser.ContentFileCache;
 import org.apache.sling.fsprovider.internal.parser.ContentFileTypes;
+import org.apache.sling.jcr.contentparser.ContentType;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Activate;
@@ -184,9 +185,9 @@ public final class FsResourceProvider im
 }
 else {
 // Sling-Initial-Content: mount 

Jenkins build is back to normal : sling-contrib-extensions-distribution-core-1.7 #52

[Apache Jenkins Server]

See 

svn commit: r1793810 - /sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/HttpConfiguration.java

[tommaso]

Author: tommaso
Date: Thu May  4 14:18:22 2017
New Revision: 1793810

URL: http://svn.apache.org/viewvc?rev=1793810=rev
Log:
SLING-5952 - added missing http config class

Added:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/HttpConfiguration.java
   (with props)

Added: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/HttpConfiguration.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/HttpConfiguration.java?rev=1793810=auto
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/HttpConfiguration.java
 (added)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/HttpConfiguration.java
 Thu May  4 14:18:22 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.
+ */
+package org.apache.sling.distribution.transport.impl;
+
+/**
+ * HTTP related configuration for {@link SimpleHttpDistributionTransport}
+ */
+public class HttpConfiguration {
+
+private final Integer connectTimeout;
+private final Integer socketTimeout;
+
+public HttpConfiguration(Integer timeout) {
+this.socketTimeout = timeout;
+this.connectTimeout = timeout;
+}
+
+public HttpConfiguration(Integer connectTimeout, Integer socketTimeout) {
+this.connectTimeout = connectTimeout;
+this.socketTimeout = socketTimeout;
+}
+
+public Integer getConnectTimeout() {
+return connectTimeout;
+}
+
+public Integer getSocketTimeout() {
+return socketTimeout;
+}
+}

Propchange: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/HttpConfiguration.java
--
svn:eol-style = native

Build failed in Jenkins: sling-contrib-extensions-distribution-core-1.8 #50

[Apache Jenkins Server]

See 


Changes:

[tommaso] SLING-5952 - added timeout configs to http transport

--
[...truncated 23.08 KB...]
A src/test/java/org/apache/sling/distribution/packaging/impl/importer
AU
src/test/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporterTest.java
AU
src/test/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporterTest.java
AU
src/test/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporterTest.java
A src/test/java/org/apache/sling/distribution/queue
A src/test/java/org/apache/sling/distribution/queue/impl
A src/test/java/org/apache/sling/distribution/queue/impl/jobhandling
AU
src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueProviderTest.java
A 
src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtilsTest.java
A 
src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueTest.java
AU
src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumerTest.java
AU
src/test/java/org/apache/sling/distribution/queue/impl/AsyncDeliveryDispatchingStrategyTest.java
A 
src/test/java/org/apache/sling/distribution/queue/impl/PriorityQueueDispatchingStrategyTest.java
A 
src/test/java/org/apache/sling/distribution/queue/impl/SingleQueueDistributionStrategyTest.java
A src/test/java/org/apache/sling/distribution/queue/impl/simple
AU
src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueCheckpointTest.java
AU
src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProviderTest.java
AU
src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProcessorTest.java
A 
src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueTest.java
A src/test/java/org/apache/sling/distribution/monitor
AU
src/test/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheckTest.java
A src/test/java/org/apache/sling/distribution/monitor/impl
AU
src/test/java/org/apache/sling/distribution/monitor/impl/ForwardDistributionAgentMBeanTest.java
AU
src/test/java/org/apache/sling/distribution/monitor/impl/QueueDistributionAgentMBeanTest.java
AU
src/test/java/org/apache/sling/distribution/monitor/impl/DistributionQueueMBeanTest.java
AU
src/test/java/org/apache/sling/distribution/monitor/impl/SimpleDistributionAgentMBeanTest.java
AU
src/test/java/org/apache/sling/distribution/monitor/impl/ReverseDistributionAgentMBeanTest.java
AU
src/test/java/org/apache/sling/distribution/monitor/impl/DistributionPackageMBeanTest.java
AU
src/test/java/org/apache/sling/distribution/monitor/impl/SyncDistributionAgentMBeanTest.java
AU
src/test/java/org/apache/sling/distribution/monitor/impl/UserCredentialsDistributionTransportSecretMBeanTest.java
A src/test/java/org/apache/sling/distribution/transport
A src/test/java/org/apache/sling/distribution/transport/impl
AU
src/test/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportTest.java
A src/test/java/org/apache/sling/distribution/serialization
A src/test/java/org/apache/sling/distribution/serialization/impl
A src/test/java/org/apache/sling/distribution/serialization/impl/vlt
AU
src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultContentSerializerTest.java
A 
src/test/java/org/apache/sling/distribution/serialization/impl/vlt/VltUtilsTest.java
AU
src/test/java/org/apache/sling/distribution/serialization/DistributionExportFilterTest.java
A src/test/java/org/apache/sling/distribution/util
A src/test/java/org/apache/sling/distribution/util/impl
AU
src/test/java/org/apache/sling/distribution/util/impl/FileBackedMemoryOutputStreamTest.java
A src/test/java/org/apache/sling/distribution/agent
A src/test/java/org/apache/sling/distribution/agent/impl
A 
src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java
AU
src/test/java/org/apache/sling/distribution/agent/impl/TriggerAgentRequestHandlerTest.java
AU
src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessorTest.java
AU
src/test/java/org/apache/sling/distribution/agent/impl/QueueingDistributionPackageProcessorTest.java
AU
src/test/java/org/apache/sling/distribution/agent/impl/PrivilegeDistributionRequestAuthorizationStrategyTest.java
AU

Build failed in Jenkins: sling-contrib-extensions-distribution-core-1.7 #51

[Apache Jenkins Server]

See 


Changes:

[tommaso] SLING-5952 - added timeout configs to http transport

--
[...truncated 23.15 KB...]
A 
src/main/java/org/apache/sling/distribution/resources/DistributionResourceTypes.java
A src/main/java/org/apache/sling/distribution/transport
A src/main/java/org/apache/sling/distribution/transport/impl
A 
src/main/java/org/apache/sling/distribution/transport/impl/DefaultRemoteDistributionPackage.java
A 
src/main/java/org/apache/sling/distribution/transport/impl/DistributionTransport.java
A 
src/main/java/org/apache/sling/distribution/transport/impl/HttpTransportUtils.java
A 
src/main/java/org/apache/sling/distribution/transport/impl/DistributionEndpoint.java
A 
src/main/java/org/apache/sling/distribution/transport/impl/DistributionTransportContext.java
AU
src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java
A 
src/main/java/org/apache/sling/distribution/transport/impl/RemoteDistributionPackage.java
AU
src/main/java/org/apache/sling/distribution/transport/impl/UserCredentialsDistributionTransportSecretProvider.java
A src/main/java/org/apache/sling/distribution/serialization
A src/main/java/org/apache/sling/distribution/serialization/impl
A 
src/main/java/org/apache/sling/distribution/serialization/impl/DefaultDistributionPackageBuilderProvider.java
A src/main/java/org/apache/sling/distribution/serialization/impl/vlt
A 
src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultContentSerializer.java
A 
src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java
A 
src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VltUtils.java
A 
src/main/java/org/apache/sling/distribution/serialization/impl/DistributionPackageBuilderFactory.java
A 
src/main/java/org/apache/sling/distribution/serialization/DistributionContentSerializer.java
A 
src/main/java/org/apache/sling/distribution/serialization/package-info.java
AU
src/main/java/org/apache/sling/distribution/serialization/DistributionExportFilter.java
AU
src/main/java/org/apache/sling/distribution/serialization/DistributionExportOptions.java
A src/main/java/org/apache/sling/distribution/util
A src/main/java/org/apache/sling/distribution/util/impl
AU
src/main/java/org/apache/sling/distribution/util/impl/FileBackedMemoryOutputStream.java
A src/main/java/org/apache/sling/distribution/util/impl/DigestUtils.java
A 
src/main/java/org/apache/sling/distribution/util/impl/DistributionUtils.java
AU
src/main/java/org/apache/sling/distribution/util/impl/ByteBufferBackedInputStream.java
AUsrc/main/java/org/apache/sling/distribution/util/package-info.java
AUsrc/main/java/org/apache/sling/distribution/util/RequestUtils.java
AU
src/main/java/org/apache/sling/distribution/util/DistributionJcrUtils.java
A src/main/java/org/apache/sling/distribution/agent
A 
src/main/java/org/apache/sling/distribution/agent/DistributionAgent.java
A 
src/main/java/org/apache/sling/distribution/agent/DistributionAgentState.java
A src/main/java/org/apache/sling/distribution/agent/impl
A 
src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java
AU
src/main/java/org/apache/sling/distribution/agent/impl/PrivilegeDistributionRequestAuthorizationStrategy.java
A 
src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java
AU
src/main/java/org/apache/sling/distribution/agent/impl/ImportingDistributionPackageProcessor.java
AU
src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentAuthenticationInfo.java
A 
src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
AU
src/main/java/org/apache/sling/distribution/agent/impl/TriggerAgentRequestHandler.java
A 
src/main/java/org/apache/sling/distribution/agent/impl/AbstractDistributionAgentFactory.java
A 
src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
A 
src/main/java/org/apache/sling/distribution/agent/impl/PrivilegeDistributionRequestAuthorizationStrategyFactory.java
A 
src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java
A 
src/main/java/org/apache/sling/distribution/agent/impl/DistributionRequestAuthorizationStrategy.java
AU
src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessor.java
AU

svn commit: r1793803 - in /sling/trunk/contrib/extensions/distribution/core/src: main/java/org/apache/sling/distribution/agent/impl/ main/java/org/apache/sling/distribution/packaging/impl/exporter/ ma

[tommaso]

Author: tommaso
Date: Thu May  4 14:00:21 2017
New Revision: 1793803

URL: http://svn.apache.org/viewvc?rev=1793803=rev
Log:
SLING-5952 - added timeout configs to http transport

Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporter.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporter.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporterFactory.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/DistributionTransport.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/HttpTransportUtils.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java

sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterTest.java

sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporterTest.java

sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportTest.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java?rev=1793803=1793802=1793803=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
 Thu May  4 14:00:21 2017
@@ -61,6 +61,7 @@ import org.apache.sling.distribution.que
 import 
org.apache.sling.distribution.queue.impl.jobhandling.JobHandlingDistributionQueueProvider;
 import 
org.apache.sling.distribution.queue.impl.simple.SimpleDistributionQueueProvider;
 import 
org.apache.sling.distribution.transport.DistributionTransportSecretProvider;
+import org.apache.sling.distribution.transport.impl.HttpConfiguration;
 import org.apache.sling.distribution.trigger.DistributionTrigger;
 import org.apache.sling.event.jobs.JobManager;
 import org.apache.sling.jcr.api.SlingRepository;
@@ -179,6 +180,12 @@ public class ForwardDistributionAgentFac
 @Property(boolValue = false, label = "Async delivery", description = 
"Whether or not to use a separate delivery queue to maximize transport 
throughput when queue has more than 100 items")
 public static final String ASYNC_DELIVERY = "async.delivery";
 
+/**
+ * timeout for HTTP requests
+ */
+@Property(label = "HTTP connection timeout", intValue = 10, description = 
"The connection timeout for HTTP requests (in seconds).")
+public static final String HTTP = "http.conn.timeout";
+
 @Reference
 private Packaging packaging;
 
@@ -239,6 +246,9 @@ public class ForwardDistributionAgentFac
 Map priorityQueues = 
PropertiesUtil.toMap(config.get(PRIORITY_QUEUES), new String[0]);
 priorityQueues = SettingsUtils.removeEmptyEntries(priorityQueues);
 
+Integer timeout = PropertiesUtil.toInteger(HTTP, 10) * 1000;
+HttpConfiguration httpConfiguration = new HttpConfiguration(timeout);
+
 DistributionPackageExporter packageExporter = new 
LocalDistributionPackageExporter(packageBuilder);
 
 DistributionQueueProvider queueProvider;
@@ -293,7 +303,8 @@ public class ForwardDistributionAgentFac
 processingQueues.addAll(endpointNames);
 processingQueues.removeAll(Arrays.asList(passiveQueues));
 
-packageImporter = new 
RemoteDistributionPackageImporter(distributionLog, 

svn commit: r1793800 - in /sling/trunk/bundles/jcr/contentparser/src: main/java/org/apache/sling/jcr/contentparser/ main/java/org/apache/sling/jcr/contentparser/impl/ test/java/org/apache/sling/jcr/co

[sseifert]

Author: sseifert
Date: Thu May  4 13:30:10 2017
New Revision: 1793800

URL: http://svn.apache.org/viewvc?rev=1793800=rev
Log:
SLING-6828 JCR Content Parser: Support XML Descriptor Files

Added:

sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/XmlContentParser.java
   (with props)

sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/XmlContentParserTest.java
   (with props)

sling/trunk/bundles/jcr/contentparser/src/test/resources/content-test/content.xml
   (with props)
Modified:

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

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

sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/package-info.java

Modified: 
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ContentParserFactory.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ContentParserFactory.java?rev=1793800=1793799=1793800=diff
==
--- 
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ContentParserFactory.java
 (original)
+++ 
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ContentParserFactory.java
 Thu May  4 13:30:10 2017
@@ -20,6 +20,7 @@ package org.apache.sling.jcr.contentpars
 
 import org.apache.sling.jcr.contentparser.impl.JcrXmlContentParser;
 import org.apache.sling.jcr.contentparser.impl.JsonContentParser;
+import org.apache.sling.jcr.contentparser.impl.XmlContentParser;
 import org.osgi.annotation.versioning.ProviderType;
 
 /**
@@ -51,6 +52,8 @@ public final class ContentParserFactory
 switch (type) {
 case JSON:
 return new JsonContentParser(options);
+case XML:
+return new XmlContentParser(options);
 case JCR_XML:
 return new JcrXmlContentParser(options);
 default:

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=1793800=1793799=1793800=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
 Thu May  4 13:30:10 2017
@@ -33,6 +33,12 @@ public enum ContentType {
 JSON("json"),
 
 /**
+ * XML content descriptor file.
+ * @see 
https://sling.apache.org/documentation/bundles/content-loading-jcr-contentloader.html#xml-descriptor-files
+ */
+XML("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.

Added: 
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/XmlContentParser.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/XmlContentParser.java?rev=1793800=auto
==
--- 
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/XmlContentParser.java
 (added)
+++ 
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/XmlContentParser.java
 Thu May  4 13:30:10 2017
@@ -0,0 +1,228 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.jcr.contentparser.impl;
+
+import java.io.IOException;
+import java.io.InputStream;
+import 

svn commit: r1793783 - /sling/trunk/bundles/extensions/models/validation-impl/src/test/provisioning/model.txt

[kwin]

Author: kwin
Date: Thu May  4 11:27:11 2017
New Revision: 1793783

URL: http://svn.apache.org/viewvc?rev=1793783=rev
Log:
rely on Sling Validation now being part of the launchpad

Modified:

sling/trunk/bundles/extensions/models/validation-impl/src/test/provisioning/model.txt

Modified: 
sling/trunk/bundles/extensions/models/validation-impl/src/test/provisioning/model.txt
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/validation-impl/src/test/provisioning/model.txt?rev=1793783=1793782=1793783=diff
==
--- 
sling/trunk/bundles/extensions/models/validation-impl/src/test/provisioning/model.txt
 (original)
+++ 
sling/trunk/bundles/extensions/models/validation-impl/src/test/provisioning/model.txt
 Thu May  4 11:27:11 2017
@@ -22,9 +22,6 @@
   org.apache.sling/org.apache.sling.launchpad/9-SNAPSHOT/slingstart
   # this is necessary to execute the tests
   org.apache.sling/org.apache.sling.junit.core/1.0.24-SNAPSHOT
-  # deploy the validation framework
-  org.apache.sling/org.apache.sling.validation.api/1.0.0
-  org.apache.sling/org.apache.sling.validation.core/1.0.0
   # deploy the to-be-tested bundle as well
   org.apache.sling/org.apache.sling.models.validation-impl/1.0.0-SNAPSHOT
 

svn commit: r1793773 - /sling/trunk/bundles/extensions/models/validation-impl/src/test/provisioning/model.txt

[kwin]

Author: kwin
Date: Thu May  4 11:18:22 2017
New Revision: 1793773

URL: http://svn.apache.org/viewvc?rev=1793773=rev
Log:
also rely on released validation version for the test

Modified:

sling/trunk/bundles/extensions/models/validation-impl/src/test/provisioning/model.txt

Modified: 
sling/trunk/bundles/extensions/models/validation-impl/src/test/provisioning/model.txt
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/validation-impl/src/test/provisioning/model.txt?rev=1793773=1793772=1793773=diff
==
--- 
sling/trunk/bundles/extensions/models/validation-impl/src/test/provisioning/model.txt
 (original)
+++ 
sling/trunk/bundles/extensions/models/validation-impl/src/test/provisioning/model.txt
 Thu May  4 11:18:22 2017
@@ -23,9 +23,9 @@
   # this is necessary to execute the tests
   org.apache.sling/org.apache.sling.junit.core/1.0.24-SNAPSHOT
   # deploy the validation framework
-  org.apache.sling/org.apache.sling.validation.api/1.0.0-SNAPSHOT
-  org.apache.sling/org.apache.sling.validation.core/1.0.0-SNAPSHOT
-  # deploy the to be tested bundle as well
+  org.apache.sling/org.apache.sling.validation.api/1.0.0
+  org.apache.sling/org.apache.sling.validation.core/1.0.0
+  # deploy the to-be-tested bundle as well
   org.apache.sling/org.apache.sling.models.validation-impl/1.0.0-SNAPSHOT
 
 [configurations]

svn commit: r1793757 - in /sling/trunk/bundles/extensions/event/resource: ./ src/main/java/org/apache/sling/event/impl/jobs/config/ src/main/java/org/apache/sling/event/impl/jobs/queues/ src/main/java

[cziegeler]

Author: cziegeler
Date: Thu May  4 09:07:53 2017
New Revision: 1793757

URL: http://svn.apache.org/viewvc?rev=1793757=rev
Log:
SLING-6823 : Use Timer instead of scheduler for delayed execution

Modified:
sling/trunk/bundles/extensions/event/resource/pom.xml

sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/config/JobManagerConfiguration.java

sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/queues/JobQueueImpl.java

sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/queues/QueueManager.java

sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/queues/QueueServices.java

sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/scheduling/JobSchedulerImpl.java

Modified: sling/trunk/bundles/extensions/event/resource/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/resource/pom.xml?rev=1793757=1793756=1793757=diff
==
--- sling/trunk/bundles/extensions/event/resource/pom.xml (original)
+++ sling/trunk/bundles/extensions/event/resource/pom.xml Thu May  4 09:07:53 
2017
@@ -82,16 +82,8 @@
 
org.apache.sling.commons.osgi;inline="org/apache/sling/commons/osgi/PropertiesUtil.*",
 
quartz;inline="org/quartz/CronExpression.*|org/quartz/ValueSet.*"
 
-
<_plugin>org.apache.felix.scrplugin.bnd.SCRDescriptorBndPlugin;destdir=${project.build.outputDirectory};
 
 
-
-
-org.apache.felix
-org.apache.felix.scr.bnd
-1.7.2
-
-
 

 org.apache.rat

Modified: 
sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/config/JobManagerConfiguration.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/config/JobManagerConfiguration.java?rev=1793757=1793756=1793757=diff
==
--- 
sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/config/JobManagerConfiguration.java
 (original)
+++ 
sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/config/JobManagerConfiguration.java
 Thu May  4 09:07:53 2017
@@ -18,12 +18,13 @@
  */
 package org.apache.sling.event.impl.jobs.config;
 
-import java.sql.Date;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -494,27 +495,22 @@ public class JobManagerConfiguration {
 } else {
 // and run checker again in some seconds (if leader)
 // notify listeners afterwards
-final Scheduler local = this.scheduler;
-if ( local != null ) {
-final Runnable r = new Runnable() {
-
-@Override
-public void run() {
-if ( newCaps == topologyCapabilities && 
newCaps.isActive()) {
-// start listeners
-notifiyListeners();
-if ( newCaps.isLeader() && newCaps.isActive() ) {
-final CheckTopologyTask mt = new 
CheckTopologyTask(JobManagerConfiguration.this);
-mt.fullRun();
-}
+final Timer timer = new Timer();
+timer.schedule(new TimerTask()
+{
+
+@Override
+public void run() {
+if ( newCaps == topologyCapabilities && 
newCaps.isActive()) {
+// start listeners
+notifiyListeners();
+if ( newCaps.isLeader() && newCaps.isActive() ) {
+final CheckTopologyTask mt = new 
CheckTopologyTask(JobManagerConfiguration.this);
+mt.fullRun();
 }
 }
-};
-if ( !local.schedule(r, local.AT(new 
Date(System.currentTimeMillis() + this.backgroundLoadDelay * 1000))) ) {
-// if for whatever reason scheduling doesn't work, let's 
run now
-r.run();
 }
-}
+}, this.backgroundLoadDelay * 1000);
 }
 logger.debug("Job 

Jenkins build is back to stable : sling-bundles-extensions-event-resource-1.7 #2

[Apache Jenkins Server]

See 

svn commit: r1793745 [1/2] - in /sling/trunk/bundles/extensions/event/resource: ./ src/main/java/org/apache/sling/event/impl/ src/main/java/org/apache/sling/event/impl/jobs/ src/main/java/org/apache/s

[cziegeler]

Author: cziegeler
Date: Thu May  4 08:03:38 2017
New Revision: 1793745

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

Modified:
sling/trunk/bundles/extensions/event/resource/pom.xml

sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/EnvironmentComponent.java

sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/EventingThreadPool.java

sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/JobConsumerManager.java

sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java

sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/Utility.java

sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/config/ConfigurationConstants.java

sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfiguration.java

sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/config/JobManagerConfiguration.java

sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/config/MainQueueConfiguration.java

sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/config/QueueConfigurationManager.java

sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/config/TopologyHandler.java

sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/console/InventoryPlugin.java

sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/console/WebConsolePlugin.java

sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/jmx/AllJobStatisticsMBean.java

sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImpl.java

sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/notifications/NewJobSender.java

sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/queues/QueueManager.java

sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/stats/StatisticsManager.java

sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/tasks/HistoryCleanUpTask.java

sling/trunk/bundles/extensions/event/resource/src/test/java/org/apache/sling/event/impl/jobs/JobConsumerManagerTest.java

sling/trunk/bundles/extensions/event/resource/src/test/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfigurationTest.java

sling/trunk/bundles/extensions/event/resource/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java

Modified: sling/trunk/bundles/extensions/event/resource/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/resource/pom.xml?rev=1793745=1793744=1793745=diff
==
--- sling/trunk/bundles/extensions/event/resource/pom.xml (original)
+++ sling/trunk/bundles/extensions/event/resource/pom.xml Thu May  4 08:03:38 
2017
@@ -205,6 +205,10 @@
 
 
 
+org.osgi
+org.osgi.service.component.annotations
+
+
 org.apache.sling
 org.apache.sling.discovery.api
 1.0.0
@@ -223,8 +227,6 @@
 
 org.osgi
 osgi.core
-6.0.0
-provided
 
 
 org.osgi
@@ -233,11 +235,6 @@
 provided
 
 
-org.apache.felix
-org.apache.felix.scr.annotations
-provided
-
-
 org.apache.sling
 org.apache.sling.settings
 1.0.0
@@ -316,13 +313,13 @@
 
 org.apache.sling
 org.apache.sling.testing.tools
-1.0.6
+1.0.14
 test
 
 
   org.apache.sling
   org.apache.sling.testing.sling-mock
-  1.6.0
+  2.2.6
   test
 
 
@@ -364,7 +361,7 @@
 
 org.apache.felix
 org.apache.felix.framework
-5.4.0
+5.6.2
 test
 
 

Modified: 
sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/EnvironmentComponent.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/EnvironmentComponent.java?rev=1793745=1793744=1793745=diff

svn commit: r1793745 [2/2] - in /sling/trunk/bundles/extensions/event/resource: ./ src/main/java/org/apache/sling/event/impl/ src/main/java/org/apache/sling/event/impl/jobs/ src/main/java/org/apache/s

[cziegeler]

Modified: 
sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImpl.java?rev=1793745=1793744=1793745=diff
==
--- 
sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImpl.java
 (original)
+++ 
sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImpl.java
 Thu May  4 08:03:38 2017
@@ -32,26 +32,26 @@ import javax.management.Notification;
 import javax.management.NotificationBroadcasterSupport;
 import javax.management.StandardEmitterMBean;
 
-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.Property;
-import org.apache.felix.scr.annotations.Service;
 import org.apache.sling.event.jobs.Queue;
 import org.apache.sling.event.jobs.jmx.QueuesMBean;
 import org.apache.sling.event.jobs.jmx.StatisticsMBean;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceRegistration;
-
-@Component
-@Service(value = { QueuesMBean.class })
-@Property(name = "jmx.objectname", value = 
"org.apache.sling:type=queues,name=QueueNames")
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
+
+@Component(service =  QueuesMBean.class,
+property = {
+"jmx.objectname=org.apache.sling:type=queues,name=QueueNames",
+Constants.SERVICE_VENDOR + "=The Apache Software Foundation"
+})
 public class QueuesMBeanImpl extends StandardEmitterMBean implements 
QueuesMBean {
 
 private static final String QUEUE_NOTIFICATION = 
"org.apache.sling.event.queue";
 private static final String[] NOTIFICATION_TYPES = { QUEUE_NOTIFICATION };
-private Map queues = new 
ConcurrentHashMap();
+private Map queues = new ConcurrentHashMap<>();
 private String[] names;
 private AtomicLong sequence = new AtomicLong(System.currentTimeMillis());
 private BundleContext bundleContext;
@@ -147,7 +147,7 @@ public class QueuesMBeanImpl extends Sta
 
 private QueueMBeanHolder add(Queue queue) {
 QueueMBeanImpl queueMBean = new QueueMBeanImpl(queue);
-ServiceRegistration serviceRegistration = bundleContext
+ServiceRegistration serviceRegistration = bundleContext
 .registerService(StatisticsMBean.class.getName(), queueMBean,
 createProperties(
 
"jmx.objectname","org.apache.sling:type=queues,name="+queue.getName(),
@@ -160,7 +160,7 @@ public class QueuesMBeanImpl extends Sta
 }
 
 private Dictionary createProperties(Object ... values) {
-Dictionary props = new Hashtable();
+Dictionary props = new Hashtable<>();
 for ( int i = 0; i < values.length; i+=2) {
 props.put((String) values[i], values[i+1]);
 }
@@ -175,7 +175,7 @@ public class QueuesMBeanImpl extends Sta
 @Override
 public String[] getQueueNames() {
 if (names == null) {
-List lnames = new ArrayList(queues.keySet());
+List lnames = new ArrayList<>(queues.keySet());
 Collections.sort(lnames);
 names = lnames.toArray(new String[lnames.size()]);
 }

Modified: 
sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/notifications/NewJobSender.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/notifications/NewJobSender.java?rev=1793745=1793744=1793745=diff
==
--- 
sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/notifications/NewJobSender.java
 (original)
+++ 
sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/notifications/NewJobSender.java
 Thu May  4 08:03:38 2017
@@ -22,10 +22,6 @@ import java.util.Dictionary;
 import java.util.Hashtable;
 import java.util.List;
 
-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.Reference;
 import 
org.apache.sling.api.resource.observation.ExternalResourceChangeListener;
 import org.apache.sling.api.resource.observation.ResourceChange;
 import