You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2016/01/27 14:59:52 UTC
svn commit: r1727058 - in /sling/trunk: ./
bundles/api/src/main/java/org/apache/sling/api/paths/
bundles/api/src/test/java/org/apache/sling/api/paths/
bundles/extensions/commons/ bundles/extensions/commons/src/
bundles/extensions/commons/src/main/ bund...
Author: rombert
Date: Wed Jan 27 13:59:52 2016
New Revision: 1727058
URL: http://svn.apache.org/viewvc?rev=1727058&view=rev
Log:
SLING-5455 - Add helper class to construct valid paths
Moved PathBuilder to org.apache.sling.commons ( under
bundles/extensions/commons ).
Added:
sling/trunk/bundles/extensions/commons/
sling/trunk/bundles/extensions/commons/pom.xml
sling/trunk/bundles/extensions/commons/src/
sling/trunk/bundles/extensions/commons/src/main/
sling/trunk/bundles/extensions/commons/src/main/java/
sling/trunk/bundles/extensions/commons/src/main/java/org/
sling/trunk/bundles/extensions/commons/src/main/java/org/apache/
sling/trunk/bundles/extensions/commons/src/main/java/org/apache/sling/
sling/trunk/bundles/extensions/commons/src/main/java/org/apache/sling/commons/
sling/trunk/bundles/extensions/commons/src/main/java/org/apache/sling/commons/paths/
sling/trunk/bundles/extensions/commons/src/main/java/org/apache/sling/commons/paths/PathBuilder.java
- copied, changed from r1727051, sling/trunk/bundles/api/src/main/java/org/apache/sling/api/paths/PathBuilder.java
sling/trunk/bundles/extensions/commons/src/main/java/org/apache/sling/commons/paths/package-info.java
- copied, changed from r1727051, sling/trunk/bundles/api/src/main/java/org/apache/sling/api/paths/package-info.java
sling/trunk/bundles/extensions/commons/src/test/
sling/trunk/bundles/extensions/commons/src/test/java/
sling/trunk/bundles/extensions/commons/src/test/java/org/
sling/trunk/bundles/extensions/commons/src/test/java/org/apache/
sling/trunk/bundles/extensions/commons/src/test/java/org/apache/sling/
sling/trunk/bundles/extensions/commons/src/test/java/org/apache/sling/commons/
sling/trunk/bundles/extensions/commons/src/test/java/org/apache/sling/commons/paths/
sling/trunk/bundles/extensions/commons/src/test/java/org/apache/sling/commons/paths/PathBuilderTest.java
- copied, changed from r1727051, sling/trunk/bundles/api/src/test/java/org/apache/sling/api/paths/PathBuilderTest.java
Removed:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/paths/
sling/trunk/bundles/api/src/test/java/org/apache/sling/api/paths/
Modified:
sling/trunk/bundles/resourceresolver/pom.xml
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/CombinedResourceProvider.java
sling/trunk/pom.xml
Added: sling/trunk/bundles/extensions/commons/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/commons/pom.xml?rev=1727058&view=auto
==============================================================================
--- sling/trunk/bundles/extensions/commons/pom.xml (added)
+++ sling/trunk/bundles/extensions/commons/pom.xml Wed Jan 27 13:59:52 2016
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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.
+-->
+<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">
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>26</version>
+ <relativePath />
+ </parent>
+
+ <artifactId>org.apache.sling.commons</artifactId>
+ <packaging>bundle</packaging>
+ <version>1.0.0-SNAPSHOT</version>
+
+ <name>Apache Sling Common Utilities</name>
+ <description>
+ Bundle containing various utility classes which are small enough to not justify their own bundle.
+ </description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/commons</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/commons</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/commons</url>
+ </scm>
+
+ <properties>
+ <site.jira.version.id>12314288</site.jira.version.id>
+ <site.javadoc.exclude>**.impl.**</site.javadoc.exclude>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <version>1.3</version>
+ </dependency>
+ </dependencies>
+</project>
Copied: sling/trunk/bundles/extensions/commons/src/main/java/org/apache/sling/commons/paths/PathBuilder.java (from r1727051, sling/trunk/bundles/api/src/main/java/org/apache/sling/api/paths/PathBuilder.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/commons/src/main/java/org/apache/sling/commons/paths/PathBuilder.java?p2=sling/trunk/bundles/extensions/commons/src/main/java/org/apache/sling/commons/paths/PathBuilder.java&p1=sling/trunk/bundles/api/src/main/java/org/apache/sling/api/paths/PathBuilder.java&r1=1727051&r2=1727058&rev=1727058&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/paths/PathBuilder.java (original)
+++ sling/trunk/bundles/extensions/commons/src/main/java/org/apache/sling/commons/paths/PathBuilder.java Wed Jan 27 13:59:52 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.api.paths;
+package org.apache.sling.commons.paths;
/**
* The <tt>PathBuilder</tt> offers a convenient way of creating a valid path from multiple fragments
Copied: sling/trunk/bundles/extensions/commons/src/main/java/org/apache/sling/commons/paths/package-info.java (from r1727051, sling/trunk/bundles/api/src/main/java/org/apache/sling/api/paths/package-info.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/commons/src/main/java/org/apache/sling/commons/paths/package-info.java?p2=sling/trunk/bundles/extensions/commons/src/main/java/org/apache/sling/commons/paths/package-info.java&p1=sling/trunk/bundles/api/src/main/java/org/apache/sling/api/paths/package-info.java&r1=1727051&r2=1727058&rev=1727058&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/paths/package-info.java (original)
+++ sling/trunk/bundles/extensions/commons/src/main/java/org/apache/sling/commons/paths/package-info.java Wed Jan 27 13:59:52 2016
@@ -17,4 +17,4 @@
* under the License.
*/
@aQute.bnd.annotation.Version("1.0")
-package org.apache.sling.api.paths;
\ No newline at end of file
+package org.apache.sling.commons.paths;
\ No newline at end of file
Copied: sling/trunk/bundles/extensions/commons/src/test/java/org/apache/sling/commons/paths/PathBuilderTest.java (from r1727051, sling/trunk/bundles/api/src/test/java/org/apache/sling/api/paths/PathBuilderTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/commons/src/test/java/org/apache/sling/commons/paths/PathBuilderTest.java?p2=sling/trunk/bundles/extensions/commons/src/test/java/org/apache/sling/commons/paths/PathBuilderTest.java&p1=sling/trunk/bundles/api/src/test/java/org/apache/sling/api/paths/PathBuilderTest.java&r1=1727051&r2=1727058&rev=1727058&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/test/java/org/apache/sling/api/paths/PathBuilderTest.java (original)
+++ sling/trunk/bundles/extensions/commons/src/test/java/org/apache/sling/commons/paths/PathBuilderTest.java Wed Jan 27 13:59:52 2016
@@ -16,10 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.api.paths;
+package org.apache.sling.commons.paths;
import static org.junit.Assert.assertThat;
+import org.apache.sling.commons.paths.PathBuilder;
import org.hamcrest.Matchers;
import org.junit.Test;
Modified: sling/trunk/bundles/resourceresolver/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/pom.xml?rev=1727058&r1=1727057&r2=1727058&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/pom.xml (original)
+++ sling/trunk/bundles/resourceresolver/pom.xml Wed Jan 27 13:59:52 2016
@@ -147,6 +147,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.0</version>
Modified: sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/CombinedResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/CombinedResourceProvider.java?rev=1727058&r1=1727057&r2=1727058&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/CombinedResourceProvider.java (original)
+++ sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/CombinedResourceProvider.java Wed Jan 27 13:59:52 2016
@@ -38,7 +38,6 @@ import javax.annotation.Nonnull;
import org.apache.commons.collections.iterators.IteratorChain;
import org.apache.commons.lang.ArrayUtils;
-import org.apache.sling.api.paths.PathBuilder;
import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
@@ -46,6 +45,7 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.resource.SyntheticResource;
import org.apache.sling.api.resource.ValueMap;
+import org.apache.sling.commons.paths.PathBuilder;
import org.apache.sling.resourceresolver.impl.providers.ResourceProviderHandler;
import org.apache.sling.resourceresolver.impl.providers.ResourceProviderInfo;
import org.apache.sling.resourceresolver.impl.providers.ResourceProviderStorage;
Modified: sling/trunk/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/pom.xml?rev=1727058&r1=1727057&r2=1727058&view=diff
==============================================================================
--- sling/trunk/pom.xml (original)
+++ sling/trunk/pom.xml Wed Jan 27 13:59:52 2016
@@ -161,6 +161,7 @@
<!-- Extensions -->
<module>bundles/extensions/adapter</module>
<module>bundles/extensions/bundleresource</module>
+ <module>bundles/extensions/commons</module>
<module>bundles/extensions/dea</module>
<module>bundles/extensions/discovery/api</module>
<module>bundles/extensions/discovery/commons</module>