diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.common.ui/META-INF/MANIFEST.MF
index e9ed944..a0645ce 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.jsf.common.ui/META-INF/MANIFEST.MF
@@ -4,20 +4,22 @@
 Bundle-SymbolicName: org.eclipse.jst.jsf.common.ui;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.ui.cheatsheets,
- org.eclipse.help,
- org.eclipse.jdt.core,
- org.eclipse.core.resources,
- org.eclipse.ui.forms,
- org.eclipse.jdt.ui,
- org.eclipse.ui.ide,
- org.eclipse.draw2d,
- org.eclipse.jface.text,
- org.eclipse.jst.j2ee.web,
- org.eclipse.jst.j2ee,
- org.eclipse.wst.common.project.facet.core
+Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.cheatsheets;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.help;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.draw2d;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.common.emf;bundle-version="[1.1.103,2.0.0)",
+ org.eclipse.wst.common.project.facet.core;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.emf;bundle-version="[2.2.0,2.4.0)",
+ org.eclipse.emf.common;bundle-version="[2.2.0,2.4.0)"
 Export-Package: org.eclipse.jst.jsf.common.ui;x-friends:="org.eclipse.jst.pagedesigner,org.eclipse.jst.pagedesigner.jsf.ui",
  org.eclipse.jst.jsf.common.ui.internal.actions;x-friends:="org.eclipse.jst.jsf.facesconfig.ui",
  org.eclipse.jst.jsf.common.ui.internal.dialogfield;x-friends:="org.eclipse.jst.pagedesigner,org.eclipse.jst.pagedesigner.jsf.ui",
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.common/META-INF/MANIFEST.MF
index 01c12d2..c68ec69 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/META-INF/MANIFEST.MF
@@ -36,20 +36,16 @@
  org.eclipse.jst.jsf.context.symbol.internal.util;x-internal:=true,
  org.eclipse.jst.jsf.context.symbol.provider,
  org.eclipse.jst.jsf.context.symbol.source
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.wst.sse.core,
- org.eclipse.jst.jsp.core,
- org.eclipse.core.resources,
- org.eclipse.jface.text,
- org.eclipse.wst.sse.ui,
- org.eclipse.wst.xml.core,
- org.eclipse.jdt.core,
- org.eclipse.emf.common,
- org.eclipse.jface,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.edit,
- org.eclipse.emf.edit.ui,
- org.eclipse.emf.ecore.xmi
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jst.jsp.core;bundle-version="[1.1.0,1.3.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.wst.sse.ui;bundle-version="[1.0.101,1.1.0)",
+ org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.emf.edit.ui;bundle-version="[2.2.0,2.4.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.4.0)"
 Eclipse-LazyStart: true
 Bundle-Vendor: %plugin.provider
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.core/META-INF/MANIFEST.MF
index b665a05..6faa8cf 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/META-INF/MANIFEST.MF
@@ -6,41 +6,37 @@
 Bundle-Activator: org.eclipse.jst.jsf.core.internal.JSFCorePlugin
 Bundle-Vendor: %plugin.provider
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.jst.j2ee.web,
- org.eclipse.jst.server.core,
- org.eclipse.wst.server.core,
- org.eclipse.wst.common.frameworks,
- org.eclipse.jst.jsf.facesconfig,
- org.eclipse.jst.common.frameworks,
- org.eclipse.jdt.core,
- org.eclipse.core.resources,
- org.eclipse.jst.j2ee,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jem.util,
- org.eclipse.wst.xml.core,
- org.eclipse.jem.workbench,
- org.eclipse.wst.common.frameworks.ui,
- org.eclipse.jst.jsp.core,
- org.eclipse.jst.jsf.common,
- org.eclipse.jface.text,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.html.core,
- org.eclipse.wst.validation,
- org.eclipse.wst.sse.ui,
- org.eclipse.wst.common.emf,
- org.eclipse.ui.browser,
- org.eclipse.jst.jee.web,
- org.eclipse.jst.jee
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.wst.common.project.facet.core;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jst.jsf.facesconfig;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jst.jsp.core;bundle-version="[1.1.0,1.3.0)",
+ org.eclipse.jst.jsf.common;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.html.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.sse.ui;bundle-version="[1.0.101,1.1.0)",
+ org.eclipse.wst.common.emf;bundle-version="[1.1.103,2.0.0)",
+ org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.emf.common;bundle-version="[2.2.0,2.4.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.2.0,2.4.0)",
+ org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.swt;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.4.0)",
+ org.eclipse.emf.edit;bundle-version="[2.2.0,2.4.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.jst.jsf.core,
  org.eclipse.jst.jsf.core.internal;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests",
  org.eclipse.jst.jsf.core.internal.contentassist.el;x-friends:="org.eclipse.jst.jsf.contentassist.tests",
- org.eclipse.jst.jsf.core.internal.jsflibraryconfig;x-friends:="org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.core.tests",
+ org.eclipse.jst.jsf.core.internal.jsflibraryconfig;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui.tests",
  org.eclipse.jst.jsf.core.internal.jsflibraryregistry;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests",
  org.eclipse.jst.jsf.core.internal.jsflibraryregistry.adapter;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests",
  org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests",
@@ -48,18 +44,18 @@
  org.eclipse.jst.jsf.core.internal.launch;x-internal:=true,
  org.eclipse.jst.jsf.core.internal.project.facet;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests",
  org.eclipse.jst.jsf.core.internal.tld;x-friends:="org.eclipse.jst.pagedesigner,org.eclipse.jst.jsf.core.tests",
- org.eclipse.jst.jsf.core.jsflibraryregistry,
+ org.eclipse.jst.jsf.core.jsfappconfig,
  org.eclipse.jst.jsf.core.jsflibraryconfiguration,
  org.eclipse.jst.jsf.core.jsflibraryconfiguration.internal;x-friends:="org.eclipse.jst.jsf.core.tests",
- org.eclipse.jst.jsf.core.internal.jsflibraryconfig;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui.tests",
- org.eclipse.jst.jsf.core.jsfappconfig,
  org.eclipse.jst.jsf.core.jsflibraryregistry,
+ org.eclipse.jst.jsf.core.jsflibraryregistry.internal;x-friends:="org.eclipse.jst.jsf.core.tests",
  org.eclipse.jst.jsf.core.set.constraint,
  org.eclipse.jst.jsf.core.set.mapping,
  org.eclipse.jst.jsf.core.tagmatcher,
  org.eclipse.jst.jsf.designtime,
  org.eclipse.jst.jsf.designtime.context,
  org.eclipse.jst.jsf.designtime.el,
+ org.eclipse.jst.jsf.designtime.internal;x-internal:=true,
  org.eclipse.jst.jsf.designtime.internal.jsp;x-internal:=true,
  org.eclipse.jst.jsf.designtime.internal.symbols;x-friends:="org.eclipse.jst.jsf.designtime.tests",
  org.eclipse.jst.jsf.designtime.resolver,
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/META-INF/MANIFEST.MF
index 22ac5a1..68b1433 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/META-INF/MANIFEST.MF
@@ -6,41 +6,29 @@
 Bundle-Activator: org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin
 Bundle-Vendor: %plugin.provider
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.jdt.core,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.ui.views,
- org.eclipse.help,
- org.eclipse.ui.forms,
- org.eclipse.gef,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.xml.ui,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.jst.jsp.core,
- org.eclipse.draw2d,
- org.eclipse.wst.sse.ui,
- org.eclipse.wst.common.ui.properties,
- org.eclipse.wst.common.uriresolver,
- org.eclipse.jface.text,
- org.eclipse.emf.edit,
- org.eclipse.ui.editors,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.jst.jsp.ui,
- org.eclipse.jst.j2ee.web,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.wst.common.emf,
- org.eclipse.jem.util,
- org.eclipse.jst.jsf.facesconfig,
- org.eclipse.ui.cheatsheets,
- org.apache.xerces,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.emf.edit.ui,
- org.eclipse.jst.jsf.common.ui,
- org.eclipse.jdt.ui,
- org.eclipse.jst.jsf.core
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.help;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.gef;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.xml.ui;bundle-version="[1.0.100,1.1.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.4.0)",
+ org.eclipse.jst.jsp.core;bundle-version="[1.1.0,1.3.0)",
+ org.eclipse.wst.sse.ui;bundle-version="[1.0.101,1.1.0)",
+ org.eclipse.wst.common.ui.properties;bundle-version="[1.0.101,1.2.0)",
+ org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.wst.common.emf;bundle-version="[1.1.103,2.0.0)",
+ org.eclipse.jst.jsf.facesconfig;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.wst.common.project.facet.core;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.emf.edit.ui;bundle-version="[2.2.0,2.4.0)",
+ org.eclipse.jst.jsf.common.ui;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jst.jsf.core;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.jst.jsf.facesconfig.ui;x-internal:=true,
  org.eclipse.jst.jsf.facesconfig.ui.dialog;x-internal:=true,
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/META-INF/MANIFEST.MF
index e9903ab..30c0c13 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/META-INF/MANIFEST.MF
@@ -6,24 +6,16 @@
 Bundle-Activator: org.eclipse.jst.jsf.facesconfig.FacesConfigPlugin$Implementation
 Bundle-Vendor: %plugin.provider
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.emf.edit.ui;visibility:=reexport,
- org.eclipse.gef,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.ui,
- org.eclipse.ui.ide;visibility:=reexport,
- org.eclipse.ui.views,
- org.eclipse.wst.common.emf,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.wst.common.frameworks.ui,
- org.eclipse.wst.common.modulecore,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.validation,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.common.uriresolver
+Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.4.0)",
+ org.eclipse.wst.common.emf;bundle-version="[1.1.103,2.0.0)",
+ org.eclipse.emf.edit.ui;bundle-version="[2.2.0,2.4.0)",
+ org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.jst.jsf.facesconfig,
  org.eclipse.jst.jsf.facesconfig.edit.provider,
diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/META-INF/MANIFEST.MF
index d6401b0..51284ac 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/META-INF/MANIFEST.MF
@@ -4,10 +4,10 @@
 Bundle-SymbolicName: org.eclipse.jst.jsf.standard.tagsupport;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.jst.jsf.standard.tagsupport.StandardTagSupportPlugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.jst.jsf.common,
- org.eclipse.emf.ecore.xmi
+Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jst.jsf.common;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.4.0)"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.jst.jsf.standard.tagsupport;x-internal:=true
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.ui/META-INF/MANIFEST.MF
index f06da40..2662ed9 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.jsf.ui/META-INF/MANIFEST.MF
@@ -6,33 +6,21 @@
 Bundle-Activator: org.eclipse.jst.jsf.ui.internal.JSFUiPlugin
 Bundle-Vendor: %plugin.provider
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.jst.jsf.core,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.wst.common.project.facet.ui,
- org.eclipse.jst.j2ee.web,
- org.eclipse.jst.server.core,
- org.eclipse.wst.server.core,
- org.eclipse.wst.common.frameworks,
- org.eclipse.jst.common.frameworks,
- org.eclipse.jdt.core,
- org.eclipse.jdt.ui,
- org.eclipse.core.resources,
- org.eclipse.jst.j2ee,
- org.eclipse.emf.common,
- org.eclipse.wst.common.frameworks.ui,
- org.eclipse.ui.ide,
- org.eclipse.jst.j2ee.core,
- org.eclipse.emf.ecore,
- org.eclipse.jem.util,
- org.eclipse.jst.jsf.common,
- org.eclipse.jface.text,
- org.eclipse.jst.jsp.core,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.xml.ui,
- org.eclipse.jst.jsp.ui,
- org.eclipse.wst.sse.ui
+Require-Bundle: org.eclipse.jst.jsf.core;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,1.3.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jst.jsf.common;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jst.jsp.core;bundle-version="[1.1.0,1.3.0)",
+ org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.xml.ui;bundle-version="[1.0.100,1.1.0)",
+ org.eclipse.wst.sse.ui;bundle-version="[1.0.101,1.1.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.2.0,2.4.0)",
+ org.eclipse.jst.jsp.ui;bundle-version="[1.1.0,1.3.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.jst.jsf.ui.internal;x-friends:="org.eclipse.jst.jsf.ui.tests",
  org.eclipse.jst.jsf.ui.internal.classpath;x-friends:="org.eclipse.jst.jsf.ui.tests",
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 9a2ea84..c2f149b 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
@@ -5,16 +5,21 @@
 Bundle-Activator: org.eclipse.jst.pagedesigner.jsf.ui.JSFUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jst.jsf.facesconfig.ui,
