Author: rombert
Date: Tue Feb 2 15:34:55 2016
New Revision: 1728151
URL: http://svn.apache.org/viewvc?rev=1728151&view=rev
Log:
SLING-5455 - Add helper class to construct valid paths
Move back PathBuilder to the api bundle, in a org.apache.sling.resource.path
package.
Added:
sling/trunk/bundles/api/src/main/java/org/apache/sling/resource/
sling/trunk/bundles/api/src/main/java/org/apache/sling/resource/path/
sling/trunk/bundles/api/src/main/java/org/apache/sling/resource/path/PathBuilder.java
- copied, changed from r1728145,
sling/trunk/bundles/extensions/commons/src/main/java/org/apache/sling/commons/paths/PathBuilder.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/resource/path/package-info.java
- copied, changed from r1728145,
sling/trunk/bundles/extensions/commons/src/main/java/org/apache/sling/commons/paths/package-info.java
sling/trunk/bundles/api/src/test/java/org/apache/sling/resource/
sling/trunk/bundles/api/src/test/java/org/apache/sling/resource/path/
sling/trunk/bundles/api/src/test/java/org/apache/sling/resource/path/PathBuilderTest.java
- copied, changed from r1728145,
sling/trunk/bundles/extensions/commons/src/test/java/org/apache/sling/commons/paths/PathBuilderTest.java
Removed:
sling/trunk/bundles/extensions/commons/
Modified:
sling/trunk/bundles/resourceresolver/pom.xml
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverContext.java
sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
sling/trunk/pom.xml
Copied:
sling/trunk/bundles/api/src/main/java/org/apache/sling/resource/path/PathBuilder.java
(from r1728145,
sling/trunk/bundles/extensions/commons/src/main/java/org/apache/sling/commons/paths/PathBuilder.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/resource/path/PathBuilder.java?p2=sling/trunk/bundles/api/src/main/java/org/apache/sling/resource/path/PathBuilder.java&p1=sling/trunk/bundles/extensions/commons/src/main/java/org/apache/sling/commons/paths/PathBuilder.java&r1=1728145&r2=1728151&rev=1728151&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/commons/src/main/java/org/apache/sling/commons/paths/PathBuilder.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/resource/path/PathBuilder.java
Tue Feb 2 15:34:55 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.commons.paths;
+package org.apache.sling.resource.path;
/**
* The <tt>PathBuilder</tt> offers a convenient way of creating a valid path
from multiple fragments
Copied:
sling/trunk/bundles/api/src/main/java/org/apache/sling/resource/path/package-info.java
(from r1728145,
sling/trunk/bundles/extensions/commons/src/main/java/org/apache/sling/commons/paths/package-info.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/resource/path/package-info.java?p2=sling/trunk/bundles/api/src/main/java/org/apache/sling/resource/path/package-info.java&p1=sling/trunk/bundles/extensions/commons/src/main/java/org/apache/sling/commons/paths/package-info.java&r1=1728145&r2=1728151&rev=1728151&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/commons/src/main/java/org/apache/sling/commons/paths/package-info.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/resource/path/package-info.java
Tue Feb 2 15:34:55 2016
@@ -17,4 +17,4 @@
* under the License.
*/
@aQute.bnd.annotation.Version("1.0")
-package org.apache.sling.commons.paths;
\ No newline at end of file
+package org.apache.sling.resource.path;
\ No newline at end of file
Copied:
sling/trunk/bundles/api/src/test/java/org/apache/sling/resource/path/PathBuilderTest.java
(from r1728145,
sling/trunk/bundles/extensions/commons/src/test/java/org/apache/sling/commons/paths/PathBuilderTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/test/java/org/apache/sling/resource/path/PathBuilderTest.java?p2=sling/trunk/bundles/api/src/test/java/org/apache/sling/resource/path/PathBuilderTest.java&p1=sling/trunk/bundles/extensions/commons/src/test/java/org/apache/sling/commons/paths/PathBuilderTest.java&r1=1728145&r2=1728151&rev=1728151&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/commons/src/test/java/org/apache/sling/commons/paths/PathBuilderTest.java
(original)
+++
sling/trunk/bundles/api/src/test/java/org/apache/sling/resource/path/PathBuilderTest.java
Tue Feb 2 15:34:55 2016
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.commons.paths;
+package org.apache.sling.resource.path;
import static org.junit.Assert.assertThat;
-import org.apache.sling.commons.paths.PathBuilder;
+import org.apache.sling.resource.path.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=1728151&r1=1728150&r2=1728151&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/pom.xml (original)
+++ sling/trunk/bundles/resourceresolver/pom.xml Tue Feb 2 15:34:55 2016
@@ -147,12 +147,6 @@
<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/helper/ResourceResolverContext.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverContext.java?rev=1728151&r1=1728150&r2=1728151&view=diff
==============================================================================
---
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverContext.java
(original)
+++
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverContext.java
Tue Feb 2 15:34:55 2016
@@ -46,7 +46,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.resource.path.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/launchpad/builder/src/main/provisioning/sling.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1728151&r1=1728150&r2=1728151&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Tue Feb 2
15:34:55 2016
@@ -36,7 +36,6 @@
org.apache.sling/org.apache.sling.auth.core/1.3.12
org.apache.sling/org.apache.sling.auth.form/1.0.8
org.apache.sling/org.apache.sling.bundleresource.impl/2.2.0
- org.apache.sling/org.apache.sling.commons/1.0.0-SNAPSHOT
org.apache.sling/org.apache.sling.commons.classloader/1.3.2
org.apache.sling/org.apache.sling.commons.compiler/2.2.0
org.apache.sling/org.apache.sling.commons.fsclassloader/1.0.3-SNAPSHOT
Modified: sling/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/pom.xml?rev=1728151&r1=1728150&r2=1728151&view=diff
==============================================================================
--- sling/trunk/pom.xml (original)
+++ sling/trunk/pom.xml Tue Feb 2 15:34:55 2016
@@ -161,7 +161,6 @@
<!-- 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>
