Bug 322729: Define a new content type "XML Document" and use this 
content type as sub-type for DITA and DocBook.

Signed-off-by: Florian Thienel <florian@thienel.org>
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.dita/META-INF/MANIFEST.MF b/sourceediting/plugins/org.eclipse.wst.xml.vex.dita/META-INF/MANIFEST.MF
index 814fa68..b27d9fc 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.dita/META-INF/MANIFEST.MF
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.dita/META-INF/MANIFEST.MF
@@ -5,6 +5,7 @@
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.wst.xml.vex.dita;singleton:=true
 Require-Bundle: org.eclipse.wst.xml.vex.core;bundle-version="[0.5.0,1.0.0)",
- org.eclipse.wst.xml.vex.ui;bundle-version="[0.5.0,1.0.0)"
+ org.eclipse.wst.xml.vex.ui;bundle-version="[0.5.0,1.0.0)",
+ org.eclipse.wst.xml.core
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.dita/plugin.properties b/sourceediting/plugins/org.eclipse.wst.xml.vex.dita/plugin.properties
index 7b8358c..fb9035d 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.dita/plugin.properties
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.dita/plugin.properties
@@ -22,7 +22,7 @@
 style.classed=DITA Classed
 style.mapStyle=DITA Map
 
-contentType.name = DITA Content Type
-contentType.map.name = DITA Map Content Type
-contentType.ditaval.name = DITAVal Content Type
-contentType.topic.name = DITA Topic Content Type
\ No newline at end of file
+contentType.name = DITA
+contentType.map.name = DITA Map
+contentType.ditaval.name = DITAVal
+contentType.topic.name = DITA Topic
\ No newline at end of file
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.dita/plugin.xml b/sourceediting/plugins/org.eclipse.wst.xml.vex.dita/plugin.xml
index 3b473be..3d9a5e3 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.dita/plugin.xml
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.dita/plugin.xml
@@ -5,7 +5,7 @@
 	<!-- Registers DITA-related content types extensions as xml content-->
 	<extension point="org.eclipse.core.contenttype.contentTypes">
 		<content-type id="org.eclipse.wst.xml.vex.ui.dita" name="%contentType.name"
-			base-type="org.eclipse.core.runtime.xml" file-extensions="dita, ditamap, ditaval">
+			base-type="org.eclipse.wst.xml.vex.ui.XmlDocument" file-extensions="dita, ditamap, bookmap, ditaval">
 		</content-type>
 		<content-type id="org.eclipse.wst.xml.vex.ui.dita.map"
 			name="%contentType.map.name" base-type="org.eclipse.wst.xml.vex.ui.dita.map"