svn commit: r1524373 - in /sling/branches/tooling-ide-vlt/tooling/ide: eclipse-core/src/org/apache/sling/ide/eclipse/core/ eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/

[stefanegli]

Author: stefanegli
Date: Wed Sep 18 11:42:26 2013
New Revision: 1524373

URL: http://svn.apache.org/r1524373
Log:
SLING-2989 : using filesystem-absolute sync-path to ensure 
VltSerializationManager.isSerializationFile works for serializations of node 
into the format 'node-name.xml'

Modified:
    
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ProjectUtil.java
    
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
    
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java

Modified: 
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ProjectUtil.java
URL: 
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ProjectUtil.java?rev=1524373&r1=1524372&r2=1524373&view=diff
==============================================================================
--- 
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ProjectUtil.java
 (original)
+++ 
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ProjectUtil.java
 Wed Sep 18 11:42:26 2013
@@ -16,6 +16,8 @@
  */
 package org.apache.sling.ide.eclipse.core;
 
+import java.io.File;
+
 import org.apache.sling.ide.eclipse.core.internal.Activator;
 import org.apache.sling.ide.eclipse.core.internal.ProjectHelper;
 import org.eclipse.core.resources.IFolder;
@@ -76,6 +78,10 @@ public abstract class ProjectUtil {
 
         return value;
     }
+    
+    public static File getSyncDirectoryFile(IProject project) {
+       return new File(project.getLocation().toFile(), 
getSyncDirectoryValue(project));
+    }
 
     public static IPath getSyncDirectoryFullPath(IProject project) {
 

Modified: 
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
URL: 
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java?rev=1524373&r1=1524372&r2=1524373&view=diff
==============================================================================
--- 
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
 (original)
+++ 
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
 Wed Sep 18 11:42:26 2013
@@ -522,7 +522,7 @@ public class SlingLaunchpadBehaviour ext
         IProject project = file.getProject();
 
         String syncDirectory = ProjectUtil.getSyncDirectoryValue(project);
-        File syncDirectoryAsFile = 
ProjectUtil.getSyncDirectoryFullPath(project).toFile();
+        File syncDirectoryAsFile = ProjectUtil.getSyncDirectoryFile(project);
 
         Filter filter = null;
         try {
@@ -570,7 +570,8 @@ public class SlingLaunchpadBehaviour ext
             Repository repository) throws SerializationException {
 
         String filePath = resource.getModuleRelativePath().toOSString();
-        if (serializationManager(repository, 
contentSyncRoot).isSerializationFile(filePath)) {
+               String absFilePath = new File(contentSyncRoot, 
filePath).getAbsolutePath();
+        if (serializationManager(repository, 
contentSyncRoot).isSerializationFile(absFilePath)) {
             filePath = serializationManager.getBaseResourcePath(filePath);
         }
 

Modified: 
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java
URL: 
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java?rev=1524373&r1=1524372&r2=1524373&view=diff
==============================================================================
--- 
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java
 (original)
+++ 
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java
 Wed Sep 18 11:42:26 2013
@@ -79,7 +79,7 @@ public class ImportWizard extends Wizard
 
                 try {
                     Repository repository = ServerUtil.getRepository(server, 
monitor);
-                    serializationManager.init(repository, 
ProjectUtil.getSyncDirectoryFullPath(project).toFile());
+                    serializationManager.init(repository, 
ProjectUtil.getSyncDirectoryFile(project));
 
                     new ImportRepositoryContentAction(repositoryPath, server, 
filterFile, projectRelativePath, project,
                             serializationManager).run(monitor);