Author: rombert
Date: Thu Sep 26 21:46:45 2013
New Revision: 1526716
URL: http://svn.apache.org/r1526716
Log:
SLING-3129 - Node names which are changed when encoding in platform
format are not imported
Removed all path encoding from Jcr commands, since they are expected to
work only on repository paths, not on platform paths.
Modified:
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
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=1526716&r1=1526715&r2=1526716&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
Thu Sep 26 21:46:45 2013
@@ -29,12 +29,10 @@ 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,
PlatformNameFormat.getRepositoryPath(path));
+ super(repository, credentials, 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=1526716&r1=1526715&r2=1526716&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
Thu Sep 26 21:46:45 2013
@@ -27,23 +27,12 @@ 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=1526716&r1=1526715&r2=1526716&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
Thu Sep 26 21:46:45 2013
@@ -23,13 +23,12 @@ 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,
PlatformNameFormat.getRepositoryPath(path));
+ super(repository, credentials, path);
}
@Override
