Author: rombert
Date: Mon Sep 30 15:51:50 2013
New Revision: 1527617
URL: http://svn.apache.org/r1527617
Log:
SLING-3137 - Ignore vlt tracking files when publishing content
Ignore .vlt and .vltignore when publishing content.
Modified:
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
Modified:
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java?rev=1527617&r1=1527616&r2=1527617&view=diff
==============================================================================
---
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
(original)
+++
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
Mon Sep 30 15:51:50 2013
@@ -24,10 +24,12 @@ import java.net.URISyntaxException;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.apache.commons.io.IOUtils;
import org.apache.sling.ide.artifacts.EmbeddedArtifactLocator;
@@ -76,6 +78,12 @@ import org.osgi.framework.Version;
public class SlingLaunchpadBehaviour extends ServerBehaviourDelegate {
+ private final Set<String> ignoredFileNames = new HashSet<String>();
+ {
+ ignoredFileNames.add(".vlt");
+ ignoredFileNames.add(".vltignore");
+ }
+
private SerializationManager serializationManager;
private ILaunch launch;
private JVMDebuggerConnection debuggerConnection;
@@ -492,6 +500,10 @@ public class SlingLaunchpadBehaviour ext
private Command<?> addFileCommand(Repository repository, IModuleResource
resource) throws CoreException,
SerializationException, IOException {
+ if (ignoredFileNames.contains(resource.getName())) {
+ return null;
+ }
+
FileInfo info = createFileInfo(resource, repository);
IResource res = getResource(resource);
@@ -678,6 +690,10 @@ public class SlingLaunchpadBehaviour ext
private Command<?> removeFileCommand(Repository repository,
IModuleResource resource) throws SerializationException, IOException,
CoreException {
+ if (ignoredFileNames.contains(resource.getName())) {
+ return null;
+ }
+
IResource deletedResource = getResource(resource);
if ( deletedResource == null ) {