- org.eclipse.jst.jsf.facesconfig,
- org.eclipse.jst.pagedesigner,
- org.eclipse.jst.pagedesigner.jsp.core,
- org.eclipse.wst.common.modulecore,
- org.eclipse.wst.common.ui.properties,
- org.eclipse.jst.jsf.common.ui,
- org.eclipse.jst.jsf.core,
- org.eclipse.jst.jsf.common,
- org.eclipse.emf.codegen.ecore
+Require-Bundle: org.eclipse.jst.jsf.facesconfig;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.jst.pagedesigner;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.jst.pagedesigner.jsp.core;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.common.ui.properties;bundle-version="[1.0.101,1.2.0)",
+ org.eclipse.jst.jsf.common.ui;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.jst.jsf.core;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.jst.jsf.common;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.gef;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)"
 Eclipse-LazyStart: true
 Bundle-ManifestVersion: 2
 Export-Package: org.eclipse.jst.pagedesigner.jsf.core.dom;x-internal:=true,
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 442154c..3aa3bf4 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
@@ -9,15 +9,13 @@
 Bundle-Activator: org.eclipse.jst.pagedesigner.jsp.core.JSPCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.jdt.core;visibility:=reexport,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.xml.core,
- org.eclipse.jst.jsp.core,
- org.eclipse.wst.html.core,
- org.eclipse.jst.jsf.common,
- org.eclipse.jface
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jst.jsp.core;bundle-version="[1.1.0,1.3.0)",
+ org.eclipse.wst.html.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jst.jsf.common;bundle-version="[1.0.0,1.1.0)"
 Eclipse-LazyStart: true
 Bundle-ManifestVersion: 2
 Export-Package: javax.servlet;x-internal:=true,
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/.classpath b/jsf/plugins/org.eclipse.jst.pagedesigner/.classpath
index cb01053..472ee29 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/.classpath
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
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 d0c8d36..a6280e9 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/META-INF/MANIFEST.MF
@@ -5,36 +5,48 @@
 Bundle-Activator: org.eclipse.jst.pagedesigner.PDPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
- org.eclipse.debug.ui,
- org.eclipse.emf.ecore,
- org.eclipse.gef;visibility:=reexport,
- org.eclipse.jface.text;visibility:=reexport,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.wst.common.ui,
- org.eclipse.wst.sse.core;visibility:=reexport,
- org.eclipse.wst.css.core;visibility:=reexport,
- org.eclipse.wst.html.core;visibility:=reexport,
- org.eclipse.wst.xml.core;visibility:=reexport,
- org.eclipse.wst.common.uriresolver;visibility:=reexport,
- org.eclipse.wst.sse.ui;visibility:=reexport,
- org.eclipse.wst.xml.ui,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.jsp.core;visibility:=reexport,
- org.eclipse.jst.jsp.ui,
- org.eclipse.jst.j2ee.web,
- org.eclipse.jst.pagedesigner.jsp.core,
- org.eclipse.wst.html.ui,
- org.eclipse.wst.common.ui.properties,
- org.eclipse.jst.jsf.common.ui,
- org.eclipse.ui.ide,
- org.eclipse.jdt.ui,
- org.eclipse.swt,
- org.eclipse.jst.jsf.common,
- org.eclipse.jst.jsf.core
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.2.0,2.4.0)",
+ org.eclipse.gef;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.wst.common.ui;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.sse.ui;bundle-version="[1.0.101,1.1.0)",
+ org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jst.jsp.core;bundle-version="[1.1.0,1.3.0)",
+ org.eclipse.jst.jsp.ui;bundle-version="[1.1.0,1.3.0)",
+ org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jst.pagedesigner.jsp.core;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.wst.common.ui.properties;bundle-version="[1.0.101,1.2.0)",
+ org.eclipse.jst.jsf.common.ui;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jst.jsf.common;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.jst.jsf.core;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.wst.html.ui;bundle-version="[1.0.100,1.1.0)",
+ org.eclipse.wst.css.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.html.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.xml.ui;bundle-version="[1.0.100,1.1.0)",
+ org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)"
 Eclipse-LazyStart: true
 Bundle-ManifestVersion: 2
-Export-Package: org.eclipse.jst.pagedesigner,
+Export-Package: org.eclipse.jst.pagedesigner;
+  uses:="org.eclipse.swt.graphics,
+   org.osgi.framework,
+   org.eclipse.wst.sse.core.internal.provisional,
+   org.eclipse.core.resources,
+   org.eclipse.ui,
+   org.eclipse.jst.jsf.common.ui.internal.guiutils,
+   org.eclipse.jst.jsf.common.ui.internal.logging,
+   org.eclipse.jface.preference,
+   org.eclipse.ui.plugin,
+   org.eclipse.jface.resource,
+   org.eclipse.swt.widgets,
+   org.eclipse.core.runtime",
  org.eclipse.jst.pagedesigner.actions.container;x-internal:=true,
  org.eclipse.jst.pagedesigner.actions.link;x-internal:=true,
  org.eclipse.jst.pagedesigner.actions.menuextension;x-internal:=true,
