From 60a90d28f498a9115a4cba2e660483654d40a6b6 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Mon, 11 Jun 2007 08:07:58 +0000
Subject: [PATCH] forget to update build.properties with webpage editor
---
assembly/features/org.eclipse.jst.feature/feature.properties | 1 +
assembly/features/org.eclipse.jst.feature/feature.xml | 4 ++--
.../org.eclipse.wtp.releng.tests.feature/build.properties | 4 +++-
features/org.eclipse.wtp.releng.tests.feature/feature.xml | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/assembly/features/org.eclipse.jst.feature/feature.properties b/assembly/features/org.eclipse.jst.feature/feature.properties
index bc892b7c1..fb2a7c721 100644
--- a/assembly/features/org.eclipse.jst.feature/feature.properties
+++ b/assembly/features/org.eclipse.jst.feature/feature.properties
@@ -16,6 +16,7 @@
# "featureName" property - name of the feature
featureName=J2EE Standard Tools (JST) Project
+optionalFeatureName=Web Page Editor (Optional)
# "providerName" property - name of the company that provides the feature
providerName=Eclipse.org
diff --git a/assembly/features/org.eclipse.jst.feature/feature.xml b/assembly/features/org.eclipse.jst.feature/feature.xml
index 1c2f27870..4036469be 100644
--- a/assembly/features/org.eclipse.jst.feature/feature.xml
+++ b/assembly/features/org.eclipse.jst.feature/feature.xml
@@ -45,10 +45,10 @@
version="0.0.0"/>
<includes
+ optional="true"
id="org.eclipse.jst.webpageeditor.feature"
version="0.0.0"
- name="Web Page Editor (Optional)"
- optional="true"/>
+ name="%optionalFeatureName" />
<plugin
id="org.eclipse.jst"
diff --git a/features/org.eclipse.wtp.releng.tests.feature/build.properties b/features/org.eclipse.wtp.releng.tests.feature/build.properties
index 64f93a9f0..52c3cfc48 100644
--- a/features/org.eclipse.wtp.releng.tests.feature/build.properties
+++ b/features/org.eclipse.wtp.releng.tests.feature/build.properties
@@ -1 +1,3 @@
-bin.includes = feature.xml
+bin.includes = feature.xml,\
+ license.html,\
+ feature.properties
diff --git a/features/org.eclipse.wtp.releng.tests.feature/feature.xml b/features/org.eclipse.wtp.releng.tests.feature/feature.xml
index 0b479a1b1..380212fff 100644
--- a/features/org.eclipse.wtp.releng.tests.feature/feature.xml
+++ b/features/org.eclipse.wtp.releng.tests.feature/feature.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.wtp.releng.tests.feature"
- label="Releng Test Feature"
+ label="%featureName"
version="1.0.1.qualifier"
provider-name="%providerName">
--
GitLab