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 2013/09/13 16:30:07 UTC
svn commit: r1522952 - in
/sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt:
AddNodeCommand.java DeleteNodeCommand.java GetNodeCommand.java
JcrCommand.java ListChildrenCommand.java UpdateNodePropertiesCommand.java
Author: rombert
Date: Fri Sep 13 14:30:06 2013
New Revision: 1522952
URL: http://svn.apache.org/r1522952
Log:
SLING-2989 - [Tooling] integrate with vlt once available
Ensure that the JCR commands operate on a repository paths rather than
on platform paths. This still isn't the right level of abstraction, but
the Repository APIs will need an overhaul for this to work properly.
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/AddNodeCommand.java
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/DeleteNodeCommand.java
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/GetNodeCommand.java
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrCommand.java
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/ListChildrenCommand.java
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/UpdateNodePropertiesCommand.java
Modified: sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/AddNodeCommand.java
URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/AddNodeCommand.java?rev=1522952&r1=1522951&r2=1522952&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/AddNodeCommand.java (original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/AddNodeCommand.java Fri Sep 13 14:30:06 2013
@@ -29,7 +29,6 @@ import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.apache.jackrabbit.vault.util.PathUtil;
import org.apache.jackrabbit.vault.util.Text;
import org.apache.sling.ide.transport.FileInfo;
@@ -39,7 +38,7 @@ public class AddNodeCommand extends JcrC
public AddNodeCommand(Repository repository, Credentials credentials, FileInfo fileInfo) {
- super(repository, credentials, PathUtil.makePath(fileInfo.getRelativeLocation(), fileInfo.getName()));
+ super(repository, credentials, makePath(fileInfo));
this.fileInfo = fileInfo;
}
Modified: sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/DeleteNodeCommand.java
URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/DeleteNodeCommand.java?rev=1522952&r1=1522951&r2=1522952&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/DeleteNodeCommand.java (original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/DeleteNodeCommand.java Fri Sep 13 14:30:06 2013
@@ -23,13 +23,12 @@ import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.apache.jackrabbit.vault.util.PathUtil;
import org.apache.sling.ide.transport.FileInfo;
public class DeleteNodeCommand extends JcrCommand<Void> {
public DeleteNodeCommand(Repository repository, Credentials credentials, FileInfo fileInfo) {
- super(repository, credentials, PathUtil.makePath(fileInfo.getRelativeLocation(), fileInfo.getName()));
+ super(repository, credentials, makePath(fileInfo));
}
@Override
Modified: sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/GetNodeCommand.java
URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/GetNodeCommand.java?rev=1522952&r1=1522951&r2=1522952&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/GetNodeCommand.java (original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/GetNodeCommand.java Fri Sep 13 14:30:06 2013
@@ -29,10 +29,12 @@ import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import org.apache.jackrabbit.vault.util.PlatformNameFormat;
+
public class GetNodeCommand extends JcrCommand<byte[]> {
public GetNodeCommand(Repository repository, Credentials credentials, String path) {
- super(repository, credentials, path);
+ super(repository, credentials, PlatformNameFormat.getRepositoryPath(path));
}
@Override
Modified: sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrCommand.java
URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrCommand.java?rev=1522952&r1=1522951&r2=1522952&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrCommand.java (original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrCommand.java Fri Sep 13 14:30:06 2013
@@ -27,12 +27,23 @@ import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import org.apache.jackrabbit.vault.util.PathUtil;
+import org.apache.jackrabbit.vault.util.PlatformNameFormat;
import org.apache.sling.ide.transport.Command;
+import org.apache.sling.ide.transport.FileInfo;
import org.apache.sling.ide.transport.ResourceProxy;
import org.apache.sling.ide.transport.Result;
public abstract class JcrCommand<T> implements Command<T> {
+ protected static String makePath(FileInfo fileInfo) {
+
+ String platformPath = PathUtil.makePath(fileInfo.getRelativeLocation(), fileInfo.getName());
+
+ return PlatformNameFormat.getRepositoryPath(platformPath);
+ }
+
+
private final Credentials credentials;
private final Repository repository;
private final String path;
Modified: sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/ListChildrenCommand.java
URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/ListChildrenCommand.java?rev=1522952&r1=1522951&r2=1522952&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/ListChildrenCommand.java (original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/ListChildrenCommand.java Fri Sep 13 14:30:06 2013
@@ -23,12 +23,13 @@ import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import org.apache.jackrabbit.vault.util.PlatformNameFormat;
import org.apache.sling.ide.transport.ResourceProxy;
public class ListChildrenCommand extends JcrCommand<ResourceProxy> {
public ListChildrenCommand(Repository repository, Credentials credentials, String path) {
- super(repository, credentials, path);
+ super(repository, credentials, PlatformNameFormat.getRepositoryPath(path));
}
@Override
Modified: sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/UpdateNodePropertiesCommand.java
URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/UpdateNodePropertiesCommand.java?rev=1522952&r1=1522951&r2=1522952&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/UpdateNodePropertiesCommand.java (original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/UpdateNodePropertiesCommand.java Fri Sep 13 14:30:06 2013
@@ -30,6 +30,7 @@ import javax.jcr.Session;
import javax.jcr.Value;
import org.apache.jackrabbit.vault.util.PathUtil;
+import org.apache.jackrabbit.vault.util.PlatformNameFormat;
import org.apache.sling.ide.transport.FileInfo;
public class UpdateNodePropertiesCommand extends JcrCommand<Void> {
@@ -39,8 +40,9 @@ public class UpdateNodePropertiesCommand
public UpdateNodePropertiesCommand(Repository jcrRepo, Credentials credentials, FileInfo fileInfo,
Map<String, Object> serializationData) {
- // intentional since the fileInfo refers to the .content.xml file ( TODO - should we change that )?
- super(jcrRepo, credentials, PathUtil.makePath(fileInfo.getRelativeLocation(), ""));
+ // TODO - won't support serialization of full coverage nodes
+ super(jcrRepo, credentials, PlatformNameFormat.getRepositoryPath(PathUtil.makePath(
+ fileInfo.getRelativeLocation(), "")));
this.serializationData = serializationData;
}