use own schemas and DTDs to test resolving, in order to reduce
dependencies to otherwise unused plug-ins
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/META-INF/MANIFEST.MF b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/META-INF/MANIFEST.MF
index 3f9fb7d..b520e1a 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/META-INF/MANIFEST.MF
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.xml.vex.core.tests
+Bundle-SymbolicName: org.eclipse.wst.xml.vex.core.tests;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.wst.xml.vex.core.tests.VEXCoreTestPlugin
 Bundle-Vendor: %providerName
@@ -16,9 +16,7 @@
  org.eclipse.emf.ecore.xmi;bundle-version="[2.4.1,3.0.0)",
  org.eclipse.wst.xml.core;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.wst.sse.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.xsd;bundle-version="[2.6.0,3.0.0)",
- org.eclipse.wst.standard.schemas;bundle-version="[1.0.300,2.0.0)"
+ org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.wst.xml.vex.core.internal.css;x-internal:=true,
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/build.properties b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/build.properties
index 4208a75..e207202 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/build.properties
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/build.properties
@@ -4,4 +4,5 @@
                .,\
                projectFiles/,\
                bin/,\
-               plugin.properties
+               plugin.properties,\
+               plugin.xml
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/plugin.xml b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/plugin.xml
new file mode 100644
index 0000000..56bdcf6
--- /dev/null
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/plugin.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.4"?>

+<plugin>

+   <extension

+         point="org.eclipse.wst.xml.core.catalogContributions">

+      <catalogContribution

+            id="testSchemas">

+         <uri

+               name="http://www.eclipse.org/vex/test/structure"

+               uri="projectFiles/structure.xsd">

+         </uri>

+         <uri

+               name="http://www.eclipse.org/vex/test/content"

+               uri="projectFiles/content.xsd">

+         </uri>

+         <public

+               publicId="-//Eclipse Foundation//DTD Vex Test//EN"

+               uri="projectFiles/test1.dtd">

+         </public>

+      </catalogContribution>

+   </extension>

+

+</plugin>

diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/projectFiles/content.xsd b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/projectFiles/content.xsd
new file mode 100644
index 0000000..dafb955
--- /dev/null
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/projectFiles/content.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ Copyright (c) 2011 Florian Thienel and others.

+ All rights reserved. This program and the accompanying materials

+ are made available under the terms of the Eclipse Public License v1.0

+ which accompanies this distribution, and is available at

+ http://www.eclipse.org/legal/epl-v10.html

+ 

+ Contributors:

+ 		Florian Thienel - initial creation 

+-->

+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.eclipse.org/vex/test/content" xmlns="http://www.eclipse.org/vex/test/content" elementFormDefault="qualified">

+

+	<xs:complexType name="ParagraphType">

+		<xs:complexContent>

+			<xs:restriction base="ContentType"/>

+		</xs:complexContent>

+	</xs:complexType>

+	

+	<xs:complexType name="ContentType">

+		<xs:complexContent>

+			<xs:extension base="xs:string">

+				<xs:element name="b" type="ContentType"/>

+				<xs:element name="i" type="ContentType"/>

+			</xs:extension>

+		</xs:complexContent>

+	</xs:complexType>

+

+	<xs:element name="p" type="ParagraphType"/>

+	

+</xs:schema>
\ No newline at end of file
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/projectFiles/structure.xsd b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/projectFiles/structure.xsd
new file mode 100644
index 0000000..e345e93
--- /dev/null
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/projectFiles/structure.xsd
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2011 Florian Thienel and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+ 
+ Contributors:
+ 		Florian Thienel - initial creation 
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.eclipse.org/vex/test/structure" xmlns="http://www.eclipse.org/vex/test/structure" elementFormDefault="qualified">
+
+	<xs:complexType name="ChapterType">
+		<xs:sequence>
+			<xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
+			<xs:choice>
+				<xs:element name="chapter" type="ChapterType" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:any namespace="http://www.eclipse.org/vex/test/content" processContents="skip" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:choice>
+		</xs:sequence>
+	</xs:complexType>
+	
+	<xs:element name="chapter" type="ChapterType"/>
+	
+</xs:schema>
\ No newline at end of file
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/projectFiles/test1.dtd b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/projectFiles/test1.dtd
index f246a88..86cbc19 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/projectFiles/test1.dtd
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/projectFiles/test1.dtd
@@ -1,9 +1,14 @@
+<!-- PUBLIC "-//Eclipse Foundation//DTD Vex Test//EN" -->
+<!ELEMENT title (#PCDATA)>
 <!ELEMENT any ANY>
 <!ELEMENT empty EMPTY>
 <!ELEMENT section (title?, para+)>
 <!ELEMENT para (#PCDATA | emphasis)*>
-<!ELEMENT title (#PCDATA)>
 <!ELEMENT emphasis (#PCDATA)>
+<!ELEMENT one-kind-of-child (section+)>
+<!ELEMENT document (title?, preface, section+, index)>
+<!ELEMENT preface (para+)>
+<!ELEMENT index (para+)>
 
 <!-- a dummy attribute, just to make sure attribute def serialization is OK -->
 <!ATTLIST section
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/ProjectPlanTest.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/ProjectPlanTest.java
index 9e3c6e0..96055dc 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/ProjectPlanTest.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/ProjectPlanTest.java
@@ -72,12 +72,12 @@
 		final URIResolver uriResolver = URIResolverPlugin.createResolver();

 		final ContentModelManager modelManager = ContentModelManager.getInstance();

 		

-		final String schemaLocation = uriResolver.resolve(null, "http://www.w3.org/2001/XMLSchema", null);

+		final String schemaLocation = uriResolver.resolve(null, "http://www.eclipse.org/vex/test/structure", null);

 		assertNotNull(schemaLocation);

 		final CMDocument schema = modelManager.createCMDocument(schemaLocation, null);

 		assertNotNull(schema);

 		

-		final String dtdLocation = uriResolver.resolve(null, "-//W3C//DTD XHTML 1.1//EN", null);

+		final String dtdLocation = uriResolver.resolve(null, "-//Eclipse Foundation//DTD Vex Test//EN", null);

 		assertNotNull(dtdLocation);

 		final CMDocument dtd = modelManager.createCMDocument(dtdLocation, null);

 		assertNotNull(dtd);