Author: rombert
Date: Fri Jul 19 15:07:21 2013
New Revision: 1504911
URL: http://svn.apache.org/r1504911
Log:
SLING-2973 - [Tooling] Align Eclipse tooling to proposed structure
Update ids in the plugin.xml files to be more consistent with the
component types they define and also to be under the
org.apache.sling.ide namespace.
Modified:
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/plugin.xml
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/plugin.xml
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SlingLaunchpadLaunchConfigurationTabGroup.java
Modified: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/plugin.xml
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/plugin.xml?rev=1504911&r1=1504910&r2=1504911&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-core/plugin.xml (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/plugin.xml Fri Jul 19
15:07:21 2013
@@ -2,7 +2,7 @@
<?eclipse version="3.0"?>
<plugin>
- <!-- Define the sling module type. TODO needed ? -->
+ <!-- Define the sling module type -->
<extension point="org.eclipse.wst.server.core.moduleTypes">
<moduleType
id="sling.content"
@@ -14,7 +14,7 @@
<moduleFactory
projects="true"
class="org.apache.sling.ide.eclipse.core.internal.SlingContentModuleFactory"
- id="org.apache.sling.contentModuleFactory">
+ id="org.apache.sling.ide.contentModuleFactory">
<moduleType
versions="1.0"
types="sling.content"/>
@@ -29,7 +29,6 @@
</project-facet>
<project-facet-version facet="sling.content" version="1.0"/>
- <!-- TODO add image -->
<action facet="sling.content" version="1.0" type="INSTALL">
<delegate
class="org.apache.sling.ide.eclipse.core.internal.SlingContentFacetInstallDelegate"/>
@@ -43,7 +42,7 @@
<!-- Define the Sling launchpad runtime type -->
<extension point="org.eclipse.wst.server.core.runtimeTypes">
<runtimeType
- id="org.apache.sling.launchpad.runtime"
+ id="org.apache.sling.ide.launchpadRuntimeType"
name="Sling Launchpad (runtime name)"
description="Sling Launchpad (runtime description)"
vendor="Sling"
@@ -56,7 +55,7 @@
<!-- Define the Sling launchpad server type -->
<extension point="org.eclipse.wst.server.core.serverTypes">
<serverType
- id="org.apache.sling.launchpad.server"
+ id="org.apache.sling.ide.launchpadServer"
name="Sling Launchpad (server name)"
description="Sling Launchpad (server description)"
supportsRemoteHosts="true"
@@ -65,8 +64,8 @@
stopTimeout="15000"
initialState="stopped"
hasConfiguration="true"
-
launchConfigId="org.apache.sling.ide.eclipse.launchpad.launchConfigurationType"
- runtimeTypeId="org.apache.sling.launchpad.runtime"
+ launchConfigId="org.apache.sling.ide.launchpadLaunchConfigurationType"
+ runtimeTypeId="org.apache.sling.ide.launchpadRuntimeType"
class="org.apache.sling.ide.eclipse.core.internal.SlingLaunchpadServer"
behaviourClass="org.apache.sling.ide.eclipse.core.internal.SlingLaunchpadBehaviour">
</serverType>
@@ -75,13 +74,13 @@
<extension point="org.eclipse.wst.server.core.launchableAdapters">
<launchableAdapter
class="org.apache.sling.ide.eclipse.core.internal.SlingLaunchpadLaunchableAdapterDelegate"
- id="org.sling.slingclipse.web"/>
+ id="org.apache.sling.ide.launchpadLaunchableAdapterDelegate"/>
</extension>
<!-- Define the launch configuration type for the launchpad TODO do we
need a sourcePathComputer ? -->
<extension point="org.eclipse.debug.core.launchConfigurationTypes">
<launchConfigurationType
- id="org.apache.sling.ide.eclipse.launchpad.launchConfigurationType"
+ id="org.apache.sling.ide.launchpadLaunchConfigurationType"
name="Sling Launchpad"
delegate="org.apache.sling.ide.eclipse.core.internal.SlingLaunchpadLaunchConfigurationDelegate"
modes="run"
@@ -90,12 +89,12 @@
<!-- Declare that the launchpad runtime type, supporting content
modules -->
<extension point="org.eclipse.wst.common.project.facet.core.runtimes">
- <runtime-component-type id="org.apache.sling.launchpad"/>
- <runtime-component-version type="org.apache.sling.launchpad"
version="1.0"/>
+ <runtime-component-type
id="org.apache.sling.ide.launchpadRuntimeComponentType"/>
+ <runtime-component-version
type="org.apache.sling.ide.launchpadRuntimeComponentType" version="1.0"/>
<adapter>
<runtime-component
- id="org.apache.sling.launchpad"/>
+ id="org.apache.sling.ide.launchpadRuntimeComponentType"/>
<factory
class="org.eclipse.jst.server.core.internal.RuntimeClasspathProvider$Factory"/>
<type
@@ -103,7 +102,7 @@
</adapter>
<supported>
- <runtime-component id="org.apache.sling.launchpad"
version="1.0"/>
+ <runtime-component
id="org.apache.sling.ide.launchpadRuntimeComponentType" version="1.0"/>
<facet id="sling.content" version="1.0"/>
</supported>
</extension>
@@ -112,7 +111,7 @@
<!-- Define default facets ( needed ? ) -->
<extension point="org.eclipse.wst.common.project.facet.core.defaultFacets">
<default-facets>
- <runtime-component id="org.apache.sling.launchpad"/>
+ <runtime-component
id="org.apache.sling.ide.launchpadRuntimeComponentType"/>
<facet id="sling.content" version="1.0"/>
</default-facets>
</extension>
@@ -120,8 +119,8 @@
<!-- Map from the launchpad runtime type to our runtime components -->
<extension point="org.eclipse.jst.server.core.runtimeFacetMappings">
<runtimeFacetMapping
- runtimeTypeId="org.apache.sling.launchpad.runtime"
- runtime-component="org.apache.sling.launchpad"
+ runtimeTypeId="org.apache.sling.ide.launchpadRuntimeType"
+ runtime-component="org.apache.sling.ide.launchpadRuntimeComponentType"
version="1.0"/>
</extension>
</plugin>
Modified: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/plugin.xml
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/plugin.xml?rev=1504911&r1=1504910&r2=1504911&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/plugin.xml (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/plugin.xml Fri Jul 19
15:07:21 2013
@@ -5,18 +5,19 @@
<!-- Define the launch configuration's tab group -->
<extension point="org.eclipse.debug.ui.launchConfigurationTabGroups">
<launchConfigurationTabGroup
- id="org.apache.sling.ide.eclipse.launchpad.launchConfigurationTabGroup"
- type="org.apache.sling.ide.eclipse.launchpad.launchConfigurationType"
+ id="org.apache.sling.ide.launchpadLaunchConfigurationTabGroup"
+ type="org.apache.sling.ide.launchpadLaunchConfigurationType"
class="org.apache.sling.ide.eclipse.ui.internal.SlingLaunchpadLaunchConfigurationTabGroup">
</launchConfigurationTabGroup>
</extension>
<!-- Define images -->
- <extension point="org.eclipse.wst.server.ui.serverImages">
+ <extension point="org.eclipse.wst.server.ui.serverImages">
+ <!-- TODO : merge into a single image? -->
<image
icon="icons/obj16/sling.gif"
- typeIds="org.apache.sling.launchpad.server"/>
+ typeIds="org.apache.sling.ide.launchpadServer"/>
<image
icon="icons/obj16/sling.gif"
typeIds="sling.content"/>
@@ -25,17 +26,17 @@
<!-- Define the editor section(s) we contribute to the WST UI -->
<extension point="org.eclipse.wst.server.ui.editorPageSections">
<section
- id="org.apache.sling.ide.eclipse.configuration.editor.port"
+ id="org.apache.sling.ide.launchpadConfigurationEditorSection"
order="10"
insertionId="org.eclipse.wst.server.editor.overview.right"
- typeIds="org.apache.sling.launchpad.server"
+ typeIds="org.apache.sling.ide.launchpadServer"
class="org.apache.sling.ide.eclipse.ui.internal.ConnectionEditorSection">
</section>
</extension>
<!-- Runtime images -->
<extension point="org.eclipse.wst.common.project.facet.ui.images">
- <image runtime-component-type="org.apache.sling.launchpad"
+ <image
runtime-component-type="org.apache.sling.ide.launchpadRuntimeComponentType"
path="icons/obj16/sling.gif"/>
</extension>
@@ -44,9 +45,9 @@
point="org.eclipse.ui.popupMenus">
<!-- All Sling contributions -->
<objectContribution
- id="org.apache.sling.slingclipse.slingMenu"
+ id="org.apache.sling.ide.menu"
objectClass="org.eclipse.core.resources.IProject">
- <menu id="org.apache.sling.slingclipse.slingMenu"
+ <menu id="org.apache.sling.ide.menu"
path="additions"
label="Sling">
<groupMarker name="sling"/>
@@ -54,14 +55,14 @@
</objectContribution>
<!-- Import.
I prefer to do this outside the import wizard section since I
can restrict the destination -->
- <objectContribution id="org.apache.sling.slingclipse.slingImport"
+ <objectContribution id="org.apache.sling.ide.menu.import"
objectClass="org.eclipse.core.resources.IProject">
<action
class="org.apache.sling.ide.eclipse.ui.internal.ImportContentAction"
- id="org.apache.sling.slingclipse.importContentAction"
+ id="org.apache.sling.ide.menu.importContentAction"
label="Import Content..."
- menubarPath="org.apache.sling.slingclipse.slingMenu/sling"
+ menubarPath="org.apache.sling.ide.menu/sling"
style="push">
</action>
<visibility>
@@ -81,7 +82,7 @@
<!-- Property page for project to select directory to sync -->
<extension point="org.eclipse.ui.propertyPages">
<page
- id="org.apache.sling.ide.eclipse.projectPropertyPage"
+ id="org.apache.sling.ide.projectPropertyPage"
name="Sling"
class="org.apache.sling.ide.eclipse.ui.internal.SlingProjectPropertyPage">
<enabledWhen>
Modified:
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SlingLaunchpadLaunchConfigurationTabGroup.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SlingLaunchpadLaunchConfigurationTabGroup.java?rev=1504911&r1=1504910&r2=1504911&view=diff
==============================================================================
---
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SlingLaunchpadLaunchConfigurationTabGroup.java
(original)
+++
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SlingLaunchpadLaunchConfigurationTabGroup.java
Fri Jul 19 15:07:21 2013
@@ -28,11 +28,13 @@ import org.eclipse.wst.server.ui.ServerL
public class SlingLaunchpadLaunchConfigurationTabGroup extends
AbstractLaunchConfigurationTabGroup {
+ private static final String LAUNCHPAD_SERVER_ID =
"org.apache.sling.ide.launchpadServer";
+
@Override
public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[6];
- tabs[0] = new ServerLaunchConfigurationTab(new String[] {
"org.apache.sling.launchpad.server" });
+ tabs[0] = new ServerLaunchConfigurationTab(new String[] {
LAUNCHPAD_SERVER_ID });
tabs[0].setLaunchConfigurationDialog(dialog);
tabs[1] = new JavaArgumentsTab();
tabs[1].setLaunchConfigurationDialog(dialog);
