svn commit: r933928 - /sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java

[cziegeler]

Author: cziegeler
Date: Wed Apr 14 12:38:24 2010
New Revision: 933928

URL: http://svn.apache.org/viewvc?rev=933928&view=rev
Log:
SLING-1447 : support for resource paths containing workspace name

Modified:
    
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java

Modified: 
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java?rev=933928&r1=933927&r2=933928&view=diff
==============================================================================
--- 
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java
 (original)
+++ 
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java
 Wed Apr 14 12:38:24 2010
@@ -27,7 +27,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import javax.jcr.NamespaceException;
-import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.Value;
@@ -494,15 +493,15 @@ public class JcrResourceResolver extends
     public Resource getResource(String path) {
         checkClosed();
 
-        if (path.contains(":")) {
-            String[] parts = path.split(":");
-            String workspaceName = parts[0];
+        final int wsSepPos = path.indexOf(":/");
+        if (wsSepPos != -1) {
+            final String workspaceName = path.substring(0, wsSepPos);
             if (workspaceName.equals(getSession().getWorkspace().getName())) {
-                path = parts[1];
+                path = path.substring(wsSepPos + 1);
             } else {
                 try {
                     ResourceResolver wsResolver = 
getResolverForWorkspace(workspaceName);
-                    return wsResolver.getResource(parts[1]);
+                    return wsResolver.getResource(path.substring(wsSepPos + 
1));
                 } catch (LoginException e) {
                     // requested a resource in a workspace I don't have access 
to.
                     // TODO
@@ -558,15 +557,13 @@ public class JcrResourceResolver extends
     /**
      * @see 
org.apache.sling.api.resource.ResourceResolver#listChildren(org.apache.sling.api.resource.Resource)
      */
-    public Iterator<Resource> listChildren(Resource parent) {
+    public Iterator<Resource> listChildren(final Resource parent) {
         checkClosed();
-        String path = parent.getPath();
-        if (path.contains(":")) {
-            String[] parts = path.split(":");
-            String workspaceName = parts[0];
-            if (workspaceName.equals(getSession().getWorkspace().getName())) {
-                path = parts[1];
-            } else {
+        final String path = parent.getPath();
+        final int wsSepPos = path.indexOf(":/");
+        if (wsSepPos != -1) {
+            final String workspaceName = path.substring(0, wsSepPos);
+            if (!workspaceName.equals(getSession().getWorkspace().getName())) {
                 try {
                     ResourceResolver wsResolver = 
getResolverForWorkspace(workspaceName);
                     return wsResolver.listChildren(parent);