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/12 17:56:48 UTC
svn commit: r1522643 -
/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
Author: rombert
Date: Thu Sep 12 15:56:47 2013
New Revision: 1522643
URL: http://svn.apache.org/r1522643
Log:
SLING-2989 - [Tooling] integrate with vlt once available
Disable serialization on DocView xml files which don't have the standard
.content.xml file. The reason is twofold:
1. We don't recurse below jcr:root, therefore we don't properly update
them
2. We have the pathological case of such a file being checked in the
repository which we don't handle well.
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
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=1522643&r1=1522642&r2=1522643&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 Thu Sep 12 15:56:47 2013
@@ -227,6 +227,11 @@ public class SlingLaunchpadBehaviour ext
}
if (serializationManager().isSerializationFile(info.getLocation())) {
+
+ // TODO - we don't support files with different names, see the docview file ( ui.xml ) pathological case
+ if (!info.getName().equals(".content.xml")) {
+ return null;
+ }
try {
IFile file = (IFile) resource.getAdapter(IFile.class);
InputStream contents = file.getContents();