Bug #166531. Add missing plugin properties for org.eclipse.jst.jsf.common.ui. Update org.eclipse.jst.jsf.feature to include newly-refactored plugins.
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/plugin.properties b/jsf/plugins/org.eclipse.jst.jsf.common.ui/plugin.properties
index fd8ad24..01ea597 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/plugin.properties
+++ b/jsf/plugins/org.eclipse.jst.jsf.common.ui/plugin.properties
@@ -2,7 +2,9 @@
# Plugin XML information.
####################################################
pluginName=JSF Common UI Plugin
+plugin.name=JSF Common UI Plugin
providerName=Eclipse.org
+plugin.provider=Eclipse.org
prefs.JMT=Web Application Development
jmt.wizard.CategoryName=Web Application Development
####################################################
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/META-INF/MANIFEST.MF
index f89678b..b006f4d 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/META-INF/MANIFEST.MF
@@ -1,8 +1,7 @@
Manifest-Version: 1.0
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jst.pagedesigner.jsf.ui;singleton:=true
-Bundle-Version: 1.5.0
-Bundle-ClassPath: jsfui.jar
+Bundle-Version: 0.5.0.qualifier
Bundle-Activator: org.eclipse.jst.pagedesigner.jsf.ui.JSFUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/build.properties b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/build.properties
index c7f1d2b..744dcb1 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/build.properties
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/build.properties
@@ -1,8 +1,9 @@
-source.jsfui.jar = src/
-output.jsfui.jar = bin/
+source.. = src/
+output.. = bin/
bin.includes = plugin.xml,\
META-INF/,\
- jsfui.jar,\
+ .,\
configs/,\
- icons/
-jars.compile.order = jsfui.jar
+ icons/,\
+ plugin.properties
+jars.compile.order = .
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/META-INF/MANIFEST.MF
index 7de20e5..245c7ec 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jst.pagedesigner.jsp.core;singleton:=true
-Bundle-Version: 1.5.0
-Bundle-ClassPath: jspcore.jar,
+Bundle-Version: 0.5.0.qualifier
+Bundle-ClassPath: .,
lib/commons-el.jar,
lib/jsp-api.jar,
lib/servlet-api.jar
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/build.properties b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/build.properties
index d4969cb..22cb42c 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/build.properties
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/build.properties
@@ -1,7 +1,9 @@
-source.jspcore.jar = src/
-output.jspcore.jar = bin/
+source.. = src/
+output.. = bin/
bin.includes = plugin.xml,\
META-INF/,\
- jspcore.jar,\
+ .,\
lib/,\
- schema/
+ schema/,\
+ about.html,\
+ plugin.properties
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.pagedesigner/META-INF/MANIFEST.MF
index a54f71c..b16f7c6 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/META-INF/MANIFEST.MF
@@ -1,8 +1,7 @@
Manifest-Version: 1.0
Bundle-SymbolicName: org.eclipse.jst.pagedesigner;singleton:=true
Bundle-Name: %pluginName
-Bundle-Version: 1.5.0
-Bundle-ClassPath: pagedesigner.jar
+Bundle-Version: 0.5.0.qualifier
Bundle-Activator: org.eclipse.jst.pagedesigner.PDPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/build.properties b/jsf/plugins/org.eclipse.jst.pagedesigner/build.properties
index 049eca9..3723ab8 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/build.properties
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/build.properties
@@ -1,12 +1,13 @@
-jars.compile.order = pagedesigner.jar
-source.pagedesigner.jar = src/
-output.pagedesigner.jar = bin/
-bin.includes = pagedesigner.jar,\
+jars.compile.order = .
+source.. = src/
+output.. = bin/
+bin.includes = .,\
META-INF/,\
configs/,\
icons/,\
plugin.properties,\
plugin.xml,\
schema/,\
- about.html
+ about.html,\
+ default.properties
src.includes = src/