@@ -48,7 +60,14 @@
  org.eclipse.jst.pagedesigner.commands.nav;x-internal:=true,
  org.eclipse.jst.pagedesigner.commands.range;x-internal:=true,
  org.eclipse.jst.pagedesigner.commands.single;x-internal:=true,
- org.eclipse.jst.pagedesigner.converter,
+ org.eclipse.jst.pagedesigner.converter;
+  uses:="org.eclipse.jface.viewers,
+   org.eclipse.swt.graphics,
+   org.w3c.dom,
+   org.eclipse.wst.sse.core.internal.provisional,
+   org.eclipse.jst.pagedesigner.css2.style,
+   org.eclipse.wst.xml.core.internal.provisional.document,
+   org.eclipse.jst.jsf.common.ui.internal.logging",
  org.eclipse.jst.pagedesigner.converter.html;x-internal:=true,
  org.eclipse.jst.pagedesigner.converter.jsp;x-internal:=true,
  org.eclipse.jst.pagedesigner.css2;x-internal:=true,
@@ -68,12 +87,18 @@
  org.eclipse.jst.pagedesigner.dnd.internal;x-internal:=true,
  org.eclipse.jst.pagedesigner.dom;x-internal:=true,
  org.eclipse.jst.pagedesigner.dom.html;x-internal:=true,
- org.eclipse.jst.pagedesigner.dtmanager,
- org.eclipse.jst.pagedesigner.dtmanager.converter,
+ org.eclipse.jst.pagedesigner.dtmanager;
+  uses:="org.eclipse.jst.jsf.common.metadata,
+   org.w3c.dom,
+   org.eclipse.core.resources,
+   org.eclipse.jst.pagedesigner.dtmanager.dtinfo,
+   org.eclipse.jst.pagedesigner.converter,
+   org.eclipse.wst.xml.core.internal.provisional.document",
+ org.eclipse.jst.pagedesigner.dtmanager.converter;uses:="org.w3c.dom,org.eclipse.jst.pagedesigner.converter",
  org.eclipse.jst.pagedesigner.dtmanager.converter.internal;x-friends:="org.eclipse.jst.pagedesigner.jsf.ui",
- org.eclipse.jst.pagedesigner.dtmanager.converter.operations,
+ org.eclipse.jst.pagedesigner.dtmanager.converter.operations;uses:="org.eclipse.jst.jsf.common.metadata,org.w3c.dom,org.eclipse.jst.pagedesigner.dtmanager.converter",
  org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal;x-internal:=true,
- org.eclipse.jst.pagedesigner.dtmanager.dtinfo,
+ org.eclipse.jst.pagedesigner.dtmanager.dtinfo;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
  org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.impl;x-internal:=true,
  org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.util;x-internal:=true,
  org.eclipse.jst.pagedesigner.editors;x-internal:=true,
@@ -89,7 +114,11 @@
  org.eclipse.jst.pagedesigner.elementedit;x-internal:=true,
  org.eclipse.jst.pagedesigner.elementedit.html;x-internal:=true,
  org.eclipse.jst.pagedesigner.elementedit.jsp;x-internal:=true,
- org.eclipse.jst.pagedesigner.extensionpoint,
+ org.eclipse.jst.pagedesigner.extensionpoint;
+  uses:="org.eclipse.jface.viewers,
+   org.eclipse.wst.sse.core.internal.provisional,
+   org.eclipse.jface.action,
+   org.eclipse.swt.widgets",
  org.eclipse.jst.pagedesigner.figurehandler;x-internal:=true,
  org.eclipse.jst.pagedesigner.itemcreation;x-internal:=true,
  org.eclipse.jst.pagedesigner.itemcreation.internal;x-internal:=true,
@@ -112,7 +141,6 @@
  org.eclipse.jst.pagedesigner.utils;x-internal:=true,
  org.eclipse.jst.pagedesigner.validation.caret;x-internal:=true,
  org.eclipse.jst.pagedesigner.viewer;x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5