Author: akazakov Date: 2012-04-16 20:06:32 -0400 (Mon, 16 Apr 2012) New Revision: 40228 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 trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml Log: https://issues.jboss.org/browse/JBIDE-11537 JBoss AS Tools Features have the same name 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-04-16 23:57:36 UTC (rev 40227) +++ trunk/as/features/org.jboss.ide.eclipse.as.archives.integration.feature/feature.xml 2012-04-17 00:06:32 UTC (rev 40228) @@ -3,8 +3,7 @@ id="org.jboss.ide.eclipse.as.archives.integration.feature" label="%featureName" version="2.3.0.qualifier" - provider-name="%providerName" - plugin="org.jboss.ide.eclipse.as.ui"> + provider-name="%providerName"> <description url="http://www.jboss.org/tools"> %description @@ -24,6 +23,10 @@ Raleigh NC 27606 USA. </license> + <includes + id="org.jboss.ide.eclipse.as.serverAdapter.wtp.feature" + version="0.0.0"/> + <requires> <import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual"/> <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/> @@ -53,7 +56,6 @@ <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-04-16 23:57:36 UTC (rev 40227) +++ trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml 2012-04-17 00:06:32 UTC (rev 40228) @@ -3,8 +3,7 @@ id="org.jboss.ide.eclipse.as.feature" label="%featureName" version="2.3.0.qualifier" - provider-name="%providerName" - plugin="org.jboss.ide.eclipse.as.ui"> + provider-name="%providerName"> <description url="http://www.jboss.org/tools"> %description @@ -24,6 +23,22 @@ Raleigh NC 27606 USA. </license> + <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"/> + <requires> <import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual"/> <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/> @@ -61,14 +76,9 @@ <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.tools.jmx.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-04-16 23:57:36 UTC (rev 40227) +++ trunk/as/features/org.jboss.ide.eclipse.as.jmx.integration.feature/feature.xml 2012-04-17 00:06:32 UTC (rev 40228) @@ -1,15 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<feature id="org.jboss.ide.eclipse.as.jmx.integration.feature" label="%featureName" version="2.3.0.qualifier" provider-name="%providerName" plugin="org.jboss.ide.eclipse.as.ui"> +<feature + id="org.jboss.ide.eclipse.as.jmx.integration.feature" + label="%featureName" + version="2.3.0.qualifier" + provider-name="%providerName"> - <description url="http://www.jboss.org/tools"> + <description url="http://www.jboss.org/tools"> %description </description> - <copyright> + <copyright> %copyright </copyright> - <license url="license.html"> + <license url="license.html"> Red Hat, Inc. licenses these features and plugins to you under certain open source licenses (or aggregations of such licenses), which in a particular case may include the Eclipse Public License, @@ -19,40 +23,49 @@ Raleigh NC 27606 USA. </license> - <requires> - <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual" /> - <import plugin="org.jboss.ide.eclipse.as.wtp.core" version="1.0.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.server.core" version="1.1.302" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.common.project.facet.core" version="1.4.200" match="greaterOrEqual" /> - <import plugin="org.eclipse.core.resources" version="3.7.100" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.common.modulecore" version="1.2.100" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.common.emfworkbench.integration" version="1.2.100" match="greaterOrEqual" /> - <import plugin="org.eclipse.jem.util" version="2.1.2" match="greaterOrEqual" /> - <import plugin="org.eclipse.debug.core" version="3.7.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.jdt.launching" version="3.6.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.server.ui" version="1.1.305" match="greaterOrEqual" /> - <import plugin="org.eclipse.debug.ui" version="3.7.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.core" version="3.1.200" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.subsystems.files.core" version="3.2.100" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.services" version="3.2.100" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.services.files.ftp" version="3.0.300" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.services.local" version="2.1.300" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.services.ssh" version="3.1.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.subsystems.shells.core" version="3.1.200" match="greaterOrEqual" /> - <import plugin="org.jboss.ide.eclipse.as.core" /> - <import plugin="org.jboss.ide.eclipse.archives.webtools" /> - <import plugin="org.eclipse.tm.terminal" version="3.1.0" match="greaterOrEqual" /> - <import plugin="org.jboss.ide.eclipse.as.ui" /> - <import plugin="org.eclipse.rse.files.ui" version="3.2.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.ui" version="3.2.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.subsystems.shells.dstore" version="2.1.300" match="greaterOrEqual" /> - <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.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" /> + <includes + id="org.jboss.ide.eclipse.as.serverAdapter.wtp.feature" + version="0.0.0"/> + + <requires> + <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.jboss.ide.eclipse.as.wtp.core" version="1.0.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.server.core" version="1.1.302" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.common.project.facet.core" version="1.4.200" match="greaterOrEqual"/> + <import plugin="org.eclipse.core.resources" version="3.7.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.common.modulecore" version="1.2.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.common.emfworkbench.integration" version="1.2.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.jem.util" version="2.1.2" match="greaterOrEqual"/> + <import plugin="org.eclipse.debug.core" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.jdt.launching" version="3.6.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.server.ui" version="1.1.305" match="greaterOrEqual"/> + <import plugin="org.eclipse.debug.ui" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.core" version="3.1.200" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.subsystems.files.core" version="3.2.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.services" version="3.2.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.services.files.ftp" version="3.0.300" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.services.local" version="2.1.300" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.services.ssh" version="3.1.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.subsystems.shells.core" version="3.1.200" match="greaterOrEqual"/> + <import plugin="org.jboss.ide.eclipse.as.core"/> + <import plugin="org.jboss.ide.eclipse.archives.webtools"/> + <import plugin="org.eclipse.tm.terminal" version="3.1.0" match="greaterOrEqual"/> + <import plugin="org.jboss.ide.eclipse.as.ui"/> + <import plugin="org.eclipse.rse.files.ui" version="3.2.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.ui" version="3.2.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.subsystems.shells.dstore" version="2.1.300" match="greaterOrEqual"/> + <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.tools.jmx.feature"/> + </requires> + + <plugin + id="org.jboss.ide.eclipse.as.jmx.integration" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + </feature> Modified: trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml =================================================================== --- trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml 2012-04-16 23:57:36 UTC (rev 40227) +++ trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml 2012-04-17 00:06:32 UTC (rev 40228) @@ -1,15 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<feature id="org.jboss.ide.eclipse.as.server.rse.integration.feature" label="%featureName" version="2.3.0.qualifier" provider-name="%providerName" plugin="org.jboss.ide.eclipse.as.ui"> +<feature + id="org.jboss.ide.eclipse.as.server.rse.integration.feature" + label="%featureName" + version="2.3.0.qualifier" + provider-name="%providerName"> - <description url="http://www.jboss.org/tools"> + <description url="http://www.jboss.org/tools"> %description </description> - <copyright> + <copyright> %copyright </copyright> - <license url="license.html"> + <license url="license.html"> Red Hat, Inc. licenses these features and plugins to you under certain open source licenses (or aggregations of such licenses), which in a particular case may include the Eclipse Public License, @@ -19,59 +23,62 @@ Raleigh NC 27606 USA. </license> - <requires> - <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual" /> - <import plugin="org.jboss.ide.eclipse.as.wtp.core" version="1.0.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.server.core" version="1.1.302" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.common.project.facet.core" version="1.4.200" match="greaterOrEqual" /> - <import plugin="org.eclipse.core.resources" version="3.7.100" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.common.modulecore" version="1.2.100" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.common.emfworkbench.integration" version="1.2.100" match="greaterOrEqual" /> - <import plugin="org.eclipse.jem.util" version="2.1.2" match="greaterOrEqual" /> - <import plugin="org.eclipse.debug.core" version="3.7.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.jdt.launching" version="3.6.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.server.ui" version="1.1.305" match="greaterOrEqual" /> - <import plugin="org.eclipse.debug.ui" version="3.7.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.core" version="3.1.200" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.subsystems.files.core" version="3.2.100" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.services" version="3.2.100" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.services.files.ftp" version="3.0.300" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.services.local" version="2.1.300" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.services.ssh" version="3.1.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.subsystems.shells.core" version="3.1.200" match="greaterOrEqual" /> - <import plugin="org.jboss.ide.eclipse.as.core" /> - <import plugin="org.jboss.ide.eclipse.archives.webtools" /> - <import plugin="org.eclipse.tm.terminal" version="3.1.0" match="greaterOrEqual" /> - <import plugin="org.jboss.ide.eclipse.as.ui" /> - <import plugin="org.eclipse.rse.files.ui" version="3.2.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.ui" version="3.2.0" match="greaterOrEqual" /> - <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" /> - - <!-- - The following plugins are required for completeness and usability of product only. - We have no compilation requirements against them, nor any critical outstanding bugs - that require a specific version or API. Functionality this forces to be included - are things such as terminal support, process support, shell support, - the sending and receiving of remote commands, the sending and receiving of remote files, - and support for the connector service. - --> - <import plugin="org.eclipse.rse.connectorservice.local"/> - <import plugin="org.eclipse.rse.connectorservice.ssh"/> - <import plugin="org.eclipse.rse.processes.ui"/> - <import plugin="org.eclipse.rse.shells.ui"/> - <import plugin="org.eclipse.rse.subsystems.files.local"/> - <import plugin="org.eclipse.rse.subsystems.files.ssh"/> - <import plugin="org.eclipse.rse.subsystems.processes.core"/> - <import plugin="org.eclipse.rse.subsystems.processes.local"/> - <import plugin="org.eclipse.rse.subsystems.processes.shell.linux"/> - <import plugin="org.eclipse.rse.subsystems.terminals.core"/> - <import plugin="org.eclipse.rse.subsystems.terminals.ssh"/> - <import plugin="org.eclipse.rse.terminals.ui"/> - </requires> + <requires> + <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.jboss.ide.eclipse.as.wtp.core" version="1.0.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.server.core" version="1.1.302" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.common.project.facet.core" version="1.4.200" match="greaterOrEqual"/> + <import plugin="org.eclipse.core.resources" version="3.7.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.common.modulecore" version="1.2.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.common.emfworkbench.integration" version="1.2.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.jem.util" version="2.1.2" match="greaterOrEqual"/> + <import plugin="org.eclipse.debug.core" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.jdt.launching" version="3.6.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.server.ui" version="1.1.305" match="greaterOrEqual"/> + <import plugin="org.eclipse.debug.ui" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.core" version="3.1.200" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.subsystems.files.core" version="3.2.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.services" version="3.2.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.services.files.ftp" version="3.0.300" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.services.local" version="2.1.300" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.services.ssh" version="3.1.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.subsystems.shells.core" version="3.1.200" match="greaterOrEqual"/> + <import plugin="org.jboss.ide.eclipse.as.core"/> + <import plugin="org.jboss.ide.eclipse.archives.webtools"/> + <import plugin="org.eclipse.tm.terminal" version="3.1.0" match="greaterOrEqual"/> + <import plugin="org.jboss.ide.eclipse.as.ui"/> + <import plugin="org.eclipse.rse.files.ui" version="3.2.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.ui" version="3.2.0" match="greaterOrEqual"/> + <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 plugin="org.eclipse.rse.connectorservice.local"/> + <import plugin="org.eclipse.rse.connectorservice.ssh"/> + <import plugin="org.eclipse.rse.processes.ui"/> + <import plugin="org.eclipse.rse.shells.ui"/> + <import plugin="org.eclipse.rse.subsystems.files.local"/> + <import plugin="org.eclipse.rse.subsystems.files.ssh"/> + <import plugin="org.eclipse.rse.subsystems.processes.core"/> + <import plugin="org.eclipse.rse.subsystems.processes.local"/> + <import plugin="org.eclipse.rse.subsystems.processes.shell.linux"/> + <import plugin="org.eclipse.rse.subsystems.terminals.core"/> + <import plugin="org.eclipse.rse.subsystems.terminals.ssh"/> + <import plugin="org.eclipse.rse.terminals.ui"/> + </requires> - <plugin id="org.jboss.ide.eclipse.as.rse.core" download-size="0" install-size="0" version="0.0.0" unpack="false" /> - <plugin id="org.jboss.ide.eclipse.as.rse.ui" download-size="0" install-size="0" version="0.0.0" unpack="false" /> + <plugin + id="org.jboss.ide.eclipse.as.rse.core" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.ide.eclipse.as.rse.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + </feature>