sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vram...@apache.org
Subject svn commit: r1241262 - in /sling/whiteboard/resourceresolverfactory: jcr-resource/ jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/ jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/ jcr-resource/src/test/java/o...
Date Mon, 06 Feb 2012 23:34:57 GMT
Author: vramdal
Date: Mon Feb  6 23:34:55 2012
New Revision: 1241262

URL: http://svn.apache.org/viewvc?rev=1241262&view=rev
Log:
SLING-2396 - Slow progress

Added:
    sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/
    sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/RedirectResource.java
      - copied, changed from r1241231, sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/RedirectResource.java
    sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/ResourceDecoratorTracker.java
      - copied, changed from r1241231, sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/ResourceDecoratorTracker.java
    sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/ResourceIteratorDecorator.java
      - copied, changed from r1241231, sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/ResourceIteratorDecorator.java
    sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/ResourcePathIterator.java
      - copied, changed from r1241231, sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/ResourcePathIterator.java
    sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/StarResource.java
      - copied, changed from r1241231, sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/StarResource.java
    sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/WorkspaceDecoratedResource.java
      - copied, changed from r1241231, sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/WorkspaceDecoratedResource.java
    sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/uri/
    sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/uri/URI.java
      - copied, changed from r1241231, sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/URI.java
    sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/uri/URIException.java
      - copied, changed from r1241231, sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/URIException.java
    sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/test/java/org/apache/sling/resourceresolverfactory/resource/
    sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/test/java/org/apache/sling/resourceresolverfactory/resource/StarResourceTest.java
      - copied, changed from r1241240, sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/test/java/org/apache/sling/resourceresolverfactory/StarResourceTest.java
    sling/whiteboard/resourceresolverfactory/test-app/src/test/config/
    sling/whiteboard/resourceresolverfactory/test-app/src/test/config/sling.properties
Removed:
    sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/ResourceDecoratorTracker.java
    sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/ResourceIteratorDecorator.java
    sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/WorkspaceDecoratedResource.java
    sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/RedirectResource.java
    sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/ResourcePathIterator.java
    sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/URI.java
    sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/URIException.java
    sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/jcr/
    sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/StarResource.java
    sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/test/java/org/apache/sling/resourceresolverfactory/StarResourceTest.java
Modified:
    sling/whiteboard/resourceresolverfactory/jcr-resource/pom.xml
    sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java
    sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverWebConsolePlugin.java
    sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/ResourceResolverFactoryImpl.java
    sling/whiteboard/resourceresolverfactory/jcr-resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverTest.java
    sling/whiteboard/resourceresolverfactory/jcr-resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/RedirectResourceTest.java
    sling/whiteboard/resourceresolverfactory/jcr-resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/ResourcePathIteratorTest.java
    sling/whiteboard/resourceresolverfactory/resourceresolverfactory/pom.xml

Modified: sling/whiteboard/resourceresolverfactory/jcr-resource/pom.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/resourceresolverfactory/jcr-resource/pom.xml?rev=1241262&r1=1241261&r2=1241262&view=diff
==============================================================================
--- sling/whiteboard/resourceresolverfactory/jcr-resource/pom.xml (original)
+++ sling/whiteboard/resourceresolverfactory/jcr-resource/pom.xml Mon Feb  6 23:34:55 2012
@@ -124,8 +124,7 @@
 		<dependency>
 			<groupId>org.apache.sling</groupId>
 			<artifactId>org.apache.sling.resourceresolverfactory</artifactId>
-			<version>2.0.11-WHITEBOARD</version>
-            <scope>compile</scope>
+			<version>2.0.11-SNAPSHOT</version>
 		</dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>

Modified: sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java?rev=1241262&r1=1241261&r2=1241262&view=diff
==============================================================================
--- sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java
(original)
+++ sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java
Mon Feb  6 23:34:55 2012
@@ -58,14 +58,16 @@ import org.apache.sling.api.resource.Val
 import org.apache.sling.jcr.resource.JcrResourceConstants;
 import org.apache.sling.jcr.resource.JcrResourceUtil;
 import org.apache.sling.jcr.resource.internal.helper.MapEntry;
-import org.apache.sling.jcr.resource.internal.helper.RedirectResource;
 import org.apache.sling.jcr.resource.internal.helper.ResourceIterator;
