Author: rob.stryker(a)jboss.com Date: 2011-08-22 05:38:33 -0400 (Mon, 22 Aug 2011) New Revision: 34132 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/.EgitUtils.java.swp trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitPublishMethod.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/plugin.xml trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitBehaviourDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EGitCoreActivator.java trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/module/GitProjectModuleFactoryDelegate.java Log: JBIDE-9510 - linking the actions to deployment Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/META-INF/MANIFEST.MF 2011-08-22 06:30:32 UTC (rev 34131) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/META-INF/MANIFEST.MF 2011-08-22 09:38:33 UTC (rev 34132) @@ -5,7 +5,7 @@ Bundle-Version: 0.0.1.qualifier Bundle-Activator: org.jboss.ide.eclipse.as.egit.core.internal.EGitCoreActivator Require-Bundle: org.jboss.ide.eclipse.as.core;bundle-version="2.3.0", - org.eclipse.jgit;bundle-version="[1.1.0,2.0.0)", + org.eclipse.jgit;bundle-version="[1.1.0,2.1.0)", org.eclipse.egit;bundle-version="[1.1.0,2.0.0)", org.eclipse.egit.core;bundle-version="[1.1.0,2.0.0)", org.eclipse.egit.ui;bundle-version="[1.1.0,2.0.0)", Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/plugin.xml 2011-08-22 06:30:32 UTC (rev 34131) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/plugin.xml 2011-08-22 09:38:33 UTC (rev 34132) @@ -4,7 +4,7 @@ <extension point="org.eclipse.wst.server.core.moduleFactories"> <moduleFactory - class="org.jboss.ide.eclipse.as.egit.core.internal.module.GitProjectModuleFactoryDelegate" + class="org.jboss.ide.eclipse.as.egit.core.module.GitProjectModuleFactoryDelegate" id="org.jboss.ide.eclipse.as.egit.core.module.gitProjectModuleFactory" projects="true"> <moduleType @@ -20,4 +20,14 @@ name="Egit"> </moduleType> </extension> + <extension + point="org.jboss.ide.eclipse.as.core.publishMethod"> + <publishMethod + class="org.jboss.ide.eclipse.as.egit.core.EgitPublishMethod" + id="egit" + name="Egit Publish Method" + serverTypes="org.jboss.ide.eclipse.as.systemCopyServer"> + </publishMethod> + </extension> + </plugin> Added: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/.EgitUtils.java.swp =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/.EgitUtils.java.swp ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitBehaviourDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitBehaviourDelegate.java 2011-08-22 06:30:32 UTC (rev 34131) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitBehaviourDelegate.java 2011-08-22 09:38:33 UTC (rev 34132) @@ -19,7 +19,7 @@ public class EgitBehaviourDelegate implements IJBossBehaviourDelegate { - private static final String ID = "egit"; + public static final String ID = "egit"; @Override public String getBehaviourTypeId() { Added: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitPublishMethod.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitPublishMethod.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitPublishMethod.java 2011-08-22 09:38:33 UTC (rev 34132) @@ -0,0 +1,65 @@ +package org.jboss.ide.eclipse.as.egit.core; + +import java.util.concurrent.ExecutionException; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.wst.server.core.IModule; +import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.ExtensionManager; +import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod; +import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType; +import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; +import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler; + +public class EgitPublishMethod implements IJBossServerPublishMethod { + @Override + public IJBossServerPublishMethodType getPublishMethodType() { + return ExtensionManager.getDefault().getPublishMethod(getPublishMethodId()); + } + + public String getPublishMethodId() { + return EgitBehaviourDelegate.ID; + } + + @Override + public void publishStart(DeployableServerBehavior behaviour, + IProgressMonitor monitor) throws CoreException { + // TODO Auto-generated method stub + + } + + @Override + public int publishFinish(DeployableServerBehavior behaviour, + IProgressMonitor monitor) throws CoreException { + // TODO Auto-generated method stub + return 0; + } + + @Override + public int publishModule(DeployableServerBehavior behaviour, int kind, + int deltaKind, IModule[] module, IProgressMonitor monitor) + throws CoreException { + // TODO Auto-generated method stub + IProject project = module[0].getProject(); + EGitUtils.commit(project, null); + EGitUtils.push(EGitUtils.getRepository(project), null); + return IServer.PUBLISH_STATE_NONE; + } + + @Override + public IPublishCopyCallbackHandler getCallbackHandler(IPath path, + IServer server) { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getPublishDefaultRootFolder(IServer server) { + // TODO Auto-generated method stub + return null; + } + +} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EGitCoreActivator.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EGitCoreActivator.java 2011-08-22 06:30:32 UTC (rev 34131) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EGitCoreActivator.java 2011-08-22 09:38:33 UTC (rev 34132) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.egit.core.internal; +import org.jboss.ide.eclipse.as.core.server.internal.v7.DelegatingJBoss7ServerBehavior; +import org.jboss.ide.eclipse.as.egit.core.EgitBehaviourDelegate; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; @@ -26,6 +28,7 @@ public void start(BundleContext bundleContext) throws Exception { EGitCoreActivator.context = bundleContext; + DelegatingJBoss7ServerBehavior.addDelegateMapping(EgitBehaviourDelegate.ID, EgitBehaviourDelegate.class); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/module/GitProjectModuleFactoryDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/module/GitProjectModuleFactoryDelegate.java 2011-08-22 06:30:32 UTC (rev 34131) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/module/GitProjectModuleFactoryDelegate.java 2011-08-22 09:38:33 UTC (rev 34132) @@ -31,6 +31,7 @@ private HashMap<IModule, GitProjectModuleDelegate> moduleToDelegate; private IResourceChangeListener resourceListener; public GitProjectModuleFactoryDelegate() { + System.out.println("test"); } public void initialize() { moduleIdToModule = new HashMap<String, IModule>(); @@ -42,7 +43,14 @@ public boolean visit(IResourceDelta delta) throws CoreException { IResource r = delta.getResource(); if( r instanceof IProject ) { - incrementChanged((IProject)r); + IResourceDelta[] kids = delta.getAffectedChildren(); + if( kids.length > 1 ) + incrementChanged((IProject)r); + else if( kids.length == 1 ) { + String changedkid = kids[0].getResource().getName(); + if( !changedkid.equals(".git")) + incrementChanged((IProject)r); + } } return !(r instanceof IProject); }