Author: rombert Date: Thu Jul 25 13:02:46 2013 New Revision: 1506951 URL: http://svn.apache.org/r1506951 Log: SLING-2978 - Create tooling top-level directory and move maven and ide under it
Moved the current IDE tooling from whiteboard/asanso to trunk/tooling/ide. Added: sling/trunk/tooling/ide/ (props changed) - copied from r1506918, sling/whiteboard/asanso/plugins/eclipse/ Removed: sling/whiteboard/asanso/plugins/eclipse/ Modified: sling/trunk/tooling/ide/api/ (props changed) sling/trunk/tooling/ide/eclipse-core/ (props changed) sling/trunk/tooling/ide/eclipse-core/plugin.xml sling/trunk/tooling/ide/eclipse-ui/ (props changed) sling/trunk/tooling/ide/eclipse-ui/plugin.xml sling/trunk/tooling/ide/feature/ (props changed) sling/trunk/tooling/ide/impl-resource/ (props changed) sling/trunk/tooling/ide/impl-resource-test/ (props changed) sling/trunk/tooling/ide/p2update/ (props changed) Propchange: sling/trunk/tooling/ide/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jul 25 13:02:46 2013 @@ -0,0 +1,4 @@ +.settings +.project +.classpath +target Propchange: sling/trunk/tooling/ide/api/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jul 25 13:02:46 2013 @@ -0,0 +1,4 @@ +target +.settings +.project +.classpath Propchange: sling/trunk/tooling/ide/eclipse-core/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jul 25 13:02:46 2013 @@ -0,0 +1,4 @@ +target +.settings +.project +.classpath Modified: sling/trunk/tooling/ide/eclipse-core/plugin.xml URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/plugin.xml?rev=1506951&r1=1506918&r2=1506951&view=diff ============================================================================== --- sling/trunk/tooling/ide/eclipse-core/plugin.xml (original) +++ sling/trunk/tooling/ide/eclipse-core/plugin.xml Thu Jul 25 13:02:46 2013 @@ -1,126 +1,126 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.0"?> -<plugin> - - <!-- Define the sling module type --> - <extension point="org.eclipse.wst.server.core.moduleTypes"> - <moduleType - id="sling.content" - name="Sling module type"/> - </extension> - - <!-- Define a sling module factory --> - <extension point="org.eclipse.wst.server.core.moduleFactories"> - <moduleFactory - projects="true" - class="org.apache.sling.ide.eclipse.core.internal.SlingContentModuleFactory" - id="org.apache.sling.ide.contentModuleFactory"> - <moduleType - versions="1.0" - types="sling.content"/> - </moduleFactory> - </extension> - - <!-- Define the sling facet we support --> - <extension point="org.eclipse.wst.common.project.facet.core.facets"> - <project-facet id="sling.content"> - <label>Sling content module</label> - <description>Sling content modules contain content which is installed into the repository as-is. Good examples are static files ( HTML, CSS, JS ), scripts ( JSP, ESP ) and any other form of content.</description> - </project-facet> - - <project-facet-version facet="sling.content" version="1.0"/> - - <action facet="sling.content" version="1.0" type="INSTALL"> - <delegate class="org.apache.sling.ide.eclipse.core.internal.SlingContentFacetInstallDelegate"/> - </action> - - <action facet="sling.content" version="1.0" type="UNINSTALL"> - <delegate class="org.apache.sling.ide.eclipse.core.internal.SlingContentFacetUninstallDelegate"/> - </action> - </extension> - - <!-- Define the Sling launchpad runtime type --> - <extension point="org.eclipse.wst.server.core.runtimeTypes"> - <runtimeType - id="org.apache.sling.ide.launchpadRuntimeType" - name="Sling Launchpad (runtime name)" - description="Sling Launchpad (runtime description)" - vendor="Sling" - version="1.0" - class="org.apache.sling.ide.eclipse.core.internal.SlingLaunchpadRuntime"> - <moduleType types="sling.content" versions="1.0"/> - </runtimeType> - </extension> - - <!-- Define the Sling launchpad server type --> - <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)" - supportsRemoteHosts="true" - runtime="true" - startTimeout="30000" - stopTimeout="15000" - initialState="stopped" - hasConfiguration="true" - 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> - </extension> - - <extension point="org.eclipse.wst.server.core.launchableAdapters"> - <launchableAdapter - class="org.apache.sling.ide.eclipse.core.internal.SlingLaunchpadLaunchableAdapterDelegate" - 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.launchpadLaunchConfigurationType" - name="Sling Launchpad" - delegate="org.apache.sling.ide.eclipse.core.internal.SlingLaunchpadLaunchConfigurationDelegate" - modes="run" - sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/> - </extension> - - <!-- 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.ide.launchpadRuntimeComponentType"/> - <runtime-component-version type="org.apache.sling.ide.launchpadRuntimeComponentType" version="1.0"/> - - <adapter> - <runtime-component - id="org.apache.sling.ide.launchpadRuntimeComponentType"/> - <factory - class="org.eclipse.jst.server.core.internal.RuntimeClasspathProvider$Factory"/> - <type - class="org.eclipse.jst.common.project.facet.core.IClasspathProvider"/> - </adapter> - - <supported> - <runtime-component id="org.apache.sling.ide.launchpadRuntimeComponentType" version="1.0"/> - <facet id="sling.content" version="1.0"/> - </supported> - </extension> - - - <!-- Define default facets ( needed ? ) --> - <extension point="org.eclipse.wst.common.project.facet.core.defaultFacets"> - <default-facets> - <runtime-component id="org.apache.sling.ide.launchpadRuntimeComponentType"/> - <facet id="sling.content" version="1.0"/> - </default-facets> - </extension> - - <!-- Map from the launchpad runtime type to our runtime components --> - <extension point="org.eclipse.jst.server.core.runtimeFacetMappings"> - <runtimeFacetMapping - runtimeTypeId="org.apache.sling.ide.launchpadRuntimeType" - runtime-component="org.apache.sling.ide.launchpadRuntimeComponentType" - version="1.0"/> - </extension> -</plugin> +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> +<plugin> + + <!-- Define the sling module type --> + <extension point="org.eclipse.wst.server.core.moduleTypes"> + <moduleType + id="sling.content" + name="Sling module type"/> + </extension> + + <!-- Define a sling module factory --> + <extension point="org.eclipse.wst.server.core.moduleFactories"> + <moduleFactory + projects="true" + class="org.apache.sling.ide.eclipse.core.internal.SlingContentModuleFactory" + id="org.apache.sling.ide.contentModuleFactory"> + <moduleType + versions="1.0" + types="sling.content"/> + </moduleFactory> + </extension> + + <!-- Define the sling facet we support --> + <extension point="org.eclipse.wst.common.project.facet.core.facets"> + <project-facet id="sling.content"> + <label>Sling content module</label> + <description>Sling content modules contain content which is installed into the repository as-is. Good examples are static files ( HTML, CSS, JS ), scripts ( JSP, ESP ) and any other form of content.</description> + </project-facet> + + <project-facet-version facet="sling.content" version="1.0"/> + + <action facet="sling.content" version="1.0" type="INSTALL"> + <delegate class="org.apache.sling.ide.eclipse.core.internal.SlingContentFacetInstallDelegate"/> + </action> + + <action facet="sling.content" version="1.0" type="UNINSTALL"> + <delegate class="org.apache.sling.ide.eclipse.core.internal.SlingContentFacetUninstallDelegate"/> + </action> + </extension> + + <!-- Define the Sling launchpad runtime type --> + <extension point="org.eclipse.wst.server.core.runtimeTypes"> + <runtimeType + id="org.apache.sling.ide.launchpadRuntimeType" + name="Sling Launchpad (runtime name)" + description="Sling Launchpad (runtime description)" + vendor="Sling" + version="1.0" + class="org.apache.sling.ide.eclipse.core.internal.SlingLaunchpadRuntime"> + <moduleType types="sling.content" versions="1.0"/> + </runtimeType> + </extension> + + <!-- Define the Sling launchpad server type --> + <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)" + supportsRemoteHosts="true" + runtime="true" + startTimeout="30000" + stopTimeout="15000" + initialState="stopped" + hasConfiguration="true" + 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> + </extension> + + <extension point="org.eclipse.wst.server.core.launchableAdapters"> + <launchableAdapter + class="org.apache.sling.ide.eclipse.core.internal.SlingLaunchpadLaunchableAdapterDelegate" + 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.launchpadLaunchConfigurationType" + name="Sling Launchpad" + delegate="org.apache.sling.ide.eclipse.core.internal.SlingLaunchpadLaunchConfigurationDelegate" + modes="run" + sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/> + </extension> + + <!-- 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.ide.launchpadRuntimeComponentType"/> + <runtime-component-version type="org.apache.sling.ide.launchpadRuntimeComponentType" version="1.0"/> + + <adapter> + <runtime-component + id="org.apache.sling.ide.launchpadRuntimeComponentType"/> + <factory + class="org.eclipse.jst.server.core.internal.RuntimeClasspathProvider$Factory"/> + <type + class="org.eclipse.jst.common.project.facet.core.IClasspathProvider"/> + </adapter> + + <supported> + <runtime-component id="org.apache.sling.ide.launchpadRuntimeComponentType" version="1.0"/> + <facet id="sling.content" version="1.0"/> + </supported> + </extension> + + + <!-- Define default facets ( needed ? ) --> + <extension point="org.eclipse.wst.common.project.facet.core.defaultFacets"> + <default-facets> + <runtime-component id="org.apache.sling.ide.launchpadRuntimeComponentType"/> + <facet id="sling.content" version="1.0"/> + </default-facets> + </extension> + + <!-- Map from the launchpad runtime type to our runtime components --> + <extension point="org.eclipse.jst.server.core.runtimeFacetMappings"> + <runtimeFacetMapping + runtimeTypeId="org.apache.sling.ide.launchpadRuntimeType" + runtime-component="org.apache.sling.ide.launchpadRuntimeComponentType" + version="1.0"/> + </extension> +</plugin> Propchange: sling/trunk/tooling/ide/eclipse-ui/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jul 25 13:02:46 2013 @@ -0,0 +1,4 @@ +target +.settings +.project +.classpath Modified: sling/trunk/tooling/ide/eclipse-ui/plugin.xml URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/plugin.xml?rev=1506951&r1=1506918&r2=1506951&view=diff ============================================================================== --- sling/trunk/tooling/ide/eclipse-ui/plugin.xml (original) +++ sling/trunk/tooling/ide/eclipse-ui/plugin.xml Thu Jul 25 13:02:46 2013 @@ -1,100 +1,100 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.0"?> -<plugin> - - <!-- Define the launch configuration's tab group --> - <extension point="org.eclipse.debug.ui.launchConfigurationTabGroups"> - <launchConfigurationTabGroup - 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"> - <!-- TODO : merge into a single image? --> - <image - icon="icons/obj16/sling.gif" - typeIds="org.apache.sling.ide.launchpadServer"/> - <image - icon="icons/obj16/sling.gif" - typeIds="sling.content"/> - </extension> - - <!-- 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.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.ConnectionEditorSection"> - </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"/> - </extension> - - <!-- Menu contributions --> - <extension - point="org.eclipse.ui.popupMenus"> - <!-- All Sling contributions --> - <objectContribution - id="org.apache.sling.ide.menu" - objectClass="org.eclipse.core.resources.IProject"> - <menu id="org.apache.sling.ide.menu" - path="additions" - label="Sling"> - <groupMarker name="sling"/> - </menu> - </objectContribution> - <!-- Import. - I prefer to do this outside the import wizard section since I can restrict the destination --> - <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.ide.menu.importContentAction" - label="Import Content..." - menubarPath="org.apache.sling.ide.menu/sling" - style="push"> - </action> - <visibility> - <objectState - name="open" - value="true"> - </objectState> - </visibility> - <enablement> - <test - property="org.eclipse.wst.common.project.facet.core.projectFacet" - value="sling.content"/> - </enablement> - </objectContribution> - </extension> - - <!-- Property page for project to select directory to sync --> - <extension point="org.eclipse.ui.propertyPages"> - <page - id="org.apache.sling.ide.projectPropertyPage" - name="Sling" - class="org.apache.sling.ide.eclipse.ui.internal.SlingProjectPropertyPage"> - <enabledWhen> - <and> - <instanceof - value="org.eclipse.core.resources.IProject"> - </instanceof> - <test - property="org.eclipse.wst.common.project.facet.core.projectFacet" - value="sling.content"/> - </and> - </enabledWhen> - </page> - </extension> -</plugin> +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> +<plugin> + + <!-- Define the launch configuration's tab group --> + <extension point="org.eclipse.debug.ui.launchConfigurationTabGroups"> + <launchConfigurationTabGroup + 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"> + <!-- TODO : merge into a single image? --> + <image + icon="icons/obj16/sling.gif" + typeIds="org.apache.sling.ide.launchpadServer"/> + <image + icon="icons/obj16/sling.gif" + typeIds="sling.content"/> + </extension> + + <!-- 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.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.ConnectionEditorSection"> + </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"/> + </extension> + + <!-- Menu contributions --> + <extension + point="org.eclipse.ui.popupMenus"> + <!-- All Sling contributions --> + <objectContribution + id="org.apache.sling.ide.menu" + objectClass="org.eclipse.core.resources.IProject"> + <menu id="org.apache.sling.ide.menu" + path="additions" + label="Sling"> + <groupMarker name="sling"/> + </menu> + </objectContribution> + <!-- Import. + I prefer to do this outside the import wizard section since I can restrict the destination --> + <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.ide.menu.importContentAction" + label="Import Content..." + menubarPath="org.apache.sling.ide.menu/sling" + style="push"> + </action> + <visibility> + <objectState + name="open" + value="true"> + </objectState> + </visibility> + <enablement> + <test + property="org.eclipse.wst.common.project.facet.core.projectFacet" + value="sling.content"/> + </enablement> + </objectContribution> + </extension> + + <!-- Property page for project to select directory to sync --> + <extension point="org.eclipse.ui.propertyPages"> + <page + id="org.apache.sling.ide.projectPropertyPage" + name="Sling" + class="org.apache.sling.ide.eclipse.ui.internal.SlingProjectPropertyPage"> + <enabledWhen> + <and> + <instanceof + value="org.eclipse.core.resources.IProject"> + </instanceof> + <test + property="org.eclipse.wst.common.project.facet.core.projectFacet" + value="sling.content"/> + </and> + </enabledWhen> + </page> + </extension> +</plugin> Propchange: sling/trunk/tooling/ide/feature/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jul 25 13:02:46 2013 @@ -0,0 +1,4 @@ +target +.settings +.project +.classpath Propchange: sling/trunk/tooling/ide/impl-resource/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jul 25 13:02:46 2013 @@ -0,0 +1,4 @@ +target +.settings +.project +.classpath Propchange: sling/trunk/tooling/ide/impl-resource-test/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jul 25 13:02:46 2013 @@ -0,0 +1,4 @@ +target +.settings +.project +.classpath Propchange: sling/trunk/tooling/ide/p2update/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jul 25 13:02:46 2013 @@ -0,0 +1,4 @@ +target +.settings +.project +.classpath