-import org.apache.sling.jcr.resource.internal.helper.ResourcePathIterator;
-import org.apache.sling.jcr.resource.internal.helper.URI;
-import org.apache.sling.jcr.resource.internal.helper.URIException;
+import org.apache.sling.resourceresolverfactory.resource.RedirectResource;
+import org.apache.sling.resourceresolverfactory.resource.ResourcePathIterator;
+import org.apache.sling.resourceresolverfactory.resource.WorkspaceDecoratedResource;
+import org.apache.sling.resourceresolverfactory.uri.URI;
+import org.apache.sling.resourceresolverfactory.uri.URIException;
 import org.apache.sling.jcr.resource.internal.helper.jcr.JcrNodeResourceIterator;
 import org.apache.sling.jcr.resource.internal.helper.jcr.JcrResourceProviderEntry;
-import org.apache.sling.resourceresolverfactory.StarResource;
+import org.apache.sling.resourceresolverfactory.resource.StarResource;
+import org.apache.sling.resourceresolverfactory.resource.ResourceIteratorDecorator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverWebConsolePlugin.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverWebConsolePlugin.java?rev=1241262&r1=1241261&r2=1241262&view=diff
==============================================================================
--- sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverWebConsolePlugin.java
(original)
+++ sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverWebConsolePlugin.java
Mon Feb  6 23:34:55 2012
@@ -39,8 +39,8 @@ import org.apache.sling.api.resource.Res
 import org.apache.sling.api.request.ResponseUtil;
 import org.apache.sling.jcr.resource.internal.helper.MapEntries;
 import org.apache.sling.jcr.resource.internal.helper.MapEntry;
-import org.apache.sling.jcr.resource.internal.helper.URI;
-import org.apache.sling.jcr.resource.internal.helper.URIException;
+import org.apache.sling.resourceresolverfactory.uri.URI;
+import org.apache.sling.resourceresolverfactory.uri.URIException;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceRegistration;

Modified: sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/ResourceResolverFactoryImpl.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/ResourceResolverFactoryImpl.java?rev=1241262&r1=1241261&r2=1241262&view=diff
==============================================================================
--- sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/ResourceResolverFactoryImpl.java
(original)
+++ sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/ResourceResolverFactoryImpl.java
Mon Feb  6 23:34:55 2012
@@ -59,6 +59,7 @@ import org.apache.sling.jcr.resource.int
 import org.apache.sling.jcr.resource.internal.helper.ResourceProviderEntry;
 import org.apache.sling.jcr.resource.internal.helper.RootResourceProviderEntry;
 import org.apache.sling.jcr.resource.internal.helper.jcr.JcrResourceProviderEntry;
+import org.apache.sling.resourceresolverfactory.resource.ResourceDecoratorTracker;
 import org.osgi.framework.Constants;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.event.EventAdmin;

Modified: sling/whiteboard/resourceresolverfactory/jcr-resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverTest.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/resourceresolverfactory/jcr-resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverTest.java?rev=1241262&r1=1241261&r2=1241262&view=diff
==============================================================================
--- sling/whiteboard/resourceresolverfactory/jcr-resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverTest.java
(original)
+++ sling/whiteboard/resourceresolverfactory/jcr-resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverTest.java
Mon Feb  6 23:34:55 2012
@@ -59,8 +59,8 @@ import org.apache.sling.jcr.base.util.Ac
 import org.apache.sling.jcr.resource.JcrResourceConstants;
 import org.apache.sling.jcr.resource.internal.helper.MapEntries;
 import org.apache.sling.jcr.resource.internal.helper.Mapping;
-import org.apache.sling.jcr.resource.internal.helper.RedirectResource;
-import org.apache.sling.resourceresolverfactory.StarResource;
+import org.apache.sling.resourceresolverfactory.resource.RedirectResource;
+import org.apache.sling.resourceresolverfactory.resource.StarResource;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.event.Event;
 import org.osgi.service.event.EventAdmin;

Modified: sling/whiteboard/resourceresolverfactory/jcr-resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/RedirectResourceTest.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/resourceresolverfactory/jcr-resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/RedirectResourceTest.java?rev=1241262&r1=1241261&r2=1241262&view=diff
==============================================================================
--- sling/whiteboard/resourceresolverfactory/jcr-resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/RedirectResourceTest.java
(original)
+++ sling/whiteboard/resourceresolverfactory/jcr-resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/RedirectResourceTest.java
Mon Feb  6 23:34:55 2012
@@ -24,6 +24,7 @@ import org.apache.sling.api.resource.Per
 import org.apache.sling.api.resource.ValueMap;
 
 import junit.framework.TestCase;
