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/13 10:14:38 UTC

svn commit: r1522808 [1/2] - in /sling/branches/tooling-ide-vlt/tooling/ide: ./ eclipse-core/ eclipse-core/META-INF/ eclipse-core/src/org/apache/sling/ide/eclipse/core/ eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ eclipse-m2e-ui/ eclips...

Author: rombert
Date: Fri Sep 13 08:14:36 2013
New Revision: 1522808

URL: http://svn.apache.org/r1522808
Log:
Merged work from trunk

This is done to have a single place where work is done until FileVault has an official release from the Jackrabit project.

Conflicts:
  - target-definition/org.apache.sling.ide.target-definition.target

Added:
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ConfigurationHelper.java
      - copied unchanged from r1522803, sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ConfigurationHelper.java
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/MavenLaunchHelper.java
      - copied unchanged from r1522803, sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/MavenLaunchHelper.java
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetBundleInstallLocallyCommand.java
      - copied unchanged from r1522803, sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetBundleInstallLocallyCommand.java
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerDebugPortCommand.java
      - copied unchanged from r1522803, sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerDebugPortCommand.java
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/JVMDebuggerConnection.java
      - copied unchanged from r1522803, sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/JVMDebuggerConnection.java
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ProjectHelper.java
      - copied unchanged from r1522803, sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ProjectHelper.java
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingBundleFacetInstallDelegate.java
      - copied unchanged from r1522803, sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingBundleFacetInstallDelegate.java
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingBundleFacetUninstallDelegate.java
      - copied unchanged from r1522803, sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingBundleFacetUninstallDelegate.java
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingBundleModuleFactory.java
      - copied unchanged from r1522803, sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingBundleModuleFactory.java
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-m2e-ui/   (props changed)
      - copied from r1522803, sling/trunk/tooling/ide/eclipse-m2e-ui/
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/WhitelabelSupport.java
      - copied unchanged from r1522803, sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/WhitelabelSupport.java
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/
      - copied from r1522803, sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/InstallEditorSection.java
      - copied unchanged from r1522803, sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/InstallEditorSection.java
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ServersActionModeFiddlerActionDelegate.java
      - copied unchanged from r1522803, sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ServersActionModeFiddlerActionDelegate.java
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SlingProjectDecorator.java
      - copied unchanged from r1522803, sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SlingProjectDecorator.java
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/connectOverlay.png
      - copied unchanged from r1522803, sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/connectOverlay.png
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/slingDecoration.png
      - copied unchanged from r1522803, sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/slingDecoration.png
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/PackageExplorerOpenActionProvider.java
      - copied unchanged from r1522803, sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/PackageExplorerOpenActionProvider.java
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/DirNode.java
      - copied unchanged from r1522803, sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/DirNode.java
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/LinkHelper.java
      - copied unchanged from r1522803, sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/LinkHelper.java
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/ModifiableProperties.java
      - copied unchanged from r1522803, sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/ModifiableProperties.java
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/properties/
      - copied from r1522803, sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/properties/
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/
      - copied from r1522803, sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/
    sling/branches/tooling-ide-vlt/tooling/ide/m2e-feature/   (props changed)
      - copied from r1522803, sling/trunk/tooling/ide/m2e-feature/
Removed:
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/ReadOnlyProperties.java
Modified:
    sling/branches/tooling-ide-vlt/tooling/ide/   (props changed)
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/META-INF/MANIFEST.MF
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/plugin.xml
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ISlingLaunchpadConfiguration.java
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ISlingLaunchpadServer.java
    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/SlingContentModuleFactory.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-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadConfiguration.java
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadServer.java
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/plugin.xml
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/pom.xml
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ConnectionEditorSection.java
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SharedImages.java
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/JcrContentContentProvider.java
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/SyncDir.java
    sling/branches/tooling-ide-vlt/tooling/ide/p2update/category.xml
    sling/branches/tooling-ide-vlt/tooling/ide/pom.xml
    sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target

Propchange: sling/branches/tooling-ide-vlt/tooling/ide/
------------------------------------------------------------------------------
    svn:mergeinfo = /sling/trunk/tooling/ide:1514627-1522803

