diff --git a/assembly/features/org.eclipse.jst.feature/feature.xml b/assembly/features/org.eclipse.jst.feature/feature.xml index a9be4a54c876a5bfa053bc24de45016523fc4703..4a3b63c5a00f6a675c185c7822277d6e0f7d3e64 100644 --- a/assembly/features/org.eclipse.jst.feature/feature.xml +++ b/assembly/features/org.eclipse.jst.feature/feature.xml @@ -18,16 +18,15 @@ <includes id="org.eclipse.wst" version="0.0.0"/> - - <includes - id="org.eclipse.jst.common_core.feature" - version="0.0.0"/> - - + <!-- for now, we must include all top-level features here, to get logs assembled as we expect ... in future, we can fix build process to heirarchically gather logs --> + + <includes + id="org.eclipse.jst.common_core.feature" + version="0.0.0"/> <includes id="org.eclipse.jst.server_core.feature" @@ -42,9 +41,6 @@ version="0.0.0"/> - <!-- the following are enough to get built correctly, - since they 'include' what they need, heirarchically --> - <includes id="org.eclipse.jst.server_ui.feature" diff --git a/assembly/features/org.eclipse.jst.sdk/feature.xml b/assembly/features/org.eclipse.jst.sdk/feature.xml index 7531f3bb17555469e27df03b104b44097d48d483..39e2316435c7a15daea908798eb04dd61a86d5f8 100644 --- a/assembly/features/org.eclipse.jst.sdk/feature.xml +++ b/assembly/features/org.eclipse.jst.sdk/feature.xml @@ -20,38 +20,8 @@ version="0.0.0"/> - <!-- For now, we need to list each compiled - feature to ensure logs gather right --> - <includes - id="org.eclipse.jst.common_core.feature" - version="0.0.0"/> - - <includes - id="org.eclipse.jst.web_core.feature" - version="0.0.0"/> - <includes - id="org.eclipse.jst.web_ui.feature" - version="0.0.0"/> - <includes - id="org.eclipse.jst.server_core.feature" - version="0.0.0"/> - <includes - id="org.eclipse.jst.server_ui.feature" - version="0.0.0"/> - <includes - id="org.eclipse.jst.server_adapters.feature" - version="0.0.0"/> - <includes - id="org.eclipse.jst.enterprise_core.feature" - version="0.0.0"/> - <includes - id="org.eclipse.jst.enterprise_ui.feature" - version="0.0.0"/> - - - - - + <!-- For now, we assume runtime is always built + prior to sdk build --> <includes id="org.eclipse.jst.common_sdk.feature"