Author: adietish Date: 2011-10-05 10:14:01 -0400 (Wed, 05 Oct 2011) New Revision: 35373 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/plugin.properties 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/EGitUtils.java trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitPublishMethod.java Log: [JBIDE-9845] added extension 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-10-05 14:13:40 UTC (rev 35372) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/META-INF/MANIFEST.MF 2011-10-05 14:14:01 UTC (rev 35373) @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: EGit Integration Core +Bundle-Name: Bundle-Name Bundle-SymbolicName: org.jboss.ide.eclipse.as.egit.core;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.jboss.ide.eclipse.as.egit.core.internal.EGitCoreActivator @@ -15,7 +15,7 @@ org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Bundle-Vendor: JBoss by Red Hat +Bundle-Vendor: Bundle-Vendor Export-Package: org.jboss.ide.eclipse.as.egit.core, org.jboss.ide.eclipse.as.egit.core.internal;x-friends:="org.jboss.ide.eclipse.as.egit.test", org.jboss.ide.eclipse.as.egit.core.module Added: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/plugin.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/plugin.properties (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/plugin.properties 2011-10-05 14:14:01 UTC (rev 35373) @@ -0,0 +1,4 @@ +Bundle-Vendor = JBoss by Red Hat +Bundle-Name = JBossAS RSE Tools +ServerTypesJBoss7=org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.eap.60 +EGitMethodName=EGit Deployment \ No newline at end of file Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/plugin.properties ___________________________________________________________________ Added: svn:mime-type + text/plain 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-10-05 14:13:40 UTC (rev 35372) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/plugin.xml 2011-10-05 14:14:01 UTC (rev 35373) @@ -31,4 +31,14 @@ </publishMethod> </extension> --> + <extension + point="org.jboss.ide.eclipse.as.core.behaviourExtension"> + <behaviour + behaviourDelegate="org.jboss.ide.eclipse.as.egit.core.EgitBehaviourDelegate" + name="%EGitMethodName" + publishMethod="org.jboss.ide.eclipse.as.rse.core.RSEPublishMethod" + serverTypes="%ServerTypesJBoss7" + typeId="egit"> + </behaviour> + </extension> </plugin> Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EGitUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EGitUtils.java 2011-10-05 14:13:40 UTC (rev 35372) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EGitUtils.java 2011-10-05 14:14:01 UTC (rev 35373) @@ -77,7 +77,7 @@ null, getFormattedUser(userConfig.getAuthorName(), userConfig.getAuthorEmail()), getFormattedUser(userConfig.getCommitterName(), userConfig.getCommitterEmail()), - "Initial commit"); + "Push from JBoss Tools Server adapt er " + System.currentTimeMillis()); op.setCommitAll(true); op.setRepository(repository); op.execute(monitor); @@ -132,6 +132,8 @@ repository.toString(), remote)); } createPushOperation(remoteConfig, repository).run(monitor); + } catch (CoreException e) { + throw e; } catch (Exception e) { throw new CoreException(createStatus(e, "Could not push repo {0}", repository.toString())); } @@ -400,9 +402,9 @@ private static IStatus createStatus(Exception e, String message, String... arguments) throws CoreException { IStatus status = null; if (e == null) { - new Status(IStatus.ERROR, EGitCoreActivator.PLUGIN_ID, NLS.bind(message, arguments)); + status = new Status(IStatus.ERROR, EGitCoreActivator.PLUGIN_ID, NLS.bind(message, arguments)); } else { - new Status(IStatus.ERROR, EGitCoreActivator.PLUGIN_ID, NLS.bind(message, arguments), e); + status = new Status(IStatus.ERROR, EGitCoreActivator.PLUGIN_ID, NLS.bind(message, arguments), e); } return status; } Modified: 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 2011-10-05 14:13:40 UTC (rev 35372) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitPublishMethod.java 2011-10-05 14:14:01 UTC (rev 35373) @@ -11,10 +11,6 @@ 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;