+import org.apache.sling.resourceresolverfactory.resource.RedirectResource;
 
 public class RedirectResourceTest extends TestCase {
 

Modified: sling/whiteboard/resourceresolverfactory/jcr-resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/ResourcePathIteratorTest.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/resourceresolverfactory/jcr-resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/ResourcePathIteratorTest.java?rev=1241262&r1=1241261&r2=1241262&view=diff
==============================================================================
--- sling/whiteboard/resourceresolverfactory/jcr-resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/ResourcePathIteratorTest.java
(original)
+++ sling/whiteboard/resourceresolverfactory/jcr-resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/ResourcePathIteratorTest.java
Mon Feb  6 23:34:55 2012
@@ -22,6 +22,7 @@ import java.util.Iterator;
 import java.util.NoSuchElementException;
 
 import junit.framework.TestCase;
+import org.apache.sling.resourceresolverfactory.resource.ResourcePathIterator;
 
 public class ResourcePathIteratorTest extends TestCase {
 

Modified: sling/whiteboard/resourceresolverfactory/resourceresolverfactory/pom.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/resourceresolverfactory/resourceresolverfactory/pom.xml?rev=1241262&r1=1241261&r2=1241262&view=diff
==============================================================================
--- sling/whiteboard/resourceresolverfactory/resourceresolverfactory/pom.xml (original)
+++ sling/whiteboard/resourceresolverfactory/resourceresolverfactory/pom.xml Mon Feb  6 23:34:55
2012
@@ -27,7 +27,7 @@
     </parent>
 
     <artifactId>org.apache.sling.resourceresolverfactory</artifactId>
-    <version>2.0.11-WHITEBOARD</version>
+    <version>2.0.11-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>Apache Sling Resource Resolver Factory</name>

Copied: sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/RedirectResource.java
(from r1241231, sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/RedirectResource.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/RedirectResource.java?p2=sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/RedirectResource.java&p1=sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/RedirectResource.java&r1=1241231&r2=1241262&rev=1241262&view=diff
==============================================================================
--- sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/RedirectResource.java
(original)
+++ sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/RedirectResource.java
Mon Feb  6 23:34:55 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.resource.internal.helper;
+package org.apache.sling.resourceresolverfactory.resource;
 
 import java.util.Collections;
 import java.util.HashMap;

Copied: sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/ResourceDecoratorTracker.java
(from r1241231, sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/ResourceDecoratorTracker.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/ResourceDecoratorTracker.java?p2=sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/ResourceDecoratorTracker.java&p1=sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/ResourceDecoratorTracker.java&r1=1241231&r2=1241262&rev=1241262&view=diff
==============================================================================
--- sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/ResourceDecoratorTracker.java
(original)
+++ sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/ResourceDecoratorTracker.java
Mon Feb  6 23:34:55 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.resource.internal;
+package org.apache.sling.resourceresolverfactory.resource;
 
 import java.util.ArrayList;
 import java.util.Collections;

Copied: sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/ResourceIteratorDecorator.java
(from r1241231, sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/ResourceIteratorDecorator.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/ResourceIteratorDecorator.java?p2=sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/ResourceIteratorDecorator.java&p1=sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/ResourceIteratorDecorator.java&r1=1241231&r2=1241262&rev=1241262&view=diff
==============================================================================
--- sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/ResourceIteratorDecorator.java
(original)
+++ sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/ResourceIteratorDecorator.java
Mon Feb  6 23:34:55 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.resource.internal;
+package org.apache.sling.resourceresolverfactory.resource;
 
 import java.util.Iterator;
 

Copied: sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/ResourcePathIterator.java
(from r1241231, sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/ResourcePathIterator.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/ResourcePathIterator.java?p2=sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/ResourcePathIterator.java&p1=sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/ResourcePathIterator.java&r1=1241231&r2=1241262&rev=1241262&view=diff
==============================================================================
--- sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/ResourcePathIterator.java
(original)
+++ sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/ResourcePathIterator.java
Mon Feb  6 23:34:55 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.jcr.resource.internal.helper;
+package org.apache.sling.resourceresolverfactory.resource;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;

Copied: sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/StarResource.java
(from r1241231, sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/StarResource.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/StarResource.java?p2=sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/StarResource.java&p1=sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/StarResource.java&r1=1241231&r2=1241262&rev=1241262&view=diff
==============================================================================
--- sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/StarResource.java
(original)
+++ sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/StarResource.java
Mon Feb  6 23:34:55 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.resourceresolverfactory;
+package org.apache.sling.resourceresolverfactory.resource;
 
 import java.util.Map;
 

Copied: sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/WorkspaceDecoratedResource.java
(from r1241231, sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/WorkspaceDecoratedResource.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/WorkspaceDecoratedResource.java?p2=sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/WorkspaceDecoratedResource.java&p1=sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/WorkspaceDecoratedResource.java&r1=1241231&r2=1241262&rev=1241262&view=diff
==============================================================================
--- sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/WorkspaceDecoratedResource.java
(original)
+++ sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/WorkspaceDecoratedResource.java
Mon Feb  6 23:34:55 2012
@@ -14,7 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.apache.sling.jcr.resource.internal;
+package org.apache.sling.resourceresolverfactory.resource;
 
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceWrapper;
@@ -23,7 +23,7 @@ import org.apache.sling.api.resource.Res
  * Decorated resource which prepends the workspace name to
  * a delegate resource's path.
  */
-class WorkspaceDecoratedResource extends ResourceWrapper {
+public class WorkspaceDecoratedResource extends ResourceWrapper {
 
     private final String workspaceName;
 

Copied: sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/uri/URI.java
(from r1241231, sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/URI.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/uri/URI.java?p2=sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/uri/URI.java&p1=sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/URI.java&r1=1241231&r2=1241262&rev=1241262&view=diff
==============================================================================
--- sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/URI.java
(original)
+++ sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/uri/URI.java
Mon Feb  6 23:34:55 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.resource.internal.helper;
+package org.apache.sling.resourceresolverfactory.uri;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

Copied: sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/uri/URIException.java
(from r1241231, sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/URIException.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/uri/URIException.java?p2=sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/uri/URIException.java&p1=sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/URIException.java&r1=1241231&r2=1241262&rev=1241262&view=diff
==============================================================================
--- sling/whiteboard/resourceresolverfactory/jcr-resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/URIException.java
(original)
+++ sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/uri/URIException.java
Mon Feb  6 23:34:55 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.resource.internal.helper;
+package org.apache.sling.resourceresolverfactory.uri;
 
 import org.apache.sling.api.SlingException;
 

Copied: sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/test/java/org/apache/sling/resourceresolverfactory/resource/StarResourceTest.java
(from r1241240, sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/test/java/org/apache/sling/resourceresolverfactory/StarResourceTest.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/test/java/org/apache/sling/resourceresolverfactory/resource/StarResourceTest.java?p2=sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/test/java/org/apache/sling/resourceresolverfactory/resource/StarResourceTest.java&p1=sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/test/java/org/apache/sling/resourceresolverfactory/StarResourceTest.java&r1=1241240&r2=1241262&rev=1241262&view=diff
==============================================================================
--- sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/test/java/org/apache/sling/resourceresolverfactory/StarResourceTest.java
(original)
+++ sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/test/java/org/apache/sling/resourceresolverfactory/resource/StarResourceTest.java
Mon Feb  6 23:34:55 2012
@@ -16,11 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.resourceresolverfactory;
+package org.apache.sling.resourceresolverfactory.resource;
 
 import junit.framework.TestCase;
 
 import org.apache.sling.api.resource.ResourceMetadata;
+import org.apache.sling.resourceresolverfactory.resource.StarResource;
 
 /** Test the StarResource */
 public class StarResourceTest extends TestCase {

Added: sling/whiteboard/resourceresolverfactory/test-app/src/test/config/sling.properties
URL: http://svn.apache.org/viewvc/sling/whiteboard/resourceresolverfactory/test-app/src/test/config/sling.properties?rev=1241262&view=auto
==============================================================================
--- sling/whiteboard/resourceresolverfactory/test-app/src/test/config/sling.properties (added)
+++ sling/whiteboard/resourceresolverfactory/test-app/src/test/config/sling.properties Mon
Feb  6 23:34:55 2012
@@ -0,0 +1,12 @@
+#    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.
+felix.fileinstall.dir=${basedir}/src/test/config/fileinstall
+org.osgi.framework.startlevel.beginning=35



Mime
View raw message