svn commit: r1629327 - /sling/trunk/launchpad/builder/src/main/bundles/list.xml
Author: rombert Date: Fri Oct 3 21:44:17 2014 New Revision: 1629327 URL: http://svn.apache.org/r1629327 Log: Re-add the oak bundles to the bundle list, following the release of Sling 7 Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=1629327&r1=1629326&r2=1629327&view=diff == --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Fri Oct 3 21:44:17 2014 @@ -483,11 +483,13 @@ org.apache.derby derby 10.5.3.0_1 +jackrabbit org.apache.sling org.apache.sling.jcr.jackrabbit.server 2.2.0 +jackrabbit org.apache.sling @@ -535,4 +537,70 @@ 1.2.2 + + + + +org.apache.sling +org.apache.sling.jcr.oak.server +0.0.2-SNAPSHOT +oak + + +com.google.guava +guava +15.0 +oak + + +org.apache.jackrabbit +oak-core +1.0.0 +oak + + + +org.apache.jackrabbit +oak-commons +1.0.0 +oak + + +org.apache.jackrabbit +oak-mk +1.0.0 +oak + + +org.apache.jackrabbit +oak-mk-api +1.0.0 +oak + + +org.apache.jackrabbit +oak-mk-remote +1.0.0 +oak + + +org.apache.jackrabbit +oak-lucene +1.0.0 +oak + + +org.apache.jackrabbit +oak-blob +1.0.0 +oak + +
svn commit: r1629325 - /sling/trunk/tooling/ide/eclipse-test/pom.xml
Author: rombert
Date: Fri Oct 3 21:23:03 2014
New Revision: 1629325
URL: http://svn.apache.org/r1629325
Log:
SLING-3825 - Eclipse-based tests depend on SNAPSHOT version of the Sling
Launchpad
Sling 7 is released, so use that as a dependency.
Modified:
sling/trunk/tooling/ide/eclipse-test/pom.xml
Modified: sling/trunk/tooling/ide/eclipse-test/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/pom.xml?rev=1629325&r1=1629324&r2=1629325&view=diff
==
--- sling/trunk/tooling/ide/eclipse-test/pom.xml (original)
+++ sling/trunk/tooling/ide/eclipse-test/pom.xml Fri Oct 3 21:23:03 2014
@@ -111,7 +111,7 @@
org.apache.sling
org.apache.sling.launchpad
-7-SNAPSHOT
+7
war
false
${project.build.directory}
svn commit: r924565 - /websites/production/sling/content/
Author: rombert Date: Fri Oct 3 21:21:20 2014 New Revision: 924565 Log: Publishing svnmucc operation to sling site by rombert Added: websites/production/sling/content/ - copied from r924563, websites/staging/sling/trunk/content/
svn commit: r1629323 - in /sling/site/trunk: content/downloads.list content/news.mdtext templates/downloads.html
Author: rombert Date: Fri Oct 3 21:13:28 2014 New Revision: 1629323 URL: http://svn.apache.org/r1629323 Log: Sling 7 Modified: sling/site/trunk/content/downloads.list sling/site/trunk/content/news.mdtext sling/site/trunk/templates/downloads.html Modified: sling/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1629323&r1=1629322&r2=1629323&view=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Fri Oct 3 21:13:28 2014 @@ -12,7 +12,7 @@ # # (1) Sling Launchpad Application and Web App Version -sling|6 +sling|7 # (2) Sling IDE Tooling Version sling-ide-tooling|1.0.2 Modified: sling/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1629323&r1=1629322&r2=1629323&view=diff == --- sling/site/trunk/content/news.mdtext (original) +++ sling/site/trunk/content/news.mdtext Fri Oct 3 21:13:28 2014 @@ -1,6 +1,6 @@ Title: News -* New Release: Apache Sling Superimposing Resource Provider 0.2.0 (October 3th, 2014) +* New Release: Apache Sling Superimposing Resource Provider 0.2.0, Apache Sling 7 (October 3th, 2014) * New Release: Apache Sling Scripting Java 2.0.12 (September 30th, 2014) * New Release: Apache Sling Resource Resolver Mock 0.3.0 (September 29th, 2014) * New Release: Apache Sling Resource Resolver 1.1.4 (September 26, 2014) Modified: sling/site/trunk/templates/downloads.html URL: http://svn.apache.org/viewvc/sling/site/trunk/templates/downloads.html?rev=1629323&r1=1629322&r2=1629323&view=diff == --- sling/site/trunk/templates/downloads.html (original) +++ sling/site/trunk/templates/downloads.html Fri Oct 3 21:13:28 2014 @@ -63,11 +63,6 @@ please reload this page by -The Sling 6 release is quite old now - we are working to release version 7, but in the meantime -we recommend building Sling yourself to get a recent version. - - To get the latest code you can build Sling yourself,
svn commit: r924563 - in /websites/staging/sling/trunk/content: ./ downloads.html news.html sitemap.html
Author: buildbot Date: Fri Oct 3 21:13:46 2014 New Revision: 924563 Log: Staging update by buildbot for sling Modified: websites/staging/sling/trunk/content/ (props changed) websites/staging/sling/trunk/content/downloads.html websites/staging/sling/trunk/content/news.html websites/staging/sling/trunk/content/sitemap.html Propchange: websites/staging/sling/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Fri Oct 3 21:13:46 2014 @@ -1 +1 @@ -1629170 +1629323 Modified: websites/staging/sling/trunk/content/downloads.html == --- websites/staging/sling/trunk/content/downloads.html (original) +++ websites/staging/sling/trunk/content/downloads.html Fri Oct 3 21:13:46 2014 @@ -162,30 +162,25 @@ please reload this page by org.apache.sling.launchpad-6-standalone.jar (http://www.apache.org/dist/sling/org.apache.sling.launchpad-6-standalone.jar.asc";>asc, http://www.apache.org/dist/sling/org.apache.sling.launchpad-6-standalone.jar.md5";>md5) +org.apache.sling.launchpad-7-standalone.jar (http://www.apache.org/dist/sling/org.apache.sling.launchpad-7-standalone.jar.asc";>asc, http://www.apache.org/dist/sling/org.apache.sling.launchpad-7-standalone.jar.md5";>md5) Sling Web Application -6 +7 A ready-to run Sling webapp as a war file. -org.apache.sling.launchpad-6.war (http://www.apache.org/dist/sling/org.apache.sling.launchpad-6.war.asc";>asc, http://www.apache.org/dist/sling/org.apache.sling.launchpad-6.war.md5";>md5) +org.apache.sling.launchpad-7.war (http://www.apache.org/dist/sling/org.apache.sling.launchpad-7.war.asc";>asc, http://www.apache.org/dist/sling/org.apache.sling.launchpad-7.war.md5";>md5) Sling Source Package -6 +7 The released Sling source code. -sling-6-source-release.tar.gz (http://www.apache.org/dist/sling/sling-6-source-release.tar.gz.asc";>asc, http://www.apache.org/dist/sling/sling-6-source-release.tar.gz.md5";>md5)sling-6-source-release.zip (http://www.apache.org/dist/sling/sling-6-source-release.zip.asc";>asc, http://www.apache.org/dist/sling/sling-6-source-release.zip.md5";>md5) +sling-7-source-release.tar.gz (http://www.apache.org/dist/sling/sling-7-source-release.tar.gz.asc";>asc, http://www.apache.org/dist/sling/sling-7-source-release.tar.gz.md5";>md5)sling-7-source-release.zip (http://www.apache.org/dist/sling/sling-7-source-release.zip.asc";>asc, http://www.apache.org/dist/sling/sling-7-source-release.zip.md5";>md5) - -The Sling 6 release is quite old now - we are working to release version 7, but in the meantime -we recommend building Sling yourself to get a recent version. - - To get the latest code you can build Sling yourself, @@ -1038,7 +1033,7 @@ incubator releases of Apache Sling, have -Rev. 1629170 by sseifert on Fri, 3 Oct 2014 10:04:14 + +Rev. 1629323 by rombert on Fri, 3 Oct 2014 21:13:28 + Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project Modified: websites/staging/sling/trunk/content/news.html == --- websites/staging/sling/trunk/content/news.html (original) +++ websites/staging/sling/trunk/content/news.html Fri Oct 3 21:13:46 2014 @@ -90,7 +90,7 @@ News -New Release: Apache Sling Superimposing Resource Provider 0.2.0 (October 3th, 2014) +New Release: Apache Sling Superimposing Resource Provider 0.2.0, Apache Sling 7 (October 3th, 2014) New Release: Apache Sling Scripting Java 2.0.12 (September 30th, 2014) New Release: Apache Sling Resource Resolver Mock 0.3.0 (September 29th, 2014) New Release: Apache Sling Resource Resolver 1.1.4 (September 26, 2014) @@ -265,7 +265,7 @@ Apache Sling has graduated into a top level project! (June 17, 2009) -Rev. 1629169 by sseifert on Fri, 3 Oct 2014 10:02:19 + +Rev. 1629323 by rombert on Fri, 3 Oct 2014 21:13:28 + Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project Modified: websites/staging/sling/trunk/content/sitemap.html == --- websites/staging/sling/trunk/content/sitemap.html (original) +++ websites/staging/sling/trunk/content/sitemap.html Fri Oct 3 21:13:46 2014 @@ -146,7 +146,7 @@ Repository Based Development Sling Testing Tools Maven Sling Plugin -Apache SlingStart +The Apache Sling Provisioning Model and Apache SlingStart Version Policy
svn commit: r6719 - /release/sling/
Author: rombert Date: Fri Oct 3 20:52:33 2014 New Revision: 6719 Log: launchpad 7 Added: release/sling/org.apache.sling.launchpad-7-bin.tar.gz (with props) release/sling/org.apache.sling.launchpad-7-bin.tar.gz.asc (with props) release/sling/org.apache.sling.launchpad-7-bin.tar.gz.md5 release/sling/org.apache.sling.launchpad-7-bin.tar.gz.sha1 release/sling/org.apache.sling.launchpad-7-bin.zip (with props) release/sling/org.apache.sling.launchpad-7-bin.zip.asc (with props) release/sling/org.apache.sling.launchpad-7-bin.zip.md5 release/sling/org.apache.sling.launchpad-7-bin.zip.sha1 release/sling/org.apache.sling.launchpad-7-bundlelist.xml (with props) release/sling/org.apache.sling.launchpad-7-bundlelist.xml.asc (with props) release/sling/org.apache.sling.launchpad-7-bundlelist.xml.md5 release/sling/org.apache.sling.launchpad-7-bundlelist.xml.sha1 release/sling/org.apache.sling.launchpad-7-bundlelistconfig.zip (with props) release/sling/org.apache.sling.launchpad-7-bundlelistconfig.zip.asc (with props) release/sling/org.apache.sling.launchpad-7-bundlelistconfig.zip.md5 release/sling/org.apache.sling.launchpad-7-bundlelistconfig.zip.sha1 release/sling/org.apache.sling.launchpad-7-bundles.jar (with props) release/sling/org.apache.sling.launchpad-7-bundles.jar.asc (with props) release/sling/org.apache.sling.launchpad-7-bundles.jar.md5 release/sling/org.apache.sling.launchpad-7-bundles.jar.sha1 release/sling/org.apache.sling.launchpad-7-source-release.zip (with props) release/sling/org.apache.sling.launchpad-7-source-release.zip.asc (with props) release/sling/org.apache.sling.launchpad-7-source-release.zip.md5 release/sling/org.apache.sling.launchpad-7-source-release.zip.sha1 release/sling/org.apache.sling.launchpad-7-sources.jar (with props) release/sling/org.apache.sling.launchpad-7-sources.jar.asc (with props) release/sling/org.apache.sling.launchpad-7-sources.jar.md5 release/sling/org.apache.sling.launchpad-7-sources.jar.sha1 release/sling/org.apache.sling.launchpad-7-standalone.jar (with props) release/sling/org.apache.sling.launchpad-7-standalone.jar.asc (with props) release/sling/org.apache.sling.launchpad-7-standalone.jar.md5 release/sling/org.apache.sling.launchpad-7-standalone.jar.sha1 release/sling/org.apache.sling.launchpad-7.pom (with props) release/sling/org.apache.sling.launchpad-7.pom.asc (with props) release/sling/org.apache.sling.launchpad-7.pom.md5 release/sling/org.apache.sling.launchpad-7.pom.sha1 release/sling/org.apache.sling.launchpad-7.war (with props) release/sling/org.apache.sling.launchpad-7.war.asc (with props) release/sling/org.apache.sling.launchpad-7.war.md5 release/sling/org.apache.sling.launchpad-7.war.sha1 Removed: release/sling/org.apache.sling.launchpad-6-standalone.jar release/sling/org.apache.sling.launchpad-6-standalone.jar.asc release/sling/org.apache.sling.launchpad-6-standalone.jar.md5 release/sling/org.apache.sling.launchpad-6-standalone.jar.sha1 release/sling/org.apache.sling.launchpad-6.war release/sling/org.apache.sling.launchpad-6.war.asc release/sling/org.apache.sling.launchpad-6.war.md5 release/sling/org.apache.sling.launchpad-6.war.sha1 Added: release/sling/org.apache.sling.launchpad-7-bin.tar.gz == Binary file - no diff available. Propchange: release/sling/org.apache.sling.launchpad-7-bin.tar.gz -- svn:mime-type = application/x-gzip Added: release/sling/org.apache.sling.launchpad-7-bin.tar.gz.asc == Binary file - no diff available. Propchange: release/sling/org.apache.sling.launchpad-7-bin.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: release/sling/org.apache.sling.launchpad-7-bin.tar.gz.md5 == --- release/sling/org.apache.sling.launchpad-7-bin.tar.gz.md5 (added) +++ release/sling/org.apache.sling.launchpad-7-bin.tar.gz.md5 Fri Oct 3 20:52:33 2014 @@ -0,0 +1 @@ +f343ad724b363cb6857b2d61b7d03b6b \ No newline at end of file Added: release/sling/org.apache.sling.launchpad-7-bin.tar.gz.sha1 == --- release/sling/org.apache.sling.launchpad-7-bin.tar.gz.sha1 (added) +++ release/sling/org.apache.sling.launchpad-7-bin.tar.gz.sha1 Fri Oct 3 20:52:33 2014 @@ -0,0 +1 @@ +ced61e7c13d9b4b7f94adae843558618e05ba0d4 \ No newline at end of file Added: release/sling/org.apache.sling.launchpad-7-bin.zip ==
Nexus: Promotion Completed
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Maven/3.2.3 (Java 1.7.0_51; Linux 3.11.10-21-desktop), Apache-Maven/3.2.3 (Java 1.7.0_51; Linux 3.11.10-21-desktop)""userId" = "rombert""ip" = "109.103.80.27"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/sling/org.apache.sling.launchpad/7/org.apache.sling.launchpad-7-source-release.zip.asc(SHA1: 775e42da9d94de3d285348f4211b22f6bc0dcfdd)/org/apache/sling/org.apache.sling.launchpad/7/org.apache.sling.launchpad-7-bundles.jar(SHA1: 97ba60d7e3c3470d4e757015b8095a1e0934c23b)/org/apache/sling/org.apache.sling.launchpad/7/org.apache.sling.launchpad-7-bin.tar.gz(SHA1: ced61e7c13d9b4b7f94adae843558618e05ba0d4)/org/apache/sling/org.apache.sling.launchpad/7/org.apache.sling.launchpad-7-bundles.jar.asc(SHA1: 8ae919ad327d246180f05ec61d209b383f80e0f8)/org/apache/sling/org.apache.sling.launchpad/7/org.apache.sling.launchpad-7-bin.tar.gz.asc(SHA1: c53a573e7a946e80e0f2fe810d61088391642f5e)/org/apache/sling/org.apache.sling.launchpad/7/org.apache.sling.launchpad-7-bundlelistconfig.zip(SHA1: dc85bd389076e7a5e98c5eb09041efb49c9b9d9e)/org/apache/sling/org.apache.sling.launchpad/7/org.apache.sling.launchpad-7-bin.zip(SHA1: 111fa2f8b3246576a5de411f8132b7b6ff06407f)/org/apache/sling/org.apache.sling.launchpad/7/org.apache.sling.launchpad-7-standalone.jar.asc(SHA1: b17eff0f9d18a87c57b12d7bcbe618992dc4d7eb)/org/apache/sling/org.apache.sling.launchpad/7/org.apache.sling.launchpad-7.pom.asc(SHA1: 0cb60e8b55f4ef7e770c181338fb853249166af9)/org/apache/sling/org.apache.sling.launchpad/7/org.apache.sling.launchpad-7-sources.jar.asc(SHA1: cbce35d9f509df228996785e09232861cb1be562)/org/apache/sling/org.apache.sling.launchpad/7/org.apache.sling.launchpad-7-bin.zip.asc(SHA1: 2833c07ac3c7204edc9899b2391725c749a8ad1f)/org/apache/sling/org.apache.sling.launchpad/7/org.apache.sling.launchpad-7.war.asc(SHA1: 9afdc9af2cd871ab3a099403d537f7456fa67e41)/org/apache/sling/org.apache.sling.launchpad/7/org.apache.sling.launchpad-7-bundlelist.xml(SHA1: db347c927a2856c0c80d6a247a8c3670ac4418cf)/org/apache/sling/org.apache.sling.launchpad/7/org.apache.sling.launchpad-7.war(SHA1: 1fc11ae9d568ad27843c9b26b557948e2bd61b59)/org/apache/sling/org.apache.sling.launchpad/7/org.apache.sling.launchpad-7-sources.jar(SHA1: 5cb77fca51b4535b3e20568e9e6aaca6a87e13e1)/org/apache/sling/org.apache.sling.launchpad/7/org.apache.sling.launchpad-7-source-release.zip(SHA1: 872bbd6f88cec4ff23fbebedabff84ff22b2e0f7)/org/apache/sling/org.apache.sling.launchpad/7/org.apache.sling.launchpad-7-bundlelist.xml.asc(SHA1: b38b944bd702b8f10ad6b2ab13758c2af4eb9901)/org/apache/sling/org.apache.sling.launchpad/7/org.apache.sling.launchpad-7-bundlelistconfig.zip.asc(SHA1: 5ddef19f051f81e917b65342fab53e7ee2110651)/org/apache/sling/org.apache.sling.launchpad/7/org.apache.sling.launchpad-7.pom(SHA1: a0d811a0bb19a0bee4b310ecb642b5d39a5df3b7)/org/apache/sling/org.apache.sling.launchpad/7/org.apache.sling.launchpad-7-standalone.jar(SHA1: 64ac36f7b8ce9c5e5bebce30667fb774029a55e6)Action performed by Robert Munteanu (rombert)
svn commit: r1629277 - in /sling/trunk/bundles/extensions/models: api/src/main/java/org/apache/sling/models/factory/ impl/src/main/java/org/apache/sling/models/impl/ impl/src/test/java/org/apache/slin
Author: justin
Date: Fri Oct 3 18:09:32 2014
New Revision: 1629277
URL: http://svn.apache.org/r1629277
Log:
SLING-3709 - adding additional testing for missing elements and post construct
failures
Added:
sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/testmodels/classes/FailingPostConstuctModel.java
- copied, changed from r1629167,
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/factory/InvalidAdaptableException.java
Modified:
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/factory/InvalidAdaptableException.java
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/factory/InvalidModelException.java
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/factory/MissingElementsException.java
sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java
sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/Result.java
sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/PostConstructTest.java
sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/ResourceModelClassesTest.java
Modified:
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/factory/InvalidAdaptableException.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/factory/InvalidAdaptableException.java?rev=1629277&r1=1629276&r2=1629277&view=diff
==
---
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/factory/InvalidAdaptableException.java
(original)
+++
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/factory/InvalidAdaptableException.java
Fri Oct 3 18:09:32 2014
@@ -25,7 +25,7 @@ package org.apache.sling.models.factory;
* @see ModelFactory
*
*/
-public class InvalidAdaptableException extends RuntimeException {
+public final class InvalidAdaptableException extends RuntimeException {
private static final long serialVersionUID = -1209301268928038702L;
public InvalidAdaptableException(String message) {
Modified:
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/factory/InvalidModelException.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/factory/InvalidModelException.java?rev=1629277&r1=1629276&r2=1629277&view=diff
==
---
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/factory/InvalidModelException.java
(original)
+++
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/factory/InvalidModelException.java
Fri Oct 3 18:09:32 2014
@@ -25,7 +25,7 @@ package org.apache.sling.models.factory;
*
* @see ModelFactory
*/
-public class InvalidModelException extends RuntimeException {
+public final class InvalidModelException extends RuntimeException {
private static final long serialVersionUID = 4323592065808565135L;
Modified:
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/factory/MissingElementsException.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/factory/MissingElementsException.java?rev=1629277&r1=1629276&r2=1629277&view=diff
==
---
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/factory/MissingElementsException.java
(original)
+++
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/factory/MissingElementsException.java
Fri Oct 3 18:09:32 2014
@@ -21,7 +21,6 @@ package org.apache.sling.models.factory;
import java.lang.reflect.AnnotatedElement;
import java.util.Collection;
-
/**
* Exception which is triggered whenever a Sling Model cannot be instantiated
* due to some missing elements (i.e. required fields/methods/constructor
params
@@ -30,31 +29,31 @@ import java.util.Collection;
* @see ModelFactory
*
*/
-public class MissingElementsException extends RuntimeException {
+public final class MissingElementsException extends RuntimeException {
private static final long serialVersionUID = 7870762030809272254L;
-
+
private final Collection missingElements;
private String formatString;
private Class type;
-
+
public MissingElementsException(String format, Collection elements, Class type) {
super();
this.formatString = format;
this.missingElements = elements;
this.type = type;
}
-
+
svn commit: r924502 - in /websites/staging/sling/trunk/content: ./ downloads.html
Author: buildbot Date: Fri Oct 3 10:04:21 2014 New Revision: 924502 Log: Staging update by buildbot for sling Modified: websites/staging/sling/trunk/content/ (props changed) websites/staging/sling/trunk/content/downloads.html Propchange: websites/staging/sling/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Fri Oct 3 10:04:21 2014 @@ -1 +1 @@ -1629169 +1629170 Modified: websites/staging/sling/trunk/content/downloads.html == --- websites/staging/sling/trunk/content/downloads.html (original) +++ websites/staging/sling/trunk/content/downloads.html Fri Oct 3 10:04:21 2014 @@ -932,8 +932,8 @@ incubator releases of Apache Sling, have Superimposing Resource Provider 0.2.0 -Bundle (http://www.apache.org/dist/sling/oorg.apache.sling.superimposing-0.2.0.jar.asc";>asc, http://www.apache.org/dist/sling/oorg.apache.sling.superimposing-0.2.0.jar.md5";>md5) -Source ZIP (http://www.apache.org/dist/sling/oorg.apache.sling.superimposing-0.2.0-source-release.zip.asc";>asc, http://www.apache.org/dist/sling/oorg.apache.sling.superimposing-0.2.0-source-release.zip.md5";>md5) +Bundle (http://www.apache.org/dist/sling/org.apache.sling.superimposing-0.2.0.jar.asc";>asc, http://www.apache.org/dist/sling/org.apache.sling.superimposing-0.2.0.jar.md5";>md5) +Source ZIP (http://www.apache.org/dist/sling/org.apache.sling.superimposing-0.2.0-source-release.zip.asc";>asc, http://www.apache.org/dist/sling/org.apache.sling.superimposing-0.2.0-source-release.zip.md5";>md5) System Bundle Extension: Activation API @@ -1038,7 +1038,7 @@ incubator releases of Apache Sling, have -Rev. 1629169 by sseifert on Fri, 3 Oct 2014 10:02:19 + +Rev. 1629170 by sseifert on Fri, 3 Oct 2014 10:04:14 + Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project
svn commit: r924503 - /websites/production/sling/content/
Author: sseifert Date: Fri Oct 3 10:04:29 2014 New Revision: 924503 Log: Publishing svnmucc operation to sling site by sseifert Added: websites/production/sling/content/ - copied from r924502, websites/staging/sling/trunk/content/
svn commit: r1629170 - /sling/site/trunk/content/downloads.list
Author: sseifert Date: Fri Oct 3 10:04:14 2014 New Revision: 1629170 URL: http://svn.apache.org/r1629170 Log: Release Apache Sling Superimposing Resource Provider 0.2.0 Modified: sling/site/trunk/content/downloads.list Modified: sling/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1629170&r1=1629169&r2=1629170&view=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Fri Oct 3 10:04:14 2014 @@ -139,7 +139,7 @@ Servlets Resolver|org.apache.sling.servl Settings|org.apache.sling.settings|1.3.2 Slf4j MDC Filter|org.apache.sling.extensions.slf4j.mdc|1.0.0 Sling Query|org.apache.sling.query|2.0.0 -Superimposing Resource Provider|oorg.apache.sling.superimposing|0.2.0 +Superimposing Resource Provider|org.apache.sling.superimposing|0.2.0 System Bundle Extension: Activation API|org.apache.sling.fragment.activation|1.0.2 System Bundle Extension: WS APIs|org.apache.sling.fragment.ws|1.0.2 System Bundle Extension: XML APIs|org.apache.sling.fragment.xml|1.0.2
svn commit: r924501 - /websites/production/sling/content/
Author: sseifert Date: Fri Oct 3 10:02:54 2014 New Revision: 924501 Log: Publishing svnmucc operation to sling site by sseifert Added: websites/production/sling/content/ - copied from r924500, websites/staging/sling/trunk/content/
svn commit: r1629169 - in /sling/site/trunk/content: downloads.list news.mdtext
Author: sseifert Date: Fri Oct 3 10:02:19 2014 New Revision: 1629169 URL: http://svn.apache.org/r1629169 Log: Release Apache Sling Superimposing Resource Provider 0.2.0 Modified: sling/site/trunk/content/downloads.list sling/site/trunk/content/news.mdtext Modified: sling/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1629169&r1=1629168&r2=1629169&view=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Fri Oct 3 10:02:19 2014 @@ -139,6 +139,7 @@ Servlets Resolver|org.apache.sling.servl Settings|org.apache.sling.settings|1.3.2 Slf4j MDC Filter|org.apache.sling.extensions.slf4j.mdc|1.0.0 Sling Query|org.apache.sling.query|2.0.0 +Superimposing Resource Provider|oorg.apache.sling.superimposing|0.2.0 System Bundle Extension: Activation API|org.apache.sling.fragment.activation|1.0.2 System Bundle Extension: WS APIs|org.apache.sling.fragment.ws|1.0.2 System Bundle Extension: XML APIs|org.apache.sling.fragment.xml|1.0.2 Modified: sling/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1629169&r1=1629168&r2=1629169&view=diff == --- sling/site/trunk/content/news.mdtext (original) +++ sling/site/trunk/content/news.mdtext Fri Oct 3 10:02:19 2014 @@ -1,5 +1,6 @@ Title: News +* New Release: Apache Sling Superimposing Resource Provider 0.2.0 (October 3th, 2014) * New Release: Apache Sling Scripting Java 2.0.12 (September 30th, 2014) * New Release: Apache Sling Resource Resolver Mock 0.3.0 (September 29th, 2014) * New Release: Apache Sling Resource Resolver 1.1.4 (September 26, 2014)
svn commit: r924500 - in /websites/staging/sling/trunk/content: ./ downloads.html news.html
Author: buildbot Date: Fri Oct 3 10:02:29 2014 New Revision: 924500 Log: Staging update by buildbot for sling Modified: websites/staging/sling/trunk/content/ (props changed) websites/staging/sling/trunk/content/downloads.html websites/staging/sling/trunk/content/news.html Propchange: websites/staging/sling/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Fri Oct 3 10:02:29 2014 @@ -1 +1 @@ -1628963 +1629169 Modified: websites/staging/sling/trunk/content/downloads.html == --- websites/staging/sling/trunk/content/downloads.html (original) +++ websites/staging/sling/trunk/content/downloads.html Fri Oct 3 10:02:29 2014 @@ -930,6 +930,12 @@ incubator releases of Apache Sling, have Source ZIP (http://www.apache.org/dist/sling/org.apache.sling.query-2.0.0-source-release.zip.asc";>asc, http://www.apache.org/dist/sling/org.apache.sling.query-2.0.0-source-release.zip.md5";>md5) +Superimposing Resource Provider +0.2.0 +Bundle (http://www.apache.org/dist/sling/oorg.apache.sling.superimposing-0.2.0.jar.asc";>asc, http://www.apache.org/dist/sling/oorg.apache.sling.superimposing-0.2.0.jar.md5";>md5) +Source ZIP (http://www.apache.org/dist/sling/oorg.apache.sling.superimposing-0.2.0-source-release.zip.asc";>asc, http://www.apache.org/dist/sling/oorg.apache.sling.superimposing-0.2.0-source-release.zip.md5";>md5) + + System Bundle Extension: Activation API 1.0.2 Bundle (http://www.apache.org/dist/sling/org.apache.sling.fragment.activation-1.0.2.jar.asc";>asc, http://www.apache.org/dist/sling/org.apache.sling.fragment.activation-1.0.2.jar.md5";>md5) @@ -1032,7 +1038,7 @@ incubator releases of Apache Sling, have -Rev. 1628691 by cziegeler on Wed, 1 Oct 2014 12:46:24 + +Rev. 1629169 by sseifert on Fri, 3 Oct 2014 10:02:19 + Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project Modified: websites/staging/sling/trunk/content/news.html == --- websites/staging/sling/trunk/content/news.html (original) +++ websites/staging/sling/trunk/content/news.html Fri Oct 3 10:02:29 2014 @@ -90,6 +90,7 @@ News +New Release: Apache Sling Superimposing Resource Provider 0.2.0 (October 3th, 2014) New Release: Apache Sling Scripting Java 2.0.12 (September 30th, 2014) New Release: Apache Sling Resource Resolver Mock 0.3.0 (September 29th, 2014) New Release: Apache Sling Resource Resolver 1.1.4 (September 26, 2014) @@ -264,7 +265,7 @@ Apache Sling has graduated into a top level project! (June 17, 2009) -Rev. 1628691 by cziegeler on Wed, 1 Oct 2014 12:46:24 + +Rev. 1629169 by sseifert on Fri, 3 Oct 2014 10:02:19 + Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project
svn commit: r1629167 - /sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/
Author: tommaso
Date: Fri Oct 3 09:59:17 2014
New Revision: 1629167
URL: http://svn.apache.org/r1629167
Log:
SLING-3994 - adjusted imports and javadocs
Modified:
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/CoordinatingReplicationAgentFactory.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/DefaultReplicationComponentFactory.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/DefaultReplicationComponentProvider.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/GenericReplicationComponentFactory.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgent.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgentFactory.java
Modified:
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/CoordinatingReplicationAgentFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/CoordinatingReplicationAgentFactory.java?rev=1629167&r1=1629166&r2=1629167&view=diff
==
---
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/CoordinatingReplicationAgentFactory.java
(original)
+++
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/CoordinatingReplicationAgentFactory.java
Fri Oct 3 09:59:17 2014
@@ -18,7 +18,21 @@
*/
package org.apache.sling.replication.agent.impl;
-import org.apache.felix.scr.annotations.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Dictionary;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.apache.felix.scr.annotations.Activate;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.ConfigurationPolicy;
+import org.apache.felix.scr.annotations.Deactivate;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
import org.apache.sling.commons.osgi.PropertiesUtil;
import org.apache.sling.replication.agent.ReplicationAgent;
import org.apache.sling.replication.agent.ReplicationComponent;
@@ -30,7 +44,6 @@ import org.apache.sling.replication.queu
import org.apache.sling.replication.queue.impl.SingleQueueDistributionStrategy;
import
org.apache.sling.replication.queue.impl.jobhandling.JobHandlingReplicationQueueProvider;
import
org.apache.sling.replication.transport.authentication.TransportAuthenticationProvider;
-import org.apache.sling.replication.trigger.ReplicationTrigger;
import org.apache.sling.settings.SlingSettingsService;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
@@ -38,9 +51,6 @@ import org.osgi.framework.ServiceRegistr
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.*;
-import java.util.Properties;
-
/**
* An OSGi service factory for {@link
org.apache.sling.replication.agent.ReplicationAgent}s which references already
existing OSGi services.
*/
Modified:
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/DefaultReplicationComponentFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/DefaultReplicationComponentFactory.java?rev=1629167&r1=1629166&r2=1629167&view=diff
==
---
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/DefaultReplicationComponentFactory.java
(original)
+++
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/DefaultReplicationComponentFactory.java
Fri Oct 3 09:59:17 2014
@@ -18,10 +18,16 @@
*/
package org.apache.sling.replication.agent.impl;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.felix.scr.annotations.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.apache.felix.scr.annotations.Activate;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.Service;
import org.apache.jackrabbit.vault.packaging.Packaging;
import org.apache.sling.commons.osgi.PropertiesUtil;
import org.apache.sling.commons.scheduler.Sch
svn commit: r1629162 [1/2] - in /sling/trunk/contrib/extensions/replication: core/src/main/java/org/apache/sling/replication/agent/ core/src/main/java/org/apache/sling/replication/agent/impl/ core/src
Author: tommaso Date: Fri Oct 3 09:33:20 2014 New Revision: 1629162 URL: http://svn.apache.org/r1629162 Log: SLING-3994 - simplified replication components' dependency management, minor javadoc adjustments Added: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/ReplicationComponent.java (with props) sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/ReplicationComponentFactory.java (with props) sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/GenericReplicationComponentFactory.java (with props) sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-test-content-event.json sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-test-remote-event.json sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-test-replicate-event.json sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-test-scheduled-event.json sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-remote-event.json sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-content-changed.json sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-cache-flush.json sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json Removed: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/CompactSimpleReplicationAgentFactory.java sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/CoordinatingReplicationAgent.java sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/ReplicationComponentListener.java sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgentFactoryTest.java sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-test-content-event.json sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-test-remote-event.json sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-test-replicate-event.json sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-test-scheduled-event.json sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-publish-reverse.json sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-publish.json sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-remote-event.json sling/trunk/contrib/exte
svn commit: r1629162 [2/2] - in /sling/trunk/contrib/extensions/replication: core/src/main/java/org/apache/sling/replication/agent/ core/src/main/java/org/apache/sling/replication/agent/impl/ core/src
Modified:
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgentFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgentFactory.java?rev=1629162&r1=1629161&r2=1629162&view=diff
==
---
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgentFactory.java
(original)
+++
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgentFactory.java
Fri Oct 3 09:33:20 2014
@@ -18,21 +18,14 @@
*/
package org.apache.sling.replication.agent.impl;
-import java.util.Dictionary;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-
-import org.apache.felix.scr.annotations.Activate;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.ConfigurationPolicy;
-import org.apache.felix.scr.annotations.Deactivate;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.ReferencePolicy;
+import java.util.*;
+
+import org.apache.felix.scr.annotations.*;
import org.apache.sling.commons.osgi.PropertiesUtil;
import org.apache.sling.replication.agent.ReplicationAgent;
+import org.apache.sling.replication.agent.ReplicationComponent;
+import org.apache.sling.replication.agent.ReplicationComponentFactory;
+import org.apache.sling.replication.agent.ReplicationComponentProvider;
import org.apache.sling.replication.event.ReplicationEventFactory;
import org.apache.sling.replication.packaging.ReplicationPackageExporter;
import org.apache.sling.replication.packaging.ReplicationPackageImporter;
@@ -40,6 +33,7 @@ import org.apache.sling.replication.queu
import org.apache.sling.replication.queue.ReplicationQueueProvider;
import org.apache.sling.replication.queue.impl.SingleQueueDistributionStrategy;
import
org.apache.sling.replication.queue.impl.jobhandling.JobHandlingReplicationQueueProvider;
+import
org.apache.sling.replication.transport.authentication.TransportAuthenticationProvider;
import org.apache.sling.settings.SlingSettingsService;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
@@ -52,26 +46,18 @@ import org.slf4j.LoggerFactory;
*/
@Component(metatype = true,
label = "Simple Replication Agents Factory",
-description = "OSGi configuration based ReplicationAgent service
factory",
-name = SimpleReplicationAgentFactory.SERVICE_PID,
+description = "OSGi configuration factory for agents",
configurationFactory = true,
specVersion = "1.1",
policy = ConfigurationPolicy.REQUIRE
)
-public class SimpleReplicationAgentFactory {
-
-public static final String PACKAGE_EXPORTER_TARGET =
"ReplicationPackageExporter.target";
-
-public static final String PACKAGE_IMPORTER_TARGET =
"ReplicationPackageImporter.target";
+public class SimpleReplicationAgentFactory implements
ReplicationComponentProvider {
+public static final String QUEUEPROVIDER_TARGET = "queueProvider.target";
-public static final String QUEUEPROVIDER_TARGET =
"ReplicationQueueProvider.target";
-
-public static final String QUEUE_DISTRIBUTION_TARGET =
"ReplicationQueueDistributionStrategy.target";
+public static final String QUEUE_DISTRIBUTION_TARGET =
"queueDistributionStrategy.target";
private final Logger log = LoggerFactory.getLogger(getClass());
-static final String SERVICE_PID =
"org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory";
-
private static final String DEFAULT_QUEUEPROVIDER = "(name=" +
JobHandlingReplicationQueueProvider.NAME + ")";
private static final String DEFAULT_DISTRIBUTION = "(name=" +
SingleQueueDistributionStrategy.NAME + ")";
@@ -82,35 +68,32 @@ public class SimpleReplicationAgentFacto
@Property(label = "Name")
public static final String NAME = "name";
-@Property(label = "Triggers")
-public static final String TRIGGERS = "triggers";
-
@Property(boolValue = true, label = "Replicate using aggregated paths")
public static final String USE_AGGREGATE_PATHS = "useAggregatePaths";
@Property(boolValue = false, label = "Replicate using aggregated paths")
public static final String IS_PASSIVE = "isPassive";
-@Property(label = "Target ReplicationPackageExporter", name =
PACKAGE_EXPORTER_TARGET)
-@Reference(name = "ReplicationPackageExporter", policy =
ReferencePolicy.DYNAMIC)
-private volatile ReplicationPackageExporter packageExporter;
-
-@Property(label = "Target ReplicationPackageImporter", name =
PACKAGE_IMPORTER_TARGET)
-@Reference(name = "Replic
svn commit: r1629144 - in /sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler: JspRuntimeContext.java TagFileProcessor.java
Author: cziegeler
Date: Fri Oct 3 08:49:24 2014
New Revision: 1629144
URL: http://svn.apache.org/r1629144
Log:
SLING-3984 : JSP Compilation failure under heavy load. Apply partial patch from
Viktor Adam
Modified:
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JspRuntimeContext.java
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/TagFileProcessor.java
Modified:
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JspRuntimeContext.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JspRuntimeContext.java?rev=1629144&r1=1629143&r2=1629144&view=diff
==
---
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JspRuntimeContext.java
(original)
+++
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JspRuntimeContext.java
Fri Oct 3 08:49:24 2014
@@ -31,6 +31,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
import javax.servlet.Servlet;
import javax.servlet.ServletContext;
@@ -229,6 +231,11 @@ public final class JspRuntimeContext {
*/
private final Map> depToJsp = new HashMap>();
+/**
+ * Locks for loading tag files.
+ */
+private final ConcurrentHashMap tagFileLoadingLocks = new
ConcurrentHashMap();
+
// -- Public Methods
public void addJspDependencies(final JspServletWrapper jsw, final
List deps) {
@@ -313,13 +320,22 @@ public final class JspRuntimeContext {
}
/**
- * Remove a JspServletWrapper.
- *
- * @param jspUri JSP URI of JspServletWrapper to remove
-public void removeWrapper(String jspUri) {
-jsps.remove(jspUri);
+ * Locks a tag file path. Use this before loading it.
+ * @param tagFilePath Tag file path
+ */
+public void lockTagFileLoading(final String tagFilePath) {
+final Lock lock = getTagFileLoadingLock(tagFilePath);
+lock.lock();
}
+
+/**
+ * Unlocks a tag file path. Use this after loading it.
+ * @param tagFilePath Tag file path
*/
+public void unlockTagFileLoading(final String tagFilePath) {
+final Lock lock = getTagFileLoadingLock(tagFilePath);
+lock.unlock();
+}
/**
* Process a "destroy" event for this web application context.
@@ -403,5 +419,20 @@ public final class JspRuntimeContext {
}
}
+/**
+ * Returns and optionally creates a lock to load a tag file.
+ */
+private Lock getTagFileLoadingLock(final String tagFilePath) {
+Lock lock = tagFileLoadingLocks.get(tagFilePath);
+if (lock == null) {
+lock = new ReentrantLock();
+final Lock existingLock =
tagFileLoadingLocks.putIfAbsent(tagFilePath, lock);
+if (existingLock != null) {
+lock = existingLock;
+}
+}
+
+return lock;
+}
}
Modified:
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/TagFileProcessor.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/TagFileProcessor.java?rev=1629144&r1=1629143&r2=1629144&view=diff
==
---
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/TagFileProcessor.java
(original)
+++
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/TagFileProcessor.java
Fri Oct 3 08:49:24 2014
@@ -533,67 +533,75 @@ class TagFileProcessor {
JspCompilationContext ctxt = compiler.getCompilationContext();
JspRuntimeContext rctxt = ctxt.getRuntimeContext();
-JspServletWrapper wrapper = rctxt.getWrapper(tagFilePath);
-if (wrapper == null) {
-wrapper = new JspServletWrapper(ctxt.getServletContext(), ctxt
-.getOptions(), tagFilePath, tagInfo, ctxt
-.getRuntimeContext(), compiler.getDefaultIsSession(),
- ctxt.getTagFileJarUrl(tagFilePath));
-wrapper = rctxt.addWrapper(tagFilePath, wrapper);
-
-// Use same classloader and classpath for compiling tag files
-
//wrapper.getJspEngineContext().setClassLoader(ctxt.getClassLoader());
-//wrapper.getJspEngineContext().setClassPath(ctxt.getClassPath());
-} else {
-// Make sure that JspCompilationContext gets the latest TagI
Nexus: Promotion Completed
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Maven/3.0.5 (Java 1.7.0_51; Windows 7 6.1)""userId" = "sseifert""ip" = "91.64.33.29"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/sling/org.apache.sling.superimposing/0.2.0/org.apache.sling.superimposing-0.2.0-sources.jar(SHA1: 1f445bee3b39e52c369aa70cf55494a082b5e0cd)/org/apache/sling/org.apache.sling.superimposing/0.2.0/org.apache.sling.superimposing-0.2.0.jar(SHA1: 6f4031427d069723165130d6887f2ba978819c56)/org/apache/sling/org.apache.sling.superimposing/0.2.0/org.apache.sling.superimposing-0.2.0-sources.jar.asc(SHA1: 0be72458899cbdcda1c5d0d88b621bf985df79ed)/org/apache/sling/org.apache.sling.superimposing/0.2.0/org.apache.sling.superimposing-0.2.0.jar.asc(SHA1: 425aba9c342bfd954958400e11b9a865f3a4e333)/org/apache/sling/org.apache.sling.superimposing/0.2.0/org.apache.sling.superimposing-0.2.0-source-release.zip.asc(SHA1: b690c6ed6983ba9948716bafe7f58bbf232fd0fc)/org/apache/sling/org.apache.sling.superimposing/0.2.0/org.apache.sling.superimposing-0.2.0-source-release.zip(SHA1: ef5febc47e9345fe005073590fde0c3a62bde4ab)/org/apache/sling/org.apache.sling.superimposing/0.2.0/org.apache.sling.superimposing-0.2.0-javadoc.jar(SHA1: b96066da79f8b891ac13b4e6493389f6dad68ac3)/org/apache/sling/org.apache.sling.superimposing/0.2.0/org.apache.sling.superimposing-0.2.0-javadoc.jar.asc(SHA1: 1a876127a36123e78d47cc266064c62bcda3d7a1)/org/apache/sling/org.apache.sling.superimposing/0.2.0/org.apache.sling.superimposing-0.2.0.pom.asc(SHA1: d6713ce58c1938fdf572c034eb7996cfacfb75c6)/org/apache/sling/org.apache.sling.superimposing/0.2.0/org.apache.sling.superimposing-0.2.0.pom(SHA1: 4462a96e41fe967e591bf35a13885c0f068d74d9)Action performed by Oliver Lietz (olli)
svn commit: r6715 - /release/sling/
Author: olli Date: Fri Oct 3 08:41:06 2014 New Revision: 6715 Log: Superimposing 0.2.0 Added: release/sling/org.apache.sling.superimposing-0.2.0-javadoc.jar (with props) release/sling/org.apache.sling.superimposing-0.2.0-javadoc.jar.asc release/sling/org.apache.sling.superimposing-0.2.0-javadoc.jar.md5 release/sling/org.apache.sling.superimposing-0.2.0-javadoc.jar.sha1 release/sling/org.apache.sling.superimposing-0.2.0-source-release.zip (with props) release/sling/org.apache.sling.superimposing-0.2.0-source-release.zip.asc release/sling/org.apache.sling.superimposing-0.2.0-source-release.zip.md5 release/sling/org.apache.sling.superimposing-0.2.0-source-release.zip.sha1 release/sling/org.apache.sling.superimposing-0.2.0-sources.jar (with props) release/sling/org.apache.sling.superimposing-0.2.0-sources.jar.asc release/sling/org.apache.sling.superimposing-0.2.0-sources.jar.md5 release/sling/org.apache.sling.superimposing-0.2.0-sources.jar.sha1 release/sling/org.apache.sling.superimposing-0.2.0.jar (with props) release/sling/org.apache.sling.superimposing-0.2.0.jar.asc release/sling/org.apache.sling.superimposing-0.2.0.jar.md5 release/sling/org.apache.sling.superimposing-0.2.0.jar.sha1 release/sling/org.apache.sling.superimposing-0.2.0.pom release/sling/org.apache.sling.superimposing-0.2.0.pom.asc release/sling/org.apache.sling.superimposing-0.2.0.pom.md5 release/sling/org.apache.sling.superimposing-0.2.0.pom.sha1 Added: release/sling/org.apache.sling.superimposing-0.2.0-javadoc.jar == Binary file - no diff available. Propchange: release/sling/org.apache.sling.superimposing-0.2.0-javadoc.jar -- svn:mime-type = application/octet-stream Added: release/sling/org.apache.sling.superimposing-0.2.0-javadoc.jar.asc == --- release/sling/org.apache.sling.superimposing-0.2.0-javadoc.jar.asc (added) +++ release/sling/org.apache.sling.superimposing-0.2.0-javadoc.jar.asc Fri Oct 3 08:41:06 2014 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQEcBAABAgAGBQJUKcftAAoJEM4rf/Z1146SdMcH/j1CVcsM01uqJ/4YMnHxn1zP +0/QX176stC62Dtpm4cTrhBNHYErR0rhRiFcA6jnt6+Qv2IUfeXpg66huY4ofPExF +MEu0zh2/5veTlsdSMESwJV9wpRBI+1qKJPL0agMVGSj+ZbP4OuLf3cPtJxwTaMyY +cI8etIPqeXqi0hgJkGUlNyUYy70a6p7f+mNcoPD3veZM4JJRVfUOBKwAnuZXTyjw +CmumI6ZdZRtP5Lz5M7aC8ZzM8jIgp4yFiXdOfIwqUSEPMCYsRlCzSmgPYEtXzB7Y +eZOI5q+tXOPXQH9FXNengFc3huxQMkkrhkknfK7luyWmV5LBl//XFXoQZhjlVJE= +=8iTx +-END PGP SIGNATURE- Added: release/sling/org.apache.sling.superimposing-0.2.0-javadoc.jar.md5 == --- release/sling/org.apache.sling.superimposing-0.2.0-javadoc.jar.md5 (added) +++ release/sling/org.apache.sling.superimposing-0.2.0-javadoc.jar.md5 Fri Oct 3 08:41:06 2014 @@ -0,0 +1 @@ +3cd494ee8e4112a3d935eeb94e8fc947 \ No newline at end of file Added: release/sling/org.apache.sling.superimposing-0.2.0-javadoc.jar.sha1 == --- release/sling/org.apache.sling.superimposing-0.2.0-javadoc.jar.sha1 (added) +++ release/sling/org.apache.sling.superimposing-0.2.0-javadoc.jar.sha1 Fri Oct 3 08:41:06 2014 @@ -0,0 +1 @@ +b96066da79f8b891ac13b4e6493389f6dad68ac3 \ No newline at end of file Added: release/sling/org.apache.sling.superimposing-0.2.0-source-release.zip == Binary file - no diff available. Propchange: release/sling/org.apache.sling.superimposing-0.2.0-source-release.zip -- svn:mime-type = application/octet-stream Added: release/sling/org.apache.sling.superimposing-0.2.0-source-release.zip.asc == --- release/sling/org.apache.sling.superimposing-0.2.0-source-release.zip.asc (added) +++ release/sling/org.apache.sling.superimposing-0.2.0-source-release.zip.asc Fri Oct 3 08:41:06 2014 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQEcBAABAgAGBQJUKcftAAoJEM4rf/Z1146S6gQH/20o/Hp+I1qKgewWoCKntLhz +E8dUe3gXWoSk262/RRpH+LACTrXEHTYdkNkzr9t2TDKWPrxxCW046BXnh/kts1EL +NS9rZ1/6H+IQX0xvvJnCpWxUENR3GtaCZnsKZt0oIMcwWV4ARe4SJ3qdmaYE+Iy1 +ABEwn2W1S0zyowhJYx9KKfy5HADKbzj/hFXMhM5qAiiwHoCNT27TMGohxEpq4sfd +XoOQl3aS2AIDEqZXH0GKvtzyF4+yIuJxdJC+q7XPOIJ07OdRp2yVQSImw/nCKEX+ +dYeT9QL6yRkJSDw3BLxPytLtzMSdEL5S5QStscnIS/L7O+5/3jiviAWYCz0Ublg= +=UKZr +-END PGP SIGNATURE- Added: release/sling/org.apache.sling.superimposing-0.2.0-source-release.zip.md5 == --- release/sling/org
