Plugin refactoring stage 1: jst.jsf.context plugins (except context.symbol) and contentmodel.annotations have been moved to jsf.common, obsoleting previous plugins
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/META-INF/MANIFEST.MF b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/META-INF/MANIFEST.MF
index f940df8..15e1505 100644
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/META-INF/MANIFEST.MF
+++ b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/META-INF/MANIFEST.MF
@@ -16,11 +16,9 @@
  org.eclipse.jst.jsp.core,
  org.eclipse.wst.html.core,
  org.eclipse.wst.xml.core,
- org.eclipse.jst.jsf.context,
- org.eclipse.jst.jsf.context.resolver,
- org.eclipse.jst.jsf.context.resolver.structureddocument,
- org.eclipse.jst.jsf.context.structureddocument,
+ org.eclipse.jst.jsf.common,
  org.eclipse.jst.jsf.core.tests,
  org.eclipse.jst.jsf.designtime,
- org.eclipse.jst.jsf.context.symbol
+ org.eclipse.jst.jsf.context.symbol,
+ org.eclipse.jface.text
 Eclipse-LazyStart: true
diff --git a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/META-INF/MANIFEST.MF b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/META-INF/MANIFEST.MF
index 6d4f1d9..72c650b 100644
--- a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/META-INF/MANIFEST.MF
+++ b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/META-INF/MANIFEST.MF
@@ -10,9 +10,6 @@
  org.junit,
  org.eclipse.jst.jsf.designtime,
  org.eclipse.core.resources,
- org.eclipse.jst.jsf.context.resolver,
- org.eclipse.jst.jsf.context.resolver.structureddocument,
- org.eclipse.jst.jsf.context.structureddocument,
  org.eclipse.jst.jsf.test.util,
  org.eclipse.jst.jsf.core.tests,
  org.eclipse.jst.jsf.context.symbol,
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/META-INF/MANIFEST.MF b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/META-INF/MANIFEST.MF
index d89a205..3dcb480 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/META-INF/MANIFEST.MF
+++ b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/META-INF/MANIFEST.MF
@@ -17,15 +17,13 @@
  org.eclipse.emf.ecore.xmi,
  org.eclipse.core.runtime.compatibility,
  org.junit,
- org.eclipse.jst.jsf.contentmodel.annotations,
  org.eclipse.jst.jsf.taglibprocessing,
  org.eclipse.wst.common.project.facet.core,
  org.eclipse.wst.common.modulecore,
  org.eclipse.jst.j2ee.web,
- org.eclipse.jst.jsf.context.resolver.structureddocument,
- org.eclipse.jst.jsf.context.structureddocument,
  org.eclipse.wst.sse.core,
- org.eclipse.jdt.core
+ org.eclipse.jdt.core,
+ org.eclipse.jst.jsf.common
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.jst.jsf.metadata.tests
 Plugin-Class: org.eclipse.jst.jsf.metadata.tests.Activator
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/plugin.xml b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/plugin.xml
index 409abd3..33c2df7 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/plugin.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/plugin.xml
@@ -2,7 +2,7 @@
 <?eclipse version="3.0"?>
 <plugin>
    <extension
-         point="org.eclipse.jst.jsf.contentmodel.annotations.annotationFiles">
+         point="org.eclipse.jst.jsf.common.annotationFiles">
       <annotationFile
             location="/testfiles/metadata/jsf_test.xml"
             uri="http://org.eclipse.jsf/test"/>
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/META-INF/MANIFEST.MF b/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/META-INF/MANIFEST.MF
index 273f0dc..dc6aee3 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/META-INF/MANIFEST.MF
+++ b/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/META-INF/MANIFEST.MF
@@ -6,11 +6,7 @@
 Bundle-Activator: org.eclipse.jst.jsf.metadataprocessingtests2.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.jst.jsf.contentmodel.annotations,
  org.eclipse.jst.jsf.metadataprocessors,
  org.eclipse.jst.jsf.metadata.tests,
- org.eclipse.jst.jsf.context,
- org.eclipse.jst.jsf.context.resolver,
- org.eclipse.jst.jsf.context.resolver.structureddocument,
- org.eclipse.jst.jsf.context.structureddocument
+ org.eclipse.jst.jsf.common
 Eclipse-LazyStart: true
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/plugin.xml b/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/plugin.xml
index 5f0dedf..62619fa 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/plugin.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/plugin.xml
@@ -2,7 +2,7 @@
 <?eclipse version="3.0"?>
 <plugin>
    <extension
-         point="org.eclipse.jst.jsf.contentmodel.annotations.annotationFiles">
+         point="org.eclipse.jst.jsf.common.annotationFiles">
       <annotationFile
             location="/metadata/jsf_metadataprocessing2.xml"
             uri=" http://org.eclipse.jsf/metadataprocessing"/>
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/META-INF/MANIFEST.MF b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/META-INF/MANIFEST.MF
index 779308c..ae5adaf 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/META-INF/MANIFEST.MF
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/META-INF/MANIFEST.MF
@@ -14,14 +14,12 @@
  org.eclipse.jst.jsf.core,
  org.eclipse.jst.jsf.facesconfig,
  org.eclipse.wst.sse.core,
- org.eclipse.jst.jsf.context,
- org.eclipse.jst.jsf.context.resolver,
- org.eclipse.jst.jsf.context.resolver.structureddocument,
- org.eclipse.jst.jsf.context.structureddocument,
+ org.eclipse.jst.jsf.common,
  org.eclipse.wst.xml.core,
  org.eclipse.jst.jsp.core,
  org.eclipse.jst.jsf.validation.el,
  org.eclipse.wst.validation,
  org.eclipse.wst.internet.cache,
- org.eclipse.wst.internet.proxy
+ org.eclipse.wst.internet.proxy,
+ org.eclipse.jface.text
 Eclipse-LazyStart: true