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 2014/06/20 21:53:24 UTC
svn commit: r1604266 - in /sling/trunk/tooling/ide: api/src/org/apache/sling/ide/serialization/ impl-resource/src/org/apache/sling/ide/impl/resource/serialization/ impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/

Author: rombert
Date: Fri Jun 20 19:53:24 2014
New Revision: 1604266

URL: http://svn.apache.org/r1604266
Log:
SLING-3656 - nested nodes below file/jcr:content cause problems on
import and export

Added SerializationManager methods to help converting between repository
and OS paths.

Modified:
    sling/trunk/tooling/ide/api/src/org/apache/sling/ide/serialization/SerializationManager.java
    sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java
    sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java

Modified: sling/trunk/tooling/ide/api/src/org/apache/sling/ide/serialization/SerializationManager.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/api/src/org/apache/sling/ide/serialization/SerializationManager.java?rev=1604266&r1=1604265&r2=1604266&view=diff
==============================================================================
--- sling/trunk/tooling/ide/api/src/org/apache/sling/ide/serialization/SerializationManager.java (original)
+++ sling/trunk/tooling/ide/api/src/org/apache/sling/ide/serialization/SerializationManager.java Fri Jun 20 19:53:24 2014
@@ -33,6 +33,10 @@ public interface SerializationManager {
 
     String getSerializationFilePath(String baseFilePath, SerializationKind serializationKind);
 
+    String getRepositoryPath(String osPath);
+
+    String getOsPath(String repositoryPath);
+
     SerializationDataBuilder newBuilder(Repository repository, File contentSyncRoot) throws SerializationException;
 
     /**

Modified: sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java?rev=1604266&r1=1604265&r2=1604266&view=diff
==============================================================================
--- sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java (original)
+++ sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java Fri Jun 20 19:53:24 2014
@@ -167,6 +167,16 @@ public class SimpleXmlSerializationManag
         }
     }
 
+    @Override
+    public String getRepositoryPath(String osPath) {
+        return osPath;
+    }
+
+    @Override
+    public String getOsPath(String repositoryPath) {
+        return repositoryPath;
+    }
+
     private void startElement(TransformerHandler handler, String tagName) throws SAXException {
 
         handler.startElement("", tagName, tagName, null);

Modified: sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java?rev=1604266&r1=1604265&r2=1604266&view=diff
==============================================================================
--- sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java (original)
+++ sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java Fri Jun 20 19:53:24 2014
@@ -162,6 +162,16 @@ public class VltSerializationManager imp
         throw new IllegalArgumentException("Unsupported serialization kind " + serializationKind);
     }
 
+    @Override
+    public String getRepositoryPath(String osPath) {
+        return PlatformNameFormat.getRepositoryPath(osPath);
+    }
+
+    @Override
+    public String getOsPath(String repositoryPath) {
+        return PlatformNameFormat.getPlatformPath(repositoryPath);
+    }
+
     protected void bindVaultFsLocator(VaultFsLocator fsLocator) {
 
         getBuilder().setLocator(fsLocator);