Skip to content
Snippets Groups Projects
Commit 6a4d6439 authored by Nick Boldt's avatar Nick Boldt
Browse files

replace includes with requires; mark a few assembly/dev/patch/prereq features... 

replace includes with requires; mark a few assembly/dev/patch/prereq features with TODO markers to possibly deprecate/delete them

Signed-off-by: default avatarnickboldt <nboldt@redhat.com>
parent 2527cc81
Branches R3_6_0_patches
Tags v201406201440
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 64 additions and 164 deletions
assembly/features/org.eclipse.jst.sdk/feature.xml
+ 0
− 1
View file @ 6a4d6439
......@@ -30,5 +30,4 @@
<import feature="org.eclipse.jst.ws.jaxws.assembly_sdk.feature"/>
<import feature="org.eclipse.jsf_sdk.assembly.feature"/>
</requires>
</feature>
assembly/features/org.eclipse.jst.tests/feature.xml
+ 9
− 28
View file @ 6a4d6439
......@@ -19,32 +19,13 @@
%license
</license>
<includes
id="org.eclipse.jst.server_tests.feature"
version="0.0.0"/>
<includes
id="org.eclipse.jst.server_adapters.ext_tests.feature"
version="0.0.0"/>
<includes
id="org.eclipse.wst.ws_tests.feature"
version="0.0.0"/>
<includes
id="org.eclipse.jst.web_tests.feature"
version="0.0.0"/>
<includes
id="org.eclipse.jst.enterprise_tests.feature"
version="0.0.0"/>
<includes
id="org.eclipse.jst.jsf.tests.feature"
version="0.0.0"/>
<includes
id="org.eclipse.jst.ws.jaxws.assembly_tests.feature"
version="0.0.0"/>
<requires>
<import feature="org.eclipse.jst.server_tests.feature"/>
<import feature="org.eclipse.jst.server_adapters.ext_tests.feature"/>
<import feature="org.eclipse.wst.ws_tests.feature"/>
<import feature="org.eclipse.jst.web_tests.feature"/>
<import feature="org.eclipse.jst.enterprise_tests.feature"/>
<import feature="org.eclipse.jst.jsf.tests.feature"/>
<import feature="org.eclipse.jst.ws.jaxws.assembly_tests.feature"/>
</requires>
</feature>
assembly/features/org.eclipse.wst.sdk/feature.xml
+ 8
− 24
View file @ 6a4d6439
......@@ -19,28 +19,12 @@
%license
</license>
<includes
id="org.eclipse.wst.common.fproj.sdk"
version="0.0.0"/>
<includes
id="org.eclipse.wst.jsdt_sdk.feature"
version="0.0.0"/>
<includes
id="org.eclipse.wst.xml_sdk.feature"
version="0.0.0"/>
<includes
id="org.eclipse.wst.web_sdk.feature"
version="0.0.0"/>
<includes
id="org.eclipse.wst.xsl_sdk.feature"
version="0.0.0"/>
<includes
id="org.eclipse.wst.server_adapters.sdk.feature"
version="0.0.0"/>
<requires>
<import feature="org.eclipse.wst.common.fproj.sdk"/>
<import feature="org.eclipse.wst.jsdt_sdk.feature"/>
<import feature="org.eclipse.wst.xml_sdk.feature"/>
<import feature="org.eclipse.wst.web_sdk.feature"/>
<import feature="org.eclipse.wst.xsl_sdk.feature"/>
<import feature="org.eclipse.wst.server_adapters.sdk.feature"/>
</requires>
</feature>
assembly/features/org.eclipse.wst.tests.feature/feature.xml
+ 9
− 29
View file @ 6a4d6439
......@@ -15,33 +15,13 @@
%copyright
</copyright>
<includes
id="org.eclipse.wtp.releng.tests.feature"
version="0.0.0"/>
<includes
id="org.eclipse.wst.common_tests.feature"
version="0.0.0"/>
<includes
id="org.eclipse.wst.xml_tests.feature"
version="0.0.0"/>
<includes
id="org.eclipse.wst.xsl_tests.feature"
version="0.0.0"/>
<includes
id="org.eclipse.wst.server_tests.feature"
version="0.0.0"/>
<includes
id="org.eclipse.wst.web_tests.feature"
version="0.0.0"/>
<includes
id="org.eclipse.wst.jsdt_tests.feature"
version="0.0.0"/>
<requires>
<import feature="org.eclipse.wtp.releng.tests.feature"/>
<import feature="org.eclipse.wst.common_tests.feature"/>
<import feature="org.eclipse.wst.xml_tests.feature"/>
<import feature="org.eclipse.wst.xsl_tests.feature"/>
<import feature="org.eclipse.wst.server_tests.feature"/>
<import feature="org.eclipse.wst.web_tests.feature"/>
<import feature="org.eclipse.wst.jsdt_tests.feature"/>
</requires>
</feature>
assembly/features/org.eclipse.wtp.noship.assembly.feature/feature.xml
+ 7
− 12
View file @ 6a4d6439
......@@ -5,6 +5,8 @@
version="1.0.0"
provider-name="Eclipse.org">
<!-- TODO: is this actually useful? Or can it be deprecated/deleted? -->
<description>
This feature is purely a build-time construct, so guide the build
of feature patches.
......@@ -12,16 +14,9 @@ The feature itself should not be included in zip files,
update sites, or deployed in any fashion.
</description>
<includes
id="org.eclipse.wst.common_core.feature.patch"
version="0.0.0"/>
<includes
id="org.eclipse.wst.xml_core.feature.patch"
version="0.0.0"/>
<includes
id="org.eclipse.jst.web_core.feature.patch"
version="0.0.0"/>
<requires>
<import feature="org.eclipse.wst.common_core.feature.patch"/>
<import feature="org.eclipse.wst.xml_core.feature.patch"/>
<import feature="org.eclipse.jst.web_core.feature.patch"/>
</requires>
</feature>
assembly/features/org.eclipse.wtp.patch.assembly.feature/feature.xml
+ 5
− 7
View file @ 6a4d6439
......@@ -16,12 +16,10 @@
[Enter License Description here.]
</license>
<includes
id="org.eclipse.wst.server_core.feature.patch"
version="0.0.0"/>
<includes
id="org.eclipse.wtp.releng.tests.feature"
version="0.0.0"/>
<!-- TODO: is this actually useful? Or can it be deprecated/deleted? -->
<requires>
<import feature="org.eclipse.wst.server_core.feature.patch"/>
<import feature="org.eclipse.wtp.releng.tests.feature"/>
</requires>
</feature>
assembly/features/org.eclipse.wtp.requiredpreques/feature.xml
+ 7
− 13
View file @ 6a4d6439
......@@ -9,18 +9,12 @@
build time prereqs
</description>
<includes
id="org.eclipse.emf"
version="0.0.0"/>
<includes
id="org.eclipse.emf"
version="0.0.0"/>
<includes
id="org.eclipse.xsd"
version="0.0.0"/>
<includes
id="org.eclipse.xsd.sdk"
version="0.0.0"/>
<!-- TODO: is this actually useful? Or can it be deprecated/deleted? -->
<requires>
<import feature="org.eclipse.emf"/>
<import feature="org.eclipse.emf"/>
<import feature="org.eclipse.xsd"/>
<import feature="org.eclipse.xsd.sdk"/>
</requires>
</feature>
assembly/features/org.eclipse.wtp.xml.dev.feature/feature.xml
+ 7
− 12
View file @ 6a4d6439
......@@ -4,19 +4,14 @@
label="Dev Feature"
version="1.0.0.qualifier">
<!-- TODO: is this actually useful? Or can it be deprecated/deleted? -->
<description>
A simply assembly feature to drive build. Not intended for distribution.
A simple assembly feature to drive build. Not intended for distribution.
</description>
<includes
id="org.eclipse.wst.xml_ui.feature"
version="0.0.0"/>
<plugin
id="org.eclipse.wtp.xml.dev"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<requires>
<import feature="org.eclipse.wst.xml_ui.feature"/>
<import plugin="org.eclipse.wtp.xml.dev"/>
</requires>
</feature>
features/org.eclipse.wst.doc.user.feature/feature.xml
+ 6
− 17
View file @ 6a4d6439
......@@ -21,21 +21,10 @@
<update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
</url>
<includes
id="org.eclipse.wst.server_userdoc.feature"
version="0.0.0"/>
<includes
id="org.eclipse.wst.web_userdoc.feature"
version="0.0.0"/>
<includes
id="org.eclipse.wst.ws_userdoc.feature"
version="0.0.0"/>
<includes
id="org.eclipse.wst.xml_userdoc.feature"
version="0.0.0"/>
<requires>
<import feature="org.eclipse.wst.server_userdoc.feature"/>
<import feature="org.eclipse.wst.web_userdoc.feature"/>
<import feature="org.eclipse.wst.ws_userdoc.feature"/>
<import feature="org.eclipse.wst.xml_userdoc.feature"/>
</requires>
</feature>
features/org.eclipse.wtp.releng.tests.feature/feature.xml
+ 6
− 21
View file @ 6a4d6439
......@@ -19,25 +19,10 @@
%license
</license>
<includes
id="org.eclipse.wtp.releng.fixups.feature"
version="0.0.0"/>
<includes
id="org.eclipse.wtp.releng.tools.feature"
version="0.0.0"/>
<plugin
id="org.eclipse.wtp.releng.versionchecker"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.wtp.releng.tests"
download-size="0"
install-size="0"
version="0.0.0"/>
<requires>
<import feature="org.eclipse.wtp.releng.fixups.feature"/>
<import feature="org.eclipse.wtp.releng.tools.feature"/>
<import plugin="org.eclipse.wtp.releng.versionchecker"/>
<import plugin="org.eclipse.wtp.releng.tests"/>
</requires>
</feature>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent