svn commit: r1560925 - in /sling/trunk/contrib/extensions/i18n: ./ src/main/java/org/apache/sling/i18n/impl/ src/test/java/org/apache/sling/i18n/impl/ src/test/java/org/apache/sling/i18n/it/
Author: fmeschbe
Date: Fri Jan 24 09:04:55 2014
New Revision: 1560925
URL: http://svn.apache.org/r1560925
Log:
SLING-2881 JcrResourceBundleProvider clears the cache on mix:language changes
- Apply patch by Tobias Bocanegra (thanks alot).
- Completely disabled the integration test due to unavailability
of the pax test support (as well as the launchpad snapshot reference)
- Updated requirement to Java 6 due to use of Collections.newSetFromMap
Modified:
sling/trunk/contrib/extensions/i18n/pom.xml
sling/trunk/contrib/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
sling/trunk/contrib/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundleProvider.java
sling/trunk/contrib/extensions/i18n/src/test/java/org/apache/sling/i18n/impl/JcrResourceBundleTest.java
sling/trunk/contrib/extensions/i18n/src/test/java/org/apache/sling/i18n/it/ResourceBundleProviderIT.java
Modified: sling/trunk/contrib/extensions/i18n/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/i18n/pom.xml?rev=1560925r1=1560924r2=1560925view=diff
==
--- sling/trunk/contrib/extensions/i18n/pom.xml (original)
+++ sling/trunk/contrib/extensions/i18n/pom.xml Fri Jan 24 09:04:55 2014
@@ -41,6 +41,7 @@
url.version1.5.2/url.version
org.ops4j.pax.logging.DefaultServiceLog.levelINFO/org.ops4j.pax.logging.DefaultServiceLog.level
bundle.file.name${basedir}/target/${project.build.finalName}.jar/bundle.file.name
+sling.java.version6/sling.java.version
/properties
scm
@@ -185,12 +186,15 @@
artifactIdjunit/artifactId
scopetest/scope
/dependency
+!--
+No release yet available, omit for now
dependency
groupIdorg.apache.sling/groupId
artifactIdorg.apache.sling.paxexam.util/artifactId
version1.0-SNAPSHOT/version
scopetest/scope
/dependency
+--
dependency
groupIdorg.apache.sling/groupId
artifactIdorg.apache.sling.commons.testing/artifactId
Modified:
sling/trunk/contrib/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java?rev=1560925r1=1560924r2=1560925view=diff
==
---
sling/trunk/contrib/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
(original)
+++
sling/trunk/contrib/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
Fri Jan 24 09:04:55 2014
@@ -19,8 +19,10 @@
package org.apache.sling.i18n.impl;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
@@ -32,9 +34,12 @@ import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.query.Query;
+import org.apache.jackrabbit.util.ISO9075;
import org.apache.sling.api.SlingException;
+import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceUtil;
+import org.apache.sling.api.resource.ValueMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,23 +57,36 @@ public class JcrResourceBundle extends R
static final String PROP_LANGUAGE = jcr:language;
+/**
+ * java.util.Formatter pattern to build the XPath query to search for
+ * messages in a given root path (%s argument).
+ *
+ * @see #loadFully(ResourceResolver, Set, Set)
+ */
+private static final String QUERY_MESSAGES_FORMAT =
/jcr:root%s//element(*,sling:Message);
+
private final MapString, Object resources;
private final Locale locale;
+private final SetString languageRoots = new HashSetString();
+
JcrResourceBundle(Locale locale, String baseName,
ResourceResolver resourceResolver) {
this.locale = locale;
-
+
long start = System.currentTimeMillis();
refreshSession(resourceResolver, true);
-final String loadQuery = getFullLoadQuery(locale, baseName);
-this.resources = loadFully(resourceResolver, loadQuery);
+SetString roots = loadPotentialLanguageRoots(resourceResolver,
locale, baseName);
+this.resources = loadFully(resourceResolver, roots,
this.languageRoots);
long end = System.currentTimeMillis();
-log.debug(
-JcrResourceBundle: Fully loaded {} entries for {} (base: {}) in
{}ms,
-new Object[] { resources.size(), locale, baseName,
-(end - start) });
+if (log.isDebugEnabled()) {
+
svn commit: r1560937 - /sling/trunk/contrib/pom.xml
Author: bdelacretaz Date: Fri Jan 24 10:45:28 2014 New Revision: 1560937 URL: http://svn.apache.org/r1560937 Log: SLING-2788 - move sling-pax-util under testing Modified: sling/trunk/contrib/pom.xml Modified: sling/trunk/contrib/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/pom.xml?rev=1560937r1=1560936r2=1560937view=diff == --- sling/trunk/contrib/pom.xml (original) +++ sling/trunk/contrib/pom.xml Fri Jan 24 10:45:28 2014 @@ -102,7 +102,6 @@ moduleextensions/rewriter/module moduleextensions/tenant/module moduleextensions/replication/module - moduleextensions/sling-pax-util/module modulejcr/jackrabbit-client/module modulejcr/compiler/module modulejcr/prefs/module
svn commit: r1560938 - in /sling/trunk: contrib/extensions/sling-pax-util/ testing/sling-pax-util/
Author: bdelacretaz Date: Fri Jan 24 10:46:07 2014 New Revision: 1560938 URL: http://svn.apache.org/r1560938 Log: SLING-2788 - move sling-pax-util under testing Added: sling/trunk/testing/sling-pax-util/ - copied from r1560937, sling/trunk/contrib/extensions/sling-pax-util/ Removed: sling/trunk/contrib/extensions/sling-pax-util/
svn commit: r1560940 - in /sling/trunk: pom.xml testing/sling-pax-util/pom.xml
Author: bdelacretaz Date: Fri Jan 24 10:49:12 2014 New Revision: 1560940 URL: http://svn.apache.org/r1560940 Log: SLING-2788 - move sling-pax-util under testing Modified: sling/trunk/pom.xml sling/trunk/testing/sling-pax-util/pom.xml Modified: sling/trunk/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/pom.xml?rev=1560940r1=1560939r2=1560940view=diff == --- sling/trunk/pom.xml (original) +++ sling/trunk/pom.xml Fri Jan 24 10:49:12 2014 @@ -196,6 +196,7 @@ moduletesting/junit/healthcheck/module moduletesting/junit/remote/module moduletesting/resourceresolver-mock/module +moduletesting/sling-pax-util/module !-- Installer -- moduleinstaller/core/module Modified: sling/trunk/testing/sling-pax-util/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/sling-pax-util/pom.xml?rev=1560940r1=1560939r2=1560940view=diff == --- sling/trunk/testing/sling-pax-util/pom.xml (original) +++ sling/trunk/testing/sling-pax-util/pom.xml Fri Jan 24 10:49:12 2014 @@ -26,7 +26,7 @@ version1.0-SNAPSHOT/version packagingjar/packaging -nameSling Pax Exam Utilities/name +nameApache Sling Pax Exam Utilities/name properties project.build.sourceEncodingUTF-8/project.build.sourceEncoding
svn commit: r1560941 - in /sling/trunk/testing/sling-pax-util: pom.xml src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.j
Author: bdelacretaz
Date: Fri Jan 24 11:03:20 2014
New Revision: 1560941
URL: http://svn.apache.org/r1560941
Log:
SLING-2788 - prepare for release
Modified:
sling/trunk/testing/sling-pax-util/pom.xml
sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
Modified: sling/trunk/testing/sling-pax-util/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/sling-pax-util/pom.xml?rev=1560941r1=1560940r2=1560941view=diff
==
--- sling/trunk/testing/sling-pax-util/pom.xml (original)
+++ sling/trunk/testing/sling-pax-util/pom.xml Fri Jan 24 11:03:20 2014
@@ -38,6 +38,21 @@
build
plugins
plugin
+artifactIdmaven-clean-plugin/artifactId
+configuration
+filesets
+fileset
+directory${basedir}/directory
+includes
+includederby.log/include
+includejackrabbit/**/include
+includecoverage.ec/include
+/includes
+/fileset
+/filesets
+/configuration
+/plugin
+plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-surefire-plugin/artifactId
configuration
@@ -95,7 +110,7 @@
dependency
groupIdorg.apache.sling/groupId
artifactIdmaven-launchpad-plugin/artifactId
-version2.2.1-SNAPSHOT/version
+version2.2.0/version
typemaven-plugin/type
/dependency
dependency
Modified:
sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java?rev=1560941r1=1560940r2=1560941view=diff
==
---
sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
(original)
+++
sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
Fri Jan 24 11:03:20 2014
@@ -48,7 +48,7 @@ public class SlingRepositoryTest {
@org.ops4j.pax.exam.Configuration
public Option[] config() {
-return
SlingPaxOptions.defaultLaunchpadOptions(7-SNAPSHOT).getOptions();
+return SlingPaxOptions.defaultLaunchpadOptions(6).getOptions();
}
@Test
@@ -69,4 +69,4 @@ public class SlingRepositoryTest {
assertNotNull(s);
s.logout();
}
- }
\ No newline at end of file
+ }
Modified:
sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java?rev=1560941r1=1560940r2=1560941view=diff
==
---
sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
(original)
+++
sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
Fri Jan 24 11:03:20 2014
@@ -45,7 +45,7 @@ public class SlingSetupTest {
@org.ops4j.pax.exam.Configuration
public Option[] config() {
-return
SlingPaxOptions.defaultLaunchpadOptions(7-SNAPSHOT).getOptions();
+return SlingPaxOptions.defaultLaunchpadOptions(6).getOptions();
}
private void assertBundleActive(String symbolicName) {
@@ -98,47 +98,32 @@ public class SlingSetupTest {
org.apache.sling.commons.classloader,
org.apache.sling.commons.json,
org.apache.sling.commons.log,
-org.apache.sling.commons.logservice,
org.apache.sling.commons.mime,
org.apache.sling.commons.osgi,
org.apache.sling.commons.scheduler,
org.apache.sling.commons.threads,
-org.apache.sling.discovery.api,
-org.apache.sling.discovery.impl,
-org.apache.sling.discovery.support,
org.apache.sling.engine,
org.apache.sling.event,
org.apache.sling.extensions.explorer,
-org.apache.sling.extensions.groovy,
org.apache.sling.extensions.threaddump,
org.apache.sling.extensions.webconsolebranding,
org.apache.sling.extensions.webconsolesecurityprovider,
-
svn commit: r1560942 - in /sling/trunk/testing/sling-pax-util: pom.xml src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.j
Author: bdelacretaz
Date: Fri Jan 24 11:10:39 2014
New Revision: 1560942
URL: http://svn.apache.org/r1560942
Log:
SLING-2788 - explain this better
Modified:
sling/trunk/testing/sling-pax-util/pom.xml
sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
Modified: sling/trunk/testing/sling-pax-util/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/sling-pax-util/pom.xml?rev=1560942r1=1560941r2=1560942view=diff
==
--- sling/trunk/testing/sling-pax-util/pom.xml (original)
+++ sling/trunk/testing/sling-pax-util/pom.xml Fri Jan 24 11:10:39 2014
@@ -27,6 +27,11 @@
packagingjar/packaging
nameApache Sling Pax Exam Utilities/name
+
+description
+Utilities that make it easier to test Sling code with Pax Exam.
+See this module's tests for usage examples.
+/description
properties
project.build.sourceEncodingUTF-8/project.build.sourceEncoding
Modified:
sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java?rev=1560942r1=1560941r2=1560942view=diff
==
---
sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
(original)
+++
sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
Fri Jan 24 11:10:39 2014
@@ -34,11 +34,10 @@ import org.ops4j.pax.exam.spi.reactors.P
/** Verify that our tests have access to a functional Sling instance,
* and demonstrate how a simple test is setup.
*
- * To create a test like this that runs against a full Sling launchpad
- * instance, one only needs the pax exam setup in the pom and a test
- * like this one that runs with @RunWith PaxExam, that provides a
- * Configuration method and can access services or the BundleContext
- * using @Inject.
+ * Note how little boilerplate this example test has. You basically just
+ * define which version of the Sling launchpad bundle list you want to use,
+ * and you can then @Inject any OSGi services to be tested, along with the
+ * BundleContext.
*/
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
@@ -46,9 +45,12 @@ public class SlingRepositoryTest {
@Inject
private SlingRepository repository;
+/** Use a released launchpad for this example */
+public static final String SLING_LAUNCHPAD_VERSION = 6;
+
@org.ops4j.pax.exam.Configuration
public Option[] config() {
-return SlingPaxOptions.defaultLaunchpadOptions(6).getOptions();
+return
SlingPaxOptions.defaultLaunchpadOptions(SLING_LAUNCHPAD_VERSION).getOptions();
}
@Test
Modified:
sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java?rev=1560942r1=1560941r2=1560942view=diff
==
---
sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
(original)
+++
sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
Fri Jan 24 11:10:39 2014
@@ -40,12 +40,15 @@ import org.osgi.framework.ServiceReferen
@ExamReactorStrategy(PerClass.class)
public class SlingSetupTest {
+/** Use a released launchpad for this example */
+public static final String SLING_LAUNCHPAD_VERSION = 6;
+
@Inject
private BundleContext bundleContext;
@org.ops4j.pax.exam.Configuration
public Option[] config() {
-return SlingPaxOptions.defaultLaunchpadOptions(6).getOptions();
+return
SlingPaxOptions.defaultLaunchpadOptions(SLING_LAUNCHPAD_VERSION).getOptions();
}
private void assertBundleActive(String symbolicName) {
svn commit: r1560978 - /sling/trunk/testing/sling-pax-util/pom.xml
Author: bdelacretaz Date: Fri Jan 24 13:02:48 2014 New Revision: 1560978 URL: http://svn.apache.org/r1560978 Log: [maven-release-plugin] prepare release org.apache.sling.paxexam.util-1.0.2 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=1560978r1=1560977r2=1560978view=diff == --- sling/trunk/testing/sling-pax-util/pom.xml (original) +++ sling/trunk/testing/sling-pax-util/pom.xml Fri Jan 24 13:02:48 2014 @@ -9,8 +9,7 @@ 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. -- -project xmlns=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; +project xmlns=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; modelVersion4.0.0/modelVersion @@ -23,7 +22,7 @@ groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.paxexam.util/artifactId -version1.0-SNAPSHOT/version +version1.0.2/version packagingjar/packaging nameApache Sling Pax Exam Utilities/name @@ -162,4 +161,10 @@ scopetest/scope /dependency /dependencies + + scm + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.paxexam.util-1.0.2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.paxexam.util-1.0.2/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.paxexam.util-1.0.2/url + /scm /project
svn commit: r1560981 - /sling/trunk/testing/sling-pax-util/pom.xml
Author: bdelacretaz Date: Fri Jan 24 13:08:47 2014 New Revision: 1560981 URL: http://svn.apache.org/r1560981 Log: SLING-2788 - add missing scm section 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=1560981r1=1560980r2=1560981view=diff == --- sling/trunk/testing/sling-pax-util/pom.xml (original) +++ sling/trunk/testing/sling-pax-util/pom.xml Fri Jan 24 13:08:47 2014 @@ -22,7 +22,7 @@ groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.paxexam.util/artifactId -version1.0.2/version +version1.0.1-SNAPSHOT/version packagingjar/packaging nameApache Sling Pax Exam Utilities/name @@ -39,6 +39,12 @@ pax.exam.log.levelINFO/pax.exam.log.level /properties +scm + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util/connection +developerConnection scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/testing/sling-pax-util/url +/scm + build plugins plugin @@ -162,9 +168,4 @@ /dependency /dependencies - scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.paxexam.util-1.0.2/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.paxexam.util-1.0.2/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.paxexam.util-1.0.2/url - /scm /project
svn commit: r1560982 - /sling/trunk/testing/sling-pax-util/pom.xml
Author: bdelacretaz Date: Fri Jan 24 13:10:03 2014 New Revision: 1560982 URL: http://svn.apache.org/r1560982 Log: [maven-release-plugin] prepare release org.apache.sling.paxexam.util-1.0.2 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=1560982r1=1560981r2=1560982view=diff == --- sling/trunk/testing/sling-pax-util/pom.xml (original) +++ sling/trunk/testing/sling-pax-util/pom.xml Fri Jan 24 13:10:03 2014 @@ -22,7 +22,7 @@ groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.paxexam.util/artifactId -version1.0.1-SNAPSHOT/version +version1.0.2/version packagingjar/packaging nameApache Sling Pax Exam Utilities/name @@ -40,9 +40,9 @@ /properties scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util/connection -developerConnection scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/testing/sling-pax-util/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.paxexam.util-1.0.2/connection +developerConnection scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.paxexam.util-1.0.2/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.paxexam.util-1.0.2/url /scm build
svn commit: r1560984 - /sling/trunk/testing/sling-pax-util/pom.xml
Author: bdelacretaz Date: Fri Jan 24 13:10:28 2014 New Revision: 1560984 URL: http://svn.apache.org/r1560984 Log: [maven-release-plugin] prepare for next development iteration 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=1560984r1=1560983r2=1560984view=diff == --- sling/trunk/testing/sling-pax-util/pom.xml (original) +++ sling/trunk/testing/sling-pax-util/pom.xml Fri Jan 24 13:10:28 2014 @@ -22,7 +22,7 @@ groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.paxexam.util/artifactId -version1.0.2/version +version1.0.3-SNAPSHOT/version packagingjar/packaging nameApache Sling Pax Exam Utilities/name @@ -40,9 +40,9 @@ /properties scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.paxexam.util-1.0.2/connection -developerConnection scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.paxexam.util-1.0.2/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.paxexam.util-1.0.2/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util/connection +developerConnection scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/testing/sling-pax-util/url /scm build
svn commit: r1560989 - in /sling/site/trunk/content/documentation: bundles.mdtext pax-exam-utils.mdtext
Author: bdelacretaz
Date: Fri Jan 24 13:24:28 2014
New Revision: 1560989
URL: http://svn.apache.org/r1560989
Log:
SLING-2788 - minimal docs for Pax Exam Utils
Added:
sling/site/trunk/content/documentation/pax-exam-utils.mdtext
Modified:
sling/site/trunk/content/documentation/bundles.mdtext
Modified: sling/site/trunk/content/documentation/bundles.mdtext
URL:
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/bundles.mdtext?rev=1560989r1=1560988r2=1560989view=diff
==
--- sling/site/trunk/content/documentation/bundles.mdtext (original)
+++ sling/site/trunk/content/documentation/bundles.mdtext Fri Jan 24 13:24:28
2014
@@ -28,6 +28,7 @@ Title: Bundles
* [Sling Settings (org.apache.sling.settings)]({{
refs.sling-settings-org-apache-sling-settings.path }})
* [Caching Services]({{ refs.caching-services.path }})
* [Model Objects]({{ refs.models.path }})
+* [Sling Pax Exam Utilities]({{ refs.pax-exam-utils.path }})
## Content Presentation
* [Output Rewriting Pipelines (org.apache.sling.rewriter)]({{
refs.output-rewriting-pipelines-org-apache-sling-rewriter.path }})
Added: sling/site/trunk/content/documentation/pax-exam-utils.mdtext
URL:
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/pax-exam-utils.mdtext?rev=1560989view=auto
==
--- sling/site/trunk/content/documentation/pax-exam-utils.mdtext (added)
+++ sling/site/trunk/content/documentation/pax-exam-utils.mdtext Fri Jan 24
13:24:28 2014
@@ -0,0 +1,11 @@
+Title: Sling Pax Exam Utilities
+
+Utilities to help testing Sling components with Pax Exam are available at
+[https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util](https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util)
+
+The focus is on making it easier to test Sling components against a full Sling
launchpad,
+with minimal boilerplate code.
+
+See the
+[SlingRepositoryTest](https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java)
class
+for an example test.
svn commit: r895306 - in /websites/staging/sling/trunk/content: ./ documentation/bundles.html documentation/pax-exam-utils.html
Author: buildbot Date: Fri Jan 24 13:24:38 2014 New Revision: 895306 Log: Staging update by buildbot for sling Added: websites/staging/sling/trunk/content/documentation/pax-exam-utils.html Modified: websites/staging/sling/trunk/content/ (props changed) websites/staging/sling/trunk/content/documentation/bundles.html Propchange: websites/staging/sling/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Fri Jan 24 13:24:38 2014 @@ -1 +1 @@ -1560710 +1560989 Modified: websites/staging/sling/trunk/content/documentation/bundles.html == --- websites/staging/sling/trunk/content/documentation/bundles.html (original) +++ websites/staging/sling/trunk/content/documentation/bundles.html Fri Jan 24 13:24:38 2014 @@ -115,6 +115,7 @@ lia href=/documentation/bundles/sling-settings-org-apache-sling-settings.htmlSling Settings (org.apache.sling.settings)/a/li lia href=/documentation/bundles/caching-services.htmlCaching Services/a/li lia href=/documentation/bundles/models.htmlModel Objects/a/li +lia href=/documentation/pax-exam-utils.htmlSling Pax Exam Utilities/a/li /ul h2 id=content-presentationContent Presentation/h2 ul @@ -134,7 +135,7 @@ lia href=/documentation/bundles/discovery-api-and-impl.htmlDiscovery API and its Implementations (discovery.api, discovery.impl)/a/li /ul div class=timestamp style=margin-top: 30px; font-size: 80%; text-align: right; -Rev. 1560484 by justin on Wed, 22 Jan 2014 19:21:21 + +Rev. 1560989 by bdelacretaz on Fri, 24 Jan 2014 13:24:28 + /div div class=trademarkFooter Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project Added: websites/staging/sling/trunk/content/documentation/pax-exam-utils.html == --- websites/staging/sling/trunk/content/documentation/pax-exam-utils.html (added) +++ websites/staging/sling/trunk/content/documentation/pax-exam-utils.html Fri Jan 24 13:24:38 2014 @@ -0,0 +1,105 @@ +!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN http://www.w3.org/TR/html4/loose.dtd; +html +!-- + +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. +-- + head +titleApache Sling - Sling Pax Exam Utilities/title +link rel=icon href=/res/favicon.ico +link rel=stylesheet href=/res/site.css type=text/css media=all +link rel=stylesheet href=/res/codehilite.css type=text/css media=all +meta http-equiv=Content-Type content=text/html;charset=UTF-8 + /head + body +div class=title + div class=logo +a href=http://sling.apache.org/; + img border=0 alt=Apache Sling src=/res/logo.png +/a + /div + div class=header +a href=http://www.apache.org/; + img border=0 alt=Apache src=/res/apache.png +/a + /div +/div + +div class=menu + pstronga href=/documentation.htmlDocumentation/a/strong br / +a href=/documentation/getting-started.htmlGetting Started/a br / +a href=/documentation/the-sling-engine.htmlThe Sling Engine/a br / +a href=/documentation/development.htmlDevelopment/a br / +a href=/documentation/bundles.htmlBundles/a br / +a href=/documentation/tutorials-how-tos.htmlTutorials amp; How-Tos/a br / +a href=/documentation/configuration.htmlConfiguration/a br / +a href=http://s.apache.org/sling.wiki;Wiki/a br / +a href=http://s.apache.org/sling.faq;FAQ/a br / +a href=/sitemap.htmlSite Map/a/p +pstrongAPI Docs/strong br / +a href=/apidocs/sling6/index.htmlSling 6/a br / +a href=/apidocs/sling5/index.htmlSling 5/a /p +pstrongProject info/strong br / +a href=/downloads.cgiDownloads/a br / +a href=http://www.apache.org/licenses/;License/a br / +a href=/contributing.htmlContributing/a br / +a href=/news.htmlNews/a br / +a href=/links.htmlLinks/a br / +a href=/project-information.htmlProject Information/a br / +a href=https://issues.apache.org/jira/browse/SLING;Issue Tracker/a br / +a href=http://svn.apache.org/viewvc/sling/trunk;Browse Source Repository/a br / +a
svn commit: r895307 - /websites/production/sling/content/
Author: bdelacretaz Date: Fri Jan 24 13:25:35 2014 New Revision: 895307 Log: SLING-2788 - minimal docs for Pax Exam Utils Added: websites/production/sling/content/ - copied from r895306, websites/staging/sling/trunk/content/
Nexus: Promotion Completed
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Maven/3.0.5 (Java 1.6.0_65; Mac OS X 10.7.5)""userId" = "cziegeler""ip" = "50.84.224.210"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/sling/org.apache.sling.api/2.5.0/org.apache.sling.api-2.5.0-source-release.zip.asc(SHA1: 43b729c7ba996505f0abbe1294b81f5b4428e3d6)/org/apache/sling/org.apache.sling.api/2.5.0/org.apache.sling.api-2.5.0.jar.asc(SHA1: 7f00a7e55684b154e1a6580e208458703dfd6fb4)/org/apache/sling/org.apache.sling.api/2.5.0/org.apache.sling.api-2.5.0-javadoc.jar.asc(SHA1: 2a97621033ead09b1779ca9ffb18e0df8b8f7eb3)/org/apache/sling/org.apache.sling.api/2.5.0/org.apache.sling.api-2.5.0-source-release.zip(SHA1: dcf7a945e15b21fb4ed32cab823d2d87eb8b323e)/org/apache/sling/org.apache.sling.api/2.5.0/org.apache.sling.api-2.5.0-sources.jar(SHA1: 7ed72cb558c37c5f4a8ba3e95518fc60b3ae7888)/org/apache/sling/org.apache.sling.api/2.5.0/org.apache.sling.api-2.5.0.pom.asc(SHA1: 0f41fe1174c4c8bd2acb4964df2cf3e383c682df)/org/apache/sling/org.apache.sling.api/2.5.0/org.apache.sling.api-2.5.0.jar(SHA1: 0a37f471f3e300ed1c9ad5a053e2736318d3dc38)/org/apache/sling/org.apache.sling.api/2.5.0/org.apache.sling.api-2.5.0-sources.jar.asc(SHA1: 777d0a3b56e3e1cc556051de0766b317881af183)/org/apache/sling/org.apache.sling.api/2.5.0/org.apache.sling.api-2.5.0-javadoc.jar(SHA1: 08ead008d0d650797e2024a739bd8b22261b7979)/org/apache/sling/org.apache.sling.api/2.5.0/org.apache.sling.api-2.5.0.pom(SHA1: 25231570ce3743e969331a3bd0308378bc5a6f0a)Action performed by Carsten Ziegeler (cziege...@googlemail.com)
svn commit: r895312 - in /websites/staging/sling/trunk/content: ./ downloads.html news.html
Author: buildbot Date: Fri Jan 24 15:08:19 2014 New Revision: 895312 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 Jan 24 15:08:19 2014 @@ -1 +1 @@ -1560989 +1561030 Modified: websites/staging/sling/trunk/content/downloads.html == --- websites/staging/sling/trunk/content/downloads.html (original) +++ websites/staging/sling/trunk/content/downloads.html Fri Jan 24 15:08:19 2014 @@ -202,9 +202,9 @@ incubator releases of Apache Sling, have tbody tr tdAPI/td -td2.4.2/td -tda href=[preferred]/sling/org.apache.sling.api-2.4.2.jarBundle/a (a href=http://www.apache.org/dist/sling/org.apache.sling.api-2.4.2.jar.asc;asc/a, a href=http://www.apache.org/dist/sling/org.apache.sling.api-2.4.2.jar.md5;md5/a)/td -tda href=[preferred]/sling/org.apache.sling.api-2.4.2-source-release.zipSource ZIP/a (a href=http://www.apache.org/dist/sling/org.apache.sling.api-2.4.2-source-release.zip.asc;asc/a, a href=http://www.apache.org/dist/sling/org.apache.sling.api-2.4.2-source-release.zip.md5;md5/a)/td +td2.5.0/td +tda href=[preferred]/sling/org.apache.sling.api-2.5.0.jarBundle/a (a href=http://www.apache.org/dist/sling/org.apache.sling.api-2.5.0.jar.asc;asc/a, a href=http://www.apache.org/dist/sling/org.apache.sling.api-2.5.0.jar.md5;md5/a)/td +tda href=[preferred]/sling/org.apache.sling.api-2.5.0-source-release.zipSource ZIP/a (a href=http://www.apache.org/dist/sling/org.apache.sling.api-2.5.0-source-release.zip.asc;asc/a, a href=http://www.apache.org/dist/sling/org.apache.sling.api-2.5.0-source-release.zip.md5;md5/a)/td /tr tr tdAdapter Annotations/td @@ -346,9 +346,9 @@ incubator releases of Apache Sling, have /tr tr tdEvent/td -td3.3.2/td -tda href=[preferred]/sling/org.apache.sling.event-3.3.2.jarBundle/a (a href=http://www.apache.org/dist/sling/org.apache.sling.event-3.3.2.jar.asc;asc/a, a href=http://www.apache.org/dist/sling/org.apache.sling.event-3.3.2.jar.md5;md5/a)/td -tda href=[preferred]/sling/org.apache.sling.event-3.3.2-source-release.zipSource ZIP/a (a href=http://www.apache.org/dist/sling/org.apache.sling.event-3.3.2-source-release.zip.asc;asc/a, a href=http://www.apache.org/dist/sling/org.apache.sling.event-3.3.2-source-release.zip.md5;md5/a)/td +td3.3.4/td +tda href=[preferred]/sling/org.apache.sling.event-3.3.4.jarBundle/a (a href=http://www.apache.org/dist/sling/org.apache.sling.event-3.3.4.jar.asc;asc/a, a href=http://www.apache.org/dist/sling/org.apache.sling.event-3.3.4.jar.md5;md5/a)/td +tda href=[preferred]/sling/org.apache.sling.event-3.3.4-source-release.zipSource ZIP/a (a href=http://www.apache.org/dist/sling/org.apache.sling.event-3.3.4-source-release.zip.asc;asc/a, a href=http://www.apache.org/dist/sling/org.apache.sling.event-3.3.4-source-release.zip.md5;md5/a)/td /tr tr tdExplorer/td @@ -837,7 +837,7 @@ incubator releases of Apache Sling, have div class=timestamp style=margin-top: 30px; font-size: 80%; text-align: right; -Rev. 1559396 by cziegeler on Sat, 18 Jan 2014 19:31:52 + +Rev. 1561030 by cziegeler on Fri, 24 Jan 2014 15:08:12 + /div div class=trademarkFooter 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 Jan 24 15:08:19 2014 @@ -86,6 +86,7 @@ h1News/h1 ul +liNew Releases: Apache Sling API 2.5.0, and Apache Sling Eventing 3.3.4 (January 24th, 2014)/li liNew Releases: Apache Sling Installer Core 3.5.0, and Apache Sling Eventing 3.3.2 (January 19th, 2014)/li liNew Release: Apache Sling Web Console Security Provider 1.1.2 (December 17th, 2013)/li liNew Release: Apache Sling Maven JSPC Plugin 2.0.8 (December 14th, 2013)/li @@ -196,7 +197,7 @@ em SVN moved to http://svn.apache.org/repos/asf/sling (June 18, 2009) /em Apache Sling has graduated into a top level project! (June 17, 2009)/p div class=timestamp style=margin-top: 30px; font-size: 80%; text-align: right; -Rev. 1559396 by cziegeler on Sat, 18 Jan 2014 19:31:52 + +Rev. 1561030 by cziegeler on Fri, 24 Jan 2014 15:08:12 + /div div class=trademarkFooter Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project
svn commit: r1561030 - in /sling/site/trunk/content: downloads.list news.mdtext
Author: cziegeler Date: Fri Jan 24 15:08:12 2014 New Revision: 1561030 URL: http://svn.apache.org/r1561030 Log: API and event release 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=1561030r1=1561029r2=1561030view=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Fri Jan 24 15:08:12 2014 @@ -19,7 +19,7 @@ sling|6 # Format: title|artifactId|version[|classifier[|extension]] Adapter|org.apache.sling.adapter|2.1.0 Adapter Annotations|adapter-annotations|1.0.0 -API|org.apache.sling.api|2.4.2 +API|org.apache.sling.api|2.5.0 Auth Core|org.apache.sling.auth.core|1.1.4 Auth Form|org.apache.sling.auth.form|1.0.4 Auth OpenID|org.apache.sling.auth.openid|1.0.2 @@ -42,7 +42,7 @@ Discovery Impl|org.apache.sling.discover Discovery Standalone|org.apache.sling.discovery.standalone|1.0.0 Discovery Support|org.apache.sling.discovery.support|1.0.0 Engine|org.apache.sling.engine|2.2.10 -Event|org.apache.sling.event|3.3.2 +Event|org.apache.sling.event|3.3.4 Explorer|org.apache.sling.extensions.explorer|1.0.2 GWT Integration|org.apache.sling.gwt.servlet|3.0.0 Thread Dumper|org.apache.sling.extensions.threaddump|0.2.2 Modified: sling/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1561030r1=1561029r2=1561030view=diff == --- sling/site/trunk/content/news.mdtext (original) +++ sling/site/trunk/content/news.mdtext Fri Jan 24 15:08:12 2014 @@ -1,5 +1,6 @@ Title: News +* New Releases: Apache Sling API 2.5.0, and Apache Sling Eventing 3.3.4 (January 24th, 2014) * New Releases: Apache Sling Installer Core 3.5.0, and Apache Sling Eventing 3.3.2 (January 19th, 2014) * New Release: Apache Sling Web Console Security Provider 1.1.2 (December 17th, 2013) * New Release: Apache Sling Maven JSPC Plugin 2.0.8 (December 14th, 2013)
svn commit: r1561035 - /sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletResponseImpl.java
Author: justin
Date: Fri Jan 24 15:38:23 2014
New Revision: 1561035
URL: http://svn.apache.org/r1561035
Log:
SLING-3338 including request when mapping urls
Modified:
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletResponseImpl.java
Modified:
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletResponseImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletResponseImpl.java?rev=1561035r1=1561034r2=1561035view=diff
==
---
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletResponseImpl.java
(original)
+++
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletResponseImpl.java
Fri Jan 24 15:38:23 2014
@@ -362,6 +362,6 @@ public class SlingHttpServletResponseImp
}
private String map(String url) {
-return getRequestData().getResourceResolver().map(url);
+return
getRequestData().getResourceResolver().map(getRequestData().getServletRequest(),
url);
}
}
svn commit: r1561044 - /sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceListener.java
Author: justin
Date: Fri Jan 24 15:52:53 2014
New Revision: 1561044
URL: http://svn.apache.org/r1561044
Log:
SLING-3339 - moving event.getUserID() check to inside else block for
isExternal()
Modified:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceListener.java
Modified:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceListener.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceListener.java?rev=1561044r1=1561043r2=1561044view=diff
==
---
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceListener.java
(original)
+++
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceListener.java
Fri Jan 24 15:52:53 2014
@@ -296,11 +296,14 @@ public class JcrResourceListener impleme
final ChangedAttributes changedAttributes) {
final DictionaryString, Object properties = new HashtableString,
Object();
-if ( event.getUserID() != null ) {
-properties.put(SlingConstants.PROPERTY_USERID, event.getUserID());
-}
+
if (this.isExternal(event)) {
properties.put(event.application, unknown);
+} else {
+final String userID = event.getUserID();
+if (userID != null) {
+properties.put(SlingConstants.PROPERTY_USERID, userID);
+}
}
if (changedAttributes != null) {
changedAttributes.addProperties(properties);
[CONF] Apache Sling Testing Options
Justin Edelson created a page: Testing Options Within Sling, we have a number of different ways to implement automated testing. This is an attempt to explain these options: Remote HTTP Testing Sling Test Tools Pax Exam Utils Description Sling Module Commons Testing Example Project http://svn.apache.org/repos/asf/sling/trunk/launchpad/integration-tests/ http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/i18n/ http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/i18n/ Tests Run... External Process (IDE or Maven Surefire plugin) Within Sling JVM Within Sling JVM Usable with running instance? Yes (by definition) Yes (see SLING-3328) No View Online Like Add Comment Stop watching space Manage Notifications This message was
[CONF] Apache Sling Testing Options
Justin Edelson edited the page: Testing Options Within Sling, we have a number of different ways to implement automated testing. This is an attempt to explain these options: Remote HTTP Testing Sling Test ToolsServer Side JUnit Pax Exam Utils Description Tests make various HTTP requests and make assertions upon the responses. Typically also involves creating test services and/or deploying test resources. Typically associated with black box testing. JUnit tests are packaged into an OSGi bundle and deployed into a Sling instance. Test results can be viewed using a simple HTTP front end or as part of Sling Health Checks. For IDE and Maven integration, a separate test class can be created to start Sling, deploy the test bundle, and execute the tests. This is still technically black box testing as the tests only have access to the service APIs, but it is less blackboxy than pure HTTP-based testing. JUnit tests are written and executed using the Pax Exam framework which causes an OSGi framework to be started as part of the test harness. Sling bundles are deployed into this framework and the tests are executed within the framework. Sling Module Commons Testing Sling Test Tools Pax Exam Utils Example Project http://svn.apache.org/repos/asf/sling/trunk/launchpad/integration-tests/ http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/i18n/ http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/i18n/Launchpad Integration Tests Sling Modules Integration Tests Sling I18N Tests Run... External Process (IDE or Maven Surefire plugin)
svn commit: r1561216 - in /sling/trunk/bundles: resourceaccesssecurity/pom.xml resourceresolver/pom.xml
Author: cziegeler Date: Fri Jan 24 22:39:51 2014 New Revision: 1561216 URL: http://svn.apache.org/r1561216 Log: Use released Sling API Modified: sling/trunk/bundles/resourceaccesssecurity/pom.xml sling/trunk/bundles/resourceresolver/pom.xml Modified: sling/trunk/bundles/resourceaccesssecurity/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceaccesssecurity/pom.xml?rev=1561216r1=1561215r2=1561216view=diff == --- sling/trunk/bundles/resourceaccesssecurity/pom.xml (original) +++ sling/trunk/bundles/resourceaccesssecurity/pom.xml Fri Jan 24 22:39:51 2014 @@ -100,7 +100,7 @@ dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.api/artifactId -version2.5.1-SNAPSHOT/version +version2.5.0/version scopeprovided/scope /dependency dependency Modified: sling/trunk/bundles/resourceresolver/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/pom.xml?rev=1561216r1=1561215r2=1561216view=diff == --- sling/trunk/bundles/resourceresolver/pom.xml (original) +++ sling/trunk/bundles/resourceresolver/pom.xml Fri Jan 24 22:39:51 2014 @@ -114,7 +114,7 @@ dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.api/artifactId -version2.5.1-SNAPSHOT/version +version2.5.0/version scopeprovided/scope /dependency dependency
svn commit: r1561218 - /sling/trunk/contrib/extensions/feature-flags/pom.xml
Author: cziegeler Date: Fri Jan 24 22:40:42 2014 New Revision: 1561218 URL: http://svn.apache.org/r1561218 Log: Use released Sling API Modified: sling/trunk/contrib/extensions/feature-flags/pom.xml Modified: sling/trunk/contrib/extensions/feature-flags/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/feature-flags/pom.xml?rev=1561218r1=1561217r2=1561218view=diff == --- sling/trunk/contrib/extensions/feature-flags/pom.xml (original) +++ sling/trunk/contrib/extensions/feature-flags/pom.xml Fri Jan 24 22:40:42 2014 @@ -43,7 +43,7 @@ dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.api/artifactId -version2.4.3-SNAPSHOT/version +version2.5.0/version scopeprovided/scope /dependency dependency
svn commit: r1561217 - /sling/trunk/bundles/jcr/resource/pom.xml
Author: cziegeler Date: Fri Jan 24 22:40:09 2014 New Revision: 1561217 URL: http://svn.apache.org/r1561217 Log: Use released Sling API Modified: sling/trunk/bundles/jcr/resource/pom.xml Modified: sling/trunk/bundles/jcr/resource/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/pom.xml?rev=1561217r1=1561216r2=1561217view=diff == --- sling/trunk/bundles/jcr/resource/pom.xml (original) +++ sling/trunk/bundles/jcr/resource/pom.xml Fri Jan 24 22:40:09 2014 @@ -146,7 +146,7 @@ dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.api/artifactId -version2.5.1-SNAPSHOT/version +version2.5.0/version scopeprovided/scope /dependency dependency
svn commit: r1561219 - /sling/trunk/contrib/jcr/resourcesecurity/pom.xml
Author: cziegeler Date: Fri Jan 24 22:41:02 2014 New Revision: 1561219 URL: http://svn.apache.org/r1561219 Log: Use released Sling API Modified: sling/trunk/contrib/jcr/resourcesecurity/pom.xml Modified: sling/trunk/contrib/jcr/resourcesecurity/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/resourcesecurity/pom.xml?rev=1561219r1=1561218r2=1561219view=diff == --- sling/trunk/contrib/jcr/resourcesecurity/pom.xml (original) +++ sling/trunk/contrib/jcr/resourcesecurity/pom.xml Fri Jan 24 22:41:02 2014 @@ -92,7 +92,7 @@ dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.api/artifactId -version2.4.3-SNAPSHOT/version +version2.5.0/version scopeprovided/scope /dependency dependency
svn commit: r1561220 - /sling/trunk/launchpad/builder/src/main/bundles/list.xml
Author: cziegeler Date: Fri Jan 24 22:41:36 2014 New Revision: 1561220 URL: http://svn.apache.org/r1561220 Log: Use released Sling API 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=1561220r1=1561219r2=1561220view=diff == --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Fri Jan 24 22:41:36 2014 @@ -165,7 +165,7 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.api/artifactId -version2.5.1-SNAPSHOT/version +version2.5.0/version /bundle bundle groupIdorg.apache.sling/groupId
svn commit: r1561221 - /sling/trunk/launchpad/builder/src/main/bundles/list.xml
Author: cziegeler Date: Fri Jan 24 22:42:59 2014 New Revision: 1561221 URL: http://svn.apache.org/r1561221 Log: Use latest sling event release 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=1561221r1=1561220r2=1561221view=diff == --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Fri Jan 24 22:42:59 2014 @@ -159,7 +159,7 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.event/artifactId -version3.3.2/version +version3.3.4/version /bundle bundle
