You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2016/04/01 15:26:35 UTC
svn commit: r1737378 - /sling/trunk/tooling/ide/eclipse-core/plugin.xml
Author: rombert
Date: Fri Apr 1 13:26:35 2016
New Revision: 1737378
URL: http://svn.apache.org/viewvc?rev=1737378&view=rev
Log:
SLING-5634 - Content projects automatically configured as WST projects
fail to deploy
Now that content projects also have the Dynamic Web Project facet, we
need to ensure that our module factory is invoked before the 'standard'
Eclipse module factories, so that the module type is sling.content, not
jst.web.
Modified:
sling/trunk/tooling/ide/eclipse-core/plugin.xml
Modified: sling/trunk/tooling/ide/eclipse-core/plugin.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/plugin.xml?rev=1737378&r1=1737377&r2=1737378&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/plugin.xml (original)
+++ sling/trunk/tooling/ide/eclipse-core/plugin.xml Fri Apr 1 13:26:35 2016
@@ -36,7 +36,8 @@
<moduleFactory
projects="true"
class="org.apache.sling.ide.eclipse.core.internal.SlingContentModuleFactory"
- id="org.apache.sling.ide.contentModuleFactory">
+ id="org.apache.sling.ide.contentModuleFactory"
+ order="-10">
<moduleType
versions="1.0"
types="sling.content"/>
@@ -99,6 +100,7 @@
class="org.apache.sling.ide.eclipse.core.internal.SlingLaunchpadRuntime">
<moduleType types="sling.content" versions="1.0"/>
<moduleType types="sling.bundle" versions="1.0"/>
+ <moduleType types="jst.web" versions="2.2, 2.3, 2.4, 2.5, 3.0, 3.1"/>
</runtimeType>
</extension>
@@ -137,7 +139,7 @@
sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
</extension>
- <!-- Declare that the launchpad runtime type, supporting content modules -->
+ <!-- Declare that the launchpad runtime type, supporting content and web 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"/>
@@ -154,7 +156,32 @@
<supported>
<runtime-component id="org.apache.sling.ide.launchpadRuntimeComponentType" version="1.0"/>
<facet id="sling.content" version="1.0"/>
- </supported>
+ </supported>
+
+ <supported>
+ <runtime-component id="org.apache.sling.ide.launchpadRuntimeComponentType" version="1.0"/>
+ <facet id="jst.web" version="2.2"/>
+ </supported>
+ <supported>
+ <runtime-component id="org.apache.sling.ide.launchpadRuntimeComponentType" version="1.0"/>
+ <facet id="jst.web" version="2.3"/>
+ </supported>
+ <supported>
+ <runtime-component id="org.apache.sling.ide.launchpadRuntimeComponentType" version="1.0"/>
+ <facet id="jst.web" version="2.4"/>
+ </supported>
+ <supported>
+ <runtime-component id="org.apache.sling.ide.launchpadRuntimeComponentType" version="1.0"/>
+ <facet id="jst.web" version="2.5"/>
+ </supported>
+ <supported>
+ <runtime-component id="org.apache.sling.ide.launchpadRuntimeComponentType" version="1.0"/>
+ <facet id="jst.web" version="3.0"/>
+ </supported>
+ <supported>
+ <runtime-component id="org.apache.sling.ide.launchpadRuntimeComponentType" version="1.0"/>
+ <facet id="jst.web" version="3.1"/>
+ </supported>
</extension>
@@ -168,6 +195,7 @@
<runtime-component id="org.apache.sling.ide.launchpadRuntimeComponentType"/>
<facet id="sling.bundle" version="1.0"/>
</default-facets>
+
</extension>
<!-- Map from the launchpad runtime type to our runtime components -->