@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
<extension
point="org.eclipse.ui.commands">
<command
defaultHandler="com.aptana.deploy.internal.ui.handlers.DeployHandler"
id="com.aptana.deploy.commands.deployApp"
name="%Deploy.label">
</command>
</extension>
<extension
point="org.eclipse.ui.bindings">
<key
commandId="com.aptana.deploy.commands.deployApp"
contextId="org.eclipse.ui.contexts.window"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
sequence="CTRL+M3+D">
</key>
</extension>
<extension
point="org.eclipse.ui.menus">
<menuContribution
locationURI="menu:com.aptana.explorer.deploy">
<separator
name="group.deploy"
visible="true">
</separator>
<separator
name="group.command"
visible="true">
</separator>
<separator
name="group.wizard"
visible="true">
</separator>
<separator
name="additions">
</separator>
</menuContribution>
<menuContribution
locationURI="menu:com.aptana.explorer.deploy?endof=group.deploy">
<dynamic
class="com.aptana.deploy.internal.ui.DeployAppContributionItem"
id="com.aptana.deploy.deployAppMenu">
<visibleWhen
checkEnabled="false">
<or>
<with
variable="selection">
<iterate
ifEmpty="false">
<adapt
type="org.eclipse.core.resources.IResource">
<test
property="com.aptana.deploy.project.isDeployable"
value="true">
</test>
</adapt>
</iterate>
</with>
<and>
<with
variable="activePart">
<instanceof
value="org.eclipse.ui.IEditorPart">
</instanceof>
</with>
<with
variable="activeEditorInput">
<adapt
type="org.eclipse.core.resources.IResource">
<test
property="com.aptana.deploy.project.isDeployable"
value="true">
</test>
</adapt>
</with>
</and>
</or>
</visibleWhen>
</dynamic>
</menuContribution>
<menuContribution
locationURI="popup:org.eclipse.ui.popup.any?before=group.edit">
<dynamic
class="com.aptana.deploy.internal.ui.DeployPopupContributionItem"
id="com.aptana.deploy.popup.studio">
<visibleWhen
checkEnabled="false">
<or>
<with
variable="selection">
<iterate
ifEmpty="false">
<adapt
type="org.eclipse.core.resources.IResource">
</adapt>
</iterate>
</with>
<and>
<with
variable="activePart">
<instanceof
value="org.eclipse.ui.IEditorPart">
</instanceof>
</with>
<with
variable="activeEditorInput">
<adapt
type="org.eclipse.core.resources.IResource">
</adapt>
</with>
</and>
</or>
</visibleWhen>
</dynamic>
</menuContribution>
</extension>
</plugin>
@@ -1,6 +1,6 @@
/**
* Aptana Studio
* Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
* Copyright (c) 2005-2012 by Appcelerator, Inc. All Rights Reserved.
* Licensed under the terms of the GNU Public License (GPL) v3 (with exceptions).
* Please see the license.html included with this distribution for details.
* Any modifications to this file must keep this entire header intact.
@@ -23,8 +23,8 @@
import org.eclipse.ui.services.IServiceLocator;

import com.aptana.core.logging.IdeLog;
import com.aptana.deploy.DeployPlugin;
import com.aptana.deploy.IDeployProvider;
import com.aptana.deploy.ui.DeployUIPlugin;
import com.aptana.deploy.util.DeployProviderUtil;
import com.aptana.ui.util.UIUtils;

@@ -77,7 +77,7 @@ public void fill(Menu menu, int index)
catch (NotDefinedException e)
{
// should not happen, but log it just in case
IdeLog.logError(DeployPlugin.getDefault(), "The name for the deploy command is not defined."); //$NON-NLS-1$
IdeLog.logError(DeployUIPlugin.getDefault(), "The name for the deploy command is not defined."); //$NON-NLS-1$
}
}
// the default-default for the menu name is "Deploy App"
@@ -96,7 +96,7 @@ public void widgetSelected(SelectionEvent e)
}
catch (Exception e1)
{
IdeLog.logError(DeployPlugin.getDefault(),
IdeLog.logError(DeployUIPlugin.getDefault(),
"Failed to execute the command to deploy the application."); //$NON-NLS-1$
}
}
@@ -1,6 +1,6 @@
/**
* Aptana Studio
* Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
* Copyright (c) 2005-2012 by Appcelerator, Inc. All Rights Reserved.
* Licensed under the terms of the GNU Public License (GPL) v3 (with exceptions).
* Please see the license.html included with this distribution for details.
* Any modifications to this file must keep this entire header intact.
@@ -16,7 +16,7 @@
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.ui.services.IServiceLocator;

import com.aptana.deploy.DeployPlugin;
import com.aptana.deploy.ui.DeployUIPlugin;

public class DeployPopupContributionItem extends ContributionItem implements IWorkbenchContribution
{
@@ -37,8 +37,8 @@ public DeployPopupContributionItem(String id)
public void fill(Menu menu, int index)
{
menuManager = new MenuManager(Messages.DeployPopupContributionItem_Text,
AbstractUIPlugin.imageDescriptorFromPlugin(DeployPlugin.getPluginIdentifier(),
DeployPlugin.DEPLOY_MENU_ICON), DeployPlugin.DEPLOY_MENU_ID);
AbstractUIPlugin.imageDescriptorFromPlugin(DeployUIPlugin.PLUGIN_ID, DeployUIPlugin.DEPLOY_MENU_ICON),
DeployUIPlugin.DEPLOY_MENU_ID);
IMenuService menuService = (IMenuService) serviceLocator.getService(IMenuService.class);
menuService.populateContributionManager(menuManager, MenuUtil.menuUri(menuManager.getId()));
menuManager.fill(menu, index);
@@ -1,6 +1,6 @@
/**
* Aptana Studio
* Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
* Copyright (c) 2005-2012 by Appcelerator, Inc. All Rights Reserved.
* Licensed under the terms of the GNU Public License (GPL) v3 (with exceptions).
* Please see the license.html included with this distribution for details.
* Any modifications to this file must keep this entire header intact.
@@ -1,11 +1,11 @@
/**
* Aptana Studio
* Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
* Copyright (c) 2005-2012 by Appcelerator, Inc. All Rights Reserved.
* Licensed under the terms of the GNU Public License (GPL) v3 (with exceptions).
* Please see the license.html included with this distribution for details.
* Any modifications to this file must keep this entire header intact.
*/
package com.aptana.deploy.internal.handlers;
package com.aptana.deploy.internal.ui.handlers;

