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/05/15 00:56:49 UTC
svn commit: r1594750 - in /sling/trunk/tooling/ide: eclipse-core/
eclipse-core/META-INF/
eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/
eclipse-test/META-INF/ eclipse-test/src/org/apache/sling/ide/test/impl/
eclipse-ui/ eclipse-ui/src/org...
Author: rombert
Date: Wed May 14 22:56:49 2014
New Revision: 1594750
URL: http://svn.apache.org/r1594750
Log:
SLING-2651 - Manually trigger sync on files/directories
Allow publishing resources from arbitrary paths in content projects.
Added:
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ContentResourceTester.java (with props)
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentResourceTesterTest.java (with props)
Modified:
sling/trunk/tooling/ide/eclipse-core/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/eclipse-core/plugin.xml
sling/trunk/tooling/ide/eclipse-test/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/eclipse-ui/plugin.xml
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ExportContentAction.java
Modified: sling/trunk/tooling/ide/eclipse-core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/META-INF/MANIFEST.MF?rev=1594750&r1=1594749&r2=1594750&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/META-INF/MANIFEST.MF (original)
+++ sling/trunk/tooling/ide/eclipse-core/META-INF/MANIFEST.MF Wed May 14 22:56:49 2014
@@ -24,6 +24,7 @@ Import-Package: org.apache.commons.httpc
org.apache.sling.ide.transport,
org.eclipse.core.commands,
org.eclipse.core.commands.operations,
+ org.eclipse.core.expressions,
org.eclipse.core.resources,
org.eclipse.debug.core,
org.eclipse.debug.core.model,
Modified: sling/trunk/tooling/ide/eclipse-core/plugin.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/plugin.xml?rev=1594750&r1=1594749&r2=1594750&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/plugin.xml (original)
+++ sling/trunk/tooling/ide/eclipse-core/plugin.xml Wed May 14 22:56:49 2014
@@ -171,4 +171,15 @@
name="org.apache.sling.ide.eclipse-core"></bundle>
</component>
</extension>
+
+ <extension
+ point="org.eclipse.core.expressions.propertyTesters">
+ <propertyTester
+ id="org.apache.sling.ide.eclipse.internal.ExportableResourceTester"
+ type="org.eclipse.core.resources.IResource"
+ namespace="org.apache.sling.ide.eclipse"
+ properties="canBeExported"
+ class="org.apache.sling.ide.eclipse.core.internal.ContentResourceTester">
+ </propertyTester>
+ </extension>
</plugin>
Added: sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ContentResourceTester.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ContentResourceTester.java?rev=1594750&view=auto
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ContentResourceTester.java (added)
+++ sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ContentResourceTester.java Wed May 14 22:56:49 2014
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.ide.eclipse.core.internal;
+
+import org.apache.sling.ide.eclipse.core.ProjectUtil;
+import org.eclipse.core.expressions.PropertyTester;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+
+public class ContentResourceTester extends PropertyTester {
+
+ private static final String PN_CAN_BE_EXPORTED = "canBeExported";
+
+ @Override
+ public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
+
+ if (!PN_CAN_BE_EXPORTED.equals(property)) {
+ return false;
+ }
+
+ // projects as such can always be exported
+ if (receiver instanceof IProject) {
+ return isContentProject(receiver);
+ }
+
+ // resources must be part of a content project and below the sync directory
+ if (receiver instanceof IResource) {
+ IResource resource = (IResource) receiver;
+ IProject project = resource.getProject();
+ boolean contentProject = isContentProject(project);
+
+ if (!contentProject) {
+ return false;
+ }
+
+ IFolder syncDirectory = ProjectUtil.getSyncDirectory(project);
+ if (syncDirectory == null) {
+ return false;
+ }
+
+ return syncDirectory.getFullPath().isPrefixOf(resource.getFullPath());
+ }
+
+ return false;
+ }
+
+ private boolean isContentProject(Object receiver) {
+ IProject project = (IProject) receiver;
+
+ return project != null && project.isOpen() && ProjectHelper.isContentProject(project);
+ }
+
+}
Propchange: sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ContentResourceTester.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ContentResourceTester.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Modified: sling/trunk/tooling/ide/eclipse-test/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/META-INF/MANIFEST.MF?rev=1594750&r1=1594749&r2=1594750&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-test/META-INF/MANIFEST.MF (original)
+++ sling/trunk/tooling/ide/eclipse-test/META-INF/MANIFEST.MF Wed May 14 22:56:49 2014
@@ -7,6 +7,7 @@ Bundle-RequiredExecutionEnvironment: Jav
Require-Bundle: org.junit,
org.eclipse.core.runtime,
org.eclipse.core.resources,
+ org.eclipse.core.expressions,
org.eclipse.jdt.core,
org.eclipse.jdt.launching,
org.eclipse.wst.server.core,
@@ -24,6 +25,7 @@ Require-Bundle: org.junit,
Import-Package: javax.jcr,
javax.jcr.nodetype,
org.apache.jackrabbit.util,
+ org.apache.sling.ide.eclipse.core.internal,
org.apache.sling.ide.jcr
Bundle-Activator: org.apache.sling.ide.test.impl.Activator
Bundle-ActivationPolicy: lazy
Added: sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentResourceTesterTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentResourceTesterTest.java?rev=1594750&view=auto
==============================================================================
--- sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentResourceTesterTest.java (added)
+++ sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentResourceTesterTest.java Wed May 14 22:56:49 2014
@@ -0,0 +1,114 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.ide.test.impl;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertThat;
+
+import java.io.ByteArrayInputStream;
+
+import org.apache.sling.ide.eclipse.core.internal.ContentResourceTester;
+import org.apache.sling.ide.test.impl.helpers.ProjectAdapter;
+import org.apache.sling.ide.test.impl.helpers.TemporaryProject;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Path;
+import org.junit.Rule;
+import org.junit.Test;
+
+public class ContentResourceTesterTest {
+
+ @Rule
+ public TemporaryProject projectRule = new TemporaryProject();
+
+ @Test
+ public void simpleFacetedProjectIsNotExportable() throws CoreException {
+
+ // create faceted project
+ IProject contentProject = projectRule.getProject();
+
+ ProjectAdapter project = new ProjectAdapter(contentProject);
+ project.addNatures("org.eclipse.wst.common.project.facet.core.nature");
+
+ assertThat("Faceted project can not be exported",
+ new ContentResourceTester().test(contentProject, "canBeExported", null, null), equalTo(false));
+ }
+
+ @Test
+ public void slingContentProjectIsExportable() throws CoreException, InterruptedException {
+
+ // create faceted project
+ IProject contentProject = projectRule.getProject();
+
+ ProjectAdapter project = new ProjectAdapter(contentProject);
+ project.addNatures("org.eclipse.wst.common.project.facet.core.nature");
+
+ // install bundle facet
+ project.installFacet("sling.content", "1.0");
+
+ assertThat("Sling content project can be exported",
+ new ContentResourceTester().test(contentProject, "canBeExported", null, null), equalTo(true));
+ }
+
+
+ @Test
+ public void slingContentProjectSyncedResourcesAreExportable() throws CoreException, InterruptedException {
+
+ // create faceted project
+ IProject contentProject = projectRule.getProject();
+
+ ProjectAdapter project = new ProjectAdapter(contentProject);
+ project.addNatures("org.eclipse.wst.common.project.facet.core.nature");
+
+ // install bundle facet
+ project.installFacet("sling.content", "1.0");
+
+ project.createOrUpdateFile(Path.fromPortableString("jcr_root/test/hello.txt"), new ByteArrayInputStream(
+ "goodbye, world".getBytes()));
+
+ assertThat("Content sync dir can be exported",
+ new ContentResourceTester().test(contentProject.findMember("jcr_root"), "canBeExported", null, null), equalTo(true));
+ assertThat("Dir under sync dir can be exported",
+ new ContentResourceTester().test(contentProject.findMember("jcr_root/test"), "canBeExported", null, null), equalTo(true));
+ assertThat("File under sync dir can be exported",
+ new ContentResourceTester().test(contentProject.findMember("jcr_root/test/hello.txt"), "canBeExported", null, null), equalTo(true));
+ }
+
+ @Test
+ public void slingContentProjectUnrelatedResourcesAreNotExportable() throws CoreException, InterruptedException {
+
+ // create faceted project
+ IProject contentProject = projectRule.getProject();
+
+ ProjectAdapter project = new ProjectAdapter(contentProject);
+ project.addNatures("org.eclipse.wst.common.project.facet.core.nature");
+
+ // install bundle facet
+ project.installFacet("sling.content", "1.0");
+
+ project.createOrUpdateFile(Path.fromPortableString("res/hello.txt"), new ByteArrayInputStream(
+ "goodbye, world".getBytes()));
+
+ assertThat("Dir not under content sync dir can not be exported",
+ new ContentResourceTester().test(contentProject.findMember("res"), "canBeExported", null, null), equalTo(false));
+ assertThat("File not under content sync dir can not be exported",
+ new ContentResourceTester().test(contentProject.findMember("res/hello.txt"), "canBeExported", null, null), equalTo(false));
+
+
+ }
+
+}
Propchange: sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentResourceTesterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentResourceTesterTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Modified: sling/trunk/tooling/ide/eclipse-ui/plugin.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/plugin.xml?rev=1594750&r1=1594749&r2=1594750&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/plugin.xml (original)
+++ sling/trunk/tooling/ide/eclipse-ui/plugin.xml Wed May 14 22:56:49 2014
@@ -68,7 +68,7 @@
<!-- All Sling contributions -->
<objectContribution
id="org.apache.sling.ide.menu"
- objectClass="org.eclipse.core.resources.IProject">
+ objectClass="org.eclipse.core.resources.IResource">
<menu id="org.apache.sling.ide.menu"
path="additions"
label="Sling">
@@ -107,7 +107,7 @@
</objectContribution>
<!-- Export -->
<objectContribution id="org.apache.sling.ide.menu.export"
- objectClass="org.eclipse.core.resources.IProject">
+ objectClass="org.eclipse.core.resources.IResource">
<action
class="org.apache.sling.ide.eclipse.ui.internal.ExportContentAction"
@@ -117,17 +117,10 @@
menubarPath="org.apache.sling.ide.menu/sling"
style="push">
</action>
- <visibility>
- <objectState
- name="open"
- value="true">
- </objectState>
- </visibility>
<enablement>
<or>
<test
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="sling.content"/>
+ property="org.apache.sling.ide.eclipse.canBeExported"/>
</or>
</enablement>
</objectContribution>
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ExportContentAction.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ExportContentAction.java?rev=1594750&r1=1594749&r2=1594750&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ExportContentAction.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ExportContentAction.java Wed May 14 22:56:49 2014
@@ -2,12 +2,10 @@ package org.apache.sling.ide.eclipse.ui.
import java.util.Iterator;
-import org.apache.sling.ide.eclipse.core.ProjectUtil;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExecutableExtension;
@@ -40,15 +38,13 @@ public class ExportContentAction extends
for (Iterator<?> it = structuredSelection.iterator(); it.hasNext();) {
Object selected = it.next();
- if (selected instanceof IProject) {
- IProject project = (IProject) selected;
-
- IFolder syncDir = ProjectUtil.getSyncDirectory(project);
+ if (selected instanceof IResource) {
+ IResource resource = (IResource) selected;
Shell activeShell = PlatformUI.getWorkbench().getDisplay().getActiveShell();
ExportWizard wiz = new ExportWizard();
- wiz.init(PlatformUI.getWorkbench(), syncDir);
+ wiz.init(PlatformUI.getWorkbench(), resource);
WizardDialog dialog = new WizardDialog(activeShell, wiz);
dialog.open();