Author: mickael_istria Date: 2012-03-20 07:29:14 -0400 (Tue, 20 Mar 2012) New Revision: 39651 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.serverAdapter.wtp.feature/feature.xml Log: JBIDE-11358 * AS 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-20 10:23:57 UTC (rev 39650) +++ trunk/as/features/org.jboss.ide.eclipse.as.archives.integration.feature/feature.xml 2012-03-20 11:29:14 UTC (rev 39651) @@ -1,15 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<feature 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"> +<feature + 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"> - <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,36 +24,41 @@ Raleigh NC 27606 USA. </license> - <requires> - <import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.common.emfworkbench.integration" version="1.2.100" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.server.core" version="1.1.302" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.server.ui" version="1.1.305" match="greaterOrEqual" /> - <import plugin="org.eclipse.core.resources" version="3.7.100" match="greaterOrEqual" /> - <import plugin="org.eclipse.jdt.core" version="3.7.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.jst.server.core" version="1.2.101" match="greaterOrEqual" /> - <import plugin="org.eclipse.jem.util" version="2.1.2" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.common.modulecore" version="1.2.100" match="greaterOrEqual" /> - <import plugin="org.apache.ant" version="1.7.1" match="greaterOrEqual" /> - <import plugin="org.eclipse.ui.ide" version="3.7.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.core.filesystem" version="1.3.100" match="greaterOrEqual" /> - <import plugin="org.eclipse.ui.navigator" version="3.5.0" match="greaterOrEqual" /> - <import plugin="org.jboss.tools.jmx.core" /> - <import plugin="org.eclipse.core.variables" version="3.2.500" match="greaterOrEqual" /> - <import plugin="org.jboss.ide.eclipse.as.wtp.core" version="1.0.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.emf.common" version="2.7.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.emf.ecore" version="2.7.0" match="greaterOrEqual" /> - <import plugin="org.jboss.ide.eclipse.archives.core" /> - <import plugin="org.jboss.ide.eclipse.archives.ui" /> - <import plugin="org.jboss.ide.eclipse.as.core" /> - <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" /> - </requires> + <requires> + <import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.common.emfworkbench.integration" version="1.2.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.server.core" version="1.1.302" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.server.ui" version="1.1.305" match="greaterOrEqual"/> + <import plugin="org.eclipse.core.resources" version="3.7.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.jdt.core" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.jst.server.core" version="1.2.101" match="greaterOrEqual"/> + <import plugin="org.eclipse.jem.util" version="2.1.2" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.common.modulecore" version="1.2.100" match="greaterOrEqual"/> + <import plugin="org.apache.ant" version="1.7.1" match="greaterOrEqual"/> + <import plugin="org.eclipse.ui.ide" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.core.filesystem" version="1.3.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.ui.navigator" version="3.5.0" match="greaterOrEqual"/> + <import plugin="org.jboss.tools.jmx.core"/> + <import plugin="org.eclipse.core.variables" version="3.2.500" match="greaterOrEqual"/> + <import plugin="org.jboss.ide.eclipse.as.wtp.core" version="1.0.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.emf.common" version="2.7.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.emf.ecore" version="2.7.0" match="greaterOrEqual"/> + <import plugin="org.jboss.ide.eclipse.archives.core"/> + <import plugin="org.jboss.ide.eclipse.archives.ui"/> + <import plugin="org.jboss.ide.eclipse.as.core"/> + <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" /> - <includes id="org.jboss.ide.eclipse.archives.feature" version="0.0.0" /> + <plugin + id="org.jboss.ide.eclipse.archives.webtools" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> - <plugin id="org.jboss.ide.eclipse.archives.webtools" download-size="0" install-size="0" version="0.0.0" unpack="false" /> </feature> 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-20 10:23:57 UTC (rev 39650) +++ trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml 2012-03-20 11:29:14 UTC (rev 39651) @@ -60,15 +60,14 @@ <import plugin="org.eclipse.wst.common.frameworks.ui" version="1.2.100" match="greaterOrEqual"/> <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.archives.feature" version="0.0.0" /> - <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" /> - <includes id="org.jboss.tools.jmx.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-20 10:23:57 UTC (rev 39650) +++ trunk/as/features/org.jboss.ide.eclipse.as.jmx.integration.feature/feature.xml 2012-03-20 11:29:14 UTC (rev 39651) @@ -50,10 +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" /> - <includes id="org.jboss.tools.jmx.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> Modified: trunk/as/features/org.jboss.ide.eclipse.as.serverAdapter.wtp.feature/feature.xml =================================================================== --- trunk/as/features/org.jboss.ide.eclipse.as.serverAdapter.wtp.feature/feature.xml 2012-03-20 10:23:57 UTC (rev 39650) +++ trunk/as/features/org.jboss.ide.eclipse.as.serverAdapter.wtp.feature/feature.xml 2012-03-20 11:29:14 UTC (rev 39651) @@ -83,7 +83,7 @@ </requires> <plugin id="org.jboss.ide.eclipse.as.core" download-size="0" install-size="0" version="0.0.0" unpack="false" /> - <plugin id="org.jboss.ide.eclipse.as.management.core" download-size="0" install-size="0" version="0.0.0" unpack="false" /> + <plugin id="org.jboss.ide.eclipse.as.management.core" download-size="0" install-size="0" version="0.0.0" unpack="false" /> <plugin id="org.jboss.ide.eclipse.as.management.as71" download-size="0" install-size="0" version="0.0.0" unpack="false" /> <plugin id="org.jboss.ide.eclipse.as.ui" download-size="0" install-size="0" version="0.0.0" unpack="false" /> <plugin id="org.jboss.ide.eclipse.as.classpath.core" download-size="0" install-size="0" version="0.0.0" unpack="false" />