import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
@@ -1,11 +1,11 @@
/**
* Aptana Studio
* Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
* Copyright (c) 2005-2012 by Appcelerator, Inc. All Rights Reserved.
* Licensed under the terms of the GNU Public License (GPL) v3 (with exceptions).
* Please see the license.html included with this distribution for details.
* Any modifications to this file must keep this entire header intact.
*/
package com.aptana.deploy.internal.handlers;
package com.aptana.deploy.internal.ui.handlers;

import org.eclipse.jface.wizard.IWizard;
import org.eclipse.jface.wizard.IWizardPage;
@@ -1,21 +1,20 @@
/**
* Aptana Studio
* Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
* Copyright (c) 2005-2012 by Appcelerator, Inc. All Rights Reserved.
* Licensed under the terms of the GNU Public License (GPL) v3 (with exceptions).
* Please see the license.html included with this distribution for details.
* Any modifications to this file must keep this entire header intact.
*/
package com.aptana.deploy.internal.handlers;
package com.aptana.deploy.internal.ui.handlers;

import org.eclipse.osgi.util.NLS;

public class Messages extends NLS
{

private static final String BUNDLE_NAME = "com.aptana.deploy.internal.handlers.messages"; //$NON-NLS-1$
private static final String BUNDLE_NAME = "com.aptana.deploy.internal.ui.handlers.messages"; //$NON-NLS-1$

public static String DeployHandler_DeployJobTitle;

public static String DeployHandler_Wizard_Title;

static
File renamed without changes.
File renamed without changes.
@@ -1,11 +1,11 @@
/**
* Aptana Studio
* Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
* Copyright (c) 2005-2012 by Appcelerator, Inc. All Rights Reserved.
* Licensed under the terms of the GNU Public License (GPL) v3 (with exceptions).
* Please see the license.html included with this distribution for details.
* Any modifications to this file must keep this entire header intact.
*/
package com.aptana.deploy;
package com.aptana.deploy.ui;

import org.eclipse.jface.action.ContributionItem;
import org.eclipse.swt.SWT;
@@ -0,0 +1,92 @@
/**
* Aptana Studio
* Copyright (c) 2005-2012 by Appcelerator, Inc. All Rights Reserved.
* Licensed under the terms of the GNU Public License (GPL) v3 (with exceptions).
* Please see the license.html included with this distribution for details.
* Any modifications to this file must keep this entire header intact.
*/
package com.aptana.deploy.ui;

import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;

/**
* The activator class controls the plug-in life cycle
*/
public class DeployUIPlugin extends AbstractUIPlugin
{

// The plug-in ID
public static final String PLUGIN_ID = "com.aptana.deploy.ui"; //$NON-NLS-1$

/**
* ID of the drop-down menu for the App Explorer's deployment options. Plugins can modify the menu using the
* "menu: com.aptana.explorer.deploy" URI.
*/
public static final String DEPLOY_MENU_ID = "com.aptana.explorer.deploy"; //$NON-NLS-1$

/**
* The path to the icon for deploy menu
*/
public static final String DEPLOY_MENU_ICON = "icons/full/elcl16/deploy_package.png"; //$NON-NLS-1$

/**
* The path to the hot icon for deploy menu
*/
public static final String DEPLOY_HOT_MENU_ICON = "icons/full/elcl16/deploy_package_hot.png"; //$NON-NLS-1$

// The shared instance
private static DeployUIPlugin plugin;

/**
* The constructor
*/
public DeployUIPlugin()
{
}

/*
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
public void start(BundleContext context) throws Exception
{
super.start(context);
plugin = this;
}

/*
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
public void stop(BundleContext context) throws Exception
{
plugin = null;
super.stop(context);
}

/**
* Returns the shared instance
*
* @return the shared instance
*/
public static DeployUIPlugin getDefault()
{
return plugin;
}

public static Image getImage(String string)
{
if (getDefault().getImageRegistry().get(string) == null)
{
ImageDescriptor id = imageDescriptorFromPlugin(PLUGIN_ID, string);
if (id != null)
{
getDefault().getImageRegistry().put(string, id);
}
}
return getDefault().getImageRegistry().get(string);
}
}
@@ -1,11 +1,11 @@
/**
* Aptana Studio
* Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
* Copyright (c) 2005-2012 by Appcelerator, Inc. All Rights Reserved.
* Licensed under the terms of the GNU Public License (GPL) v3 (with exceptions).
* Please see the license.html included with this distribution for details.
* Any modifications to this file must keep this entire header intact.
*/
package com.aptana.deploy.wizard;
package com.aptana.deploy.ui.wizard;

import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
@@ -15,13 +15,13 @@
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.ui.IWorkbench;

import com.aptana.deploy.DeployPlugin;
import com.aptana.deploy.ui.DeployUIPlugin;

public abstract class AbstractDeployWizard extends Wizard implements IDeployWizard
{

private static final ImageDescriptor fgDefaultImage = DeployPlugin.imageDescriptorFromPlugin(
DeployPlugin.getPluginIdentifier(), "icons/blank.png"); //$NON-NLS-1$
private static final ImageDescriptor fgDefaultImage = DeployUIPlugin.imageDescriptorFromPlugin(
DeployUIPlugin.PLUGIN_ID, "icons/blank.png"); //$NON-NLS-1$

private IProject project;

@@ -1,11 +1,11 @@
/**
* Aptana Studio
* Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
* Copyright (c) 2005-2012 by Appcelerator, Inc. All Rights Reserved.
* Licensed under the terms of the GNU Public License (GPL) v3 (with exceptions).
* Please see the license.html included with this distribution for details.
* Any modifications to this file must keep this entire header intact.
*/
package com.aptana.deploy.wizard;
package com.aptana.deploy.ui.wizard;

import org.eclipse.ui.IWorkbenchWizard;

@@ -8,15 +8,11 @@ Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.core.expressions,
org.eclipse.ui,
org.eclipse.ui.ide,
com.aptana.core;bundle-version="3.0.4",
com.aptana.scripting,
com.aptana.ui
com.aptana.scripting
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Export-Package: com.aptana.deploy,
com.aptana.deploy.preferences,
com.aptana.deploy.util,
com.aptana.deploy.wizard
com.aptana.deploy.util
Eclipse-ExtensibleAPI: true
@@ -1,7 +1,3 @@
#Properties file for com.aptana.deploy
providerName = Aptana
pluginName = Aptana Deploy

Deploy.label = Deploy App
DeployWizard.label = Run Web Deployment Wizard...
command.deploysettings.name = Deployment Settings...
@@ -5,5 +5,4 @@ bin.includes = META-INF/,\
plugin.xml,\
OSGI-INF/,\
license.html,\
icons/,\
OSGI-INF/
@@ -12,121 +12,4 @@
type="org.eclipse.core.runtime.IAdaptable">
</propertyTester>
</extension>
<extension
point="org.eclipse.ui.commands">
<command
defaultHandler="com.aptana.deploy.internal.handlers.DeployHandler"
id="com.aptana.deploy.commands.deployApp"
name="%Deploy.label">
</command>
</extension>
<extension
point="org.eclipse.ui.bindings">
<key
commandId="com.aptana.deploy.commands.deployApp"
contextId="org.eclipse.ui.contexts.window"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
sequence="CTRL+M3+D">
</key>
</extension>
<extension
point="org.eclipse.ui.menus">
<menuContribution
locationURI="menu:com.aptana.explorer.deploy">
<separator
name="group.deploy"
visible="true">
</separator>
<separator
name="group.command"
visible="true">
</separator>
<separator
name="group.wizard"
visible="true">
</separator>
<separator
name="additions">
</separator>
</menuContribution>
<menuContribution
locationURI="menu:com.aptana.explorer.deploy?endof=group.deploy">
<dynamic
class="com.aptana.deploy.internal.ui.DeployAppContributionItem"
id="com.aptana.deploy.deployAppMenu">
<visibleWhen
checkEnabled="false">
<or>
<with
variable="selection">
<iterate
ifEmpty="false">
<adapt
type="org.eclipse.core.resources.IResource">
<test
property="com.aptana.deploy.project.isDeployable"
value="true">
</test>
</adapt>
</iterate>
</with>
<and>
<with
variable="activePart">
<instanceof
value="org.eclipse.ui.IEditorPart">
</instanceof>
</with>
<with
variable="activeEditorInput">
<adapt
type="org.eclipse.core.resources.IResource">
<test
property="com.aptana.deploy.project.isDeployable"
value="true">
</test>
</adapt>
</with>
</and>
</or>
</visibleWhen>
</dynamic>
</menuContribution>
<menuContribution
locationURI="popup:org.eclipse.ui.popup.any?before=group.edit">
<dynamic
class="com.aptana.deploy.internal.ui.DeployPopupContributionItem"
id="com.aptana.deploy.popup.studio">
<visibleWhen
checkEnabled="false">
<or>
<with
variable="selection">
<iterate
ifEmpty="false">
<adapt
type="org.eclipse.core.resources.IResource">
</adapt>
</iterate>
</with>
<and>
<with
variable="activePart">
<instanceof
value="org.eclipse.ui.IEditorPart">
</instanceof>
</with>
<with
variable="activeEditorInput">
<adapt
type="org.eclipse.core.resources.IResource">
</adapt>
</with>
</and>
</or>
</visibleWhen>
</dynamic>
</menuContribution>
</extension>

</plugin>
@@ -1,38 +1,20 @@
/**
* Aptana Studio
* Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
* Copyright (c) 2005-2012 by Appcelerator, Inc. All Rights Reserved.
* Licensed under the terms of the GNU Public License (GPL) v3 (with exceptions).
* Please see the license.html included with this distribution for details.
* Any modifications to this file must keep this entire header intact.
*/
package com.aptana.deploy;

import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.core.runtime.Plugin;
import org.osgi.framework.BundleContext;

public class DeployPlugin extends AbstractUIPlugin
public class DeployPlugin extends Plugin
{

private static final String PLUGIN_ID = "com.aptana.deploy"; //$NON-NLS-1$

/**
* ID of the drop-down menu for the App Explorer's deployment options. Plugins can modify the menu using the
* "menu: com.aptana.explorer.deploy" URI.
*/
public static final String DEPLOY_MENU_ID = "com.aptana.explorer.deploy"; //$NON-NLS-1$

/**
* The path to the icon for deploy menu
*/
public static final String DEPLOY_MENU_ICON = "icons/full/elcl16/deploy_package.png"; //$NON-NLS-1$

/**
* The path to the hot icon for deploy menu
*/
public static final String DEPLOY_HOT_MENU_ICON = "icons/full/elcl16/deploy_package_hot.png"; //$NON-NLS-1$

private static DeployPlugin instance;

/*
@@ -64,15 +46,4 @@ public static DeployPlugin getDefault()
{
return instance;
}

public static Image getImage(String string)
{
if (getDefault().getImageRegistry().get(string) == null)
{
ImageDescriptor id = imageDescriptorFromPlugin(PLUGIN_ID, string);
if (id != null)
getDefault().getImageRegistry().put(string, id);
}
return getDefault().getImageRegistry().get(string);
}
}
@@ -5,25 +5,26 @@ Bundle-SymbolicName: com.aptana.explorer;singleton:=true
Bundle-Version: 3.0.0.qualifier
Bundle-Activator: com.aptana.explorer.ExplorerPlugin
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.ui.navigator,
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.core.expressions,
org.eclipse.search,
org.eclipse.team.core,
org.eclipse.ui.ide,
com.aptana.core,
com.aptana.ui,
com.aptana.git.core,
org.jruby,
com.aptana.index.core,
com.aptana.deploy,
org.eclipse.ui,
org.eclipse.search,
org.eclipse.ui.navigator,
org.eclipse.ui.navigator.resources,
org.eclipse.ui.ide,
com.aptana.ui,
com.aptana.git.ui,
com.aptana.scripting,
org.jruby,
com.aptana.editor.html,
com.aptana.index.core,
com.aptana.theme,
org.eclipse.ui.navigator.resources,
com.aptana.deploy
com.aptana.deploy.ui
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
@@ -255,6 +255,9 @@
class="com.aptana.explorer.navigator.actions.DeployActionProvider"
id="com.aptana.explorer.navigator.actions.DeployActions">
<enablement>
<instanceof
value="org.eclipse.core.resources.IResource">
</instanceof>
</enablement>
</actionProvider>
<actionProvider
@@ -9,6 +9,8 @@

import org.eclipse.core.resources.IProject;
import org.eclipse.jface.action.ContributionItem;
import org.eclipse.jface.action.GroupMarker;
import org.eclipse.jface.action.IContributionItem;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.search.ui.IContextMenuConstants;
@@ -67,6 +69,11 @@ protected String getToolTip()

protected void fillMenu(MenuManager menuManager)
{
IContributionItem item = menuManager.find(IContextMenuConstants.GROUP_PROPERTIES);
if (item == null)
{
menuManager.add(new GroupMarker(IContextMenuConstants.GROUP_PROPERTIES));
}
// Stick Delete in Properties area
menuManager.appendToGroup(IContextMenuConstants.GROUP_PROPERTIES, new ContributionItem()
{
@@ -9,7 +9,7 @@

import org.eclipse.swt.graphics.Image;

import com.aptana.deploy.DeployPlugin;
import com.aptana.deploy.ui.DeployUIPlugin;

public class DeployActionProvider extends ExplorerActionProvider
{
@@ -25,7 +25,7 @@ public String getActionId()
@Override
protected Image getImage()
{
return DeployPlugin.getImage(DeployPlugin.DEPLOY_MENU_ICON);
return DeployUIPlugin.getImage(DeployUIPlugin.DEPLOY_MENU_ICON);
}

/*
@@ -35,13 +35,13 @@ protected Image getImage()
@Override
protected Image getHotImage()
{
return DeployPlugin.getImage(DeployPlugin.DEPLOY_HOT_MENU_ICON);
return DeployUIPlugin.getImage(DeployUIPlugin.DEPLOY_HOT_MENU_ICON);
}

@Override
protected String getMenuId()
{
return DeployPlugin.DEPLOY_MENU_ID;
return DeployUIPlugin.DEPLOY_MENU_ID;
}

@Override