[jbosstools-commits] JBoss Tools SVN: r39750 - in trunk/as/features: org.jboss.ide.eclipse.as.feature and 1 other directories.

[jbosstools-commits at lists.jboss.org]

Author: rob.stryker at jboss.com
Date: 2012-03-22 05:29:02 -0400 (Thu, 22 Mar 2012)
New Revision: 39750

Modified:
   trunk/as/features/org.jboss.ide.eclipse.as.archives.integration.feature/feature.xml
   trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml
   trunk/as/features/org.jboss.ide.eclipse.as.jmx.integration.feature/feature.xml
Log:
JBIDE-11373 - re-patched as under advisement from Nick

Modified: trunk/as/features/org.jboss.ide.eclipse.as.archives.integration.feature/feature.xml
===================================================================
--- trunk/as/features/org.jboss.ide.eclipse.as.archives.integration.feature/feature.xml	2012-03-22 08:52:32 UTC (rev 39749)
+++ trunk/as/features/org.jboss.ide.eclipse.as.archives.integration.feature/feature.xml	2012-03-22 09:29:02 UTC (rev 39750)
@@ -50,10 +50,10 @@
       <import plugin="org.jboss.ide.eclipse.as.ui"/>
       <import plugin="org.jboss.ide.eclipse.as.wtp.ui"/>
       <import plugin="org.eclipse.wst.common.modulecore.ui" version="1.0.100" match="greaterOrEqual"/>
-      <import feature="org.jboss.ide.eclipse.as.serverAdapter.wtp.feature"/>
       <import feature="org.jboss.ide.eclipse.archives.feature"/>
    </requires>
 
+   <includes id="org.jboss.ide.eclipse.as.serverAdapter.wtp.feature" version="0.0.0" />
    <plugin
          id="org.jboss.ide.eclipse.archives.webtools"
          download-size="0"

Modified: trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml
===================================================================
--- trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml	2012-03-22 08:52:32 UTC (rev 39749)
+++ trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml	2012-03-22 09:29:02 UTC (rev 39750)
@@ -61,13 +61,14 @@
       <import plugin="org.eclipse.jst.j2ee.ui" version="1.1.500" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jst.common.frameworks" version="1.1.500" match="greaterOrEqual"/>
       <import feature="org.jboss.ide.eclipse.archives.feature"/>
-	  <import feature="org.jboss.ide.eclipse.as.archives.integration.feature"/>
-	  <import feature="org.jboss.ide.eclipse.as.jmx.integration.feature"/>
-	  <import feature="org.jboss.ide.eclipse.as.server.rse.integration.feature"/>
-	  <import feature="org.jboss.ide.eclipse.as.serverAdapter.wtp.feature"/>
 	  <import feature="org.jboss.tools.jmx.feature"/>
    </requires>
 
+	<includes id="org.jboss.ide.eclipse.as.archives.integration.feature" version="0.0.0" />
+	<includes id="org.jboss.ide.eclipse.as.jmx.integration.feature" version="0.0.0" />
+	<includes id="org.jboss.ide.eclipse.as.server.rse.integration.feature" version="0.0.0" />
+	<includes id="org.jboss.ide.eclipse.as.serverAdapter.wtp.feature" version="0.0.0" />
+
    <plugin
          id="org.jboss.ide.eclipse.as.ui.mbeans"
          download-size="0"

Modified: trunk/as/features/org.jboss.ide.eclipse.as.jmx.integration.feature/feature.xml
===================================================================
--- trunk/as/features/org.jboss.ide.eclipse.as.jmx.integration.feature/feature.xml	2012-03-22 08:52:32 UTC (rev 39749)
+++ trunk/as/features/org.jboss.ide.eclipse.as.jmx.integration.feature/feature.xml	2012-03-22 09:29:02 UTC (rev 39750)
@@ -50,9 +50,9 @@
 		<import plugin="org.eclipse.rse.subsystems.shells.local" version="2.1.300" match="greaterOrEqual" />
 		<import plugin="org.eclipse.rse.subsystems.shells.ssh" version="2.1.300" match="greaterOrEqual" />
 		<import plugin="org.eclipse.rse.subsystems.shells.telnet" version="1.2.200" match="greaterOrEqual" />
-		<import feature="org.jboss.ide.eclipse.as.serverAdapter.wtp.feature"/>
 		<import feature="org.jboss.tools.jmx.feature"/>
 	</requires>
-
+	
+	<includes id="org.jboss.ide.eclipse.as.serverAdapter.wtp.feature" version="0.0.0" />	
 	<plugin id="org.jboss.ide.eclipse.as.jmx.integration" download-size="0" install-size="0" version="0.0.0" unpack="false" />
 </feature>