Modified: sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/META-INF/MANIFEST.MF?rev=1522808&r1=1522807&r2=1522808&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/META-INF/MANIFEST.MF (original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/META-INF/MANIFEST.MF Fri Sep 13 08:14:36 2013
@@ -5,23 +5,49 @@ Bundle-Version: 0.0.1.qualifier
 Bundle-Activator: org.apache.sling.ide.eclipse.core.internal.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.equinox.ds;bundle-version="1.2.1",
- org.eclipse.osgi.services;bundle-version="3.2.100"
+ org.eclipse.osgi.services;bundle-version="3.2.100",
+ org.eclipse.core.resources,
+ org.eclipse.ui,
+ org.eclipse.m2e.core;bundle-version="1.4.0",
+ org.eclipse.m2e.archetype.common;bundle-version="1.4.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: .
-Import-Package: org.apache.sling.ide.filter,
+Import-Package: org.apache.commons.httpclient;version="3.1.0",
+ org.apache.commons.httpclient.auth;version="3.1.0",
+ org.apache.commons.httpclient.methods;version="3.1.0",
+ org.apache.maven,
+ org.apache.maven.artifact,
+ org.apache.maven.artifact.handler,
+ org.apache.maven.artifact.installer,
+ org.apache.maven.artifact.repository,
+ org.apache.maven.execution,
+ org.apache.maven.model,
+ org.apache.maven.plugin,
+ org.apache.sling.ide.filter,
  org.apache.sling.ide.serialization,
  org.apache.sling.ide.transport,
+ org.codehaus.plexus,
  org.eclipse.core.commands,
  org.eclipse.core.commands.operations,
  org.eclipse.core.resources,
  org.eclipse.debug.core,
+ org.eclipse.debug.core.model,
+ org.eclipse.debug.core.sourcelookup,
+ org.eclipse.debug.core.sourcelookup.containers,
+ org.eclipse.debug.internal.ui,
+ org.eclipse.debug.ui,
+ org.eclipse.jdt.core,
+ org.eclipse.jdt.internal.launching,
  org.eclipse.jdt.launching,
+ org.eclipse.jdt.launching.sourcelookup.containers,
  org.eclipse.osgi.service.debug;version="1.2.0",
  org.eclipse.wst.common.project.facet.core,
  org.eclipse.wst.server.core,
  org.eclipse.wst.server.core.model,
  org.eclipse.wst.server.core.util,
- org.osgi.service.component;version="1.1.0"
-Export-Package: org.apache.sling.ide.eclipse.core
+ org.osgi.service.component;version="1.1.0",
+ org.sonatype.aether
+Export-Package: org.apache.sling.ide.eclipse.core,
+ org.apache.sling.ide.eclipse.core.internal
 Service-Component: OSGI-INF/Tracer.xml

Modified: sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/plugin.xml
URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/plugin.xml?rev=1522808&r1=1522807&r2=1522808&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/plugin.xml (original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/plugin.xml Fri Sep 13 08:14:36 2013
@@ -6,9 +6,15 @@
   <extension point="org.eclipse.wst.server.core.moduleTypes">
     <moduleType
        id="sling.content"
-       name="Sling module type"/>
+       name="Sling content module type"/>
   </extension>
   
+  <extension point="org.eclipse.wst.server.core.moduleTypes">
+    <moduleType
+       id="sling.bundle"
+       name="Sling bundle module type"/>
+  </extension>
+
   <!-- Define a sling module factory -->
   <extension point="org.eclipse.wst.server.core.moduleFactories">
   	<moduleFactory
@@ -21,6 +27,18 @@
   	</moduleFactory>
   </extension>
   
+  <extension
+        point="org.eclipse.wst.server.core.moduleFactories">
+  	<moduleFactory
+  		projects="true"
+  		class="org.apache.sling.ide.eclipse.core.internal.SlingBundleModuleFactory"
+  		id="org.apache.sling.ide.bundleModuleFactory">
+	    <moduleType
+	       versions="1.0"
+	       types="sling.bundle"/>
+  	</moduleFactory>
+  </extension>
+
 	<!-- Define the sling facet we support -->
 	<extension point="org.eclipse.wst.common.project.facet.core.facets">
 		<project-facet id="sling.content">
@@ -37,6 +55,21 @@
   		<action facet="sling.content" version="1.0" type="UNINSTALL">
   			<delegate class="org.apache.sling.ide.eclipse.core.internal.SlingContentFacetUninstallDelegate"/>
   		</action>
+
+		<project-facet id="sling.bundle">
+			<label>Sling bundle module</label>
+			<description>Sling/OSGi bundle modules contain java code which is installed as an OSGi bundle in Sling.</description>
+		</project-facet>
+		
+  		<project-facet-version facet="sling.bundle" version="1.0"/>
+  		
+  		<action facet="sling.bundle" version="1.0" type="INSTALL">
+  			<delegate class="org.apache.sling.ide.eclipse.core.internal.SlingBundleFacetInstallDelegate"/>
+  		</action>
+
+  		<action facet="sling.bundle" version="1.0" type="UNINSTALL">
+  			<delegate class="org.apache.sling.ide.eclipse.core.internal.SlingBundleFacetUninstallDelegate"/>
+  		</action>
 	</extension>  
 
 	<!-- Define the Sling launchpad runtime type -->
@@ -49,6 +82,7 @@
        version="1.0"
        class="org.apache.sling.ide.eclipse.core.internal.SlingLaunchpadRuntime">
        <moduleType types="sling.content" versions="1.0"/> 
+       <moduleType types="sling.bundle" versions="1.0"/> 
     </runtimeType>
   </extension>
   
@@ -56,8 +90,8 @@
   <extension point="org.eclipse.wst.server.core.serverTypes">
      <serverType
        id="org.apache.sling.ide.launchpadServer"
-       name="Sling Launchpad (server name)"
-       description="Sling Launchpad (server description)"
+       name="External Sling Launchpad (server name)"
+       description="External Sling Launchpad (server description)"
        supportsRemoteHosts="true"
        runtime="true"
        startTimeout="30000"
@@ -83,7 +117,7 @@
         id="org.apache.sling.ide.launchpadLaunchConfigurationType"
         name="Sling Launchpad"
         delegate="org.apache.sling.ide.eclipse.core.internal.SlingLaunchpadLaunchConfigurationDelegate"
-        modes="run"
+        modes="run,debug"
         sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
   </extension>
     
@@ -114,6 +148,10 @@
       <runtime-component id="org.apache.sling.ide.launchpadRuntimeComponentType"/>
       <facet id="sling.content" version="1.0"/>
     </default-facets>
+    <default-facets>
+      <runtime-component id="org.apache.sling.ide.launchpadRuntimeComponentType"/>
+      <facet id="sling.bundle" version="1.0"/>
+    </default-facets>
   </extension>
   	
 	<!-- Map from the launchpad runtime type to our runtime components -->

Modified: sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ISlingLaunchpadConfiguration.java
URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ISlingLaunchpadConfiguration.java?rev=1522808&r1=1522807&r2=1522808&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ISlingLaunchpadConfiguration.java (original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ISlingLaunchpadConfiguration.java Fri Sep 13 08:14:36 2013
@@ -19,6 +19,8 @@ package org.apache.sling.ide.eclipse.cor
 public interface ISlingLaunchpadConfiguration {
 
     int getPort();
+    
+    int getDebugPort();
 
     String getContextPath();
 
@@ -26,4 +28,5 @@ public interface ISlingLaunchpadConfigur
 
     String getPassword();
 
+    boolean bundleInstallLocally();
 }
\ No newline at end of file

Modified: sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ISlingLaunchpadServer.java
URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ISlingLaunchpadServer.java?rev=1522808&r1=1522807&r2=1522808&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ISlingLaunchpadServer.java (original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ISlingLaunchpadServer.java Fri Sep 13 08:14:36 2013
@@ -28,7 +28,10 @@ public interface ISlingLaunchpadServer {
     public static final String PROP_USERNAME = "launchpad.username";
     public static final String PROP_CONTEXT_PATH = "launchpad.contextPath";
     public static final String PROP_PORT = "launchpad.port";
+    public static final String PROP_DEBUG_PORT = "launchpad.debugPort";
 
+    public static final String PROP_INSTALL_LOCALLY = "launchpad.installLocally";
+    
     void setPublishState(int publishState, IProgressMonitor monitor);
 
     int getPublishState();

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=1522808&r1=1522807&r2=1522808&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 Fri Sep 13 08:14:36 2013
@@ -17,7 +17,10 @@
 package org.apache.sling.ide.eclipse.core;
 
 import org.apache.sling.ide.eclipse.core.internal.Activator;
+import org.apache.sling.ide.eclipse.core.internal.ProjectHelper;
+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.IPath;
 import org.eclipse.core.runtime.QualifiedName;
@@ -28,6 +31,26 @@ public abstract class ProjectUtil {
     private static final String PROPERTY_SYNC_ROOT = "sync_root";
     private static final String PROPERTY_SYNC_ROOT_DEFAULT_VALUE = "jcr_root";
 
+    public static IFolder getSyncDirectory(IProject project) {
+    	if (project==null) {
+    		return null;
+    	}
+		if (!project.isOpen()) {
+			return null;
+		} else if (!ProjectHelper.isContentProject(project)) {
+			return null;
+		}
+		String syncDirectoryValue = ProjectUtil.getSyncDirectoryValue(project);
+		if (syncDirectoryValue==null || syncDirectoryValue.length()==0) {
+			return null;
+		}
+		IResource syncDir = project.findMember(syncDirectoryValue);
+		if (syncDir==null || !(syncDir instanceof IFolder)) {
+			return null;
+		}
+		return (IFolder) syncDir;
+    }
+    
     /**
      * Returns the value of the sync directory configured for a project.
      * 

Modified: sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingContentModuleFactory.java
URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingContentModuleFactory.java?rev=1522808&r1=1522807&r2=1522808&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingContentModuleFactory.java (original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingContentModuleFactory.java Fri Sep 13 08:14:36 2013
@@ -25,7 +25,7 @@ import org.eclipse.wst.server.core.util.
 
 public class SlingContentModuleFactory extends ProjectModuleFactoryDelegate {
 
-    private static final String NATURE_ID = "sling.content";
+    static final String SLING_CONTENT_FACET_ID = "sling.content";
 
     @Override
     public ModuleDelegate getModuleDelegate(IModule module) {
@@ -39,8 +39,8 @@ public class SlingContentModuleFactory e
         try {
             IFacetedProject facetedProject = ProjectFacetsManager.create(project);
             for (IProjectFacetVersion facet : facetedProject.getProjectFacets()) {
-                if (facet.getProjectFacet().getId().equals(NATURE_ID)) {
-                    return createModule(project.getName(), project.getName(), NATURE_ID, "1.0", project);
+                if (facet.getProjectFacet().getId().equals(SLING_CONTENT_FACET_ID)) {
+                    return createModule(project.getName(), project.getName(), SLING_CONTENT_FACET_ID, "1.0", project);
                 }
             }
         } catch (CoreException ce) {

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=1522808&r1=1522807&r2=1522808&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 Fri Sep 13 08:14:36 2013
@@ -16,12 +16,25 @@
  */
 package org.apache.sling.ide.eclipse.core.internal;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Arrays;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.httpclient.Credentials;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpException;
+import org.apache.commons.httpclient.URIException;
+import org.apache.commons.httpclient.UsernamePasswordCredentials;
+import org.apache.commons.httpclient.auth.AuthScope;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.sling.ide.eclipse.core.ISlingLaunchpadServer;
+import org.apache.sling.ide.eclipse.core.MavenLaunchHelper;
 import org.apache.sling.ide.eclipse.core.ProjectUtil;
 import org.apache.sling.ide.eclipse.core.ServerUtil;
 import org.apache.sling.ide.filter.Filter;
@@ -45,7 +58,12 @@ import org.eclipse.core.runtime.IProgres
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunch;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.debug.ui.DebugUITools;
+import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.wst.server.core.IModule;
 import org.eclipse.wst.server.core.IServer;
 import org.eclipse.wst.server.core.model.IModuleResource;
@@ -55,20 +73,32 @@ import org.eclipse.wst.server.core.model
 public class SlingLaunchpadBehaviour extends ServerBehaviourDelegate {
 
     private SerializationManager serializationManager;
-
+	private ILaunch launch;
+	private JVMDebuggerConnection debuggerConnection;
+	
     @Override
     public void stop(boolean force) {
-
+    	if (debuggerConnection!=null) {
+    		debuggerConnection.stop(force);
+    	}
         setServerState(IServer.STATE_STOPPED);
     }
 
     public void start(IProgressMonitor monitor) throws CoreException {
 
         boolean success = false;
+        Result<ResourceProxy> result = null;
 
-        Command<ResourceProxy> command = ServerUtil.getRepository(getServer(), monitor).newListChildrenNodeCommand("/");
-        Result<ResourceProxy> result = command.execute();
-        success = result.isSuccess();
+        if (getServer().getMode().equals(ILaunchManager.DEBUG_MODE)) {
+        	debuggerConnection = new JVMDebuggerConnection();
+        	success = debuggerConnection.connectInDebugMode(launch, getServer(), monitor);
+			
+        } else {
+	        
+        	Command<ResourceProxy> command = ServerUtil.getRepository(getServer(), monitor).newListChildrenNodeCommand("/");
+	        result = command.execute();
+	        success = result.isSuccess();
+        }
 
         if (success) {
             setServerState(IServer.STATE_STARTED);
@@ -87,6 +117,7 @@ public class SlingLaunchpadBehaviour ext
     public void setupLaunch(ILaunch launch, String launchMode, IProgressMonitor monitor) throws CoreException {
         // TODO check that ports are free
 
+    	this.launch = launch;
         setServerRestartState(false);
         setServerState(IServer.STATE_STARTING);
         setMode(launchMode);
@@ -138,7 +169,95 @@ public class SlingLaunchpadBehaviour ext
 
         System.out.println(trace.toString());
 
-        Repository repository = ServerUtil.getRepository(getServer(), monitor);
+        if (ProjectHelper.isBundleProject(module[0].getProject())) {
+            String serverMode = getServer().getMode();
+            if (!serverMode.equals(ILaunchManager.DEBUG_MODE)) {
+                // in debug mode, we rely on the hotcode replacement feature of eclipse/jvm
+                // otherwise, for run and profile modes we explicitly publish the bundle module
+                // TODO: make this configurable as part of the server config
+        		publishBundleModule(module, monitor);
+        	}
+        } else if (ProjectHelper.isContentProject(module[0].getProject())) {
+    		publishContentModule(kind, deltaKind, module, monitor); 
+        }
+    }
+
+	private void publishBundleModule(IModule[] module, IProgressMonitor monitor) throws CoreException {
+		final IProject project = module[0].getProject();
+        boolean installLocally = getServer().getAttribute(ISlingLaunchpadServer.PROP_INSTALL_LOCALLY, true);
+		if (!installLocally) {
+			try{
+				final String launchMemento = MavenLaunchHelper.createMavenLaunchConfigMemento(project.getLocation().toString(),
+						"sling:install", "bundle", false, null);
+				IFolder dotLaunches = project.getFolder(".settings").getFolder(".launches");
+				if (!dotLaunches.exists()) {
+					dotLaunches.create(true, true, monitor);
+				}
+				IFile launchFile = dotLaunches.getFile("sling_install.launch");
+				InputStream in = new ByteArrayInputStream(launchMemento.getBytes());
+				if (!launchFile.exists()) {
+					launchFile.create(in, true, monitor);
+				}
+
+				ILaunchConfiguration launchConfig = 
+						DebugPlugin.getDefault().getLaunchManager().getLaunchConfiguration(launchFile);
+				launchConfig.launch(ILaunchManager.RUN_MODE, monitor);
+			} catch(Exception e) {
+				// TODO proper logging
+				e.printStackTrace();
+			}
+		} else {
+			monitor.beginTask("deploying via local install", 5);
+	        HttpClient httpClient = new HttpClient();
+	        String hostname = getServer().getHost();
+	        int launchpadPort = getServer().getAttribute(ISlingLaunchpadServer.PROP_PORT, 8080);
+	        PostMethod method = new PostMethod("http://"+hostname+":"+launchpadPort+"/system/sling/tooling/install");
+	        String username = getServer().getAttribute(ISlingLaunchpadServer.PROP_USERNAME, "admin");
+	        String password = getServer().getAttribute(ISlingLaunchpadServer.PROP_PASSWORD, "admin");
+	        String userInfo = username+":"+password;
+	        if (userInfo != null) {
+	        	Credentials c = new UsernamePasswordCredentials(userInfo);
+	        	try {
+					httpClient.getState().setCredentials(
+							new AuthScope(method.getURI().getHost(), method
+									.getURI().getPort()), c);
+				} catch (URIException e) {
+					// TODO proper logging
+					e.printStackTrace();
+				}
+	        }
+	        IJavaProject javaProject = ProjectHelper.asJavaProject(project);
+	        IPath outputLocation = javaProject.getOutputLocation();
+			outputLocation = outputLocation.makeRelativeTo(project.getFullPath());
+	        IPath location = project.getRawLocation();
+	        if (location==null) {
+	        	location = project.getLocation();
+	        }
+			method.addParameter("dir", location.toString() + "/" + outputLocation.toString());
+	        monitor.worked(1);
+            try {
+				httpClient.executeMethod(method);
+		        monitor.worked(4);
+		        setModulePublishState(module, IServer.PUBLISH_STATE_NONE);
+			} catch (HttpException e) {
+				// TODO proper logging
+				e.printStackTrace();
+			} catch (IOException e) {
+				// TODO proper logging
+				e.printStackTrace();
+			}
+		}
+	}
+
+	private void publishContentModule(int kind, int deltaKind,
+			IModule[] module, IProgressMonitor monitor) throws CoreException {
+
+		if (runLaunchesIfExist(kind, deltaKind, module, monitor)) {
+			return;
+		}
+		// otherwise fallback to old behaviour
+		
+		Repository repository = ServerUtil.getRepository(getServer(), monitor);
 
         IModuleResource[] moduleResources = getResources(module);
         
@@ -205,7 +324,62 @@ public class SlingLaunchpadBehaviour ext
 
         // set state to published
         super.publishModule(kind, deltaKind, module, monitor);
-    }
+        setModulePublishState(module, IServer.PUBLISH_STATE_NONE);
+//        setServerPublishState(IServer.PUBLISH_STATE_NONE);
+	}
+
+	private boolean runLaunchesIfExist(int kind, int deltaKind, IModule[] module,
+			IProgressMonitor monitor) throws CoreException {
+		final IProject project = module[0].getProject();
+		final IFolder dotLaunches = project.getFolder(".settings").getFolder(".launches");
+		final List<IFile> launches = new LinkedList<IFile>();
+		if (dotLaunches.exists()) {
+			final IResource[] members = dotLaunches.members();
+			if (members!=null) {
+				for (int i = 0; i < members.length; i++) {
+					final IResource aMember = members[i];
+					if (aMember instanceof IFile) {
+						launches.add((IFile)aMember);
+					}
+				}
+			}
+		}
+		if (launches.size()>0) {
+			if (kind == IServer.PUBLISH_AUTO && deltaKind == ServerBehaviourDelegate.NO_CHANGE) {
+				// then nothing is to be done, there are no changes
+				return true;
+			}
+	        for (Iterator<IFile> it = launches.iterator(); it.hasNext();) {
+				IFile aLaunchFile = it.next();
+				try{
+//					@SuppressWarnings("restriction")
+//					IWorkbench workbench = DebugUIPlugin.getDefault().getWorkbench();
+//					if (workbench==null) {
+//						// we're not in the context of a workbench?
+//						System.err.println("We're not in the context of a workbench?");
+//					}
+//					IWorkbenchWindow aw = workbench.getActiveWorkbenchWindow();
+//					if (aw==null) {
+//						// we're not in the context of a workbench window?
+//					}
+					ILaunchConfiguration launchConfig = 
+							DebugPlugin.getDefault().getLaunchManager().getLaunchConfiguration(aLaunchFile);
+					if (launchConfig!=null) {
+						DebugUITools.launch( launchConfig, ILaunchManager.RUN_MODE);
+					}
+				} catch(Exception e) {
+					// TODO logging
+					
+					e.printStackTrace();
+				}
+
+			}
+	        super.publishModule(kind, deltaKind, module, monitor);
+	        setModulePublishState(module, IServer.PUBLISH_STATE_NONE);
+	        return true;
+		}
+		return false;
+	}
 
     private void execute(Command<?> command) throws CoreException {
         if (command == null) {

Modified: sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadConfiguration.java
URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadConfiguration.java?rev=1522808&r1=1522807&r2=1522808&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadConfiguration.java (original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadConfiguration.java Fri Sep 13 08:14:36 2013
@@ -28,6 +28,11 @@ public class SlingLaunchpadConfiguration
     public SlingLaunchpadConfiguration(SlingLaunchpadServer server) {
         this.server = server;
     }
+    
+    @Override
+    public boolean bundleInstallLocally() {
+        return workingCopy().getAttribute(ISlingLaunchpadServer.PROP_INSTALL_LOCALLY, true);
+    }
 
     @Override
     public int getPort() {
@@ -35,6 +40,11 @@ public class SlingLaunchpadConfiguration
         return workingCopy().getAttribute(ISlingLaunchpadServer.PROP_PORT, 8080);
     }
 
+    @Override
+    public int getDebugPort() {
+        return workingCopy().getAttribute(ISlingLaunchpadServer.PROP_DEBUG_PORT, 30303);
+    }
+    
     private IServerWorkingCopy workingCopy() {
         IServerWorkingCopy workingCopy = server.getServerWorkingCopy();
         server.getServer().createWorkingCopy();
@@ -46,6 +56,10 @@ public class SlingLaunchpadConfiguration
     public void setPort(int port) {
         workingCopy().setAttribute(ISlingLaunchpadServer.PROP_PORT, port);
     }
+    
+    public void setDebugPort(int debugPort) {
+    	workingCopy().setAttribute(ISlingLaunchpadServer.PROP_DEBUG_PORT, debugPort);
+    }
 
     @Override
     public String getContextPath() {

Modified: sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadServer.java
URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadServer.java?rev=1522808&r1=1522807&r2=1522808&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadServer.java (original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadServer.java Fri Sep 13 08:14:36 2013
@@ -32,6 +32,8 @@ public class SlingLaunchpadServer extend
 
     private static final String MODULE_TYPE_SLING_CONTENT = "sling.content";
 
+    private static final String MODULE_TYPE_SLING_BUNDLE = "sling.bundle";
+
     private ISlingLaunchpadConfiguration config;
 
     @Override
@@ -61,9 +63,10 @@ public class SlingLaunchpadServer extend
 
         for (IModule module : toAdd) {
 
-            if (!MODULE_TYPE_SLING_CONTENT.equals(module.getModuleType().getId())) {
+            if (!MODULE_TYPE_SLING_CONTENT.equals(module.getModuleType().getId()) &&
+            		!MODULE_TYPE_SLING_BUNDLE.equals(module.getModuleType().getId())) {
                 return new Status(IStatus.ERROR, "org.apache.sling.slingclipse", 0,
-                        "Will only handle modules of type 'sling.content'", null);
+                        "Will only handle modules of type 'sling.content' or 'sling.bundle'", null);
             }
         }
 
@@ -88,12 +91,13 @@ public class SlingLaunchpadServer extend
     @Override
     public IModule[] getRootModules(IModule arg0) throws CoreException {
 
-        if (MODULE_TYPE_SLING_CONTENT.equals(arg0.getModuleType().getId())) {
+        if (MODULE_TYPE_SLING_CONTENT.equals(arg0.getModuleType().getId()) || 
+        		MODULE_TYPE_SLING_BUNDLE.equals(arg0.getModuleType().getId())) {
             return new IModule[] { arg0 };
         }
 
         throw new CoreException(new Status(IStatus.ERROR, "org.apache.sling.slingclipse", 0,
-                "Will only handle modules of type 'sling.content'", null));
+                "Will only handle modules of type 'sling.content' or 'sling.bundle'", null));
     }
 
     /*
@@ -125,6 +129,7 @@ public class SlingLaunchpadServer extend
     public void setDefaults(IProgressMonitor monitor) {
 
         setAttribute(PROP_PORT, 8080);
+        setAttribute(PROP_DEBUG_PORT, 30303);
         setAttribute(PROP_CONTEXT_PATH, "/");
         setAttribute(PROP_USERNAME, "admin");
         setAttribute(PROP_PASSWORD, "admin");

Propchange: sling/branches/tooling-ide-vlt/tooling/ide/eclipse-m2e-ui/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Sep 13 08:14:36 2013
@@ -0,0 +1,9 @@
+target
+
+.settings
+
+bin
+
+.classpath
+
+.project

Modified: sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF?rev=1522808&r1=1522807&r2=1522808&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF (original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF Fri Sep 13 08:14:36 2013
@@ -6,7 +6,14 @@ Bundle-Activator: org.apache.sling.ide.e
 Bundle-Version: 0.0.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: .
-Import-Package: org.apache.sling.ide.eclipse.core,
+Import-Package: org.apache.commons.httpclient;version="3.1.0",
+ org.apache.commons.httpclient.auth;version="3.1.0",
+ org.apache.commons.httpclient.methods;version="3.1.0",
+ org.apache.commons.httpclient.methods.multipart;version="3.1.0",
+ org.apache.commons.httpclient.params;version="3.1.0",
+ org.apache.maven.artifact.repository,
+ org.apache.maven.model,
+ org.apache.sling.ide.eclipse.core,
  org.apache.sling.ide.filter,
  org.apache.sling.ide.serialization,
  org.apache.sling.ide.transport,
@@ -19,20 +26,27 @@ Import-Package: org.apache.sling.ide.ecl
  org.eclipse.core.runtime.jobs,
  org.eclipse.debug.core,
  org.eclipse.debug.core.model,
+ org.eclipse.debug.internal.ui,
+ org.eclipse.debug.internal.ui.actions,
  org.eclipse.debug.ui,
  org.eclipse.debug.ui.sourcelookup,
+ org.eclipse.jdt.core,
  org.eclipse.jdt.debug.ui.launchConfigurations,
+ org.eclipse.jdt.internal.ui.javaeditor,
  org.eclipse.jdt.launching,
+ org.eclipse.jdt.ui.actions,
  org.eclipse.jface.action,
  org.eclipse.jface.dialogs,
  org.eclipse.jface.operation,
  org.eclipse.jface.preference,
  org.eclipse.jface.resource,
+ org.eclipse.jface.text,
  org.eclipse.jface.viewers,
  org.eclipse.jface.window,
  org.eclipse.jface.wizard,
  org.eclipse.jst.common.project.facet.core,
  org.eclipse.jst.server.core,
+ org.eclipse.m2e.core.internal.archetype,
  org.eclipse.swt,
  org.eclipse.swt.events,
  org.eclipse.swt.layout,
@@ -48,13 +62,26 @@ Import-Package: org.apache.sling.ide.ecl
  org.eclipse.wst.server.core.util,
  org.eclipse.wst.server.ui,
  org.eclipse.wst.server.ui.editor,
+ org.eclipse.wst.server.ui.internal,
  org.osgi.framework,
+ org.osgi.service.component,
  org.osgi.service.event;version="1.3.0",
  org.osgi.util.tracker;version="1.5.0",
- org.osgi.service.component
+ org.sonatype.aether.repository
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.wst.common.project.facet.ui,
  org.eclipse.ui.navigator;bundle-version="3.5.101",
  org.eclipse.ui.views;bundle-version="3.6.0",
- org.eclipse.ui
+ org.eclipse.ui,
+ org.eclipse.core.resources,
+ org.eclipse.ui.ide,
+ org.eclipse.core.runtime,
+ org.eclipse.m2e.core;bundle-version="1.4.0",
+ org.eclipse.m2e.archetype.common;bundle-version="1.4.0",
+ org.eclipse.ui.console,
+ org.eclipse.jdt.ui,
+ org.apache.sling.ide.eclipse-core,
+ org.eclipse.ui.views.properties.tabbed
 Service-Component: OSGI-INF/*.xml
+Export-Package: org.apache.sling.ide.eclipse.ui,
+ org.apache.sling.ide.eclipse.ui.wizards

Modified: sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/plugin.xml
URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/plugin.xml?rev=1522808&r1=1522807&r2=1522808&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/plugin.xml (original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/plugin.xml Fri Sep 13 08:14:36 2013
@@ -16,11 +16,17 @@
 	<extension point="org.eclipse.wst.server.ui.serverImages">
 	<!-- TODO : merge into a single image? -->
 	      <image
-	         icon="icons/obj16/sling.gif"
-	         typeIds="org.apache.sling.ide.launchpadServer"/>
+             icon="icons/obj16/sling.gif"
+             id="slinggif"
+             typeIds="org.apache.sling.ide.launchpadServer"/>
 	      <image
-	         icon="icons/obj16/sling.gif"
-	         typeIds="sling.content"/>
+             icon="icons/obj16/sling.gif"
+             id="slingcontentgif"
+             typeIds="sling.content"/>
+	      <image
+             icon="icons/obj16/sling.gif"
+             id="slingbundle"
+             typeIds="sling.bundle"/>
 	</extension>  
 	
 	<!-- Define the editor section(s) we contribute to the WST UI -->
@@ -33,11 +39,27 @@
          class="org.apache.sling.ide.eclipse.ui.internal.ConnectionEditorSection">
       </section>
    </extension>   
+   <extension point="org.eclipse.wst.server.ui.editorPageSections">      
+      <section
+         id="org.apache.sling.ide.launchpadConfigurationEditorSection"
+         order="10"
+         insertionId="org.eclipse.wst.server.editor.overview.right"
+         typeIds="org.apache.sling.ide.launchpadServer"
+         class="org.apache.sling.ide.eclipse.ui.internal.InstallEditorSection">
+      </section>
+   </extension>   
   
   <!-- Runtime images -->
     <extension point="org.eclipse.wst.common.project.facet.ui.images">
-    <image runtime-component-type="org.apache.sling.ide.launchpadRuntimeComponentType"
-       path="icons/obj16/sling.gif"/>
+    <image
+          facet="sling.bundle"
+          path="icons/obj16/sling.gif"
+          runtime-component-type="org.apache.sling.ide.launchpadRuntimeComponentType"/>
+    <image
+          facet="sling.content"
+          path="icons/obj16/sling.gif"
+          runtime-component-type="org.apache.sling.ide.launchpadRuntimeComponentType">
+    </image>
   </extension>
   
   <!-- Menu contributions -->
@@ -72,9 +94,14 @@
                </objectState>
          </visibility>
          <enablement>
-				<test 
+			<or>
+			    <test 
 		            property="org.eclipse.wst.common.project.facet.core.projectFacet" 
-		            value="sling.content"/>         
+		            value="sling.content"/>
+			    <test 
+		            property="org.eclipse.wst.common.project.facet.core.projectFacet" 
+		            value="sling.bundle"/>
+		    </or>         
          </enablement>
 		</objectContribution>
   </extension>
@@ -107,9 +134,14 @@
              	<instanceof
                   	value="org.eclipse.core.resources.IProject">
              	</instanceof>
- 				<test 
-		            property="org.eclipse.wst.common.project.facet.core.projectFacet" 
-		            value="sling.content"/>
+             	<or>
+	 				<test 
+			            property="org.eclipse.wst.common.project.facet.core.projectFacet" 
+			            value="sling.content"/>
+	 				<test 
+			            property="org.eclipse.wst.common.project.facet.core.projectFacet" 
+			            value="sling.bundle"/>
+			    </or>
              </and>
           </enabledWhen>
         </page> 
@@ -119,6 +151,7 @@
 		<viewerContentBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
 			<includes>
 				<contentExtension pattern="org.apache.sling.ide.eclipse-ui.navigatorJcrContent" />
+				<contentExtension pattern="org.apache.sling.ide.eclipse-ui.linkHelper"/>	
 			</includes>
 		</viewerContentBinding>
 	</extension>
@@ -160,12 +193,33 @@
                      value="org.apache.sling.ide.eclipse.ui.nav.model.JcrNode" /> 
            </or>
          </enablement>
+         <commonWizard
+               type="new"
+               wizardId="org.apache.sling.ide.eclipse.ui.wizards.NewNodeWizard">
+            <enablement>
+               <or>
+                  <instanceof
+                        value="org.apache.sling.ide.eclipse.ui.nav.model.JcrNode">
+                  </instanceof>
+               </or></enablement>
+         </commonWizard>
          <!--org.eclipse.ui.navigator.resourceContent-->
          <!--org.eclipse.jdt.java.ui.javaContent-->
          <!--override
                policy="InvokeAlwaysRegardlessOfSuppressedExt"
                suppressedExtensionId="org.eclipse.ui.navigator.resourceContent">
          </override-->
+		   <actionProvider
+		         class="org.apache.sling.ide.eclipse.ui.nav.PackageExplorerOpenActionProvider"
+		         id="org.apache.sling.ide.eclipse.ui.nav.actions.OpenActions"
+		         overrides="org.eclipse.jdt.ui.navigator.actions.OpenActions">
+<!--	         overrides="org.eclipse.ui.navigator.resources.OpenActions"> 
+		         //org.eclipse.jdt.ui.navigator.actions.OpenActions -->
+		   </actionProvider>
+     <override
+           policy="InvokeAlwaysRegardlessOfSuppressedExt"
+           suppressedExtensionId="org.eclipse.ui.navigator.resourceContent">
+     </override>
         
       </navigatorContent>
    </extension>
@@ -182,12 +236,220 @@
          </adapter>
       </factory>
    </extension>
+   <!--extension
+         point="org.eclipse.ui.newWizards">
+      <category
+            id="org.apache.sling.ide.eclipse.ui"
+            name="Sling">
+      </category>
+      <wizard
+            category="org.apache.sling.ide.eclipse.ui"
+            class="org.apache.sling.ide.eclipse.ui.wizards.NewNodeWizard"
+            id="org.apache.sling.ide.eclipse.ui.wizards.NewNodeWizard"
+            name="New node">
+         <selection
+               class="selection.Selection1">
+         </selection>
+      </wizard>
+   </extension-->
+   <extension
+         point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
+      <propertyContributor
+            contributorId="org.apache.sling.ide.eclipse-ui.propertyContributor1"
+            labelProvider="org.apache.sling.ide.eclipse.ui.properties.TabbedPropertiesLabelProvider"
+            overridableTabListContentProvider="false"
+            sectionDescriptorProvider="org.apache.sling.ide.eclipse.ui.properties.TabbedPropertiesSectionDescriptor"
+            tabDescriptorProvider="org.apache.sling.ide.eclipse.ui.properties.TabbedPropertiesTabDescriptor">
+         <propertyCategory
+               category="mycategory">
+         </propertyCategory>
+      </propertyContributor>
+   </extension>
+   <extension
+         point="org.eclipse.ui.views.properties.tabbed.propertyTabs">
+      <propertyTabs
+            contributorId="org.apache.sling.ide.eclipse-ui.propertyContributor1">
+         <propertyTab
+               category="mycategory"
+               id="org.apache.sling.ide.eclipse-ui.propertyTab1"
+               label="these are jcr properties">
+         </propertyTab>
+      </propertyTabs>
+   </extension>
+   <extension
+         point="org.eclipse.ui.views.properties.tabbed.propertySections">
+      <propertySections
+            contributorId="org.apache.sling.ide.eclipse-ui.propertyContributor1">
+         <propertySection
+               class="abstractpropertysection.AbstractPropertySection1"
+               enablesFor="1"
+               id="org.apache.sling.ide.eclipse-ui.propertySection1"
+               tab="org.apache.sling.ide.eclipse-ui.propertyTab1">
+            <input
+                  type="org.apache.sling.ide.eclipse.ui.nav.model.JcrNode">
+            </input>
+         </propertySection>
+      </propertySections>
+   </extension>
+   <extension
+         point="org.eclipse.ui.viewActions">
+      <viewContribution
+            id="org.apache.sling.ide.eclipse-ui.viewContribution1"
+            targetID="org.eclipse.wst.server.ui.ServersView">
+         <action
+               class="org.apache.sling.ide.eclipse.ui.internal.ServersActionModeFiddlerActionDelegate"
+               id="org.apache.sling.ide.eclipse-ui.action1"
+               label="label"
+               style="push">
+         </action>
+      </viewContribution>
+   </extension>
    <extension
          point="org.eclipse.ui.console.consoleFactories">
       <consoleFactory
             class="org.apache.sling.ide.eclipse.ui.internal.console.SlingConsoleFactory"
             label="Sling Console">
       </consoleFactory>
+   </extension>
+   <extension
+         point="org.eclipse.ui.popupMenus">
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IProject"
+            adaptable="true"
+            id="org.apache.sling.ide.eclipse.ui.pluginProjectToolSet">
+
+         <action
+            label="Convert to Sling Content-Package Project"
+            class="org.apache.sling.ide.eclipse.ui.wizards.ConvertToContentPackageAction"
+            menubarPath="org.eclipse.ui.projectConfigure/additions"
+            enablesFor="+"
+            id="org.apache.sling.ide.eclipse.ui.wizards.ConvertToContentPackageAction">
+      	</action>
+         <action
+            label="Convert to Sling/OSGi Bundle Project"
+            class="org.apache.sling.ide.eclipse.ui.wizards.ConvertToBundleAction"
+            menubarPath="org.eclipse.ui.projectConfigure/additions"
+            enablesFor="+"
+            id="org.apache.sling.ide.eclipse.ui.wizards.ConvertToBundleAction">
+      	</action>
+      </objectContribution>
+         
+   </extension>
+
+   <extension
+         id="org.apache.sling.ide.eclipse.ui.pluginJcrNodeToolSet"
+         point="org.eclipse.ui.popupMenus">
+      <objectContribution
+            adaptable="true"
+            id="org.apache.sling.ide.eclipse.ui.pluginJcrNodeToolSet"
+            objectClass="org.apache.sling.ide.eclipse.ui.nav.model.JcrNode">
+         <action
+               class="org.apache.sling.ide.eclipse.ui.actions.JcrNewNodeAction"
+               icon="icons/obj16/sling.gif"
+               id="org.apache.sling.ide.eclipse.ui.nav.NewJcrNodeAction"
+               label="&amp;New JCR Node"
+               menubarPath="jcr">
+         </action>
+         <action
+               class="org.apache.sling.ide.eclipse.ui.actions.JcrNodeRenameAction"
+               icon="icons/obj16/sling.gif"
+               id="org.apache.sling.ide.eclipse.ui.actions.JcrNodeRenameAction"
+               label="&amp;Rename JCR Node"
+               menubarPath="jcr">
+         </action>
+         <action
+               class="org.apache.sling.ide.eclipse.ui.actions.JcrNodeDeleteAction"
+               icon="icons/obj16/sling.gif"
+               id="org.apache.sling.ide.eclipse.ui.actions.JcrNodeDeleteAction"
+               label="&amp;Delete JCR Node"
+               menubarPath="jcr">
+         </action>
+         <visibility>
+               <objectState
+                     name="domNode"
+                     value="true">
+               </objectState>
+         </visibility>
+      </objectContribution>
+   </extension>
+
+   <extension
+         id="org.apache.sling.ide.eclipse.ui.pluginNonJcrNodeToolSet"
+         point="org.eclipse.ui.popupMenus">
+      <objectContribution
+            adaptable="true"
+            id="org.apache.sling.ide.eclipse.ui.pluginNonJcrNodeToolSet"
+            objectClass="org.apache.sling.ide.eclipse.ui.nav.model.JcrNode">
+         <action
+               class="org.apache.sling.ide.eclipse.ui.actions.JcrNewNodeAction"
+               icon="icons/obj16/sling.gif"
+               id="org.apache.sling.ide.eclipse.ui.nav.NewNonJcrNodeAction"
+               label="New JCR Node"
+               menubarPath="common.new.menu/jcr">
+         </action>
+         <action
+               class="org.apache.sling.ide.eclipse.ui.actions.JcrNodeRenameAction"
+               icon="icons/obj16/sling.gif"
+               id="org.apache.sling.ide.eclipse.ui.actions.JcrNodeRenameAction"
+               label="&amp;Rename JCR Node"
+               toolbarPath="common.new.menu/jcr">
+         </action>
+         <action
+               class="org.apache.sling.ide.eclipse.ui.actions.JcrNodeDeleteAction"
+               icon="icons/obj16/sling.gif"
+               id="org.apache.sling.ide.eclipse.ui.actions.JcrNodeDeleteAction"
+               label="&amp;Delete JCR Node"
+               toolbarPath="common.new.menu/jcr">
+         </action>
+         <visibility>
+               <objectState
+                     name="nonDomNode"
+                     value="true">
+               </objectState>
+         </visibility>
+      </objectContribution>
+   </extension>
+   
+   <extension
+         point="org.eclipse.ui.decorators">
+      <decorator
+            adaptable="true"
+            class="org.apache.sling.ide.eclipse.ui.internal.SlingProjectDecorator"
+            id="org.apache.sling.ide.eclipse-ui.decorator"
+            label="Sling Project Decorator"
+            lightweight="true"
+            location="BOTTOM_RIGHT"
+            state="true">
+         <enablement>
+            <and>
+               <objectClass
+                     name="org.eclipse.core.resources.IResource">
+               </objectClass>
+               <objectClass
+                     name="org.eclipse.core.resources.IProject">
+               </objectClass>
+            </and>
+         </enablement>
+      </decorator>
+   </extension>
+   <extension
+         point="org.eclipse.ui.navigator.linkHelper">
+      <linkHelper
+            class="org.apache.sling.ide.eclipse.ui.nav.model.LinkHelper"
+            id="org.apache.sling.ide.eclipse-ui.linkHelper">
+         <editorInputEnablement>
+         	<or>
+               <instanceof
+                     value="org.eclipse.ui.IEditorInput">
+               </instanceof>
+            </or>
+         </editorInputEnablement>
+         <selectionEnablement>
+               <instanceof
+                     value="org.apache.sling.ide.eclipse.ui.nav.model.JcrNode">
+               </instanceof>
+         </selectionEnablement>
+      </linkHelper>
    </extension> 
    
 </plugin>    

Modified: sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/pom.xml
URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/pom.xml?rev=1522808&r1=1522807&r2=1522808&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/pom.xml (original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/pom.xml Fri Sep 13 08:14:36 2013
@@ -10,4 +10,13 @@
   <artifactId>org.apache.sling.ide.eclipse-ui</artifactId>
   <packaging>eclipse-plugin</packaging>
   <name>Sling IDE Tools: Eclipse UI</name>
-</project>
+<build>
+    <resources>
+      <resource>
+        <directory>src/main/java</directory>
+        <excludes>
+          <exclude>**/*.java</exclude>
+        </excludes>
+      </resource>
+    </resources>
+</build></project>

Modified: sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java
URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java?rev=1522808&r1=1522807&r2=1522808&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java (original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java Fri Sep 13 08:14:36 2013
@@ -19,12 +19,12 @@ package org.apache.sling.ide.eclipse.ui.
 import org.apache.sling.ide.eclipse.core.ServiceUtil;
 import org.apache.sling.ide.filter.FilterLocator;
 import org.apache.sling.ide.serialization.SerializationManager;
-import org.eclipse.core.runtime.Plugin;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.event.EventAdmin;
 import org.osgi.util.tracker.ServiceTracker;
 
-public class Activator extends Plugin {
+public class Activator extends AbstractUIPlugin {
 
     public static final String PLUGIN_ID = "org.apache.sling.ide.eclipse-core";
     public static Activator INSTANCE;

Modified: sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ConnectionEditorSection.java
URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ConnectionEditorSection.java?rev=1522808&r1=1522807&r2=1522808&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ConnectionEditorSection.java (original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ConnectionEditorSection.java Fri Sep 13 08:14:36 2013
@@ -22,6 +22,7 @@ import java.beans.PropertyChangeListener
 import org.apache.sling.ide.eclipse.core.ISlingLaunchpadConfiguration;
 import org.apache.sling.ide.eclipse.core.ISlingLaunchpadServer;
 import org.apache.sling.ide.eclipse.core.SetServerContextPathCommand;
+import org.apache.sling.ide.eclipse.core.SetServerDebugPortCommand;
 import org.apache.sling.ide.eclipse.core.SetServerPasswordCommand;
 import org.apache.sling.ide.eclipse.core.SetServerPortCommand;
 import org.apache.sling.ide.eclipse.core.SetServerUsernameCommand;
@@ -47,6 +48,7 @@ public class ConnectionEditorSection ext
     protected PropertyChangeListener _listener;
 
     private Text portText;
+    private Text debugPortText;
     private Text contextPathText;
     private Text usernameText;
     private Text passwordText;
@@ -80,6 +82,9 @@ public class ConnectionEditorSection ext
         createLabel(toolkit, composite, "Port");
         portText = createText(toolkit, composite, SWT.SINGLE);
 
+        createLabel(toolkit, composite, "Debug Port");
+        debugPortText = createText(toolkit, composite, SWT.SINGLE);
+
         createLabel(toolkit, composite, "Context path");
         contextPathText = createText(toolkit, composite, SWT.SINGLE);
 
@@ -126,6 +131,8 @@ public class ConnectionEditorSection ext
 
                 if (ISlingLaunchpadServer.PROP_PORT.equals(evt.getPropertyName())) {
                     portText.setText(((Integer) evt.getNewValue()).toString());
+                } else if (ISlingLaunchpadServer.PROP_DEBUG_PORT.equals(evt.getPropertyName())) {
+                    debugPortText.setText(((Integer) evt.getNewValue()).toString());
                 } else if (ISlingLaunchpadServer.PROP_CONTEXT_PATH.equals(evt.getPropertyName())) {
                     contextPathText.setText((String) evt.getNewValue());
                 } else if (ISlingLaunchpadServer.PROP_USERNAME.equals(evt.getPropertyName())) {
@@ -151,6 +158,7 @@ public class ConnectionEditorSection ext
         final ISlingLaunchpadConfiguration config = launchpadServer.getConfiguration();
 
         portText.setText(String.valueOf(config.getPort()));
+        debugPortText.setText(String.valueOf(config.getDebugPort()));
         contextPathText.setText(config.getContextPath());
 
         usernameText.setText(config.getUsername());
@@ -159,13 +167,21 @@ public class ConnectionEditorSection ext
         ModifyListener listener = new ModifyListener() {
             @Override
             public void modifyText(ModifyEvent e) {
-                if (e.getSource() == portText) {
+            	if (e.getSource() == portText) {
                     try {
                         int port = Integer.parseInt(portText.getText());
                         execute(new SetServerPortCommand(server, port));
                     } catch (NumberFormatException ex) {
                         // shucks
                     }
+                } else if (e.getSource() == debugPortText) {
+                    try {
+                        int debugPort = Integer.parseInt(debugPortText.getText());
+                        execute(new SetServerDebugPortCommand(server, debugPort));
+                    } catch (NumberFormatException ex) {
+                        // shucks
+                    	ex.printStackTrace();
+                    }
                 } else if (e.getSource() == contextPathText) {
                     execute(new SetServerContextPathCommand(server, contextPathText.getText()));
                 } else if (e.getSource() == usernameText) {
@@ -176,7 +192,7 @@ public class ConnectionEditorSection ext
             }
         };
 
-        for (Text text : new Text[] { portText, contextPathText, usernameText, passwordText }) {
+        for (Text text : new Text[] { portText, debugPortText, contextPathText, usernameText, passwordText }) {
             text.addModifyListener(listener);
         }
 

Modified: sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SharedImages.java
URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SharedImages.java?rev=1522808&r1=1522807&r2=1522808&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SharedImages.java (original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SharedImages.java Fri Sep 13 08:14:36 2013
@@ -16,16 +16,26 @@
  */
 package org.apache.sling.ide.eclipse.ui.internal;
 
+import org.eclipse.debug.internal.ui.DebugPluginImages;
+import org.eclipse.debug.ui.IDebugUIConstants;
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.DecorationOverlayIcon;
+import org.eclipse.jface.viewers.IDecoration;
 
 /**
  * The <tt>SharedImages</tt> class contains references to images
  * 
  */
+@SuppressWarnings("restriction")
 public final class SharedImages {
     
     public static final ImageDescriptor SLING_LOG = ImageDescriptor.createFromFile(SharedImages.class, "sling-logo.png");
     public static final ImageDescriptor SLING_ICON = ImageDescriptor.createFromFile(SharedImages.class, "sling.gif");
+    
+    public static final ImageDescriptor DISCONNECT = DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_DISCONNECT);
+    public static final ImageDescriptor RUN_CONNECT = new DecorationOverlayIcon(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_ACT_RUN).createImage(), ImageDescriptor.createFromFile(SharedImages.class, "connectOverlay.png"), IDecoration.BOTTOM_RIGHT);
+    public static final ImageDescriptor DEBUG_CONNECT = new DecorationOverlayIcon(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_ACT_DEBUG).createImage(), ImageDescriptor.createFromFile(SharedImages.class, "connectOverlay.png"), IDecoration.BOTTOM_RIGHT);
+	public static final ImageDescriptor SLING_DECORATION = ImageDescriptor.createFromFile(SharedImages.class, "slingDecoration.png");
 
     private SharedImages() {
     }

Modified: sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/JcrContentContentProvider.java
URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/JcrContentContentProvider.java?rev=1522808&r1=1522807&r2=1522808&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/JcrContentContentProvider.java (original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/JcrContentContentProvider.java Fri Sep 13 08:14:36 2013
@@ -17,18 +17,28 @@
 package org.apache.sling.ide.eclipse.ui.nav;
 
 import java.util.Arrays;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Set;
 
 import org.apache.sling.ide.eclipse.core.ProjectUtil;
-import org.apache.sling.ide.eclipse.ui.internal.Activator;
+import org.apache.sling.ide.eclipse.core.internal.ProjectHelper;
 import org.apache.sling.ide.eclipse.ui.nav.model.JcrNode;
 import org.apache.sling.ide.eclipse.ui.nav.model.SyncDir;
-import org.apache.sling.ide.serialization.SerializationManager;
+import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
 import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.ui.IMemento;
 import org.eclipse.ui.navigator.ICommonContentExtensionSite;
@@ -37,8 +47,51 @@ import org.eclipse.ui.navigator.Pipeline
 import org.eclipse.ui.navigator.PipelinedViewerUpdate;
 
 /** WIP: content provider for content package view in project explorer **/
-public class JcrContentContentProvider implements ITreeContentProvider, IPipelinedTreeContentProvider2 {
+public class JcrContentContentProvider implements ITreeContentProvider, IPipelinedTreeContentProvider2, IResourceChangeListener {
 
+	private Object input;
+	private TreeViewer viewer;
+
+	@Override
+	public void resourceChanged(IResourceChangeEvent event) {
+		try {
+			final List<IResource> toBeRefreshed = new LinkedList<IResource>();
+			event.getDelta().accept(new IResourceDeltaVisitor() {
+				
+				@Override
+				public boolean visit(IResourceDelta delta) throws CoreException {
+					if (delta.getResource() instanceof IContainer) {
+						return true;
+					}
+					IProject p = delta.getResource().getProject();
+					IFolder syncDir = getSyncDir(p);
+					if (syncDir==null) {
+						return false;
+					}
+					toBeRefreshed.add(syncDir.getProject());
+					return true;
+				}
+			});
+			if (toBeRefreshed.size()==0) {
+				return;
+			}
+			for (Iterator<IResource> it = toBeRefreshed.iterator(); it
+					.hasNext();) {
+				final IResource iResource = it.next();
+				viewer.getTree().getDisplay().asyncExec(new Runnable() {
+
+					@Override
+					public void run() {
+						viewer.refresh(iResource.getProject(), true);
+					}
+				});
+			}
+		} catch (CoreException e) {
+			//TODO proper logging
+			e.printStackTrace();
+		}
+	}
+	
 	@Override
 	public void dispose() {
 		// nothing to be done here
@@ -46,7 +99,8 @@ public class JcrContentContentProvider i
 
 	@Override
 	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		// nothing to be done here
+		this.input = newInput;
+		this.viewer = (TreeViewer)viewer;
 	}
 
 	@Override
@@ -76,8 +130,14 @@ public class JcrContentContentProvider i
 
 	@Override
 	public Object getParent(Object element) {
-		// TODO Auto-generated method stub
-		return null;
+		if (!(element instanceof JcrNode)) {
+			return null;
+		} else if (element instanceof SyncDir) {
+			SyncDir syncDir = (SyncDir) element;
+			return syncDir.getFolder().getProject();
+		}
+		JcrNode node = (JcrNode) element;
+		return node.getParent();
 	}
 
 	@Override
@@ -100,11 +160,7 @@ public class JcrContentContentProvider i
 	}
 
 	private IFolder getSyncDir(IProject project) {
-		if (!project.isOpen()) {
-			return null;
-		}
-		IResource syncDir = project.findMember(ProjectUtil.getSyncDirectoryValue(project));
-		return (IFolder) syncDir;
+		return ProjectUtil.getSyncDirectory(project);
 	}
 
 	@Override
@@ -157,7 +213,9 @@ public class JcrContentContentProvider i
 
 	@Override
 	public void init(ICommonContentExtensionSite aConfig) {
-		// nothing to do here
+		ResourcesPlugin.getWorkspace().addResourceChangeListener(
+				this,
+				IResourceChangeEvent.POST_CHANGE);
 	}
 
 
@@ -175,7 +233,27 @@ public class JcrContentContentProvider i
 	@Override
 	public void getPipelinedChildren(Object aParent, Set theCurrentChildren) {
 		if (aParent instanceof IProject) {
-			Object[] children = projectGetChildren((IProject)aParent);
+			IProject project = (IProject)aParent;
+			if (ProjectHelper.isContentProject(project)) {
+				for (Iterator it = theCurrentChildren.iterator(); it
+						.hasNext();) {
+					Object aChild = (Object) it.next();
+					if (aChild instanceof IPackageFragmentRoot) {
+						IPackageFragmentRoot ipfr = (IPackageFragmentRoot)aChild;
+						IResource res = ipfr.getResource();
+						IFolder syncDir = getSyncDir(project);
+						if (res!=null && syncDir!=null && res.equals(syncDir)) {
+							// then remove this one folder provided via j2ee content provider
+							// reason: we are showing it too via the sling content provider
+							it.remove();
+							// and we can break here since there's only one syncdir currently
+							break;
+						}
+						
+					}
+				}
+			}
+			Object[] children = projectGetChildren(project);
 			if (children!=null && children.length>0) {
 				theCurrentChildren.addAll(Arrays.asList(children));
 			}
@@ -192,7 +270,10 @@ public class JcrContentContentProvider i
 	@Override
 	public boolean hasPipelinedChildren(Object anInput,
 			boolean currentHasChildren) {
-		// TODO Auto-generated method stub
+		if (anInput instanceof IResource) {
+			// then typically the 'currentHasChildren' is correct
+			return currentHasChildren;
+		}
 		return true;
 	}
 

Modified: sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java
URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java?rev=1522808&r1=1522807&r2=1522808&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java (original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java Fri Sep 13 08:14:36 2013
@@ -16,6 +16,8 @@
  */
 package org.apache.sling.ide.eclipse.ui.nav.model;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
@@ -23,12 +25,19 @@ import java.util.List;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
 import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
@@ -36,7 +45,7 @@ import org.xml.sax.SAXException;
 /** WIP: model object for a [.content.xml] shown in the content package view in project explorer **/
 public class GenericJcrRootFile extends JcrNode {
 
-	private final IFile file;
+	final IFile file;
 	private final Document document;
 
 	public GenericJcrRootFile(JcrNode parent, IFile file) throws ParserConfigurationException, SAXException, IOException, CoreException {
@@ -45,7 +54,6 @@ public class GenericJcrRootFile extends 
 		}
 		this.file = file;
 		setResource(file);
-		this.underlying = this;
 		if (parent==null) {
 			throw new IllegalArgumentException("parent must not be null");
 		}
@@ -56,6 +64,20 @@ public class GenericJcrRootFile extends 
 		this.document = docBuilder.parse(file.getContents());
 		handleJcrRoot(this.document.getFirstChild());
 	}
+	
+	@Override
+	public int hashCode() {
+		return file.hashCode();
+	}
+	
+	@Override
+	public boolean equals(Object obj) {
+		if (obj instanceof GenericJcrRootFile) {
+			GenericJcrRootFile other = (GenericJcrRootFile) obj;
+			return file.equals(other.file);
+		}
+		return false;
+	}
 
 	private void handleJcrRoot(Node domNode) {
 		NodeList children = domNode.getChildNodes();
@@ -77,12 +99,13 @@ public class GenericJcrRootFile extends 
 		return file.getName().equals(".content.xml");
 	}
 	
-	private void handleProperties(Node domNode, ReadOnlyProperties properties) {
-		NamedNodeMap attributes = domNode.getAttributes();
-		for(int i=0; i<attributes.getLength(); i++) {
-			Node attr = attributes.item(i);
-			properties.add(attr.getNodeName(), attr.getNodeValue());
-		}
+	private void handleProperties(Node domNode, ModifiableProperties properties) {
+		properties.setNode(this, domNode);
+//		NamedNodeMap attributes = domNode.getAttributes();
+//		for(int i=0; i<attributes.getLength(); i++) {
+//			Node attr = attributes.item(i);
+//			properties.add(attr.getNodeName(), attr.getNodeValue());
+//		}
 	}
 
 	@Override
@@ -124,8 +147,7 @@ public class GenericJcrRootFile extends 
 			// as primaryType doesn't help a lot
 			return;
 		}
-		JcrNode childJcrNode = new JcrNode(parent, domNode);
-		childJcrNode.init();
+		JcrNode childJcrNode = new JcrNode(parent, domNode, this, null);
 		handleProperties(domNode, childJcrNode.properties);
 		NodeList children = domNode.getChildNodes();
 		for(int i=0; i<children.getLength(); i++) {
@@ -134,7 +156,7 @@ public class GenericJcrRootFile extends 
 	}
 
 	public void pickResources(List<Object> membersList) {
-		for (Iterator it = membersList.iterator(); it.hasNext();) {
+		for (Iterator<Object> it = membersList.iterator(); it.hasNext();) {
 			final IResource resource = (IResource) it.next();
 			final String resName = resource.getName();
 			Iterator it2;
@@ -156,4 +178,40 @@ public class GenericJcrRootFile extends 
 		
 	}
 	
+	@Override
+	public IFile getFileForEditor() {
+		return file;
+	}
+	
+	@Override
+	public void createChild(String nodeName) {
+		Element element = document.createElement(nodeName);
+		element.setAttribute("jcr:primaryType", "nt:unstructured");
+		Node childDomNode = document.getFirstChild().appendChild(element);
+		JcrNode childNode = new JcrNode(this, childDomNode, null);
+		underlying.save();
+	}
+	
+	public void save() {
+		try {
+			TransformerFactory transformerFactory = TransformerFactory.newInstance();
+			Transformer transformer = transformerFactory.newTransformer();
+			DOMSource source = new DOMSource(document);
+			ByteArrayOutputStream out = new ByteArrayOutputStream();
+			StreamResult result = new StreamResult(out);
+			transformer.transform(source, result);
+			file.setContents(new ByteArrayInputStream(out.toByteArray()), true, true, new NullProgressMonitor());
+		} catch (TransformerConfigurationException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (TransformerException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (CoreException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+ 
+	}
+	
 }