diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index b99a172034b3..af2a19460731 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -90,37 +90,62 @@
         <XML>
           <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
         </XML>
-        <ADDITIONAL_INDENT_OPTIONS fileType="feature">
-          <option name="INDENT_SIZE" value="2" />
-        </ADDITIONAL_INDENT_OPTIONS>
-        <ADDITIONAL_INDENT_OPTIONS fileType="gsp">
-          <option name="INDENT_SIZE" value="2" />
-        </ADDITIONAL_INDENT_OPTIONS>
-        <ADDITIONAL_INDENT_OPTIONS fileType="haml">
-          <option name="INDENT_SIZE" value="2" />
-        </ADDITIONAL_INDENT_OPTIONS>
         <ADDITIONAL_INDENT_OPTIONS fileType="html">
           <option name="INDENT_SIZE" value="2" />
           <option name="CONTINUATION_INDENT_SIZE" value="4" />
           <option name="TAB_SIZE" value="8" />
         </ADDITIONAL_INDENT_OPTIONS>
-        <ADDITIONAL_INDENT_OPTIONS fileType="jsp">
-          <option name="INDENT_SIZE" value="2" />
-          <option name="CONTINUATION_INDENT_SIZE" value="4" />
-          <option name="TAB_SIZE" value="8" />
-        </ADDITIONAL_INDENT_OPTIONS>
         <ADDITIONAL_INDENT_OPTIONS fileType="rb">
           <option name="INDENT_SIZE" value="2" />
         </ADDITIONAL_INDENT_OPTIONS>
-        <ADDITIONAL_INDENT_OPTIONS fileType="sass">
-          <option name="INDENT_SIZE" value="2" />
-        </ADDITIONAL_INDENT_OPTIONS>
-        <ADDITIONAL_INDENT_OPTIONS fileType="sql">
-          <option name="INDENT_SIZE" value="2" />
-        </ADDITIONAL_INDENT_OPTIONS>
-        <ADDITIONAL_INDENT_OPTIONS fileType="yml">
-          <option name="INDENT_SIZE" value="2" />
-        </ADDITIONAL_INDENT_OPTIONS>
+        <codeStyleSettings language="CFML">
+          <option name="KEEP_LINE_BREAKS" value="false" />
+          <option name="ELSE_ON_NEW_LINE" value="true" />
+          <option name="WHILE_ON_NEW_LINE" value="true" />
+          <option name="CATCH_ON_NEW_LINE" value="true" />
+          <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+          <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+          <option name="CALL_PARAMETERS_WRAP" value="1" />
+          <option name="METHOD_PARAMETERS_WRAP" value="5" />
+          <option name="BINARY_OPERATION_WRAP" value="5" />
+          <option name="TERNARY_OPERATION_WRAP" value="5" />
+          <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+          <option name="FOR_STATEMENT_WRAP" value="5" />
+          <option name="ASSIGNMENT_WRAP" value="1" />
+          <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+        </codeStyleSettings>
+        <codeStyleSettings language="ECMA Script Level 4">
+          <option name="KEEP_LINE_BREAKS" value="false" />
+          <option name="ELSE_ON_NEW_LINE" value="true" />
+          <option name="WHILE_ON_NEW_LINE" value="true" />
+          <option name="CATCH_ON_NEW_LINE" value="true" />
+          <option name="FINALLY_ON_NEW_LINE" value="true" />
+          <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+          <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+          <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+          <option name="CALL_PARAMETERS_WRAP" value="1" />
+          <option name="METHOD_PARAMETERS_WRAP" value="5" />
+          <option name="EXTENDS_LIST_WRAP" value="1" />
+          <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+          <option name="BINARY_OPERATION_WRAP" value="5" />
+          <option name="TERNARY_OPERATION_WRAP" value="5" />
+          <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+          <option name="FOR_STATEMENT_WRAP" value="5" />
+          <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+          <option name="ASSIGNMENT_WRAP" value="1" />
+          <option name="IF_BRACE_FORCE" value="1" />
+          <option name="DOWHILE_BRACE_FORCE" value="1" />
+          <option name="WHILE_BRACE_FORCE" value="1" />
+          <option name="FOR_BRACE_FORCE" value="1" />
+          <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+        </codeStyleSettings>
+        <codeStyleSettings language="GSP">
+          <indentOptions>
+            <option name="INDENT_SIZE" value="2" />
+          </indentOptions>
+        </codeStyleSettings>
         <codeStyleSettings language="Groovy">
           <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
           <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
@@ -201,6 +226,36 @@
             <option name="TAB_SIZE" value="8" />
           </indentOptions>
         </codeStyleSettings>
+        <codeStyleSettings language="JSP">
+          <indentOptions>
+            <option name="INDENT_SIZE" value="2" />
+            <option name="CONTINUATION_INDENT_SIZE" value="4" />
+            <option name="TAB_SIZE" value="8" />
+          </indentOptions>
+        </codeStyleSettings>
+        <codeStyleSettings language="JavaScript">
+          <option name="KEEP_LINE_BREAKS" value="false" />
+          <option name="ELSE_ON_NEW_LINE" value="true" />
+          <option name="WHILE_ON_NEW_LINE" value="true" />
+          <option name="CATCH_ON_NEW_LINE" value="true" />
+          <option name="FINALLY_ON_NEW_LINE" value="true" />
+          <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+          <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+          <option name="CALL_PARAMETERS_WRAP" value="1" />
+          <option name="METHOD_PARAMETERS_WRAP" value="5" />
+          <option name="BINARY_OPERATION_WRAP" value="5" />
+          <option name="TERNARY_OPERATION_WRAP" value="5" />
+          <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+          <option name="FOR_STATEMENT_WRAP" value="5" />
+          <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+          <option name="ASSIGNMENT_WRAP" value="1" />
+          <option name="IF_BRACE_FORCE" value="1" />
+          <option name="DOWHILE_BRACE_FORCE" value="1" />
+          <option name="WHILE_BRACE_FORCE" value="1" />
+          <option name="FOR_BRACE_FORCE" value="1" />
+          <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+        </codeStyleSettings>
         <codeStyleSettings language="XML">
           <indentOptions>
             <option name="INDENT_SIZE" value="2" />
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fa595e20de73..569ac7af0c1b 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -20,7 +20,11 @@
       <entry name="!*.class" />
       <entry name="!*.groovy" />
     </wildcardResourcePatterns>
-    <annotationProcessing enabled="false" useClasspath="true" />
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="false">
+        <processorPath useClasspath="true" />
+      </profile>
+    </annotationProcessing>
   </component>
   <component name="EclipseCompilerSettings">
     <option name="GENERATE_NO_WARNINGS" value="true" />
diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml
index 78549253c339..89047b57a1b8 100644
--- a/.idea/inspectionProfiles/idea_default.xml
+++ b/.idea/inspectionProfiles/idea_default.xml
@@ -594,6 +594,9 @@
     <inspection_tool class="UtilityClassWithPublicConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="UtilityClassWithoutPrivateConstructor" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="ignoreClassesWithOnlyMain" value="false" />
+      <option name="ignorableAnnotations">
+        <value />
+      </option>
     </inspection_tool>
     <inspection_tool class="WaitNotInLoop" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="WaitNotInSynchronizedContext" enabled="true" level="WARNING" enabled_by_default="true" />
diff --git a/.idea/inspectionProfiles/idea_default_no_spellchecker.xml b/.idea/inspectionProfiles/idea_default_no_spellchecker.xml
index f22b5d38c38c..b86ca5504888 100644
--- a/.idea/inspectionProfiles/idea_default_no_spellchecker.xml
+++ b/.idea/inspectionProfiles/idea_default_no_spellchecker.xml
@@ -799,6 +799,9 @@
     <inspection_tool class="UtilityClassWithPublicConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="UtilityClassWithoutPrivateConstructor" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="ignoreClassesWithOnlyMain" value="false" />
+      <option name="ignorableAnnotations">
+        <value />
+      </option>
     </inspection_tool>
     <inspection_tool class="ValidExternallyBoundObject" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="ValidatorConfigModelInspection" enabled="false" level="ERROR" enabled_by_default="false" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 1e2ce6f4f11a..830183138f6a 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -123,6 +123,7 @@
       <module fileurl="file://$PROJECT_DIR$/platform/xdebugger-impl/xdebugger-impl.iml" filepath="$PROJECT_DIR$/platform/xdebugger-impl/xdebugger-impl.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/xml/impl/xml.iml" filepath="$PROJECT_DIR$/xml/impl/xml.iml" group="xml" />
       <module fileurl="file://$PROJECT_DIR$/xml/openapi/xml-openapi.iml" filepath="$PROJECT_DIR$/xml/openapi/xml-openapi.iml" group="xml" />
+      <module fileurl="file://$PROJECT_DIR$/xml/tests/xml-tests.iml" filepath="$PROJECT_DIR$/xml/tests/xml-tests.iml" group="xml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/xpath/xpath.iml" filepath="$PROJECT_DIR$/plugins/xpath/xpath.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/xslt-debugger/xslt-debugger.iml" filepath="$PROJECT_DIR$/plugins/xslt-debugger/xslt-debugger.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/xslt-debugger/engine/xslt-debugger-engine.iml" filepath="$PROJECT_DIR$/plugins/xslt-debugger/engine/xslt-debugger-engine.iml" group="plugins" />
diff --git a/community-main.iml b/community-main.iml
index 68ce7b7be166..f5341e75ff3d 100644
--- a/community-main.iml
+++ b/community-main.iml
@@ -90,6 +90,7 @@
     <orderEntry type="module" module-name="relaxng" />
     <orderEntry type="module" module-name="gradle" />
     <orderEntry type="module" module-name="rearranger" />
+    <orderEntry type="module" module-name="xml-tests" scope="TEST" />
   </component>
 </module>
 
diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightFixtureTestCase.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightFixtureTestCase.java
index 4ec6f7d5b10a..742ef3792904 100644
--- a/platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightFixtureTestCase.java
+++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightFixtureTestCase.java
@@ -20,6 +20,7 @@ import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiFile;
+import com.intellij.testFramework.PlatformTestUtil;
 import com.intellij.testFramework.UsefulTestCase;
 import com.intellij.testFramework.builders.EmptyModuleFixtureBuilder;
 import com.intellij.testFramework.builders.ModuleFixtureBuilder;
@@ -82,7 +83,12 @@ public abstract class CodeInsightFixtureTestCase<T extends ModuleFixtureBuilder>
    */
   @NonNls
   protected final String getTestDataPath() {
-    return PathManager.getHomePath().replace(File.separatorChar, '/') + getBasePath();
+    String path = isCommunity() ? PlatformTestUtil.getCommunityPath() : PathManager.getHomePath();
+    return path.replace(File.separatorChar, '/') + getBasePath();
+  }
+
+  protected boolean isCommunity() {
+    return false;
   }
 
   protected Project getProject() {
diff --git a/xml/tests/src/com/intellij/codeInsight/SearchingInXmlTest.java b/xml/tests/src/com/intellij/codeInsight/SearchingInXmlTest.java
new file mode 100644
index 000000000000..64f96c81ed88
--- /dev/null
+++ b/xml/tests/src/com/intellij/codeInsight/SearchingInXmlTest.java
@@ -0,0 +1,27 @@
+package com.intellij.codeInsight;
+
+import com.intellij.psi.XmlElementFactory;
+import com.intellij.psi.xml.XmlTag;
+import com.intellij.testFramework.LightIdeaTestCase;
+import com.intellij.util.IncorrectOperationException;
+import com.intellij.xml.util.XmlUtil;
+
+/**
+ * author: lesya
+ */
+public class SearchingInXmlTest extends LightIdeaTestCase {
+  public void test() throws IncorrectOperationException {
+    XmlTag xmlTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<root>" +
+                                                     "<tag1><name>name1</name><value>1</value></tag1>" +
+                                                     "<tag1><name>name2</name><value>2</value></tag1>" +
+                                                     "<tag1><name>name3</name><value>3</value></tag1>" +
+                                                     "<tag1><name>name4</name><value>4</value></tag1>" +
+                                                     "<tag1><name>name5</name><value>5</value></tag1>" +
+                                                     "<tag1><name>name6</name><value>6</value></tag1>" +
+                                                     "<tag1><name>name7</name><value>7</value></tag1>" +
+                                                     "</root>");
+    XmlTag found = XmlUtil.find("name", "name4", "tag1", xmlTag);
+
+    assertEquals("4", found.findFirstSubTag("value").getValue().getText());
+  }
+}
diff --git a/xml/tests/src/com/intellij/codeInsight/XmlBuilderTest.java b/xml/tests/src/com/intellij/codeInsight/XmlBuilderTest.java
new file mode 100644
index 000000000000..b735141ace9d
--- /dev/null
+++ b/xml/tests/src/com/intellij/codeInsight/XmlBuilderTest.java
@@ -0,0 +1,257 @@
+/*
+ * @author max
+ */
+package com.intellij.codeInsight;
+
+import com.intellij.psi.impl.source.parsing.xml.XmlBuilder;
+import com.intellij.psi.impl.source.parsing.xml.XmlBuilderDriver;
+import com.intellij.testFramework.LightCodeInsightTestCase;
+import org.jetbrains.annotations.Nullable;
+
+public class XmlBuilderTest extends LightCodeInsightTestCase {
+  private static class TestXmlBuilder implements XmlBuilder {
+    private final StringBuilder builder = new StringBuilder();
+    private final StringBuilder currentPhysicalText = new StringBuilder();
+    private final StringBuilder currentDisplayText = new StringBuilder();
+    private final ProcessingOrder myTagProcessingOrder;
+
+    public TestXmlBuilder(final ProcessingOrder tagsAndAttributes) {
+      myTagProcessingOrder = tagsAndAttributes;
+    }
+
+    @Override
+    public void attribute(final CharSequence name, final CharSequence value, final int startoffset, final int endoffset) {
+      flushText();
+      builder.append("ATT: name='").append(name).append("' value='").append(value).append("'\n");
+    }
+
+    @Override
+    public void endTag(final CharSequence localName, final String namespace, final int startoffset, final int endoffset) {
+      flushText();
+      builder.append("ENDTAG: name='").append(localName).append("' namespace='").append(namespace).append("'\n");
+    }
+
+    @Override
+    public void doctype(@Nullable final CharSequence publicId, @Nullable final CharSequence systemId, final int startOffset, final int endOffset) {
+        }
+
+    @Override
+    public ProcessingOrder startTag(final CharSequence localName, final String namespace, final int startoffset, final int endoffset,
+                                    final int headerEndOffset) {
+      flushText();
+      builder.append("TAG: name='").append(localName).append("' namespace='").append(namespace).append("'\n");
+      return myTagProcessingOrder;
+    }
+
+    @Override
+    public void textElement(final CharSequence display, final CharSequence physical, final int startoffset, final int endoffset) {
+      currentPhysicalText.append(physical);
+      currentDisplayText.append(display);
+    }
+
+    @Override
+    public void entityRef(final CharSequence ref, final int startOffset, final int endOffset) {
+      flushText();
+      builder.append("REF: '").append(ref).append("'\n");
+    }
+
+    @Override
+    public void error(String message, int startOffset, int endOffset) {
+      flushText();
+      builder.append("ERROR: '").append(message).append("'\n");
+    }
+
+    private void flushText() {
+      if (currentPhysicalText.length() > 0) {
+        builder.append("TEXT: '").append(currentPhysicalText).append("' DISPLAY: '").append(currentDisplayText).append("'\n");
+        currentPhysicalText.setLength(0);
+        currentDisplayText.setLength(0);
+      }
+    }
+
+    public String getResult() {
+      flushText();
+      return builder.toString();
+    }
+  }
+  
+  public void testEmptyXml() throws Exception {
+    doTest("<root/>", "TAG: name='root' namespace=''\n" +
+                      "ENDTAG: name='root' namespace=''\n", XmlBuilder.ProcessingOrder.TAGS_AND_ATTRIBUTES);
+  }
+
+  public void testRealJspx() throws Exception {
+    doTest(
+      /* Test: */
+      "<jsp:root xmlns:jsp=\"http://java.sun.com/JSP/Page\" xmlns=\"http://www.w3.org/1999/xhtml\" version=\"2.0\"\n" +
+      "          xmlns:spring=\"http://www.springframework.org/tags\" xmlns:c=\"http://java.sun.com/jsp/jstl/core\">\n" +
+      "<html>\n" +
+      "  <c:set var=\"foo\" value=\"${1}\"/>\n" +
+      "  <c:set var=\"foobar\" value=\"${2}\"/>\n" +
+      "  <spring:bind path=\"test.fieldName\">\n" +
+      "    <jsp:scriptlet></jsp:scriptlet>\n" +
+      "    </spring:bind>\n" +
+      "</html>\n" +
+      "</jsp:root>",
+
+      /* Expected result: */
+      "TAG: name='root' namespace='http://java.sun.com/JSP/Page'\n" +
+      "ATT: name='xmlns:jsp' value='http://java.sun.com/JSP/Page'\n" +
+      "ATT: name='xmlns' value='http://www.w3.org/1999/xhtml'\n" +
+      "ATT: name='version' value='2.0'\n" +
+      "ATT: name='xmlns:spring' value='http://www.springframework.org/tags'\n" +
+      "ATT: name='xmlns:c' value='http://java.sun.com/jsp/jstl/core'\n" +
+      "TAG: name='html' namespace='http://www.w3.org/1999/xhtml'\n" +
+      "TAG: name='set' namespace='http://java.sun.com/jsp/jstl/core'\n" +
+      "ATT: name='var' value='foo'\n" +
+      "ATT: name='value' value='${1}'\n" +
+      "ENDTAG: name='set' namespace='http://java.sun.com/jsp/jstl/core'\n" +
+      "TAG: name='set' namespace='http://java.sun.com/jsp/jstl/core'\n" +
+      "ATT: name='var' value='foobar'\n" +
+      "ATT: name='value' value='${2}'\n" +
+      "ENDTAG: name='set' namespace='http://java.sun.com/jsp/jstl/core'\n" +
+      "TAG: name='bind' namespace='http://www.springframework.org/tags'\n" +
+      "ATT: name='path' value='test.fieldName'\n" +
+      "TAG: name='scriptlet' namespace='http://java.sun.com/JSP/Page'\n" +
+      "ENDTAG: name='scriptlet' namespace='http://java.sun.com/JSP/Page'\n" +
+      "ENDTAG: name='bind' namespace='http://www.springframework.org/tags'\n" +
+      "ENDTAG: name='html' namespace='http://www.w3.org/1999/xhtml'\n" +
+      "ENDTAG: name='root' namespace='http://java.sun.com/JSP/Page'\n",
+      XmlBuilder.ProcessingOrder.TAGS_AND_ATTRIBUTES);
+  }
+
+  public void testRealJspxNoAttributes() throws Exception {
+    doTest(
+      /* Test: */
+      "<jsp:root xmlns:jsp=\"http://java.sun.com/JSP/Page\" xmlns=\"http://www.w3.org/1999/xhtml\" version=\"2.0\"\n" +
+      "          xmlns:spring=\"http://www.springframework.org/tags\" xmlns:c=\"http://java.sun.com/jsp/jstl/core\">\n" +
+      "<html>\n" +
+      "  <c:set var=\"foo\" value=\"${1}\"/>\n" +
+      "  <c:set var=\"foobar\" value=\"${2}\"/>\n" +
+      "  <spring:bind path=\"test.fieldName\">\n" +
+      "    <jsp:scriptlet></jsp:scriptlet>\n" +
+      "    </spring:bind>\n" +
+      "</html>\n" +
+      "</jsp:root>",
+
+      /* Expected result: */
+      "TAG: name='root' namespace='http://java.sun.com/JSP/Page'\n" +
+      "TAG: name='html' namespace='http://www.w3.org/1999/xhtml'\n" +
+      "TAG: name='set' namespace='http://java.sun.com/jsp/jstl/core'\n" +
+      "ENDTAG: name='set' namespace='http://java.sun.com/jsp/jstl/core'\n" +
+      "TAG: name='set' namespace='http://java.sun.com/jsp/jstl/core'\n" +
+      "ENDTAG: name='set' namespace='http://java.sun.com/jsp/jstl/core'\n" +
+      "TAG: name='bind' namespace='http://www.springframework.org/tags'\n" +
+      "TAG: name='scriptlet' namespace='http://java.sun.com/JSP/Page'\n" +
+      "ENDTAG: name='scriptlet' namespace='http://java.sun.com/JSP/Page'\n" +
+      "ENDTAG: name='bind' namespace='http://www.springframework.org/tags'\n" +
+      "ENDTAG: name='html' namespace='http://www.w3.org/1999/xhtml'\n" +
+      "ENDTAG: name='root' namespace='http://java.sun.com/JSP/Page'\n",
+      XmlBuilder.ProcessingOrder.TAGS);
+  }
+
+
+  public void testNamespaceOverride() throws Exception {
+    doTest(
+      "<c:x xmlns:c=\"ns1\">\n" +
+      "  <c:y/>\n" +
+      "  <c:x xmlns:c=\"ns2\">\n" +
+      "    <c:y/>\n" +
+      "  </c:x>\n" +
+      "  <c:y/>\n" +
+      "</c:x>\n",
+
+      "TAG: name='x' namespace='ns1'\n" +
+      "ATT: name='xmlns:c' value='ns1'\n" +
+      "TAG: name='y' namespace='ns1'\n" +
+      "ENDTAG: name='y' namespace='ns1'\n" +
+      "TAG: name='x' namespace='ns2'\n" +
+      "ATT: name='xmlns:c' value='ns2'\n" +
+      "TAG: name='y' namespace='ns2'\n" +
+      "ENDTAG: name='y' namespace='ns2'\n" +
+      "ENDTAG: name='x' namespace='ns2'\n" +
+      "TAG: name='y' namespace='ns1'\n" +
+      "ENDTAG: name='y' namespace='ns1'\n" +
+      "ENDTAG: name='x' namespace='ns1'\n",
+      XmlBuilder.ProcessingOrder.TAGS_AND_ATTRIBUTES);
+  }
+
+  public void testSimpleEntityResolution() throws Exception {
+    doTest(
+      "<root>&lt;</root>",
+      "TAG: name='root' namespace=''\n" +
+      "TEXT: '&lt;' DISPLAY: '<'\n" +
+      "ENDTAG: name='root' namespace=''\n",
+      XmlBuilder.ProcessingOrder.TAGS_AND_TEXTS);
+  }
+
+  public void testCDATA() throws Exception {
+    doTest(
+      "<root><![CDATA[<asis/>]]></root>",
+      "TAG: name='root' namespace=''\n" +
+      "TEXT: '<![CDATA[<asis/>]]>' DISPLAY: '<asis/>'\n" +
+      "ENDTAG: name='root' namespace=''\n",
+      XmlBuilder.ProcessingOrder.TAGS_AND_TEXTS
+    );
+  }
+
+  public void testErrors() throws Exception {
+    doTest(
+      "<root>" +
+      "<foo>" +
+      "<bar" +
+      "<" +
+      "</root>",
+      "TAG: name='root' namespace=''\n" +
+      "TAG: name='foo' namespace=''\n" +
+      "ERROR: 'Element foo is not closed'\n" +
+      "ENDTAG: name='foo' namespace=''\n" +
+      "TAG: name='bar' namespace=''\n" +
+      "ERROR: 'Tag start is not closed'\n" +
+      "ENDTAG: name='bar' namespace=''\n" +
+      "TAG: name='' namespace=''\n" +
+      "ERROR: 'Tag name expected'\n" +
+      "ENDTAG: name='' namespace=''\n" +
+      "ENDTAG: name='root' namespace=''\n",
+      XmlBuilder.ProcessingOrder.TAGS_AND_TEXTS
+    );
+  }
+
+  public void testComments() throws Exception {
+    doTest(
+      "<root>" +
+      "<foo>" +
+      "<!--aa-->" +
+      "</foo>" +
+      "<foo>" +
+      "<!---->" +
+      "</foo>" +
+      "<foo>" +
+      "aaa<!--aa-->aaa" +
+      "</foo>" +
+      "<foo>" +
+      "\naaa\n<!--aa-->\naaa\n" +
+      "</foo>" +
+      "</root>",
+      "TAG: name='root' namespace=''\n" +
+      "TAG: name='foo' namespace=''\n" +
+      "ENDTAG: name='foo' namespace=''\n" +
+      "TAG: name='foo' namespace=''\n" +
+      "ENDTAG: name='foo' namespace=''\n" +
+      "TAG: name='foo' namespace=''\n" +
+      "TEXT: 'aaaaaa' DISPLAY: 'aaaaaa'\n" +
+      "ENDTAG: name='foo' namespace=''\n" +
+      "TAG: name='foo' namespace=''\n" +
+      "TEXT: '\naaa\n\naaa\n' DISPLAY: '\naaa\n\naaa\n'\n" +
+      "ENDTAG: name='foo' namespace=''\n" +
+      "ENDTAG: name='root' namespace=''\n",
+      XmlBuilder.ProcessingOrder.TAGS_AND_TEXTS
+    );
+  }
+
+  private static void doTest(String xml, String expectedEventSequence, final XmlBuilder.ProcessingOrder tagsAndAttributes) throws Exception {
+    final TestXmlBuilder builder = new TestXmlBuilder(tagsAndAttributes);
+    new XmlBuilderDriver(xml).build(builder);
+    assertEquals(expectedEventSequence, builder.getResult());
+  }
+}
\ No newline at end of file
diff --git a/xml/tests/src/com/intellij/codeInsight/XmlDtdTest.java b/xml/tests/src/com/intellij/codeInsight/XmlDtdTest.java
new file mode 100644
index 000000000000..1cd442ec761c
--- /dev/null
+++ b/xml/tests/src/com/intellij/codeInsight/XmlDtdTest.java
@@ -0,0 +1,320 @@
+package com.intellij.codeInsight;
+
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiFileFactory;
+import com.intellij.psi.xml.XmlFile;
+import com.intellij.psi.xml.XmlTag;
+import com.intellij.testFramework.PsiTestCase;
+import com.intellij.xml.XmlAttributeDescriptor;
+import com.intellij.xml.XmlElementDescriptor;
+import com.intellij.xml.XmlNSDescriptor;
+import com.intellij.xml.impl.dtd.XmlElementDescriptorImpl;
+import com.intellij.xml.impl.dtd.XmlNSDescriptorImpl;
+
+/**
+ * @author Mike
+ */
+public class XmlDtdTest extends PsiTestCase {
+  public void testDocumentDescriptor1() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor("<!ELEMENT principals (#PCDATA)><!ELEMENT data-sources (#PCDATA)>");
+
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag("principals"));
+    assertNotNull(elementDescriptor);
+
+    elementDescriptor = NSDescriptor.getElementDescriptor(tag("data-sources"));
+    assertNotNull(elementDescriptor);
+
+    elementDescriptor = NSDescriptor.getElementDescriptor(tag("xxx"));
+    assertNull(elementDescriptor);
+  }
+
+  public void testElementDescriptor1() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor("<!ELEMENT principals (#PCDATA)><!ELEMENT data-sources (#PCDATA)>");
+
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag("principals"));
+    assertEquals("principals", elementDescriptor.getName());
+
+    elementDescriptor = NSDescriptor.getElementDescriptor(tag("data-sources"));
+    assertEquals("data-sources", elementDescriptor.getName());
+  }
+
+  public void testElementDescriptor2() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<!ELEMENT principals (#PCDATA)><!ELEMENT data-sources ANY>" +
+        "<!ELEMENT read-access (namespace-resource)><!ELEMENT group EMPTY>");
+
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag("principals"));
+    assertEquals(elementDescriptor.getContentType(), XmlElementDescriptor.CONTENT_TYPE_MIXED);
+
+    elementDescriptor = NSDescriptor.getElementDescriptor(tag("data-sources"));
+    assertEquals(elementDescriptor.getContentType(), XmlElementDescriptor.CONTENT_TYPE_ANY);
+
+    elementDescriptor = NSDescriptor.getElementDescriptor(tag("read-access"));
+    assertEquals(elementDescriptor.getContentType(), XmlElementDescriptor.CONTENT_TYPE_CHILDREN);
+
+    elementDescriptor = NSDescriptor.getElementDescriptor(tag("group"));
+    assertEquals(elementDescriptor.getContentType(), XmlElementDescriptor.CONTENT_TYPE_EMPTY);
+  }
+
+  public void testElementDescriptor3() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<!ELEMENT principals ANY><!ATTLIST principals path CDATA #IMPLIED smtp-host CDATA #REQUIRED>" +
+        "<!ATTLIST principals address CDATA #IMPLIED>");
+
+    final XmlTag tag = tag("principals");
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag);
+
+    XmlAttributeDescriptor attributeDescriptor = elementDescriptor.getAttributeDescriptor("path", tag);
+    assertNotNull(attributeDescriptor);
+
+    attributeDescriptor = elementDescriptor.getAttributeDescriptor("xxx", tag);
+    assertNull(attributeDescriptor);
+
+    attributeDescriptor = elementDescriptor.getAttributeDescriptor("smtp-host", tag);
+    assertNotNull(attributeDescriptor);
+
+    attributeDescriptor = elementDescriptor.getAttributeDescriptor("address", tag);
+    assertNotNull(attributeDescriptor);
+
+    XmlAttributeDescriptor[] descriptors = elementDescriptor.getAttributesDescriptors(tag);
+    assertEquals("path", descriptors[0].getName());
+    assertEquals("smtp-host", descriptors[1].getName());
+    assertEquals("address", descriptors[2].getName());
+    assertEquals(3, descriptors.length);
+  }
+
+  public void testElementDescriptor4() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<!ELEMENT orion-application (ejb-module*, persistence?, namespace-access)>" +
+        "<!ELEMENT ejb-module ANY>" +
+        "<!ELEMENT persistence ANY>" +
+        "<!ELEMENT namespace-access ANY>");
+
+    XmlTag documentTag = tag("orion-application");
+    XmlElementDescriptorImpl elementDescriptor = (XmlElementDescriptorImpl)NSDescriptor.getElementDescriptor(documentTag);
+
+    XmlElementDescriptor[] elements = elementDescriptor.getElementsDescriptors(documentTag);
+
+    assertEquals(3, elements.length);
+    assertEquals("ejb-module", elements[0].getName());
+    assertEquals("persistence", elements[1].getName());
+    assertEquals("namespace-access", elements[2].getName());
+
+    elements = elements[0].getElementsDescriptors(documentTag);
+    assertEquals(4, elements.length);
+    assertEquals("orion-application", elements[0].getName());
+    assertEquals("ejb-module", elements[1].getName());
+    assertEquals("persistence", elements[2].getName());
+    assertEquals("namespace-access", elements[3].getName());
+  }
+
+  public void testAttributeDescriptor1() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<!ELEMENT principals ANY><!ATTLIST principals path CDATA #IMPLIED>");
+
+    final XmlTag tag = tag("principals");
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag);
+
+    XmlAttributeDescriptor attributeDescriptor = elementDescriptor.getAttributeDescriptor("path", tag);
+    assertEquals("path", attributeDescriptor.getName());
+    assertTrue(!attributeDescriptor.isRequired());
+    assertTrue(!attributeDescriptor.isFixed());
+    assertTrue(!attributeDescriptor.isEnumerated());
+    assertNull(attributeDescriptor.getDefaultValue());
+  }
+
+  public void testAttributeDescriptor2() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<!ELEMENT principals ANY><!ATTLIST principals path CDATA #IMPLIED>");
+
+    final XmlTag tag = tag("principals");
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag);
+
+    XmlAttributeDescriptor attributeDescriptor = elementDescriptor.getAttributeDescriptor("path", tag);
+    assertTrue(!attributeDescriptor.isRequired());
+    assertTrue(!attributeDescriptor.isFixed());
+    assertTrue(!attributeDescriptor.isEnumerated());
+    assertNull(attributeDescriptor.getDefaultValue());
+  }
+
+  public void testAttributeDescriptor3() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<!ELEMENT toc ANY> <!ATTLIST toc version CDATA #FIXED \"1.0\">");
+
+    final XmlTag tag = tag("toc");
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag);
+
+    XmlAttributeDescriptor attributeDescriptor = elementDescriptor.getAttributeDescriptor("version", tag);
+    assertTrue(!attributeDescriptor.isRequired());
+    assertTrue(attributeDescriptor.isFixed());
+    assertTrue(!attributeDescriptor.isEnumerated());
+    assertEquals("1.0", attributeDescriptor.getDefaultValue());
+  }
+
+  public void testAttributeDescriptor4() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<!ELEMENT toc ANY> <!ATTLIST toc remote (true|false) \"false\">");
+
+    final XmlTag tag = tag("toc");
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag);
+
+    XmlAttributeDescriptor attributeDescriptor = elementDescriptor.getAttributeDescriptor("remote", tag);
+    assertTrue(!attributeDescriptor.isRequired());
+    assertTrue(!attributeDescriptor.isFixed());
+    assertTrue(attributeDescriptor.isEnumerated());
+    assertEquals("false", attributeDescriptor.getDefaultValue());
+
+    String[] values = attributeDescriptor.getEnumeratedValues();
+    assertEquals(2, values.length);
+    assertEquals("true", values[0]);
+    assertEquals("false", values[1]);
+  }
+
+  public void testAttributeDescriptor5() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<!ELEMENT toc ANY> <!ATTLIST toc remote (0|1|2) #REQUIRED>");
+
+    final XmlTag tag = tag("toc");
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag);
+
+    XmlAttributeDescriptor attributeDescriptor = elementDescriptor.getAttributeDescriptor("remote", tag);
+    assertTrue(attributeDescriptor.isRequired());
+    assertTrue(!attributeDescriptor.isFixed());
+    assertTrue(attributeDescriptor.isEnumerated());
+    assertNull(attributeDescriptor.getDefaultValue());
+
+    String[] values = attributeDescriptor.getEnumeratedValues();
+    assertEquals(3, values.length);
+    assertEquals("0", values[0]);
+    assertEquals("1", values[1]);
+    assertEquals("2", values[2]);
+  }
+
+  public void testEntityDeclElement1() throws Exception {
+    final XmlNSDescriptor NSDescriptor = createDescriptor(
+      "<!ENTITY % types \"fileset | patternset \"> <!ELEMENT project (target | taskdef | %types; | property )*> " +
+      "<!ELEMENT target><!ELEMENT taskdef><!ELEMENT fileset><!ELEMENT patternset><!ELEMENT property>");
+
+    XmlTag projectTag = tag("project");
+    final XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(projectTag);
+
+    final XmlElementDescriptor[] elements = elementDescriptor.getElementsDescriptors(projectTag);
+
+    assertEquals(5, elements.length);
+  }
+
+  public void testEntityDecl1() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<!ENTITY % boolean \"(true|false|on|off|yes|no)\"> <!ELEMENT toc ANY> <!ATTLIST toc remote %boolean; \"false\"");
+
+    final XmlTag tag = tag("toc");
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag);
+
+    XmlAttributeDescriptor attributeDescriptor = elementDescriptor.getAttributeDescriptor("remote", tag);
+    assertTrue(!attributeDescriptor.isRequired());
+    assertTrue(!attributeDescriptor.isFixed());
+    assertTrue(attributeDescriptor.isEnumerated());
+    assertEquals("false", (attributeDescriptor.getDefaultValue()));
+
+    String[] values = attributeDescriptor.getEnumeratedValues();
+    assertEquals(6, values.length);
+    assertEquals("true", values[0]);
+    assertEquals("false", values[1]);
+    assertEquals("on", values[2]);
+    assertEquals("off", values[3]);
+    assertEquals("yes", values[4]);
+    assertEquals("no", values[5]);
+  }
+
+  public void testEntityDecl2() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<!ENTITY % coreattrs \"id D #IMPLIED\"> <!ELEMENT a ANY> <!ATTLIST a %coreattrs; version CDATA #FIXED \"1.0\"");
+
+    final XmlTag tag = tag("a");
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag);
+
+    final XmlAttributeDescriptor[] attributes = elementDescriptor.getAttributesDescriptors(tag);
+    assertEquals(2, attributes.length);
+    assertEquals("id", attributes[0].getName());
+    assertEquals("version", attributes[1].getName());
+  }
+
+  public void testEntityDecl3() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<!ENTITY % att1 \"id1 D #IMPLIED\"> <!ENTITY % att2 \"id2 D #IMPLIED\"> <!ELEMENT a ANY> <!ATTLIST a %att1; %att2; ");
+
+    final XmlTag tag = tag("a");
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag);
+
+    final XmlAttributeDescriptor[] attributes = elementDescriptor.getAttributesDescriptors(tag);
+    assertEquals(2, attributes.length);
+    assertEquals("id1", attributes[0].getName());
+    assertEquals("id2", attributes[1].getName());
+  }
+
+  public void testEntityDecl4() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<!ENTITY % boolean \'(true|false|on|off|yes|no)\'> <!ENTITY % bool \"%boolean;\">  <!ELEMENT toc ANY> <!ATTLIST toc remote %bool; \"false\"");
+
+    final XmlTag tag = tag("toc");
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag);
+
+    XmlAttributeDescriptor attributeDescriptor = elementDescriptor.getAttributeDescriptor("remote", tag);
+    assertTrue(!attributeDescriptor.isRequired());
+    assertTrue(!attributeDescriptor.isFixed());
+    assertTrue(attributeDescriptor.isEnumerated());
+    assertEquals("false", attributeDescriptor.getDefaultValue());
+
+    String[] values = attributeDescriptor.getEnumeratedValues();
+    assertEquals(6, values.length);
+    assertEquals("true", values[0]);
+    assertEquals("false", values[1]);
+    assertEquals("on", values[2]);
+    assertEquals("off", values[3]);
+    assertEquals("yes", values[4]);
+    assertEquals("no", values[5]);
+  }
+
+  public void testEntityDecl5() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<!ENTITY % boolean \"true | false\" > <!ELEMENT foo EMPTY> <!ATTLIST foo someBoolean (%boolean;) \"true\" someString CDATA #IMPLIED >");
+
+    final XmlTag tag = tag("foo");
+    final XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag);
+    final XmlAttributeDescriptor[] attributes = elementDescriptor.getAttributesDescriptors(tag);
+
+    assertEquals(2, attributes.length);
+    assertEquals("someBoolean", attributes[0].getName());
+    assertEquals("someString", attributes[1].getName());
+
+    assertTrue(attributes[0].isEnumerated());
+    assertEquals(2, attributes[0].getEnumeratedValues().length);
+    assertEquals("true", attributes[0].getEnumeratedValues()[0]);
+    assertEquals("false", attributes[0].getEnumeratedValues()[1]);
+  }
+
+  public void testEmbeddedDtd1() throws Exception {
+    XmlFile xmlFile = (XmlFile)createDummyFile("test.xml",
+      "<!DOCTYPE tv [ <!ELEMENT tv (date)*> <!ELEMENT date (#PCDATA)> ]> <tv></tv>");
+
+    final XmlTag tag = xmlFile.getDocument().getRootTag();
+    assertNotNull(tag);
+    final XmlElementDescriptor desc = xmlFile.getDocument().getRootTagNSDescriptor().getElementDescriptor(tag);
+    assertNotNull(desc);
+
+    final XmlElementDescriptor[] elements = desc.getElementsDescriptors(tag);
+    assertEquals(1, elements.length);
+    assertEquals("date", elements[0].getName());
+  }
+
+  private XmlNSDescriptor createDescriptor(String dtdText) throws Exception {
+    PsiFile dtdFile = createDummyFile("test.dtd", dtdText);
+
+    return new XmlNSDescriptorImpl((XmlFile)dtdFile);
+  }
+
+  private XmlTag tag(String tagName) throws Exception {
+    XmlFile file = (XmlFile)PsiFileFactory.getInstance(myPsiManager.getProject()).createFileFromText("tag.xml", "<" + tagName + "/>");
+    return file.getDocument().getRootTag();
+  }
+}
diff --git a/xml/tests/src/com/intellij/codeInsight/XmlEventsTest.java b/xml/tests/src/com/intellij/codeInsight/XmlEventsTest.java
new file mode 100644
index 000000000000..5ccbdba311a2
--- /dev/null
+++ b/xml/tests/src/com/intellij/codeInsight/XmlEventsTest.java
@@ -0,0 +1,238 @@
+package com.intellij.codeInsight;
+
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.Result;
+import com.intellij.openapi.command.CommandProcessor;
+import com.intellij.openapi.command.WriteCommandAction;
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.editor.ex.DocumentEx;
+import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.pom.PomManager;
+import com.intellij.pom.PomModel;
+import com.intellij.pom.PomModelAspect;
+import com.intellij.pom.event.PomChangeSet;
+import com.intellij.pom.event.PomModelEvent;
+import com.intellij.pom.event.PomModelListener;
+import com.intellij.pom.xml.XmlAspect;
+import com.intellij.psi.PsiDocumentManager;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.XmlElementFactory;
+import com.intellij.psi.impl.source.PsiFileImpl;
+import com.intellij.psi.xml.XmlAttribute;
+import com.intellij.psi.xml.XmlFile;
+import com.intellij.psi.xml.XmlTag;
+import com.intellij.psi.xml.XmlText;
+import com.intellij.testFramework.LightCodeInsightTestCase;
+import com.intellij.testFramework.PlatformTestUtil;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+
+public class XmlEventsTest extends LightCodeInsightTestCase {
+  public void test1() throws Exception{
+    final PomModel model = PomManager.getModel(getProject());
+    final Listener listener = new Listener(model.getModelAspect(XmlAspect.class));
+    model.addModelListener(listener);
+    final XmlTag tagFromText = XmlElementFactory.getInstance(getProject()).createTagFromText("<a/>");
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        tagFromText.setAttribute("a", "b");
+      }
+    });
+
+    assertFileTextEquals(getTestName(false) + ".txt", listener.getEventString());
+  }
+
+  public void test2() throws Exception{
+    final PomModel model = PomManager.getModel(getProject());
+    final Listener listener = new Listener(model.getModelAspect(XmlAspect.class));
+    model.addModelListener(listener);
+    final XmlTag tagFromText = XmlElementFactory.getInstance(getProject()).createTagFromText("<a>aaa</a>");
+    final XmlTag otherTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<a/>");
+    final XmlText xmlText = tagFromText.getValue().getTextElements()[0];
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        xmlText.insertAtOffset(otherTag, 2);
+      }
+    });
+
+    assertFileTextEquals(getTestName(false) + ".txt", listener.getEventString());
+  }
+
+  public void test3() throws Exception{
+    final PomModel model = PomManager.getModel(getProject());
+    final Listener listener = new Listener(model.getModelAspect(XmlAspect.class));
+    model.addModelListener(listener);
+    final XmlTag tagFromText = XmlElementFactory.getInstance(getProject()).createTagFromText("<a>aaa</a>");
+    final XmlText xmlText = tagFromText.getValue().getTextElements()[0];
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        xmlText.insertText("bb", 2);
+      }
+    });
+
+    assertFileTextEquals(getTestName(false) + ".txt", listener.getEventString());
+  }
+
+  public void test4() throws Exception{
+    final PomModel model = PomManager.getModel(getProject());
+    final Listener listener = new Listener(model.getModelAspect(XmlAspect.class));
+    model.addModelListener(listener);
+    final XmlTag tagFromText = XmlElementFactory.getInstance(getProject()).createTagFromText("<a>a </a>");
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        tagFromText.addAfter(tagFromText.getValue().getTextElements()[0], tagFromText.getValue().getTextElements()[0]);
+      }
+    });
+
+    assertFileTextEquals(getTestName(false) + ".txt", listener.getEventString());
+  }
+
+  public void test5() throws Exception{
+    final PomModel model = PomManager.getModel(getProject());
+    final Listener listener = new Listener(model.getModelAspect(XmlAspect.class));
+    model.addModelListener(listener);
+    final XmlTag tagFromText = XmlElementFactory.getInstance(getProject()).createTagFromText("<a>aaa</a>");
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        tagFromText.delete();
+      }
+    });
+
+    assertFileTextEquals(getTestName(false) + ".txt", listener.getEventString());
+  }
+
+  public void testBulkUpdate() throws Exception{
+    final PomModel model = PomManager.getModel(getProject());
+    final Listener listener = new Listener(model.getModelAspect(XmlAspect.class));
+    model.addModelListener(listener);
+    final PsiFile file = createFile("a.xml", "<a/>");
+    new WriteCommandAction(getProject()) {
+      @Override
+      protected void run(Result result) throws Throwable {
+        final Document document = PsiDocumentManager.getInstance(getProject()).getDocument(file);
+        ((DocumentEx)document).setInBulkUpdate(true);
+        document.insertString(0, " ");
+        commitDocument(document);
+        ((DocumentEx)document).setInBulkUpdate(false);
+      }
+    }.execute();
+    assertFileTextEquals(getTestName(false) + ".txt", listener.getEventString());
+  }
+
+  public void testDocumentChange1() throws Exception{
+    final String rootTagText = "<a/>";
+    final String stringToInsert = "b=\"c\"";
+    final int positionToInsert = 2;
+
+    checkEventsByDocumentChange(rootTagText, positionToInsert, stringToInsert);
+  }
+
+  public void testDocumentChange2() throws Exception{
+    final String rootTagText = "<a />";
+    final String stringToInsert = "b=\"c\"";
+    final int positionToInsert = 3;
+
+    checkEventsByDocumentChange(rootTagText, positionToInsert, stringToInsert);
+  }
+
+
+  public void testDocumentChange3() throws Exception{
+    final String rootTagText = "<b><a /></b>";
+    final String stringToInsert = "b=\"c\"";
+    final int positionToInsert = 6;
+
+    checkEventsByDocumentChange(rootTagText, positionToInsert, stringToInsert);
+  }
+
+  public void testAttributeValueReplace() throws Exception {
+    final String text = "<target name=\"old\"/>";
+    final PomModel model = PomManager.getModel(getProject());
+    final Listener listener = new Listener(model.getModelAspect(XmlAspect.class));
+    model.addModelListener(listener);
+
+    final XmlTag tag = XmlElementFactory.getInstance(getProject()).createTagFromText(text);
+    final XmlAttribute attribute = tag.getAttribute("name", null);
+    assert attribute != null;
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        attribute.setValue("new");
+      }
+    });
+
+
+    assertEquals(attribute.getValue(), "new");
+    assertEquals("(Attribute \"name\" for tag \"target\" set to \"\"new\"\")\n", listener.getEventString());
+  }
+
+  private void checkEventsByDocumentChange(final String rootTagText, final int positionToInsert, final String stringToInsert)
+    throws Exception {
+    final PomModel model = PomManager.getModel(getProject());
+    final Listener listener = new Listener(model.getModelAspect(XmlAspect.class));
+    model.addModelListener(listener);
+    final XmlTag tagFromText = ((XmlFile)createFile("file.xml", rootTagText)).getDocument().getRootTag();
+    final PsiFileImpl containingFile = (PsiFileImpl)tagFromText.getContainingFile();
+    final PsiDocumentManager documentManager = PsiDocumentManager.getInstance(getProject());
+    final Document document = documentManager.getDocument(containingFile);
+    CommandProcessor.getInstance().executeCommand(getProject(), new Runnable() {
+      @Override
+      public void run() {
+        ApplicationManager.getApplication().runWriteAction(new Runnable() {
+          @Override
+          public void run() {
+            document.insertString(positionToInsert, stringToInsert);
+            documentManager.commitDocument(document);
+          }
+        });
+      }
+    }, "", null);
+
+    assertFileTextEquals(getTestName(false) + ".txt", listener.getEventString());
+  }
+
+  private static class Listener implements PomModelListener{
+    private final XmlAspect myAspect;
+    private final StringBuffer myBuffer = new StringBuffer();
+
+    public Listener(XmlAspect modelAspect) {
+      myAspect = modelAspect;
+    }
+
+    @Override
+    public void modelChanged(PomModelEvent event) {
+      final PomChangeSet changeSet = event.getChangeSet(myAspect);
+      if(changeSet == null) return;
+      myBuffer.append(changeSet);
+      myBuffer.append("\n");
+    }
+
+    @Override
+    public boolean isAspectChangeInteresting(PomModelAspect aspect) {
+      return aspect == myAspect;
+    }
+
+    String getEventString(){
+      return myBuffer.toString();
+    }
+  }
+
+  private static void assertFileTextEquals(String targetDataName, String treeText) throws Exception {
+    String fullName = PlatformTestUtil.getCommunityPath().replace(File.separatorChar, '/')+ "/xml/tests/testData/psi/events" + File.separatorChar + targetDataName;
+    try{
+      String expectedText = loadFile(fullName);
+      assertEquals(expectedText.trim(), treeText.trim());
+    }
+    catch(FileNotFoundException e){
+      //FileUtil.writeToFile(new File(fullName), StringUtil.convertLineSeparators(treeText).getBytes("UTF-8"));
+      fail("No output file found. Created file "+fullName);
+    }
+  }
+
+
+  protected static String loadFile(String fullName) throws Exception {
+    String text = FileUtil.loadFile(new File(fullName)).trim();
+    text = StringUtil.convertLineSeparators(text);
+    return text;
+  }
+}
diff --git a/xml/tests/src/com/intellij/codeInsight/XmlInsightTest.java b/xml/tests/src/com/intellij/codeInsight/XmlInsightTest.java
new file mode 100644
index 000000000000..cfc5426d279e
--- /dev/null
+++ b/xml/tests/src/com/intellij/codeInsight/XmlInsightTest.java
@@ -0,0 +1,144 @@
+package com.intellij.codeInsight;
+
+import com.intellij.psi.PsiFileFactory;
+import com.intellij.psi.xml.XmlFile;
+import com.intellij.psi.xml.XmlTag;
+import com.intellij.testFramework.PsiTestCase;
+import com.intellij.xml.XmlAttributeDescriptor;
+import com.intellij.xml.XmlElementDescriptor;
+import com.intellij.xml.XmlNSDescriptor;
+
+/**
+ * @author Mike
+ */
+public class XmlInsightTest extends PsiTestCase {
+  public void testDocumentDescriptor1() throws Exception {
+    XmlFile file = createFile("<root><a></a><b></b><a></a></root>");
+    XmlNSDescriptor descriptor = createDescriptor(file);
+
+    XmlElementDescriptor element = descriptor.getElementDescriptor(file.getDocument().getRootTag());
+    assertNotNull(element);
+    assertEquals("root", element.getName());
+
+    element = descriptor.getElementDescriptor(file.getDocument().getRootTag().getSubTags()[0]);
+    assertNotNull(element);
+    assertEquals("a", element.getName());
+
+    element = descriptor.getElementDescriptor(file.getDocument().getRootTag().getSubTags()[1]);
+    assertNotNull(element);
+    assertEquals("b", element.getName());
+
+    element = descriptor.getElementDescriptor(file.getDocument().getRootTag().getSubTags()[2]);
+    assertNotNull(element);
+    assertEquals("a", element.getName());
+  }
+
+  public void testElementDescriptor1() throws Exception {
+    XmlFile file = createFile("<root><a></a><b></b><a></a></root>");
+    XmlNSDescriptor descriptor = createDescriptor(file);
+
+    XmlTag rootTag = file.getDocument().getRootTag();
+    XmlElementDescriptor element = descriptor.getElementDescriptor(rootTag);
+
+    XmlElementDescriptor[] elements = element.getElementsDescriptors(rootTag);
+
+    assertEquals(2, elements.length);
+    assertEquals("a", elements[0].getName());
+    assertEquals("b", elements[1].getName());
+  }
+
+  public void testElementDescriptor2() throws Exception {
+    XmlFile file = createFile("<root><a><b/></a><a><c/></a></root>");
+    XmlNSDescriptor descriptor = createDescriptor(file);
+
+    XmlTag rootTag = file.getDocument().getRootTag();
+    XmlElementDescriptor element = descriptor.getElementDescriptor(rootTag);
+    element = element.getElementsDescriptors(rootTag)[0];
+
+    XmlElementDescriptor[] elements = element.getElementsDescriptors(rootTag.getSubTags()[0]);
+
+    assertEquals(2, elements.length);
+    assertEquals("b", elements[0].getName());
+    assertEquals("c", elements[1].getName());
+  }
+
+  public void testElementDescriptor3() throws Exception {
+    XmlFile file = createFile("<root><a><b/><c></c></a><a><c/></a></root>");
+    XmlNSDescriptor descriptor = createDescriptor(file);
+
+    XmlTag rootTag = file.getDocument().getRootTag();
+    XmlElementDescriptor element = descriptor.getElementDescriptor(rootTag);
+    element = element.getElementsDescriptors(rootTag)[0];
+
+    XmlElementDescriptor[] elements = element.getElementsDescriptors(rootTag.getSubTags()[0]);
+
+    assertEquals(2, elements.length);
+    assertEquals("b", elements[0].getName());
+    //assertTrue(elements[0].getContentType() == XmlElementDescriptor.CONTENT_TYPE_EMPTY);
+
+    assertEquals("c", elements[1].getName());
+    //assertTrue(elements[1].getContentType() == XmlElementDescriptor.CONTENT_TYPE_CHILDREN);
+  }
+
+  public void testElementDescriptor4() throws Exception {
+    XmlFile file = createFile("<root><a attr2=''></a><a attr1=''></a></root>");
+    XmlNSDescriptor descriptor = createDescriptor(file);
+
+    XmlTag rootTag = file.getDocument().getRootTag();
+    XmlElementDescriptor element = descriptor.getElementDescriptor(rootTag);
+    element = element.getElementsDescriptors(rootTag)[0];
+
+    XmlAttributeDescriptor[] attributes = element.getAttributesDescriptors(rootTag);
+
+    assertEquals(2, attributes.length);
+    assertEquals("attr1", attributes[0].getName());
+    assertEquals("attr2", attributes[1].getName());
+  }
+
+  public void testAttributeDescriptor1() throws Exception {
+    XmlFile file = createFile("<root><a attr1=''></a><a attr2='' attr1=''></a></root>");
+    XmlNSDescriptor descriptor = createDescriptor(file);
+
+    XmlTag rootTag = file.getDocument().getRootTag();
+    XmlElementDescriptor element = descriptor.getElementDescriptor(rootTag);
+    element = element.getElementsDescriptors(rootTag)[0];
+
+    XmlAttributeDescriptor[] attributes = element.getAttributesDescriptors(rootTag);
+
+    assertEquals("attr1", attributes[0].getName());
+    assertTrue(attributes[0].isRequired());
+
+    assertEquals("attr2", attributes[1].getName());
+    assertTrue(!attributes[1].isRequired());
+  }
+
+  public void testAttributeDescriptor2() throws Exception {
+    XmlFile file = createFile("<root><a c='' a=''></a></root>");
+    XmlNSDescriptor descriptor = createDescriptor(file);
+
+    XmlTag rootTag = file.getDocument().getRootTag();
+    XmlElementDescriptor element = descriptor.getElementDescriptor(rootTag);
+    element = element.getElementsDescriptors(rootTag)[0];
+
+    XmlAttributeDescriptor[] attributes = element.getAttributesDescriptors(rootTag);
+
+    assertEquals("c", attributes[0].getName());
+    assertTrue(attributes[0].isRequired());
+
+    assertEquals("a", attributes[1].getName());
+    assertTrue(attributes[1].isRequired());
+  }
+
+  private XmlFile createFile(String text) throws Exception {
+    return (XmlFile)createDummyFile("test.xml", text);
+  }
+
+  private XmlNSDescriptor createDescriptor(XmlFile file) throws Exception{
+    return file.getDocument().getRootTagNSDescriptor();
+  }
+
+  private XmlTag tag(String tagName) throws Exception {
+    XmlFile file = (XmlFile)PsiFileFactory.getInstance(myPsiManager.getProject()).createFileFromText("tag.xml", "<" + tagName + "/>");
+    return file.getDocument().getRootTag();
+  }
+}
diff --git a/xml/tests/src/com/intellij/codeInsight/XmlParsingTest.java b/xml/tests/src/com/intellij/codeInsight/XmlParsingTest.java
new file mode 100644
index 000000000000..b3fe52305eec
--- /dev/null
+++ b/xml/tests/src/com/intellij/codeInsight/XmlParsingTest.java
@@ -0,0 +1,649 @@
+package com.intellij.codeInsight;
+
+import com.intellij.lang.ASTFactory;
+import com.intellij.lang.ASTNode;
+import com.intellij.lang.LanguageASTFactory;
+import com.intellij.lang.LanguageParserDefinitions;
+import com.intellij.lang.dtd.DTDLanguage;
+import com.intellij.lang.dtd.DTDParserDefinition;
+import com.intellij.lang.xml.XMLLanguage;
+import com.intellij.lang.xml.XMLParserDefinition;
+import com.intellij.lang.xml.XmlASTFactory;
+import com.intellij.lexer.FilterLexer;
+import com.intellij.lexer.Lexer;
+import com.intellij.lexer.XmlLexer;
+import com.intellij.openapi.application.Result;
+import com.intellij.openapi.command.WriteCommandAction;
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.extensions.ExtensionPointName;
+import com.intellij.psi.PsiDocumentManager;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.impl.DebugUtil;
+import com.intellij.psi.impl.source.CharTableImpl;
+import com.intellij.psi.impl.source.parsing.xml.OldXmlParser;
+import com.intellij.psi.impl.source.tree.CompositeElement;
+import com.intellij.psi.impl.source.tree.LeafElement;
+import com.intellij.psi.impl.source.tree.TreeUtil;
+import com.intellij.psi.tree.IElementType;
+import com.intellij.psi.xml.*;
+import com.intellij.testFramework.ParsingTestCase;
+import com.intellij.testFramework.PlatformTestUtil;
+import com.intellij.util.ThrowableRunnable;
+import org.jetbrains.annotations.NonNls;
+
+import java.io.File;
+
+/**
+ * @author Mike, ik
+ */
+public class XmlParsingTest extends ParsingTestCase {
+  public XmlParsingTest() {
+    super("psi", "???");
+    myLanguage = XMLLanguage.INSTANCE;
+  }
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    addExplicitExtension(LanguageParserDefinitions.INSTANCE, XMLLanguage.INSTANCE, new XMLParserDefinition());
+    addExplicitExtension(LanguageParserDefinitions.INSTANCE, DTDLanguage.INSTANCE, new DTDParserDefinition());
+    addExplicitExtension(LanguageASTFactory.INSTANCE, XMLLanguage.INSTANCE, new XmlASTFactory());
+    addExplicitExtension(LanguageASTFactory.INSTANCE, DTDLanguage.INSTANCE, new XmlASTFactory());
+    registerExtensionPoint(new ExtensionPointName<XmlChildRole.StartTagEndTokenProvider>("com.intellij.xml.startTagEndToken"),
+                           XmlChildRole.StartTagEndTokenProvider.class);
+  }
+
+  @Override
+  protected String getTestDataPath() {
+    return PlatformTestUtil.getCommunityPath().replace(File.separatorChar, '/') + "/xml/tests/testData/";
+  }
+
+  private void doTestXml(@NonNls String text) throws Exception {
+    myLanguage = XMLLanguage.INSTANCE;
+    doTest(text, "test.xml");
+  }
+  private void doTestDtd(@NonNls String text) throws Exception {
+    myLanguage = DTDLanguage.INSTANCE;
+    doTest(text, "test.dtd");
+  }
+  private void doTest(@NonNls String text, @NonNls String fileName) throws Exception {
+    PsiFile file = createFile(fileName, text);
+    checkResult("test" +getTestName(false), file);
+  }
+
+  public void testNewParsing1() throws Exception {
+    doTestXml("<a></a>");
+  }
+
+  public void testEmptyCommentParsing() throws Exception {
+    doTestXml("<!---->");
+  }
+
+  public void testNewParsing2() throws Exception {
+    doTestXml("<a>   </a>");
+  }
+
+  public void testNewParsing3() throws Exception {
+    doTestXml("<a   </a>");
+  }
+
+  public void testNewParsing4() throws Exception {
+    doTestXml("<a> <b> </a>");
+  }
+
+  public void testNewParsing5() throws Exception {
+    doTestXml("<a> <b/> </a>");
+  }
+
+  public void testNewParsing6() throws Exception {
+    doTestXml("<!DOCTYPE greeting SYSTEM \"hello.dtd\" [<!ELEMENT greeting EMPTY>]> <a> <b/> </a>");
+  }
+
+  public void testNewParsing7() throws Exception {
+    doTestXml("<a> <b> <c> <d> </a>");
+  }
+
+  public void testNewParsing8() throws Exception {
+    doTestXml("<a blah=\"blah\"/>");
+  }
+
+  public void testNewParsing9() throws Exception {
+    doTestXml("<a asd=\"asd\"></a>");
+  }
+
+  public void testNewParsing10() throws Exception {
+    doTestXml("<a asd=\"asd\"> <s> </a>");
+  }
+
+  public void testNewParsing11() throws Exception {
+    doTestXml("<!-- <!-- --> <a asd=\"asd\"> <s> </a>");
+  }
+
+  public void testNewParsing12() throws Exception {
+    doTestXml("<a><a ajsdg<a></a></a>");
+  }
+
+  public void testNewParsing13() throws Exception {
+    doTestXml("<a><b><c>\n" + "xxx \n" + "xxxx\n" + "<</b></a>");
+  }
+
+  public void testNewParsing14() throws Exception {
+    doTestXml("<a><a ajsdg = \"\"></a></a>");
+  }
+
+  public void testNewParsing15() throws Exception {
+    doTestXml("<!DOCTYPE a [<!ELEMENT a (a)>]> <a><a ajsdg = \"\"></a></a>");
+  }
+
+  public void testNewParsing19() throws Exception {
+    doTestXml("<!DOCTYPE aaa [" + "<!ELEMENT a #EMPTY>" + "<!ATTLIST a" + " xx CDATA #IMPLIED" + " yy  #IMPLIED" + " zz CDATA #IMPLIED>]>\n" +
+              "<a> <b> </b> </a>");
+  }
+
+  public void testNewParsing20() throws Exception {
+    doTestXml("<!DOCTYPE root [\n" + "<!\n" + "]>\n" + "<root>\n" + "\n" + "</root>");
+  }
+
+  public void testEntityInAttr() throws Exception {
+    doTestXml("<a href=\"&n\"/>");
+  }
+
+  public void testEntityInContent() throws Exception {
+    doTestXml("<a> &n </a>");
+  }
+
+  public void testMultyRoots() throws Exception {
+    doTestXml("<a href=\"\"/> <b/>");
+  }
+
+  public void testMultyRootsWithErrorsBetween() throws Exception {
+    doTestXml("<a href=\"\"/> </ss><b/>");
+  }
+
+  public void testGtInTagContent() throws Exception {
+    doTestXml("<a>></a>");
+  }
+
+  public void testManyErrors() throws Exception {
+    doTestXml(loadFile("manyErrors.xml"));
+  }
+
+  public void _testLexerPerformance1() throws Exception{
+    final String text = loadFile("pallada.xml");
+    XmlLexer lexer = new XmlLexer();
+    doLex(lexer, text);
+    final FilterLexer filterLexer = new FilterLexer(new XmlLexer(),
+                          new FilterLexer.SetFilter(LanguageParserDefinitions.INSTANCE.forLanguage(XMLLanguage.INSTANCE).getWhitespaceTokens()));
+    doLex(filterLexer, text);
+    doLex(lexer, text);
+    doLex(filterLexer, text);
+    doLex(filterLexer, text);
+  }
+  
+  public void _testLexerPerformance2() throws Exception{
+    final String text = loadFile("performance2.xml");
+    XmlLexer lexer = new XmlLexer();
+    doLex(lexer, text);
+    final FilterLexer filterLexer = new FilterLexer(new XmlLexer(),
+                          new FilterLexer.SetFilter(LanguageParserDefinitions.INSTANCE.forLanguage(XMLLanguage.INSTANCE).getWhitespaceTokens()));
+    doLex(filterLexer, text);
+    doLex(lexer, text);
+    for (int i = 0; i < 20; i++) {
+      doLex(filterLexer, text);
+    }
+  }
+
+  private static void doLex(Lexer lexer, final String text) {
+    lexer.start(text);
+    long time = System.currentTimeMillis();
+    int count = 0;
+    while(lexer.getTokenType() != null){
+      lexer.advance();
+      count++;
+    }
+    System.out.println("Plain lexing took " + (System.currentTimeMillis() - time) + "ms lexems count:" + count);
+  }
+
+  private void transformAllChildren(final ASTNode file) {
+    for (ASTNode child = file.getFirstChildNode(); child != null; child = child.getTreeNext()) {
+      transformAllChildren(child);
+    }
+  }
+
+
+  public void _testPerformance1() throws Exception{
+    final String text = loadFile("pallada.xml");
+    long time = System.currentTimeMillis();
+    final PsiFile file = createFile("test.xml", text);
+    transformAllChildren(file.getNode());
+    System.out.println("Old parsing took " + (System.currentTimeMillis() - time) + "ms");
+    int index = 0;
+    while(index++ < 10){
+      newParsing(text);
+    }
+    LeafElement firstLeaf = TreeUtil.findFirstLeaf(file.getNode());
+    index = 0;
+    do{
+      index++;
+    }
+    while((firstLeaf = TreeUtil.nextLeaf(firstLeaf, null)) != null);
+    System.out.println("For " + index + " lexems");
+  }
+
+  public void _testReparsePerformance() throws Exception {
+    final String text = loadFile("performance2.xml");
+    final PsiFile file = createFile("test.xml", text);
+    transformAllChildren(file.getNode());
+    final Document doc = PsiDocumentManager.getInstance(getProject()).getDocument(file);
+
+    System.gc();
+    System.gc();
+    
+    new WriteCommandAction(getProject(), file) {
+      @Override
+      protected void run(final Result result) throws Throwable {
+        PlatformTestUtil.startPerformanceTest("XML reparse using PsiBuilder", 2500, new ThrowableRunnable() {
+          @Override
+          public void run() throws Exception {
+            for (int i = 0; i < 10; i++) {
+              final long tm = System.currentTimeMillis();
+              doc.insertString(0, "<additional root=\"tag\"/>");
+              PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
+              System.out.println("Reparsed for: " + (System.currentTimeMillis() - tm));
+            }
+          }
+        }).cpuBound().assertTiming();
+      }
+    }.execute();
+  }
+
+  public void _testPerformance2() throws Exception{
+    final String text = loadFile("performance2.xml");
+    long time = System.currentTimeMillis();
+    final PsiFile file = createFile("test.xml", text);
+    transformAllChildren(file.getNode());
+    System.out.println("Old parsing took " + (System.currentTimeMillis() - time) + "ms");
+    int index = 0;
+    while(index++ < 10){
+      newParsing(text);
+    }
+    LeafElement firstLeaf = TreeUtil.findFirstLeaf(file.getNode());
+    index = 0;
+    do{
+      index++;
+    }
+    while((firstLeaf = TreeUtil.nextLeaf(firstLeaf, null)) != null);
+    System.out.println("For " + index + " lexems");
+  }
+
+  private static void newParsing(final String text) {
+    long time = System.currentTimeMillis();
+
+    ASTFactory.lazy(XmlElementType.XML_FILE, text).getFirstChildNode(); // ensure parsed
+
+    System.out.println("parsed for " + (System.currentTimeMillis() - time) + "ms");
+  }
+
+  public void testXmlDecl() throws Exception {
+    doTestXml("<?xml version=\"1.0\" encoding='cp1251' ?>");
+  }
+
+  public void testXmlDecl2() throws Exception {
+    doTestXml("<?xml version=\"1.0\" encoding='cp1251' ?> <foo></foo>");
+  }
+
+  public void testXmlDecl3() throws Exception {
+    doTestXml("<?xml version=\"1.0\" encoding='cp1251' > <foo></foo>");
+  }
+
+  public void testDoctype1() throws Exception {
+    doTestXml("<!DOCTYPE greeting SYSTEM \"hello.dtd\">");
+  }
+
+  public void testDoctype2() throws Exception {
+    doTestXml("<!DOCTYPE toc " + "PUBLIC \"-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 1.0//EN\" " +
+           "\"http://java.sun.com/products/javahelp/toc_1_0.dtd\">");
+  }
+
+  public void testDoctype3() throws Exception {
+    doTestXml("<!DOCTYPE greeting [" + "<!ELEMENT greeting (#PCDATA)>" + "]>");
+  }
+
+  public void testDoctype4() throws Exception {
+    doTestXml("<!DOCTYPE greeting [" + "<!ELEMENT br EMPTY>" + "]>");
+  }
+
+  public void testDoctype5() throws Exception {
+    doTestXml("<!DOCTYPE greeting [" + "<!ELEMENT p (#PCDATA|a|ul|b|i|em)*>" + "]>");
+  }
+
+  public void testDoctype6() throws Exception {
+    doTestXml("<!DOCTYPE greeting [" + "<!ELEMENT %name.para; %content.para; >" + "]>");
+  }
+
+  public void testDoctype7() throws Exception {
+    doTestXml("<?xml version='1.0' encoding='ISO-8859-1' ?>" + "<!DOCTYPE toc SYSTEM 'dtds/ejb-jar_2_0.dtd'>" + "<test>" + "</test>");
+  }
+
+  public void testAttlist1() throws Exception {
+    doTestDtd("<!ATTLIST termdef id ID #REQUIRED name CDATA #IMPLIED>");
+  }
+
+  public void testAttlist2() throws Exception {
+    doTestDtd("<!ATTLIST termdef type (bullets|ordered|glossary)  \"ordered\">");
+  }
+
+  public void testAttlist3() throws Exception {
+    doTestDtd("<!ATTLIST termdef  method  CDATA   #FIXED \"POST\">");
+  }
+
+  public void testAttlist4() throws Exception {
+    doTestDtd("<!ATTLIST termdef default-charset %CHARSET; \"iso-8859-1\">");
+  }
+
+  public void testComment1() throws Exception {
+    doTestXml("<!-- declarations for <head> & <body> -->");
+  }
+
+  public void testComment2() throws Exception {
+    doTestDtd("<!ELEMENT data-sources (#PCDATA)> <!-- abc --> <!ATTLIST data-sources path CDATA #IMPLIED");
+  }
+
+  public void testComment3() throws Exception {
+    doTestXml("<a><!--<b>--></a>");
+  }
+
+  public void testElements1() throws Exception {
+    doTestXml("<a></a>");
+  }
+
+  public void testElements2() throws Exception {
+    doTestXml("<a/>");
+  }
+
+  public void testElements3() throws Exception {
+    doTestXml("<a><b><c/><d/></b><e/><f><g/></f></a>");
+  }
+
+  public void testElements4() throws Exception {
+    doTestXml("<project name=\"IDEA_ZKM\">\n" + "<!-- set global properties for this build -->\n" + "<property value=\"off\" />\n" +
+           "</project>\n");
+  }
+
+  public void testElements5() throws Exception {
+    doTestXml("<ns1:a><ns2:b/></ns1:a>");
+  }
+
+  public void testElements6() throws Exception {
+    doTestXml("<!DOCTYPE project [" + "<!ENTITY targets SYSTEM \"file:../myproject/targets.xml\">" + "]>" + "<project>" + "</project>");
+  }
+
+  public void testAttributes1() throws Exception {
+    doTestXml("<a att1='val1' att2=\"val2\"></a>");
+  }
+
+  public void testAttributes2() throws Exception {
+    doTestXml("<a><b c=\"\" > </b> </a>");
+  }
+
+  public void testAttributes3() throws Exception {
+    doTestXml("<a><b c=\"a, b, c\" > </b> </a>");
+  }
+
+  public void testAttributes4() throws Exception {
+    doTestXml("<a><b c=\"a  b\" > </b> </a>");
+  }
+
+  public void testAttributes5() throws Exception {
+    doTestXml("<a><b c=\"a\"d=\"\" > </b> </a>");
+  }
+
+  public void testManualEmptyAttributeParsing() throws Exception{
+    String value = "<a><b c=\"\" > </b> </a>";
+    final CompositeElement element = parseManually(value, XmlElementType.XML_ELEMENT_DECL, XmlEntityDecl.EntityContextType.GENERIC_XML);
+    checkResult("testManualEmptyAttributeParsing.txt", DebugUtil.treeToString(element, false));
+  }
+
+  private CompositeElement parseManually(final String value, final IElementType xmlElementDecl, XmlEntityDecl.EntityContextType parseType) {
+    return (CompositeElement)new OldXmlParser(value, xmlElementDecl, parseType, new CharTableImpl(), getPsiManager()).parse();
+  }
+
+  public void testCharacters1() throws Exception {
+    doTestXml("<a>someChar\nData</a>");
+  }
+
+  public void testEditing1() throws Exception {
+    doTestXml("<<a></a>");
+  }
+
+  public void testEditing2() throws Exception {
+    doTestXml("<a><b/> < <c/></a>");
+  }
+
+  public void testEditing3() throws Exception {
+    doTestXml("<a><b <c/></a>");
+  }
+
+  public void testEditing4() throws Exception {
+    doTestXml("<a><b>< <c/></a>");
+  }
+
+  public void testEditing5() throws Exception {
+    doTestXml("<a><b></ <c/></a>");
+  }
+
+  public void testEditing6() throws Exception {
+    doTestXml("<one>     <two ,b\"/></one>");
+  }
+
+  public void testEditing7() throws Exception {
+    doTestXml("<one>     <two a,b\"/></one>");
+  }
+
+  public void testEditing8() throws Exception {
+    doTestXml("<one>     <two a b=\"\"/></one>");
+  }
+
+  public void testEditing9() throws Exception {
+    doTestXml("<one> <two a b=\"\"> ashdgjkasgd <aksjhdk></two></one>");
+  }
+
+
+  public void testCdata1() throws Exception {
+    doTestXml("<a><![CDATA[<greeting>Hello, world!</greeting>]]></a>");
+  }
+
+  public void testCdata2() throws Exception {
+    doTestXml("<a><![CDATA[someData <!--</greeting>--> more data]]></a>");
+  }
+
+  public void testDtd1() throws Exception {
+    doTestDtd("<!ELEMENT data-sources (#PCDATA)> <!ATTLIST data-sources path CDATA #IMPLIED>");
+  }
+
+  public void testElementDecl1() throws Exception {
+    doTestDtd("<!ELEMENT data-sources EMPTY>");
+  }
+
+  public void testElementDecl2() throws Exception {
+    doTestDtd("<!ELEMENT data-sources ANY>");
+  }
+
+  public void testConditionalSection1() throws Exception {
+    doTestDtd("<![ INCLUDE [ <!ELEMENT data-sources ANY> ]]>");
+  }
+
+  public void testConditionalSection2() throws Exception {
+    doTestDtd("<![%sgml.features;[\n" + "<![IGNORE[\n" +
+              "<!ENTITY % dbgenent SYSTEM \"http://www.oasis-open.org/docbook/xml/configerror.txt\">\n" + "]]>\n" + "]]>");
+  }
+
+  public void testConditionalSection3() throws Exception {
+    doTestDtd("<!ENTITY % dbhier.module \"INCLUDE\">\n" + "<![ %dbhier.module; [\n" + "<!ENTITY % dbhier PUBLIC\n" +
+              "\"-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4//EN\"\n" + "\"dbhierx.mod\">\n" + "%dbhier;\n" + "]]>");
+  }
+
+  public void testEntityRef1() throws Exception {
+    doTestXml("<a>%types;</a>");
+  }
+
+  public void testEntityRef3() throws Exception {
+    doTestDtd("<!ELEMENT project (target | taskdef | %types; | property )*>");
+  }
+
+  public void testEntityRef4() throws Exception {
+    doTestXml("<a b=\"aa &gt; bb\" />");
+  }
+
+  public void testEntityRef5() throws Exception {
+    doTestDtd("<!ATTLIST a %coreattrs; version CDATA #FIXED \"1.0\"");
+  }
+
+  public void testEntityRef6() throws Exception {
+    doTestDtd("&common;");
+  }
+
+  public void testEntityRef7() throws Exception {
+    doTestDtd("<!ATTLIST foo someBoolean (%boolean;) \"true\" someString CDATA #IMPLIED >");
+  }
+
+  public void testEntityDecl1() throws Exception {
+    doTestDtd("<!ENTITY % types \"fileset | patternset mapper\">");
+  }
+
+  public void testEntityDecl2() throws Exception {
+    doTestDtd("<!ENTITY types \"fileset | patternset mapper\">");
+  }
+
+  public void testEntityDecl3() throws Exception {
+    doTestDtd("<!ENTITY build-common SYSTEM \"common.xml\">");
+  }
+
+  public void testEntityDecl4() throws Exception {
+    doTestDtd(
+      "<!ENTITY open-hatch PUBLIC \"-//Textuality//TEXT Standard open-hatch boilerplate//EN\" \"http://www.textuality.com/boilerplate/OpenHatch.xml\">");
+  }
+
+  public void testUnbalanced1() throws Exception {
+    doTestXml("<a><b></a>");
+  }
+
+  public void testUnbalanced2() throws Exception {
+    doTestXml("<a><b><c></a>");
+  }
+
+  public void testUnbalanced3() throws Exception {
+    doTestXml("<a><b></bb></a>");
+  }
+
+  public void testUnbalanced4() throws Exception {
+    doTestXml("<a><b><b/></c></a>");
+  }
+
+  public void testDtdUrl1() throws Exception {
+    XmlFile file = (XmlFile)createFile("test.xml", "<!DOCTYPE greeting SYSTEM \"hello.dtd\">");
+
+    XmlDocument document = file.getDocument();
+    XmlProlog prolog = document.getProlog();
+    XmlDoctype doctype = prolog.getDoctype();
+    String url = doctype.getDtdUri();
+    assertTrue("testDtdUrl1", "hello.dtd".equals(url));
+  }
+
+  public void testContent1() throws Exception {
+    XmlFile file = (XmlFile)createFile("test.xml", "<a>   \nxxx   \n</a>");
+    checkResult("testContent1", file);
+    assertTrue("xxx".equals(file.getDocument().getRootTag().getValue().getTrimmedText()));
+  }
+
+  public void testUnopenedTag1() throws Exception {
+    doTestXml("</foo>");
+  }
+
+  public void testUnclosedTag() throws Exception {
+    XmlFile file = (XmlFile)createFile("test.xml", "<a>xxx");
+    checkResult("testUnclosedTag", file);
+    assertTrue("xxx".equals(file.getDocument().getRootTag().getValue().getText()));
+  }
+
+  public void testUnclosedTag2() throws Exception {
+    doTestXml("<a");
+  }
+
+  public void testProcessingInstruction1() throws Exception {
+    doTestXml("<?This is=\"PI\"?>");
+  }
+
+  public void testProcessingInstruction2() throws Exception {
+    doTestXml("<a><?This is=\"PI\"?></a>");
+  }
+
+  public void testProcessingInstruction3() throws Exception {
+    doTestXml("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<?xml-stylesheet type=\"text/xsl\" href=\"document.xsl\"?>" +
+           "<!-- @(#) $Id$ -->" + "<!DOCTYPE api SYSTEM \"document.dtd\">" + "<api>" + "</api>");
+  }
+
+  public void testCharRef1() throws Exception {
+    doTestXml("<a>&#123;</a>");
+  }
+
+  public void testCharRef2() throws Exception {
+    doTestXml("<a>&#x123;</a>");
+  }
+
+  public void testCharRef3() throws Exception {
+    doTestXml("&#123;");
+  }
+
+  public void testCharRef4() throws Exception {
+    doTestXml("&#xaBcD123;");
+  }
+
+  public void testCharRef5() throws Exception {
+    doTestXml("<a attr=\"abc&#123;\"/>");
+  }
+
+  public void testNotation1() throws Exception {
+    doTestDtd("<!NOTATION data-sources SYSTEM \"x3\">");
+  }
+
+  public void testPrologInDtd() throws Exception {
+    doTestDtd("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n" + "<!ELEMENT idea-plugin>\n" + "<!ATTLIST idea-plugin\n" +
+              "    url CDATA #IMPLIED>");
+  }
+
+  public void testEmptyElementsInDtd() throws Exception {
+    doTestDtd("<!ELEMENT >\n<!ELEMENT name (,)\n<!ATTLIST > <!ELEMENT zzz (aa?, bb)+> <!ELEMENT xxx(aaa,)>" + "<!ATTLIST %aaa;>");
+  }
+
+  public void testElementDeclaration() throws Exception {
+    doTestDtd(
+      "<!ELEMENT xxx EMPTY>\n<!ELEMENT xxx2 ANY>\n<!ELEMENT %name.para; %content.para; >\n<!ELEMENT xxx3 (#PCDATA | a) >\n<!ELEMENT xxx4 >");
+  }
+
+  public void testEntityDeclaration() throws Exception {
+    doTestDtd("<!ENTITY xxx > <!ENTITY >");
+  }
+
+  public void testEntityDeclaration2() throws Exception {
+    String s = "| %pre.qname; | %blockquote.qname; | %address.qname;";
+    CompositeElement element = parseManually(s, XmlElementType.XML_ELEMENT_CONTENT_SPEC, XmlEntityDecl.EntityContextType.ELEMENT_CONTENT_SPEC);
+    checkResult("testEntityDeclaration2.txt", DebugUtil.treeToString(element, false));
+  }
+
+  public void testEntityInAttlistDeclaration() throws Exception {
+    doTestDtd("<!ATTLIST %span.qname;      %Common.attrib;>");
+  }
+
+  public void testSGMLDtd() throws Exception {
+    doTestDtd("<!ELEMENT name - - (%inline;)* +(A)> <!ATTLIST (A|B) >\n" +
+              "<!ELEMENT (E|E2) - O (%flow;)*       -- table header cell, table data cell-->\n" +
+              "<!ELEMENT BODY O O (%block;|SCRIPT)+ +(INS|DEL) -- document body -->");
+  }
+
+  public void testNotation2() throws Exception {
+    doTestXml("<!DOCTYPE x3 [<!NOTATION data-sources SYSTEM \"x3\">]>");
+  }
+
+
+}
diff --git a/xml/tests/src/com/intellij/codeInsight/XmlPerformanceTest.java b/xml/tests/src/com/intellij/codeInsight/XmlPerformanceTest.java
new file mode 100644
index 000000000000..7552ad09388a
--- /dev/null
+++ b/xml/tests/src/com/intellij/codeInsight/XmlPerformanceTest.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved.
+ */
+
+/*
+ * Created by IntelliJ IDEA.
+ * User: Maxim.Mossienko
+ * Date: Sep 8, 2006
+ * Time: 3:40:30 PM
+ */
+package com.intellij.codeInsight;
+
+import com.intellij.codeInsight.daemon.quickFix.LightQuickFixTestCase;
+import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.editor.actionSystem.EditorActionManager;
+import com.intellij.testFramework.IdeaTestUtil;
+import com.intellij.testFramework.PlatformTestUtil;
+import com.intellij.util.ThrowableRunnable;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * @by Maxim.Mossienko
+ */
+public class XmlPerformanceTest extends LightQuickFixTestCase {
+  private final Set<String> ourTestsWithFolding = new HashSet<String>(Arrays.asList("IndentUnindent2"));
+
+  @Override
+  protected String getBasePath() {
+    return "performance/";
+  }
+
+  @Override
+  protected String getTestDataPath() {
+    return PlatformTestUtil.getCommunityPath().replace(File.separatorChar, '/') + "/xml/tests/testData/";
+  }
+
+  public void testDummy() {
+    @SuppressWarnings({"UnusedDeclaration"})
+    Class clazz = IdeaTestUtil.class;
+  }
+
+  public void testIndentUnindent() throws Exception {
+    doIndentTest(2000);
+  }
+
+  public void testIndentUnindent2() throws Exception {
+    doIndentTest(2001);
+  }
+
+  @Override
+  protected boolean doFolding() {
+    return ourTestsWithFolding.contains(getTestName(false));
+  }
+
+  private void doIndentTest(int time) throws Exception {
+    configureByFile(getBasePath() + getTestName(false)+".xml");
+    doHighlighting();
+    myEditor.getSelectionModel().setSelection(0,myEditor.getDocument().getTextLength());
+
+    PlatformTestUtil.startPerformanceTest("Fix long indent/unindent "+time, time, new ThrowableRunnable() {
+      @Override
+      public void run() {
+        EditorActionManager.getInstance().getActionHandler("EditorIndentSelection").execute(myEditor, new DataContext() {
+          @Override
+          @Nullable
+          public Object getData(String dataId) {
+            return null;
+          }
+        });
+
+        EditorActionManager.getInstance().getActionHandler("EditorUnindentSelection").execute(myEditor, new DataContext() {
+          @Override
+          @Nullable
+          public Object getData(String dataId) {
+            return null;
+          }
+        });
+      }
+    }).assertTiming();
+    final int startOffset = myEditor.getCaretModel().getOffset();
+    myEditor.getSelectionModel().setSelection(startOffset,startOffset);
+    checkResultByFile(getBasePath() + getTestName(false)+".xml");
+  }
+}
diff --git a/xml/tests/src/com/intellij/codeInsight/XmlReparseTest.java b/xml/tests/src/com/intellij/codeInsight/XmlReparseTest.java
new file mode 100644
index 000000000000..08107e7a2a0b
--- /dev/null
+++ b/xml/tests/src/com/intellij/codeInsight/XmlReparseTest.java
@@ -0,0 +1,165 @@
+/*
+ * Created by IntelliJ IDEA.
+ * User: mike
+ * Date: Oct 4, 2002
+ * Time: 2:14:24 PM
+ * To change template for new class use 
+ * Code Style | Class Templates options (Tools | IDE Options).
+ */
+package com.intellij.codeInsight;
+
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.fileTypes.StdFileTypes;
+import com.intellij.psi.AbstractReparseTestCase;
+import com.intellij.psi.PsiDocumentManager;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.impl.DebugUtil;
+import com.intellij.psi.impl.source.xml.XmlFileImpl;
+import com.intellij.psi.xml.XmlFile;
+import com.intellij.testFramework.ParsingTestCase;
+import com.intellij.testFramework.PlatformTestCase;
+import com.intellij.testFramework.PlatformTestUtil;
+import com.intellij.util.IncorrectOperationException;
+
+import java.io.File;
+
+@PlatformTestCase.WrapInCommand
+public class XmlReparseTest extends AbstractReparseTestCase {
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    setFileType(StdFileTypes.XML);
+  }
+
+  public void test1() throws Exception{
+    String s1 = "<a>";
+    String s2 = "</a>";
+
+    prepareFile(s1, s2);
+    final String beforeReparse = DebugUtil.treeToString(((XmlFileImpl)myDummyFile).getTreeElement(), true);
+    insert("");
+    assertEquals("Tree changed after empty reparse", beforeReparse, DebugUtil.treeToString(((XmlFileImpl)myDummyFile).getTreeElement(), true));
+  }
+
+  public void testTagData1() throws Exception {
+    String s1 = "<a>";
+    String s2 = "</a>";
+
+    prepareFile(s1, s2);
+    insert("x");
+    insert(" ");
+    insert("xxxxx");
+    insert("\n");
+    insert("xxxxx");
+  }
+
+  public void testTagData2() throws Exception {
+    String s1 = "<a><b>\nSomeDataHere";
+    String s2 = "\n</b></a>";
+
+    prepareFile(s1, s2);
+
+    PsiElement element1 = ((XmlFile)myDummyFile).getDocument().getRootTag();
+
+    insert("x");
+    insert(" ");
+    insert("xxxxx");
+    insert("\n");
+    insert("xxxxx");
+
+    assertSame(element1, ((XmlFile)myDummyFile).getDocument().getRootTag());
+  }
+
+  public void testTagInTag1() throws Exception {
+    String s1 = "<a><b>";
+    String s2 = "</b></a>";
+
+    prepareFile(s1, s2);
+
+    insert("<");
+    insert("c");
+    insert("/");
+    insert(">");
+  }
+
+  public void testTagInTag2() throws Exception {
+    String s1 = "<a><b>";
+    String s2 = "</b></a>";
+
+    prepareFile(s1, s2);
+
+    insert("<");
+    insert("c");
+    insert(">");
+    insert("\nxxx \nxxxx\n");
+    insert("<");
+    insert("/");
+    insert("c");
+    insert(">");
+  }
+
+  public void testTagInTag3() throws Exception {
+    String s1 = "<a><b>";
+    String s2 = "</b></a>";
+
+    prepareFile(s1, s2);
+
+    insert("<");
+    insert("/");
+    insert("b");
+    insert(">");
+  }
+
+  public void testSCR5925() throws Exception {
+    String s1 = "<one>     <two ";
+    String s2 = ",b\"/></one>";
+
+    prepareFile(s1, s2);
+    insert("a");
+    insert("t");
+    insert("t");
+    insert("r");
+    insert("=");
+    insert("\"");
+  }
+
+  public void testXmlReparseProblem() throws IncorrectOperationException {
+    prepareFile("<table>\n" +
+                "    <tr>\n" +
+                "<td>\n" +
+                "<table width"," </td>\n" +
+               "    </tr>\n" +
+               "</table>");
+    insert("=");
+  }
+  private static final String marker = "<marker>";
+  public void testXmlDeclDtd() throws Exception {
+    PsiFile file = createFile("x.xml", "<!DOCTYPE name [\n" +
+                                       "  <!ELEMENT name (" + marker+ "a b c d" + marker+ ")>\n" +
+                                       "  <!ELEMENT name2 (" + marker+ "%entity;" + marker+ ")>\n" +
+                                       "]>\n" +
+                                       "<name></name>");
+
+    PsiDocumentManager documentManager = PsiDocumentManager.getInstance(getProject());
+    Document document = documentManager.getDocument(file);
+
+    removeGarbage(document);
+
+    documentManager.commitAllDocuments();
+    String myFullDataPath = getTestDataPath() + "psi/";
+    ParsingTestCase.doCheckResult(myFullDataPath, file, true, "testXmlDeclDtd", false, false);
+  }
+
+  private static void removeGarbage(Document document) {
+    int i = document.getText().indexOf(marker);
+    if (i==-1) return;
+    document.replaceString(i,i+marker.length(),"");
+    removeGarbage(document);
+  }
+
+  @Override
+  protected String getTestDataPath() {
+    return PlatformTestUtil.getCommunityPath().replace(File.separatorChar, '/') + "/xml/tests/testData/";
+  }
+}
diff --git a/xml/tests/src/com/intellij/codeInsight/XmlSchemaTest.java b/xml/tests/src/com/intellij/codeInsight/XmlSchemaTest.java
new file mode 100644
index 000000000000..fc9fe64b7ec1
--- /dev/null
+++ b/xml/tests/src/com/intellij/codeInsight/XmlSchemaTest.java
@@ -0,0 +1,757 @@
+package com.intellij.codeInsight;
+
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.xml.XmlAttribute;
+import com.intellij.psi.xml.XmlFile;
+import com.intellij.psi.xml.XmlTag;
+import com.intellij.testFramework.LightCodeInsightTestCase;
+import com.intellij.xml.XmlAttributeDescriptor;
+import com.intellij.xml.XmlElementDescriptor;
+import com.intellij.xml.XmlNSDescriptor;
+import com.intellij.xml.impl.schema.XmlElementDescriptorImpl;
+import com.intellij.xml.impl.schema.XmlNSDescriptorImpl;
+import com.intellij.xml.util.XmlUtil;
+import org.jetbrains.annotations.NonNls;
+
+/**
+ * @author Mike
+ */
+public class XmlSchemaTest extends LightCodeInsightTestCase {
+  private XmlTag SHIP_TO;
+  private XmlTag UNKNOWN_TAG;
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    SHIP_TO = XmlTestUtil.tag("shipTo", getProject());
+    UNKNOWN_TAG = XmlTestUtil.tag("xxx", getProject());
+  }
+
+  public void testDocumentDescriptor1() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
+        "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
+        "<xsd:element name=\"comment\" type=\"xsd:string\"/>" +
+        "</xsd:schema>");
+
+    assertNotNull(NSDescriptor);
+    assertNotNull(NSDescriptor.getElementDescriptor(XmlTestUtil.tag("purchaseOrder", getProject())));
+    assertNotNull(NSDescriptor.getElementDescriptor(XmlTestUtil.tag("comment", getProject())));
+    assertNull(NSDescriptor.getElementDescriptor(UNKNOWN_TAG));
+  }
+
+  public void testElementDescriptor1() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
+        "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
+        "<xsd:element name=\"comment\" type=\"xsd:string\"/>" +
+        "</xsd:schema>");
+
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(XmlTestUtil.tag("purchaseOrder", getProject()));
+    assertEquals("purchaseOrder", elementDescriptor.getName());
+
+    elementDescriptor = NSDescriptor.getElementDescriptor(XmlTestUtil.tag("comment", getProject()));
+    assertEquals("comment", elementDescriptor.getName());
+  }
+
+  public void testElementDescriptor2() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
+        "<xsd:element name=\"comment\" type=\"xsd:string\"/>" +
+        "</xsd:schema>");
+
+    XmlTag tag = XmlTestUtil.tag("comment", getProject());
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag);
+
+    XmlElementDescriptor[] elements = elementDescriptor.getElementsDescriptors(tag);
+    assertEquals(0, elements.length);
+
+    XmlAttributeDescriptor[] descriptors = elementDescriptor.getAttributesDescriptors(tag);
+    assertEquals(0, descriptors.length);
+
+    assertEquals(elementDescriptor.getContentType(), XmlElementDescriptor.CONTENT_TYPE_MIXED);
+  }
+
+  public void testElementDescriptor3() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
+        "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
+        "<xsd:complexType name=\"PurchaseOrderType\">" +
+        "   <xsd:sequence>" +
+        "     <xsd:element name=\"shipTo\" type=\"USAddress\"/>" +
+        "     <xsd:element name=\"billTo\" type=\"USAddress\"/>" +
+        "     <xsd:element name=\"items\" type=\"Items\"/>" +
+        "   </xsd:sequence>" +
+        "</xsd:complexType>" +
+        "</xsd:schema>");
+
+    XmlTag tag = XmlTestUtil.tag("purchaseOrder", getProject());
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag);
+
+    XmlElementDescriptor[] elements = elementDescriptor.getElementsDescriptors(tag);
+    assertEquals(3, elements.length);
+    assertEquals("shipTo", elements[0].getName());
+    assertEquals("billTo", elements[1].getName());
+    assertEquals("items", elements[2].getName());
+
+    assertEquals("shipTo", elementDescriptor.getElementDescriptor(SHIP_TO, null).getName());
+    assertNull(elementDescriptor.getElementDescriptor(UNKNOWN_TAG, null));
+  }
+
+  public void testElementDescriptor4() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
+        "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
+        "<xsd:complexType name=\"PurchaseOrderType\">" +
+        "   <xsd:attribute name=\"orderDate\" type=\"xsd:date\"/>" +
+        "   <xsd:attribute name=\"name\" type=\"xsd:string\"/>" +
+        "</xsd:complexType>" +
+        "</xsd:schema>");
+
+    final XmlTag tag = XmlTestUtil.tag("purchaseOrder", getProject());
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag);
+
+    XmlAttributeDescriptor[] attributes = elementDescriptor.getAttributesDescriptors(tag);
+
+    assertEquals(2, attributes.length);
+    assertEquals("orderDate", attributes[0].getName());
+    assertEquals("name", attributes[1].getName());
+
+    assertEquals("name", elementDescriptor.getAttributeDescriptor("name", tag).getName());
+
+    assertNull(elementDescriptor.getAttributeDescriptor("xxx", tag));
+  }
+
+  public void testElementDescriptor5() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
+        "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
+        "<xsd:complexType name=\"PurchaseOrderType\">" +
+        "   <xsd:sequence>" +
+        "     <xsd:element name=\"shipTo\" type=\"USAddress\"/>" +
+        "     <xsd:element name=\"billTo\" type=\"USAddress\"/>" +
+        "     <xsd:element name=\"items\" type=\"Items\"/>" +
+        "   </xsd:sequence>" +
+        "</xsd:complexType>" +
+        "<xsd:complexType name=\"USAddress\">" +
+        "  <xsd:sequence>" +
+        "    <xsd:element name=\"name\" type=\"xsd:string\"/>" +
+        "    <xsd:element name=\"street\" type=\"xsd:string\"/>" +
+        "    <xsd:element name=\"city\" type=\"xsd:string\"/>" +
+        "    <xsd:element name=\"state\" type=\"xsd:string\"/>" +
+        "    <xsd:element name=\"zip\" type=\"xsd:decimal\"/>" +
+        "  </xsd:sequence>" +
+        "  <xsd:attribute name=\"country\" type=\"xsd:NMTOKEN\" fixed=\"US\"/>" +
+        "</xsd:complexType>" +
+        "</xsd:schema>");
+
+    XmlTag tag = XmlTestUtil.tag("purchaseOrder", getProject());
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag).getElementDescriptor(SHIP_TO, null);
+
+    XmlElementDescriptor[] elements = elementDescriptor.getElementsDescriptors(tag);
+    assertEquals(5, elements.length);
+    assertEquals("name", elements[0].getName());
+    assertEquals("street", elements[1].getName());
+    assertEquals("city", elements[2].getName());
+    assertEquals("state", elements[3].getName());
+    assertEquals("zip", elements[4].getName());
+
+    final XmlTag context = tag.findFirstSubTag(elements[2].getName());
+    assertEquals(0, elements[2].getElementsDescriptors(context).length);
+
+    XmlAttributeDescriptor[] attributes = elementDescriptor.getAttributesDescriptors(context);
+    assertEquals(1, attributes.length);
+    assertEquals("country", attributes[0].getName());
+  }
+
+  public void testElementDescriptor6() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
+        "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
+        "<xsd:complexType name=\"PurchaseOrderType\">" +
+        "   <xsd:sequence>" +
+        "     <xsd:element name=\"shipTo\">" +
+        "       <xsd:complexType name=\"USAddress\">" +
+        "         <xsd:sequence>" +
+        "           <xsd:element name=\"name\" type=\"xsd:string\"/>" +
+        "           <xsd:element name=\"street\" type=\"xsd:string\"/>" +
+        "           <xsd:element name=\"city\" type=\"xsd:string\"/>" +
+        "           <xsd:element name=\"state\" type=\"xsd:string\"/>" +
+        "           <xsd:element name=\"zip\" type=\"xsd:decimal\"/>" +
+        "         </xsd:sequence>" +
+        "         <xsd:attribute name=\"country\" type=\"xsd:NMTOKEN\" fixed=\"US\"/>" +
+        "       </xsd:complexType>" +
+        "     </xsd:element>" +
+        "   </xsd:sequence>" +
+        "</xsd:complexType>" +
+        "</xsd:schema>");
+
+    XmlTag tag = XmlTestUtil.tag("purchaseOrder", getProject());
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag).getElementDescriptor(SHIP_TO, null);
+
+    XmlElementDescriptor[] elements = elementDescriptor.getElementsDescriptors(tag);
+    assertEquals(5, elements.length);
+    assertEquals("name", elements[0].getName());
+    assertEquals("street", elements[1].getName());
+    assertEquals("city", elements[2].getName());
+    assertEquals("state", elements[3].getName());
+    assertEquals("zip", elements[4].getName());
+
+    final XmlTag context = tag.findFirstSubTag(elements[2].getName());
+    assertEquals(0, elements[2].getElementsDescriptors(context).length);
+
+    XmlAttributeDescriptor[] attributes = elementDescriptor.getAttributesDescriptors(context);
+    assertEquals(1, attributes.length);
+    assertEquals("country", attributes[0].getName());
+  }
+
+  public void testElementDescriptor7() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
+        "<xsd:element name=\"purchaseOrder\">" +
+        "<xsd:complexType name=\"PurchaseOrderType\">" +
+        "   <xsd:sequence>" +
+        "     <xsd:element name=\"shipTo\">" +
+        "       <xsd:complexType name=\"USAddress\">" +
+        "         <xsd:sequence>" +
+        "           <xsd:element name=\"name\" type=\"xsd:string\"/>" +
+        "           <xsd:element name=\"street\" type=\"xsd:string\"/>" +
+        "           <xsd:element name=\"city\" type=\"xsd:string\"/>" +
+        "           <xsd:element name=\"state\" type=\"xsd:string\"/>" +
+        "           <xsd:element name=\"zip\" type=\"xsd:decimal\"/>" +
+        "         </xsd:sequence>" +
+        "         <xsd:attribute name=\"country\" type=\"xsd:NMTOKEN\" fixed=\"US\"/>" +
+        "       </xsd:complexType>" +
+        "     </xsd:element>" +
+        "   </xsd:sequence>" +
+        "</xsd:complexType>" +
+        "</xsd:element>" +
+        "</xsd:schema>");
+
+    XmlTag tag = XmlTestUtil.tag("purchaseOrder", getProject());
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag);
+    XmlAttributeDescriptor[] attributes = elementDescriptor.getAttributesDescriptors(tag);
+    assertEquals(0, attributes.length);
+
+    XmlElementDescriptor[] elements = elementDescriptor.getElementsDescriptors(tag);
+    assertEquals(1, elements.length);
+    assertEquals("shipTo", elements[0].getName());
+  }
+
+  public void testElementDescriptor8() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
+        "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
+        "<xsd:complexType name=\"PurchaseOrderType\">" +
+        "   <xsd:sequence>" +
+        "     <xsd:element ref=\"items\"/>" +
+        "   </xsd:sequence>" +
+        "</xsd:complexType>" +
+        "<xsd:element name=\"items\" type=\"xsd:string\"/>" +
+        "</xsd:schema>");
+
+    XmlTag tag = XmlTestUtil.tag("purchaseOrder", getProject());
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag);
+
+    XmlElementDescriptor[] elements = elementDescriptor.getElementsDescriptors(tag);
+    assertEquals(1, elements.length);
+    assertEquals("items", elements[0].getName());
+
+    assertEquals("items", elementDescriptor.getElementDescriptor(XmlTestUtil.tag("items", getProject()), null).getName());
+    assertNull(elementDescriptor.getElementDescriptor(UNKNOWN_TAG, null));
+  }
+
+  public void testElementDescriptor9() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
+        "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
+        "<xsd:complexType name=\"PurchaseOrderType\">" +
+        "   <xsd:sequence>" +
+        "     <xsd:group ref=\"ddd:mainBookElements\"/>" +
+        "   </xsd:sequence>" +
+        "</xsd:complexType>" +
+        "<xsd:group name=\"mainBookElements\">" +
+        "   <xsd:sequence>" +
+        "       <xsd:element name=\"title\" type=\"nameType\"/>" +
+        "       <xsd:element name=\"author\" type=\"nameType\"/>" +
+        "   </xsd:sequence>" +
+        "</xsd:group>" +
+        "</xsd:schema>");
+
+    XmlTag tag = XmlTestUtil.tag("purchaseOrder", getProject());
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag);
+
+    XmlElementDescriptor[] elements = elementDescriptor.getElementsDescriptors(tag);
+    assertEquals(2, elements.length);
+    assertEquals("title", elements[0].getName());
+    assertEquals("author", elements[1].getName());
+
+    assertEquals("title", elementDescriptor.getElementDescriptor(XmlTestUtil.tag("title", getProject()), null).getName());
+    assertNull(elementDescriptor.getElementDescriptor(UNKNOWN_TAG, null));
+  }
+
+  public void testElementDescriptor10() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
+        "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
+        "<xsd:complexType name=\"PurchaseOrderType\">" +
+        "    <xsd:attributeGroup ref=\"ddd:bookAttributes\"/>" +
+        "</xsd:complexType>" +
+        "<xsd:attributeGroup name=\"bookAttributes\">" +
+        "   <xsd:attribute name=\"isbn\" type=\"xs:string\" use=\"required\"/>" +
+        "   <xsd:attribute name=\"available\" type=\"xs:string\"/>" +
+        "</xsd:attributeGroup>" +
+        "</xsd:schema>");
+
+    final XmlTag tag = XmlTestUtil.tag("purchaseOrder", getProject());
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag);
+
+    XmlAttributeDescriptor[] attributes = elementDescriptor.getAttributesDescriptors(tag);
+
+    assertEquals(2, attributes.length);
+    assertEquals("isbn", attributes[0].getName());
+    assertEquals("available", attributes[1].getName());
+
+    assertEquals("isbn", elementDescriptor.getAttributeDescriptor("isbn", tag).getName());
+
+    assertNull(elementDescriptor.getAttributeDescriptor("xxx", tag));
+  }
+
+  public void testElementDescriptor11() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
+        "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
+        "<xsd:complexType name=\"PurchaseOrderType\">" +
+        "    <xsd:complexContent>" +
+        "     <xsd:restriction base=\"PurchaseOrderType2\">" +
+        "       <xsd:element name=\"shipTo2\" type=\"USAddress\"/>" +
+        "       <xsd:element name=\"items\" type=\"Items\"/>" +
+        "     </xsd:restriction>" +
+        "    </xsd:complexContent>" +
+        "</xsd:complexType>" +
+        "<xsd:complexType name=\"PurchaseOrderType2\">" +
+        "   <xsd:sequence>" +
+        "     <xsd:element name=\"shipTo\" type=\"USAddress\"/>" +
+        "     <xsd:element name=\"billTo\" type=\"USAddress\"/>" +
+        "     <xsd:element name=\"items\" type=\"Items\"/>" +
+        "   </xsd:sequence>" +
+        "</xsd:complexType>" +
+        "</xsd:schema>");
+
+    XmlTag tag = XmlTestUtil.tag("purchaseOrder", getProject());
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag);
+
+    XmlElementDescriptor[] elements = elementDescriptor.getElementsDescriptors(tag);
+
+    assertEquals(4, elements.length);
+    assertEquals("shipTo", elements[0].getName());
+    assertEquals("billTo", elements[1].getName());
+    assertEquals("shipTo2", elements[2].getName());
+    assertEquals("items", elements[3].getName());
+  }
+
+  public void testElementDescriptor15() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
+        "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
+        "<xsd:complexType name=\"PurchaseOrderType\">" +
+        "    <xsd:complexContent>" +
+        "     <xsd:extension base=\"PurchaseOrderType2\">" +
+        "       <xsd:element name=\"shipTo2\" type=\"USAddress\"/>" +
+        "     </xsd:extension>" +
+        "    </xsd:complexContent>" +
+        "</xsd:complexType>" +
+        "<xsd:complexType name=\"PurchaseOrderType2\">" +
+        "   <xsd:sequence>" +
+        "     <xsd:element name=\"shipTo\" type=\"USAddress\"/>" +
+        "     <xsd:element name=\"billTo\" type=\"USAddress\"/>" +
+        "     <xsd:element name=\"items\" type=\"Items\"/>" +
+        "   </xsd:sequence>" +
+        "</xsd:complexType>" +
+        "</xsd:schema>");
+
+    XmlTag tag = XmlTestUtil.tag("purchaseOrder", getProject());
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag);
+
+    XmlElementDescriptor[] elements = elementDescriptor.getElementsDescriptors(tag);
+
+    assertEquals(4, elements.length);
+    assertEquals("shipTo", elements[0].getName());
+    assertEquals("billTo", elements[1].getName());
+    assertEquals("items", elements[2].getName());
+    assertEquals("shipTo2", elements[3].getName());
+  }
+
+  public void testElementDescriptor12() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
+        "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
+        "<xsd:complexType name=\"PurchaseOrderType\">" +
+        "    <xsd:complexContent>" +
+        "     <xsd:restriction base=\"PurchaseOrderType2\">" +
+        "       <xsd:attribute name=\"orderDate2\" type=\"xsd:date\"/>" +
+        "       <xsd:attribute name=\"name\" type=\"xsd:date\"/>" +
+        "     </xsd:restriction>" +
+        "    </xsd:complexContent>" +
+        "</xsd:complexType>" +
+        "<xsd:complexType name=\"PurchaseOrderType2\">" +
+        "   <xsd:sequence>" +
+        "     <xsd:attribute name=\"orderDate\" type=\"xsd:date\"/>" +
+        "     <xsd:attribute name=\"name\" type=\"xsd:string\"/>" +
+        "   </xsd:sequence>" +
+        "</xsd:complexType>" +
+        "</xsd:schema>");
+
+    final XmlTag tag = XmlTestUtil.tag("purchaseOrder", getProject());
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag);
+
+    XmlAttributeDescriptor[] attributes = elementDescriptor.getAttributesDescriptors(tag);
+
+    assertEquals(3, attributes.length);
+    assertEquals("orderDate", attributes[0].getName());
+    assertEquals("orderDate2", attributes[1].getName());
+    assertEquals("name", attributes[2].getName());
+  }
+
+  public void testElementDescriptor13() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
+        "<xsd:element name=\"purchaseOrder\">" +
+        "<xsd:complexType name=\"PurchaseOrderType\">" +
+        "   <xsd:sequence>" +
+        "     <xsd:element ref=\"shipTo\"/>" +
+        "   </xsd:sequence>" +
+        "</xsd:complexType>" +
+        "</xsd:element>" +
+        "<xsd:element name=\"shipTo\" abstract=\"true\">" +
+        "</xsd:schema>");
+
+    XmlTag tag = XmlTestUtil.tag("purchaseOrder", getProject());
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag);
+
+    final XmlElementDescriptor[] elements = elementDescriptor.getElementsDescriptors(tag);
+    assertEquals(0, elements.length);
+  }
+
+  public void testElementDescriptor14() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<xsd:schema targetNamespace=\"http://www.deansoft.com/AddressBook\" xmlns:ab=\"http://www.deansoft.com/AddressBook\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
+        "<xsd:element name=\"purchaseOrder\">" +
+        "<xsd:complexType name=\"PurchaseOrderType\">" +
+        "   <xsd:sequence>" +
+        "     <xsd:element ref=\"shipTo\"/>" +
+        "   </xsd:sequence>" +
+        "</xsd:complexType>" +
+        "</xsd:element>" +
+        "<xsd:element name=\"shipTo\" abstract=\"true\">" +
+        "   <xsd:complexType name=\"USAddress\">" +
+        "       <xsd:attribute name=\"orderDate\" type=\"xsd:date\"/>" +
+        "       <xsd:element name=\"items\" type=\"Items\"/>" +
+        "   </xsd:complexType>" +
+        "</xsd:element>" +
+        "<xsd:element name=\"name\" substitutionGroup=\"ab:shipTo\"/>" +
+        "</xsd:schema>");
+
+    XmlTag tag = XmlTestUtil.tag("purchaseOrder", "http://www.deansoft.com/AddressBook", getProject());
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag);
+
+    final XmlElementDescriptor[] elements = elementDescriptor.getElementsDescriptors(tag);
+    assertEquals(1, elements.length);
+    assertEquals("name", elements[0].getName());
+    XmlAttributeDescriptor[] attrs = elements[0].getAttributesDescriptors(tag);
+    assertEquals(1, attrs.length);
+    assertEquals("orderDate", attrs[0].getName());
+    XmlElementDescriptor[] element0Descriptors = elements[0].getElementsDescriptors(tag.findFirstSubTag(elements[0].getName()));
+    assertEquals(1, element0Descriptors.length);
+    assertEquals("items", element0Descriptors[0].getName());
+  }
+
+  public void testAttributeDescriptor1() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
+        "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
+        "<xsd:complexType name=\"PurchaseOrderType\">" +
+        "   <xsd:attribute name=\"orderDate\" type=\"xsd:date\"/>" +
+        "</xsd:complexType>" +
+        "</xsd:schema>");
+
+    final XmlTag tag = XmlTestUtil.tag("purchaseOrder", getProject());
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag);
+    XmlAttributeDescriptor attribute = elementDescriptor.getAttributeDescriptor("orderDate", tag);
+
+    assertTrue(!attribute.isEnumerated());
+    assertTrue(!attribute.isFixed());
+    assertTrue(!attribute.isRequired());
+    assertNull(attribute.getDefaultValue());
+  }
+
+  public void testAttributeDescriptorProhibited() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
+        "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
+        "<xsd:complexType name=\"PurchaseOrderType\">" +
+        "   <xsd:attribute name=\"orderDate\" type=\"xsd:date\" use=\"prohibited\" />" +
+        "</xsd:complexType>" +
+        "</xsd:schema>");
+
+    final XmlTag tag = XmlTestUtil.tag("purchaseOrder", getProject());
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag);
+    XmlAttributeDescriptor[] attributes = elementDescriptor.getAttributesDescriptors(tag);
+    assertEquals(0, attributes.length);
+  }
+
+  public void testAttributeDescriptorProhibited2() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
+        "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
+        "<xsd:complexType name=\"PurchaseOrderType\">" +
+        "    <xsd:complexContent>" +
+        "     <xsd:restriction base=\"PurchaseOrderType2\">" +
+        "       <xsd:attribute name=\"orderDate\" type=\"xsd:date\" use=\"prohibited\"/>" +
+        "     </xsd:restriction>" +
+        "    </xsd:complexContent>" +
+        "</xsd:complexType>" +
+        "<xsd:complexType name=\"PurchaseOrderType2\">" +
+        "   <xsd:sequence>" +
+        "     <xsd:attribute name=\"orderDate\" type=\"xsd:date\"/>" +
+        "     <xsd:attribute name=\"name\" type=\"xsd:string\"/>" +
+        "   </xsd:sequence>" +
+        "</xsd:complexType>" +
+        "</xsd:schema>");
+
+    final XmlTag tag = XmlTestUtil.tag("purchaseOrder", getProject());
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag);
+
+    XmlAttributeDescriptor[] attributes = elementDescriptor.getAttributesDescriptors(tag);
+
+    assertEquals(1, attributes.length);
+    assertEquals("name", attributes[0].getName());
+  }
+
+  public void testAttributeDescriptor2() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
+        "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
+        "<xsd:complexType name=\"PurchaseOrderType\">" +
+        "   <xsd:attribute name=\"orderDate\" type=\"xsd:date\" use=\"required\" default=\" 2002 \"/>" +
+        "</xsd:complexType>" +
+        "</xsd:schema>");
+
+    final XmlTag tag = XmlTestUtil.tag("purchaseOrder", getProject());
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag);
+    XmlAttributeDescriptor attribute = elementDescriptor.getAttributeDescriptor("orderDate", tag);
+
+    assertTrue(!attribute.isEnumerated());
+    assertTrue(!attribute.isFixed());
+    assertTrue(attribute.isRequired());
+    assertEquals(" 2002 ", attribute.getDefaultValue());
+  }
+
+  public void testAttributeDescriptor3() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
+        "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
+        "<xsd:complexType name=\"PurchaseOrderType\">" +
+        "   <xsd:attribute name=\"orderDate\" type=\"xsd:date\" fixed=\"1 01 2001\"/>" +
+        "</xsd:complexType>" +
+        "</xsd:schema>");
+
+    final XmlTag tag = XmlTestUtil.tag("purchaseOrder", getProject());
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag);
+    XmlAttributeDescriptor attribute = elementDescriptor.getAttributeDescriptor("orderDate", tag);
+
+    assertTrue(!attribute.isEnumerated());
+    assertTrue(attribute.isFixed());
+    assertTrue(!attribute.isRequired());
+    assertEquals("1 01 2001", attribute.getDefaultValue());
+  }
+
+  public void testAttributeDescriptor4() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
+        "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
+        "<xsd:complexType name=\"PurchaseOrderType\">" +
+        "   <xsd:attribute ref=\"orderDate\" use=\"required\"/>" +
+        "</xsd:complexType>" +
+        "   <xsd:attribute name=\"orderDate\" type=\"xsd:date\" fixed=\"1 01 2001\"/>" +
+        "</xsd:schema>");
+
+    final XmlTag tag = XmlTestUtil.tag("purchaseOrder", getProject());
+    XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag);
+    XmlAttributeDescriptor attribute = elementDescriptor.getAttributeDescriptor("orderDate", tag);
+
+    assertNotNull(attribute);
+    assertTrue(!attribute.isEnumerated());
+    assertTrue(attribute.isFixed());
+    assertTrue(attribute.isRequired());
+    assertEquals("1 01 2001", attribute.getDefaultValue());
+  }
+
+  public void testNamespace1() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<xs:schema xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">" +
+        "<xs:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
+        "<xs:element name=\"comment\" type=\"xs:string\"/>" +
+        "</xs:schema>");
+
+    assertNotNull(NSDescriptor);
+    assertNotNull(NSDescriptor.getElementDescriptor(XmlTestUtil.tag("purchaseOrder", getProject())));
+    assertNotNull(NSDescriptor.getElementDescriptor(XmlTestUtil.tag("comment", getProject())));
+    assertNull(NSDescriptor.getElementDescriptor(UNKNOWN_TAG));
+  }
+
+  public void testNamespace2() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<xsd:schema targetNamespace=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" >" +
+        "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
+        "<xsd:complexType name=\"PurchaseOrderType\">" +
+        "   <xsd:sequence>" +
+        "     <xsd:element ref=\"xsd:items\"/>" +
+        "   </xsd:sequence>" +
+        "</xsd:complexType>" +
+        "<xsd:element name=\"items\" type=\"xsd:string\"/>" +
+        "</xsd:schema>");
+
+    XmlTag tag = XmlTestUtil.tag("purchaseOrder", "http://www.w3.org/2001/XMLSchema", getProject());
+    XmlElementDescriptorImpl elementDescriptor = (XmlElementDescriptorImpl)NSDescriptor.getElementDescriptor(tag);
+
+    XmlElementDescriptor[] elements = elementDescriptor.getElementsDescriptors(tag);
+    assertEquals(1, elements.length);
+    assertEquals("items", elements[0].getName());
+
+    assertEquals("items", elementDescriptor.getElementDescriptor("items").getName());
+    assertNull(elementDescriptor.getElementDescriptor("xxx"));
+  }
+
+  public void testNamespace3() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<xs:schema xmlns=\"http://www.w3.org/2001/XMLSchema\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">" +
+        "<xs:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
+        "<element name=\"comment\" type=\"xs:string\"/>" +
+        "</xs:schema>");
+
+    assertNotNull(NSDescriptor);
+    assertNotNull(NSDescriptor.getElementDescriptor(XmlTestUtil.tag("purchaseOrder", "http://www.w3.org/2001/XMLSchema", getProject())));
+    assertNotNull(NSDescriptor.getElementDescriptor(XmlTestUtil.tag("comment", "http://www.w3.org/2001/XMLSchema", getProject())));
+    assertNull(NSDescriptor.getElementDescriptor(UNKNOWN_TAG));
+  }
+
+  //public void testAny1() throws Exception {
+  //  XmlDocumentDescriptor documentDescriptor = createDescriptorImpl(
+  //      "<xsd:schema targetNamespace=\"http://foo\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" >" +
+  //      "  <xsd:element name=\"root\">" +
+  //      "    <xsd:complexType>" +
+  //      "      <xsd:sequence minOccurs=\"1\" maxOccurs=\"1\">" +
+  //      "        <xsd:any namespace=\"##other\" minOccurs=\"0\" maxOccurs=\"unbounded\" processContents=\"skip\"/>" +
+  //      "      </xsd:sequence>" +
+  //      "    </xsd:complexType>" +
+  //      "  </xsd:element>" +
+  //      "</xsd:schema>"
+  //  );
+  //
+  //  XmlFile xmlFile = (XmlFile)createFile("file.xml",
+  //      "<root xmlns=\"http://foo\">" +
+  //      "  <a:a xmlns:a=\"http://bar\" />" +
+  //      "</root>"
+  //  );
+  //
+  //  XmlElementDescriptor rootDescriptor = documentDescriptor.getElementDescriptor(xmlFile.saveToString().getRootTag());
+  //  assertNotNull(rootDescriptor);
+  //
+  //  XmlTag aTag = xmlFile.saveToString().getRootTag().findSubTag("a:a");
+  //  assertNotNull(aTag);
+  //  XmlElementDescriptor aDescriptor = documentDescriptor.getElementDescriptor(aTag);
+  //  assertNotNull(aDescriptor);
+  //}
+
+  public void testAny2() throws Exception {
+    PsiFile dtdFile = createFile("test.xml", "<xsd:schema targetNamespace=\"http://foo\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" >" +
+                                             "  <xsd:element name=\"root\">" +
+                                             "    <xsd:complexType>" +
+                                             "      <xsd:sequence minOccurs=\"1\" maxOccurs=\"1\">" +
+                                             "        <xsd:any namespace=\"##other\" minOccurs=\"0\" maxOccurs=\"unbounded\" processContents=\"skip\"/>" +
+                                             "      </xsd:sequence>" +
+                                             "    </xsd:complexType>" +
+                                             "  </xsd:element>" +
+                                             "</xsd:schema>");
+
+    XmlNSDescriptor NSDescriptor = new XmlNSDescriptorImpl((XmlFile)dtdFile);
+
+    XmlFile xmlFile = (XmlFile)createFile("file.xml",
+                                          "<foo:root xmlns:foo=\"http://foo\">" +
+                                          "  <foo:a xmlns:a=\"http://bar\" />" +
+                                          "</foo:root>"
+    );
+
+    XmlElementDescriptor rootDescriptor = NSDescriptor.getElementDescriptor(xmlFile.getDocument().getRootTag());
+    assertNotNull(rootDescriptor);
+
+    XmlTag aTag = xmlFile.getDocument().getRootTag().findFirstSubTag("foo:a");
+    assertNotNull(aTag);
+    //XmlElementDescriptor aDescriptor = NSDescriptor.getElementDescriptor(aTag);
+    //assertNull(aDescriptor);
+  }
+
+  public void testAny3() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<xsd:schema targetNamespace=\"http://foo\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" >" +
+        "  <xsd:element name=\"root\">" +
+        "    <xsd:complexType>" +
+        "        <xsd:anyAttribute namespace=\"##other\" processContents=\"skip\"/>" +
+        "    </xsd:complexType>" +
+        "  </xsd:element>" +
+        "</xsd:schema>"
+    );
+
+    XmlFile xmlFile = (XmlFile)createFile("file.xml",
+                                          "<root xmlns=\"http://foo\" y:a=\"1\">" +
+                                          "</root>"
+    );
+
+    final XmlTag rootTag = xmlFile.getDocument().getRootTag();
+    XmlElementDescriptor rootDescriptor = NSDescriptor.getElementDescriptor(rootTag);
+    assertNotNull(rootDescriptor);
+
+    XmlAttribute attribute = rootTag.getAttribute("y:a", XmlUtil.EMPTY_URI);
+    assertNotNull(attribute);
+    XmlAttributeDescriptor aDescriptor = rootDescriptor.getAttributeDescriptor("y:a", rootTag);
+    assertNotNull(aDescriptor);
+  }
+
+  public void testAny4() throws Exception {
+    XmlNSDescriptor NSDescriptor = createDescriptor(
+        "<xsd:schema targetNamespace=\"http://foo\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" >" +
+        "  <xsd:element name=\"root\">" +
+        "    <xsd:complexType>" +
+        "        <xsd:anyAttribute namespace=\"##other\" processContents=\"skip\"/>" +
+        "    </xsd:complexType>" +
+        "  </xsd:element>" +
+        "</xsd:schema>"
+    );
+
+    XmlFile xmlFile = (XmlFile)createFile("file.xml",
+                                          "<root xmlns=\"http://foo\" a=\"1\">" +
+                                          "</root>"
+    );
+
+    final XmlTag rootTag = xmlFile.getDocument().getRootTag();
+    XmlElementDescriptor rootDescriptor = NSDescriptor.getElementDescriptor(rootTag);
+    assertNotNull(rootDescriptor);
+
+    XmlAttribute attribute = rootTag.getAttribute("a", XmlUtil.EMPTY_URI);
+    assertNotNull(attribute);
+    XmlAttributeDescriptor aDescriptor = rootDescriptor.getAttributeDescriptor("a", rootTag);
+    assertNull(aDescriptor);
+
+    attribute = rootTag.getAttribute("a", "http://foo");
+    assertNull(attribute);
+    attribute = rootTag.getAttribute("a", XmlUtil.ANT_URI);
+    assertNull(attribute);
+  }
+
+  private static XmlNSDescriptor createDescriptor(@NonNls String dtdText) throws Exception {
+    PsiFile dtdFile = createFile("test.xml", dtdText);
+
+    return new XmlNSDescriptorImpl((XmlFile)dtdFile);
+  }
+}
diff --git a/xml/tests/src/com/intellij/codeInsight/XmlTagTest.java b/xml/tests/src/com/intellij/codeInsight/XmlTagTest.java
new file mode 100644
index 000000000000..0241f4bc46da
--- /dev/null
+++ b/xml/tests/src/com/intellij/codeInsight/XmlTagTest.java
@@ -0,0 +1,960 @@
+package com.intellij.codeInsight;
+
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.Result;
+import com.intellij.openapi.command.CommandProcessor;
+import com.intellij.openapi.command.UndoConfirmationPolicy;
+import com.intellij.openapi.command.WriteCommandAction;
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.editor.RangeMarker;
+import com.intellij.openapi.fileTypes.StdFileTypes;
+import com.intellij.openapi.util.TextRange;
+import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.openapi.vfs.VfsUtil;
+import com.intellij.openapi.vfs.VirtualFileManager;
+import com.intellij.psi.*;
+import com.intellij.psi.codeStyle.CodeStyleManager;
+import com.intellij.psi.xml.*;
+import com.intellij.testFramework.LightCodeInsightTestCase;
+import com.intellij.util.ArrayUtil;
+import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.LocalTimeCounter;
+import com.intellij.xml.util.XmlTagUtil;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.Arrays;
+
+/**
+ * @author peter
+ */
+@SuppressWarnings({"ConstantConditions", "EmptyCatchBlock"})
+public class XmlTagTest extends LightCodeInsightTestCase {
+  private static XmlTag createTag(String value) throws IncorrectOperationException {
+    return XmlElementFactory.getInstance(getProject()).createTagFromText("<foo>" + value + "</foo>");
+  }
+
+  public void testGetTextValue() throws Throwable {
+    assertEquals("bar", createTag("bar").getValue().getText());
+  }
+
+  public void testCharRefs() throws Throwable {
+    String[] names = XmlTagUtil.getCharacterEntityNames();
+    for (String name : names) {
+      XmlTag tag = createTag("foo&" + name + ";bar");
+      assertEquals("foo" + XmlTagUtil.getCharacterByEntityName(name) + "bar", tag.getValue().getTrimmedText());
+    }
+  }
+
+  public void testLocalNSDeclarations() throws Throwable {
+    final XmlTag tag = XmlElementFactory.getInstance(getProject()).createTagFromText("<foo xmlns='aaa' xmlns:a='bbbb'/>");
+    final Object[] nsPrefixes = ArrayUtil.toObjectArray(tag.getLocalNamespaceDeclarations().keySet());
+    Arrays.sort(nsPrefixes);
+    assertEquals(2, nsPrefixes.length);
+    assertEquals("a",nsPrefixes[1]);
+    assertEquals("",nsPrefixes[0]);
+  }
+
+  public void testCDATA() throws Throwable {
+    XmlTag tag = createTag("foo<![CDATA[<>&'\"]]>bar");
+    assertEquals("foo<>&'\"bar", tag.getValue().getTrimmedText());
+  }
+
+  public void testWhitespacesInAttributes() throws Throwable {
+    XmlTag tag = XmlElementFactory.getInstance(getProject()).createTagFromText("<a c=d>b</a>");
+    assertEquals("b", tag.getValue().getText());
+  }
+
+  public void testCreateChildTag() throws Throwable {
+    final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<a xmlns=\"aNamespace\"/>");
+    final XmlTag childTag = rootTag.createChildTag("b", "bNamespace", null, true);
+    assertEquals("bNamespace", childTag.getNamespace());
+
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        XmlTag beanTag = (XmlTag)rootTag.add(childTag);
+        assertEquals("bNamespace", beanTag.getNamespace());
+      }
+    });
+  }
+
+  public void testDeleteTag() throws Throwable {
+    XmlTag aTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<a><b/> </a>");
+    final XmlTag bTag = aTag.findFirstSubTag("b");
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        bTag.delete();
+      }
+    });
+
+    assertEquals(0, aTag.getSubTags().length);
+  }
+
+  public void testReplaceTag() throws Throwable {
+    final XmlTag aTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<a><b/></a>");
+    final XmlTag bTag = aTag.findFirstSubTag("b");
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        PsiElement cTag = bTag.replace(XmlElementFactory.getInstance(getProject()).createTagFromText("<c/>"));
+        assertEquals(1, aTag.getSubTags().length);
+        assertEquals(cTag, aTag.getSubTags()[0]);
+      }
+    });
+  }
+
+  public void testAddText() throws Exception{
+    final XmlElementFactory elementFactory = XmlElementFactory.getInstance(getProject());
+    final XmlTag aTag = elementFactory.createTagFromText("<a>1</a>");
+    final XmlText displayText = elementFactory.createDisplayText("2");
+
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        final PsiElement psiElement = aTag.addAfter(displayText, aTag.getValue().getChildren()[0]);
+        assertEquals(psiElement.getContainingFile(), aTag.getContainingFile());
+      }
+    });
+  }
+
+  public void testWhitespaceInsideTag() throws Exception {
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        XmlElementFactory.getInstance(getProject()).createTagFromText("<p/>").getValue().setText("\n");
+      }
+    });
+  }
+
+  public void testSetAttribute_ForXhtml() throws Exception {
+    XmlFile xhtmlFile = (XmlFile)PsiFileFactory.getInstance(getProject()).createFileFromText("dummy.xhtml", "<html/>");
+    final XmlTag rootTag = xhtmlFile.getDocument().getRootTag();
+
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        rootTag.setAttribute("foo", "bar");
+      }
+    });
+
+    assertEquals(1, rootTag.getAttributes().length);
+    assertEquals("bar", rootTag.getAttributeValue("foo"));
+    assertEquals("foo", rootTag.getAttributes()[0].getName());
+  }
+
+  public void testSetAttribute() throws Exception {
+    final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<html/>");
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        rootTag.setAttribute("foo", "bar");
+      }
+    });
+
+    assertEquals(1, rootTag.getAttributes().length);
+    assertEquals("bar", rootTag.getAttributeValue("foo"));
+    assertEquals("foo", rootTag.getAttributes()[0].getName());
+    assertEquals("<html foo=\"bar\"/>", rootTag.getText());
+  }
+
+  public void testSetAttributeWithQuotes() throws Exception {
+    final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<html/>");
+    final String value = "a \"b\" c";
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        rootTag.setAttribute("foo", value);
+      }
+    });
+
+    assertEquals(1, rootTag.getAttributes().length);
+    assertEquals(value, rootTag.getAttributeValue("foo"));
+    assertEquals("foo", rootTag.getAttributes()[0].getName());
+    assertEquals("<html foo='" + value + "'/>", rootTag.getText());
+  }
+
+  public void testSetAttributeWithQuotes2() throws Exception {
+    final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<html/>");
+    final String value = "'a \"b\" c'";
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        rootTag.setAttribute("foo", value);
+      }
+    });
+
+    final String expected = value.replaceAll("\"", "&quot;");
+    assertEquals(1, rootTag.getAttributes().length);
+    assertEquals(expected, rootTag.getAttributeValue("foo"));
+    assertEquals(value, rootTag.getAttribute("foo").getDisplayValue());
+    assertEquals("foo", rootTag.getAttributes()[0].getName());
+    assertEquals("<html foo=\"" + expected + "\"/>", rootTag.getText());
+  }
+
+  public void testSetAttributeUpdateText() throws Exception {
+    final String value = "a \"b\" c";
+    final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<html foo='" + value + "'/>");
+
+    assertEquals(1, rootTag.getAttributes().length);
+    assertEquals(value, rootTag.getAttributeValue("foo"));
+
+    final XmlAttribute foo = rootTag.getAttribute("foo");
+    final String text = foo.getValueElement().getText();
+    assertEquals("'" + value + "'", text);
+
+    ((PsiLanguageInjectionHost)foo.getValueElement()).updateText(text);
+    assertEquals("<html foo='" + value + "'/>", rootTag.getText());
+  }
+
+  public void testSetAttributeWithNamespaces() throws Exception {
+    final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<ns:tag xmlns:ns=\"xxx\"/>");
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        rootTag.setAttribute("foo", "", "bar");
+      }
+    });
+
+    assertEquals(2, rootTag.getAttributes().length);
+    assertEquals("bar", rootTag.getAttributeValue("foo"));
+    assertEquals("foo", rootTag.getAttributes()[1].getName());
+    assertEquals("<ns:tag xmlns:ns=\"xxx\" foo=\"bar\"/>", rootTag.getText());
+  }
+
+  public void testTextEdit1() throws Exception {
+    final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<html>aaa</html>");
+    final XmlText xmlText = rootTag.getValue().getTextElements()[0];
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        xmlText.removeText(0, 3);
+      }
+    });
+
+    assertEquals("<html></html>", rootTag.getText());
+  }
+
+  public void testTextEdit2() throws Exception {
+    final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<html>a&lt;a</html>");
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        rootTag.getValue().getTextElements()[0].removeText(0, 3);
+      }
+    });
+
+    assertEquals("<html></html>", rootTag.getText());
+  }
+
+  public void testTextEdit3() throws Exception {
+    final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<html>a&lt;a</html>");
+    final XmlText xmlText = rootTag.getValue().getTextElements()[0];
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        xmlText.removeText(1, 2);
+      }
+    });
+
+    assertEquals(1, xmlText.getChildren().length);
+    assertEquals("<html>aa</html>", rootTag.getText());
+  }
+
+  public void testTextEdit4() throws Exception {
+    final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<html>aaa</html>");
+    final XmlText xmlText = rootTag.getValue().getTextElements()[0];
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        xmlText.removeText(1, 2);
+      }
+    });
+
+    assertEquals(1, xmlText.getChildren().length);
+    assertEquals("<html>aa</html>", rootTag.getText());
+  }
+
+  public void testTextEdit5() throws Exception {
+    final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<html><x>xxx</x>\n<y>yyy</y></html>");
+    final XmlTag y = rootTag.findFirstSubTag("y");
+
+    final PsiFile file = y.getContainingFile();
+    String text = y.getValue().getText();
+    TextRange textRange = y.getValue().getTextRange();
+
+    assertEquals(text, textRange.substring(file.getText()));
+
+    new WriteCommandAction(getProject(), file) {
+      @Override
+      protected void run(final Result result) throws Throwable {
+        CodeStyleManager.getInstance(getProject()).adjustLineIndent(file, y.getTextOffset());
+      }
+    }.execute();
+
+    text = y.getValue().getText();
+    textRange = y.getValue().getTextRange();
+
+    assertEquals(text, textRange.substring(file.getText()));
+  }
+
+  public void testTextEdit6() throws Exception {
+    final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<html>a<b>1</b>c</html>");
+    final XmlTag xmlTag = rootTag.findFirstSubTag("b");
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        xmlTag.delete();
+      }
+    });
+
+    assertEquals("<html>ac</html>", rootTag.getText());
+  }
+
+  public void testBrace() throws Exception {
+   final XmlTag tagFromText = XmlElementFactory.getInstance(getProject()).createTagFromText("<a/>");
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        tagFromText.getValue().setText("<");
+      }
+    });
+
+    assertEquals("<", tagFromText.getValue().getTextElements()[0].getValue());
+  }
+
+  public void testEmptyTextRange() throws Exception {
+    final String text = "<a></a>";
+    final String name = "test.xhtml";
+    XmlTag rootTag = createTag(name, text);
+    TextRange textRange = rootTag.getValue().getTextRange();
+    assertEquals(3, textRange.getStartOffset());
+    assertEquals(3, textRange.getEndOffset());
+  }
+
+  public void testDeleteTagBetweenText() throws Exception {
+    final XmlTag tag = createTag("foo.xhtml", "<p>a<div/>b</p>");
+    final XmlTag div = tag.getSubTags()[0];
+    new WriteCommandAction(getProject(), tag.getContainingFile()) {
+      @Override
+      protected void run(final Result result) throws Throwable {
+        div.delete();
+      }
+    }.execute();
+    assertEquals("<p>ab</p>", tag.getText());
+  }
+
+  private static XmlTag createTag(final String name, final String text) {
+    final XmlFile file = (XmlFile)PsiFileFactory.getInstance(getProject())
+      .createFileFromText(name, StdFileTypes.XML, text, LocalTimeCounter.currentTime(), true);
+    return file.getDocument().getRootTag();
+  }
+
+  // tests whether rangemarker gets changed when texts are merged, passes
+  public void testRangeMarker1() throws IOException, IncorrectOperationException {
+    final XmlFile file = (XmlFile)createFile("file.xhtml", "<a>1234<b></b>567</a>");
+    final XmlTag root = file.getDocument().getRootTag();
+    final XmlTag tag = root.findFirstSubTag("b");
+
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      @Override
+      public void run() {
+        CommandProcessor.getInstance().executeCommand(getProject(), new Runnable() {
+          @Override
+          public void run() {
+            final int offset = tag.getTextOffset();
+
+            Document document = PsiDocumentManager.getInstance(getProject()).getDocument(root.getContainingFile());
+            RangeMarker marker = document.createRangeMarker(offset - 3, offset);
+            tag.delete();
+
+
+            assertEquals(4, marker.getStartOffset());
+            assertEquals(7, marker.getEndOffset());
+          }
+        }, "", null);
+      }
+    });
+  }
+
+  // this one fails, the difference is that we do some manipulations before: move "234" before the tag
+  public void testRangeMarker2() throws IOException, IncorrectOperationException {
+    final XmlTag root = createTag("file.xhtml", "<a>1<b>234</b>567</a>");
+    final XmlTag tag = root.findFirstSubTag("b");
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      @Override
+      public void run() {
+        CommandProcessor.getInstance().executeCommand(getProject(), new Runnable() {
+          @Override
+          public void run() {
+            Document document = PsiDocumentManager.getInstance(getProject()).getDocument(root.getContainingFile());
+            XmlTagChild child = tag.getValue().getChildren()[0];
+            assertTrue(child instanceof XmlText && child.getText().equals("234"));
+
+            try {
+              tag.getParent().addBefore(child, tag);
+
+              assertEquals(7, tag.getTextOffset());
+              RangeMarker marker = document.createRangeMarker(4, 7);
+              tag.delete();
+
+              assertEquals(4, marker.getStartOffset());
+              assertEquals(7, marker.getEndOffset());
+
+            }
+            catch (IncorrectOperationException e) {
+            }
+          }
+        }, "", null);
+      }
+    });
+  }
+
+  // the previous test relveals one problem with text merge, "234" in fact is not merged with "1"
+  public void test3() throws IOException, IncorrectOperationException {
+    final XmlTag root = XmlElementFactory.getInstance(getProject()).createTagFromText("<a>1<b>234</b>456</a>");
+    final XmlTag tag = root.findFirstSubTag("b");
+
+    final XmlTagChild child = tag.getValue().getChildren()[0];
+    assertTrue(child instanceof XmlText && child.getText().equals("234"));
+
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        assertNotNull(tag.getParent().addBefore(child, tag));
+        tag.delete();
+      }
+    });
+
+
+    assertEquals(1, root.getValue().getChildren().length);
+    assertEquals("1234456", root.getValue().getChildren()[0].getText());
+  }
+
+  public void test3XHTML() throws IOException, IncorrectOperationException {
+    final XmlTag root = XmlElementFactory.getInstance(getProject()).createXHTMLTagFromText("<a>1<b>234</b>456</a>");
+    final XmlTag tag = root.findFirstSubTag("b");
+
+    final XmlTagChild child = tag.getValue().getChildren()[0];
+    assertTrue(child instanceof XmlText && child.getText().equals("234"));
+
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        assertNotNull(tag.getParent().addBefore(child, tag));
+        tag.delete();
+      }
+    });
+
+
+    assertEquals(1, root.getValue().getChildren().length);
+    assertEquals("1234456", root.getValue().getChildren()[0].getText());
+  }
+
+  public void testDisplayText() throws Throwable {
+    final XmlTag tag = XmlElementFactory.getInstance(getProject()).createTagFromText("  <foo/>");
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        tag.add(XmlElementFactory.getInstance(getProject()).createDisplayText("aaa\nbbb"));
+      }
+    });
+
+    assertEquals("aaa\nbbb", tag.getValue().getTextElements()[0].getValue());
+  }
+
+  public void testXHTMLAddBefore1() throws Exception {
+    final XmlFile file = (XmlFile)PsiFileFactory.getInstance(getProject()).createFileFromText("test.xhtml",
+                                                                                                              "<a>a <b>123</b> c</a>");
+    final XmlTag tagB = file.getDocument().getRootTag().findFirstSubTag("b");
+
+    final XmlTagChild[] tagElements = tagB.getValue().getChildren();
+    final PsiElement parent = tagB.getParent();
+
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        PsiElement first = parent.addBefore(tagElements[0], tagB);
+        assertNotNull(first);
+      }
+    });
+  }
+
+  public void testXHTMLSetAttribute1() throws Exception {
+    new WriteCommandAction.Simple(getProject()) {
+      @Override
+      protected void run() throws Throwable {
+        final XmlFile file = (XmlFile)PsiFileFactory.getInstance(getProject()).createFileFromText("test.xhtml", "<a/>");
+        final XmlTag tagB = file.getDocument().getRootTag();
+
+        tagB.setAttribute("a", "");
+        assertEquals("<a a=\"\"/>", tagB.getText());
+
+        tagB.setAttribute("b", "");
+        assertEquals("<a a=\"\" b=\"\"/>", tagB.getText());
+
+        tagB.setAttribute("c", "");
+        assertEquals("<a a=\"\" b=\"\" c=\"\"/>", tagB.getText());
+
+        tagB.getAttributes()[1].delete();
+        assertEquals("<a a=\"\"  c=\"\"/>", tagB.getText());
+      }
+    }.execute().throwException();
+  }
+
+  public void testXHTMLNbsp1() throws Exception {
+    final XmlFile file = (XmlFile)PsiFileFactory.getInstance(getProject()).createFileFromText("test.xhtml", "<a>&nbsp;</a>");
+    final XmlTag tagB = file.getDocument().getRootTag();
+    assertEquals(tagB.getValue().getTextElements().length, 1);
+    assertEquals(tagB.getValue().getTextElements()[0].getValue(), "\u00a0");
+  }
+
+  public void testDeleteTagWithMultilineWhitespace1() throws Exception {
+    final XmlFile file = (XmlFile)PsiFileFactory.getInstance(getProject()).createFileFromText("test.xml",
+                                                                                                              "<a>\n  <a/>\n</a>");
+    final XmlTag tagB = file.getDocument().getRootTag();
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        tagB.getSubTags()[0].delete();
+      }
+    });
+
+    assertEquals("<a>\n  </a>", tagB.getText());
+  }
+
+  public void testDeleteTagWithMultilineWhitespace2() throws Exception {
+    final XmlFile file = (XmlFile)PsiFileFactory.getInstance(getProject())
+      .createFileFromText("test.xml", "<a>\n    <a>\n <b>\n     hasgdgasjdgasdg    asgdjhasgd</b>\n </a>\n</a>");
+    final XmlTag tagB = file.getDocument().getRootTag();
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        tagB.getSubTags()[0].getSubTags()[0].delete();
+      }
+    });
+
+    assertEquals("<a>\n    <a>\n </a>\n</a>", tagB.getText());
+  }
+
+  public void testXHTMLRangeMarkers2() throws Exception {
+    XmlTag tag = createTag("file.xhtml", "<a>xyz</a>");
+    PsiFile psiFile = tag.getContainingFile();
+    Document document = PsiDocumentManager.getInstance(psiFile.getProject()).getDocument(psiFile);
+    RangeMarker rangeMarker = document.createRangeMarker(5, 5);
+    final XmlText text = (XmlText) tag.getValue().getChildren()[0];
+
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      @Override
+      public void run() {
+        CommandProcessor.getInstance().executeCommand(getProject(), new Runnable() {
+          @Override
+          public void run() {
+            try{
+              text.removeText(2, 3);
+            }
+            catch(IncorrectOperationException ioe){}
+          }
+        }, "", null, UndoConfirmationPolicy.DO_NOT_REQUEST_CONFIRMATION);
+      }
+    });
+
+    assertEquals(5, rangeMarker.getStartOffset());
+    assertEquals(5, rangeMarker.getEndOffset());
+  }
+
+  public void testXHTMLTextInsert() throws Exception {
+    final XmlTag tag = XmlElementFactory.getInstance(getProject()).createXHTMLTagFromText("<a>xyz</a>");
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        tag.getValue().getTextElements()[0].insertText("<", 1);
+      }
+    });
+
+    assertEquals("<a>x&lt;yz</a>", tag.getText());
+  }
+
+  public void testSimpleTextInsertion() throws Throwable {
+    doTestSimpleInsertion("xyz", "a");
+    doTestSimpleInsertion(" xyz", "a");
+    doTestSimpleInsertion("x yz", "a");
+    doTestSimpleInsertion("xy z", "a");
+    doTestSimpleInsertion("xyz ", "a");
+    doTestSimpleInsertion(" xyz ", "a");
+    doTestSimpleInsertion(" x y z ", "a");
+  }
+
+  public void testWhitespaceTextInsertion() throws Throwable {
+    doTestSimpleInsertion("xyz", " ");
+  }
+
+  public void testSimpleTextDeletion() throws Throwable {
+    doTestSimpleDeletion("xyz");
+    doTestSimpleDeletion(" xyz");
+    doTestSimpleDeletion("x yz");
+    doTestSimpleDeletion("xy z");
+    doTestSimpleDeletion("xyz ");
+    doTestSimpleDeletion(" xyz ");
+    doTestSimpleDeletion(" x y z ");
+  }
+
+  public void testWhitespaceDeletion() throws Throwable {
+    doTestSimpleDeletion(" xyz");
+    doTestSimpleDeletion("x yz");
+    doTestSimpleDeletion("xy z");
+    doTestSimpleDeletion("xyz ");
+    doTestSimpleDeletion(" xyz ");
+    doTestSimpleDeletion(" x y z ");
+  }
+
+  private static void doTestSimpleDeletion(final String text) throws IncorrectOperationException {
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        for (int i = 0; i < text.length(); i++) {
+          for (int j = i; j < text.length(); j++) {
+            XmlTag tag = XmlElementFactory.getInstance(getProject()).createXHTMLTagFromText("<a>" + text + "</a>");
+            final PsiElement[] children = tag.getValue().getTextElements();
+            assertEquals(1, children.length);
+            final XmlText xmlText = (XmlText)children[0];
+            assertEquals(text, xmlText.getText());
+            xmlText.removeText(i, j);
+            final StringBuffer expected = new StringBuffer(text);
+            expected.delete(i, j);
+            assertEquals(expected.toString(), xmlText.getValue());
+          }
+        }
+      }
+    });
+  }
+
+  private static void doTestSimpleInsertion(final String text, final String textToInsert) throws IncorrectOperationException {
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        for (int i = 0; i <= text.length(); i++) {
+          XmlTag tag = XmlElementFactory.getInstance(getProject()).createXHTMLTagFromText("<a>" + text + "</a>");
+          final PsiElement[] children = tag.getValue().getTextElements();
+          assertEquals(1, children.length);
+          final XmlText xmlText = (XmlText)children[0];
+          assertEquals(text, xmlText.getValue());
+          xmlText.insertText(textToInsert, i);
+          final StringBuffer expected = new StringBuffer(text);
+          expected.insert(i, textToInsert);
+          assertEquals(expected.toString(), xmlText.getValue());
+        }
+      }
+    });
+  }
+
+  public void testEscapedInsertion() throws Throwable {
+    doTestEscapedInsertion("xyz", "&");
+    doTestEscapedInsertion("xyz", "&&");
+    doTestEscapedInsertion("xyz", "&x&");
+    doTestEscapedInsertion("&xyz", "a");
+    doTestEscapedInsertion("&xyz", " ");
+    doTestEscapedInsertion("x&yz", "a");
+    doTestEscapedInsertion("x&yz", " ");
+    doTestEscapedInsertion("xy&z", "a");
+    doTestEscapedInsertion("xy&z", " ");
+    doTestEscapedInsertion("xyz&", "a");
+    doTestEscapedInsertion("xyz&", " ");
+    doTestEscapedInsertion("&x&y&z&", "a");
+    doTestEscapedInsertion(" x&y&z&", "a");
+    doTestEscapedInsertion(" x y&z&", "a");
+    doTestEscapedInsertion("&x y&z&", "a");
+    doTestEscapedInsertion("&x y&z ", "a");
+    doTestEscapedInsertion("&x&y&z&", "<");
+    doTestEscapedInsertion("&x&y&z&", ">");
+    doTestEscapedInsertion("_xyz", "a");
+    doTestEscapedInsertion("x_yz", "a");
+    doTestEscapedInsertion("xy_z", "a");
+    doTestEscapedInsertion("xyz_", "a");
+    doTestEscapedInsertion("_xyz_", "a");
+    doTestEscapedInsertion("_x_y_z_", "a");
+  }
+
+  public static void notestEscapedDeletion() throws Throwable {
+    doTestEscapedDeletion("&");
+    doTestEscapedDeletion("&&");
+    doTestEscapedDeletion(" &&");
+    doTestEscapedDeletion(" & &");
+    doTestEscapedDeletion(" & & ");
+    doTestEscapedDeletion(" && ");
+    doTestEscapedDeletion("&& ");
+    doTestEscapedDeletion("& ");
+    doTestEscapedDeletion(" ");
+    doTestEscapedDeletion("&abc");
+    doTestEscapedDeletion("a&bc");
+    doTestEscapedDeletion("ab&c");
+    doTestEscapedDeletion("abc&");
+    doTestEscapedDeletion(" &abc");
+    doTestEscapedDeletion("a &bc");
+    doTestEscapedDeletion("ab &c");
+    doTestEscapedDeletion("abc &");
+    doTestEscapedDeletion("& abc");
+    doTestEscapedDeletion("a& bc");
+    doTestEscapedDeletion("ab& c");
+    doTestEscapedDeletion("abc& ");
+  }
+
+  private static void doTestEscapedInsertion(final String text, final String textToInsert) throws IncorrectOperationException {
+    String tagText = toEscapedText(text);
+    for (int i = 0; i <= text.length(); i++) {
+      XmlTag tag = XmlElementFactory.getInstance(getProject()).createXHTMLTagFromText("<a>" + tagText + "</a>");
+      final PsiElement[] children = tag.getValue().getTextElements();
+      assertEquals(1, children.length);
+      final XmlText xmlText = (XmlText)children[0];
+      assertEquals(tagText, xmlText.getText());
+      xmlText.insertText(textToInsert, i);
+      final StringBuffer expectedDisplay = new StringBuffer(text.replace('_', '\u00a0'));
+      expectedDisplay.insert(i, textToInsert);
+      assertEquals(expectedDisplay.toString(), xmlText.getValue());
+
+//      final String expectedText = toEscapedText(expectedDisplay.toString());
+//      assertEquals(expectedText, xmlText.getText());
+    }
+  }
+
+  private static void doTestEscapedDeletion(final String text) throws IncorrectOperationException {
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        String tagText = toEscapedText(text);
+        for (int i = 0; i < text.length(); i++) {
+          for (int j = i; j < text.length(); j++) {
+            XmlTag tag = XmlElementFactory.getInstance(getProject()).createXHTMLTagFromText("<a>" + tagText + "</a>");
+            final PsiElement[] children = tag.getValue().getTextElements();
+            assertEquals(1, children.length);
+            final XmlText xmlText = (XmlText)children[0];
+            assertEquals(tagText, xmlText.getText());
+            xmlText.removeText(i, j);
+            final StringBuffer expectedDisplay = new StringBuffer(text.replace('_', ' '));
+            expectedDisplay.delete(i, j);
+            assertEquals(expectedDisplay.toString(), xmlText.getValue());
+
+            final String expectedText = toEscapedText(expectedDisplay.toString());
+            assertEquals(expectedText, xmlText.getText());
+          }
+        }
+      }
+    });
+  }
+
+  public void testWhitespacesInEmptyXHTMLTag() throws Exception{
+    final XmlTag tag = XmlElementFactory.getInstance(getProject()).createXHTMLTagFromText("<a> <b/> </a>");
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        tag.findFirstSubTag("b").delete();
+      }
+    });
+
+    assertEquals("<a>  </a>", tag.getText());
+  }
+
+  public void test2() throws Exception {
+    XmlFile file = (XmlFile)createFile("file.xml", "<a>x y</a>");
+    XmlTag tag = file.getDocument().getRootTag();
+    final XmlText xmlText = tag.getValue().getTextElements()[0];
+
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      @Override
+      public void run() {
+        CommandProcessor.getInstance().executeCommand(getProject(), new Runnable() {
+          @Override
+          public void run() {
+            try {
+              xmlText.insertText("z", 1);
+            }
+            catch (IncorrectOperationException e) {
+              throw new RuntimeException(e);
+            }
+          }
+        }, "", null, UndoConfirmationPolicy.DO_NOT_REQUEST_CONFIRMATION);
+      }
+    });
+    assertEquals("<a>xz y</a>", tag.getText());
+  }
+
+  private static String toDisplay(String text) {
+    text = text.replaceAll("&lt;", "<");
+    text = text.replaceAll("&gt;", ">");
+    text = text.replaceAll("&amp;", "&");
+    text = text.replaceAll("&apos;", "'");
+    text = text.replaceAll("&quot;", "\"");
+    text = text.replaceAll("<!\\[CDATA\\[", "");
+    text = text.replaceAll("\\]\\]>", "");
+    return text.replaceAll("&nbsp;", "_");
+  }
+
+  private static String toEscapedText(String original) {
+    String text = original.replaceAll("<", "&lt;");
+    text = text.replaceAll(">", "&gt;");
+    text = text.replaceAll("&", "&amp;");
+    text = text.replaceAll("'", "&apos;");
+    text = text.replaceAll("\"", "&quot;");
+    text = text.replaceAll("_", "&nbsp;");
+    assertEquals(original, toDisplay(text));
+    return text;
+  }
+
+  public void testCoordinateMappingConsistent() throws Exception {
+    doCoordinateMappingConsistentFromDisplayText("abc");
+    doCoordinateMappingConsistentFromDisplayText(" abc");
+    doCoordinateMappingConsistentFromDisplayText(" a bc");
+    doCoordinateMappingConsistentFromDisplayText(" a b c");
+    doCoordinateMappingConsistentFromDisplayText(" a b c ");
+    doCoordinateMappingConsistentFromDisplayText(" ab c ");
+    doCoordinateMappingConsistentFromDisplayText(" abc ");
+    doCoordinateMappingConsistentFromDisplayText("abc ");
+
+    doCoordinateMappingConsistentFromDisplayText(" ");
+    doCoordinateMappingConsistentFromDisplayText("&");
+
+    doCoordinateMappingConsistentFromDisplayText("&abc");
+    doCoordinateMappingConsistentFromDisplayText(" &abc");
+    doCoordinateMappingConsistentFromDisplayText(" a& bc");
+    doCoordinateMappingConsistentFromDisplayText(" a &b c");
+    doCoordinateMappingConsistentFromDisplayText(" a b& c ");
+    doCoordinateMappingConsistentFromDisplayText(" ab c& ");
+    doCoordinateMappingConsistentFromDisplayText(" ab&c ");
+    doCoordinateMappingConsistentFromDisplayText("abc &");
+    doCoordinateMappingConsistentFromDisplayText("abc&");
+    doCoordinateMappingConsistentFromDisplayText("ab&c&");
+    doCoordinateMappingConsistentFromDisplayText("ab&c");
+    doCoordinateMappingConsistentFromDisplayText("a&b&c");
+
+    doCoordinateMappingConsistentFromEscapedText("<![CDATA[ ]]>");
+    doCoordinateMappingConsistentFromEscapedText("<![CDATA[x]]>");
+    doCoordinateMappingConsistentFromEscapedText("xxx<![CDATA[x]]>");
+    doCoordinateMappingConsistentFromEscapedText("xxx<![CDATA[x]]>xxx");
+    doCoordinateMappingConsistentFromEscapedText("xxx&amp;<![CDATA[x]]>xxx");
+    doCoordinateMappingConsistentFromEscapedText("xxx&amp;<![CDATA[x]]>&amp;xxx");
+    doCoordinateMappingConsistentFromEscapedText("xxx<![CDATA[x]]>&amp;xxx");
+    doCoordinateMappingConsistentFromEscapedText("xxx<![CDATA[xas]]>&amp;xxx");
+    doCoordinateMappingConsistentFromEscapedText("xxx<![CDATA[xa>s]]>&amp;xxx");
+    doCoordinateMappingConsistentFromEscapedText("xxx<![CDATA[x<a>s]]>&amp;xxx");
+  }
+
+  public void testNBSP() throws Exception {
+    final XmlTag tagA = XmlElementFactory.getInstance(getProject()).createXHTMLTagFromText("<a>1<b>&nbsp;</b></a>");
+
+    final XmlTag tagB = tagA.findFirstSubTag("b");
+    final XmlTagChild nbsp = tagB.getValue().getChildren()[0];
+    assertEquals("&nbsp;", nbsp.getText());
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        tagA.addBefore(nbsp.copy(), tagB);
+      }
+    });
+
+    XmlTagChild nbsp1 = tagA.getValue().getChildren()[0];
+    assertEquals("1&nbsp;", nbsp1.getText());
+  }
+
+  private static void doCoordinateMappingConsistentFromDisplayText(final String text) throws IncorrectOperationException {
+    doCoordinateMappingConsistentFromEscapedText(toEscapedText(text));
+  }
+                                               
+  private static void doCoordinateMappingConsistentFromEscapedText(final String tagText) throws IncorrectOperationException {
+    String text = toDisplay(tagText);
+    XmlTag tag = XmlElementFactory.getInstance(getProject()).createTagFromText("<a>" + tagText + "</a>");
+    final PsiElement[] children = tag.getValue().getTextElements();
+    assertEquals(1, children.length);
+    final XmlText xmlText = (XmlText)children[0];
+    assertEquals(tagText, xmlText.getText());
+
+    for (int i = 0; i <= text.length(); i++) {
+      final int physical = xmlText.displayToPhysical(i);
+      final int display = xmlText.physicalToDisplay(physical);
+      assertEquals("Coords mapping failed for: '" + tagText + "' - " + physical, display, i);
+    }
+
+    assertEquals("Coords mapping failed for: '" + tagText + "'", 0, xmlText.physicalToDisplay(0));
+    assertEquals(tagText.length(), xmlText.displayToPhysical(text.length()));
+    assertEquals(text.length(), xmlText.physicalToDisplay(tagText.length()));
+  }
+
+  public void testStrangeCharactesInText() throws Throwable {
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        XmlElementFactory.getInstance(getProject()).createTagFromText("<a/>").getValue().setText("@#$%@$%$${${''}");
+      }
+    });
+  }
+
+  public void testPsiToDocumentSynchronizationFailed() throws Throwable {
+    String text = "<wpd><methods> </methods></wpd>";
+    final File tempFile = FileUtil.createTempFile("idea-test", ".xml");
+    tempFile.createNewFile();
+    final FileOutputStream fileOutputStream = new FileOutputStream(tempFile);
+    fileOutputStream.write(text.getBytes());
+    fileOutputStream.flush();
+    fileOutputStream.close();
+
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      @Override
+      public void run() {
+        CommandProcessor.getInstance().executeCommand(getProject(), new Runnable() {
+          @Override
+          @SuppressWarnings({"ConstantConditions"})
+          public void run() {
+            VirtualFileManager.getInstance().refresh(false);
+            XmlFile file ;//createTemporaryFile("wpd.xml", text));
+            try {
+              file = (XmlFile)getPsiManager().findFile(VfsUtil.findFileByURL(tempFile.toURL()));
+            }
+            catch (MalformedURLException e) {
+              throw new RuntimeException(e);
+            }
+
+            final XmlTag methodTag = file.getDocument().getRootTag().findFirstSubTag("methods");
+            try {
+              methodTag.add(XmlElementFactory.getInstance(getProject()).createTagFromText("<method/>"));
+            }
+            catch (IncorrectOperationException e) {
+              throw new RuntimeException(e);
+            }
+          }
+        }, "", null, UndoConfirmationPolicy.DO_NOT_REQUEST_CONFIRMATION);
+      }
+    });
+  }
+
+  public void testXmlFormattingException() throws Throwable {
+    final XmlTag tag = XmlElementFactory.getInstance(getProject()).createTagFromText("<foo>bar</foo>");
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        tag.add(XmlElementFactory.getInstance(getProject()).createTagFromText("<bar/>"));
+      }
+    });
+  }
+
+  public void testSetNamespace() throws Exception {
+    XmlFile xhtmlFile = (XmlFile)PsiFileFactory.getInstance(getProject()).createFileFromText("dummy.xml",
+                                                                                                             "<html><body/></html>");
+
+    final XmlTag rootTag = xhtmlFile.getDocument().getRootTag();
+
+    rootTag.getSubTags()[0].getNamespace();  // fill the cache
+
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        rootTag.setAttribute("xmlns", "http://www.ru");
+      }
+    });
+
+    assertEquals("http://www.ru", rootTag.getSubTags()[0].getNamespace());
+  }
+
+   public void testInsert() throws Exception {
+     String html = "<html><head /><body><hr /></body>\n</html>";
+     XmlFile file = (XmlFile)PsiFileFactory.getInstance(getProject()).createFileFromText("xxx.xhtml", html);
+     XmlTag body = file.getDocument().getRootTag().findFirstSubTag("body");
+     final XmlTag hr = body.getSubTags()[0];
+
+     final XmlText text = XmlElementFactory.getInstance(getProject()).createDisplayText("p");
+     ApplicationManager.getApplication().runWriteAction(new Runnable() {
+       public void run() {
+         PsiElement element = hr.getParentTag().addAfter(text, hr);
+         assertEquals(element.getParent(), hr.getParentTag());
+       }
+     });
+   }
+
+  public void testCollapse() throws IncorrectOperationException {
+    final XmlTag tag = XmlElementFactory.getInstance(getProject()).createTagFromText("<foo></foo>");
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        tag.collapseIfEmpty();
+        assertEquals("<foo/>", tag.getText());
+
+        final XmlTag tag1 = XmlElementFactory.getInstance(getProject()).createTagFromText("<foo>abc</foo>");
+        tag1.collapseIfEmpty();
+        assertEquals("<foo/>", tag1.getText());
+
+        final XmlTag tag2 = XmlElementFactory.getInstance(getProject()).createTagFromText("<foo><boo/></foo>");
+        tag2.collapseIfEmpty();
+        assertEquals("<foo><boo/></foo>", tag2.getText());
+      }
+    });
+  }
+}
diff --git a/xml/tests/src/com/intellij/codeInsight/XmlTagWriteTest.java b/xml/tests/src/com/intellij/codeInsight/XmlTagWriteTest.java
new file mode 100644
index 000000000000..7728fe5edadf
--- /dev/null
+++ b/xml/tests/src/com/intellij/codeInsight/XmlTagWriteTest.java
@@ -0,0 +1,61 @@
+package com.intellij.codeInsight;
+
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.psi.XmlElementFactory;
+import com.intellij.psi.xml.XmlTag;
+import com.intellij.psi.xml.XmlText;
+import com.intellij.testFramework.LightCodeInsightTestCase;
+import com.intellij.util.IncorrectOperationException;
+import com.intellij.xml.util.XmlUtil;
+
+/**
+ * @author lesya, dsl
+ */
+public class XmlTagWriteTest extends LightCodeInsightTestCase{
+  public void test1() throws IncorrectOperationException {
+    XmlElementFactory elementFactory = XmlElementFactory.getInstance(getProject());
+    final XmlTag xmlTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<tag1/>");
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        xmlTag.add(xmlTag.createChildTag("tag2", XmlUtil.EMPTY_URI, null, false));
+      }
+    });
+
+
+    assertEquals("<tag1><tag2/></tag1>", xmlTag.getText());
+    XmlTag createdFromText = elementFactory.createTagFromText(xmlTag.getText());
+    assertEquals("tag1", createdFromText.getName());
+    assertEquals(1, createdFromText.getSubTags().length);
+    assertEquals("tag2", createdFromText.getSubTags()[0].getName());
+  }
+
+  public void test2() throws IncorrectOperationException {
+    final XmlTag xmlTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<tag1></tag1>");
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        xmlTag.add(xmlTag.createChildTag("tag2", XmlUtil.EMPTY_URI, null, false));
+      }
+    });
+
+
+    assertEquals("<tag1><tag2/></tag1>", xmlTag.getText());
+    XmlTag createdFromText = XmlElementFactory.getInstance(getProject()).createTagFromText(xmlTag.getText());
+    assertEquals("tag1", createdFromText.getName());
+    assertEquals(1, createdFromText.getSubTags().length);
+    assertEquals("tag2", createdFromText.getSubTags()[0].getName());
+  }
+
+  public void test3() throws Exception{
+    final XmlTag tag = XmlElementFactory.getInstance(getProject()).createTagFromText("<b>\n0123456</b>");
+    final XmlText text = (XmlText) tag.getValue().getChildren()[0];
+    String textS = text.getText();
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        text.insertText("lala", 2);
+      }
+    });
+
+    XmlText text2 = (XmlText)tag.getValue().getChildren()[0];
+    assertEquals(textS.substring(0, 2) + "lala" + textS.substring(2), text2.getText());
+  }
+}
diff --git a/xml/tests/src/com/intellij/codeInsight/XmlTestUtil.java b/xml/tests/src/com/intellij/codeInsight/XmlTestUtil.java
new file mode 100644
index 000000000000..75aa8825cc68
--- /dev/null
+++ b/xml/tests/src/com/intellij/codeInsight/XmlTestUtil.java
@@ -0,0 +1,22 @@
+package com.intellij.codeInsight;
+
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiFileFactory;
+import com.intellij.psi.xml.XmlFile;
+import com.intellij.psi.xml.XmlTag;
+import org.jetbrains.annotations.NonNls;
+
+public class XmlTestUtil {
+
+  public static XmlTag tag(@NonNls String tagName, Project project) throws Exception {
+    XmlFile file = (XmlFile)PsiFileFactory.getInstance(project).createFileFromText("tag.xml", "<" + tagName + "/>");
+    return file.getDocument().getRootTag();
+  }
+
+  public static XmlTag tag(@NonNls String tagName, @NonNls String namespace, Project project) throws Exception {
+    XmlFile file = (XmlFile)PsiFileFactory.getInstance(project)
+      .createFileFromText("tag.xml", "<" + tagName + " xmlns=\"" + namespace + "\"/>");
+    return file.getDocument().getRootTag();
+  }
+
+}
diff --git a/xml/tests/src/com/intellij/codeInsight/XmlTextTest.java b/xml/tests/src/com/intellij/codeInsight/XmlTextTest.java
new file mode 100644
index 000000000000..55cdc25e4aa8
--- /dev/null
+++ b/xml/tests/src/com/intellij/codeInsight/XmlTextTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved.
+ */
+
+package com.intellij.codeInsight;
+
+import com.intellij.openapi.application.Result;
+import com.intellij.openapi.command.WriteCommandAction;
+import com.intellij.openapi.fileTypes.StdFileTypes;
+import com.intellij.psi.PsiFileFactory;
+import com.intellij.psi.XmlElementFactory;
+import com.intellij.psi.impl.source.codeStyle.CodeEditUtil;
+import com.intellij.psi.xml.XmlElement;
+import com.intellij.psi.xml.XmlFile;
+import com.intellij.psi.xml.XmlTag;
+import com.intellij.psi.xml.XmlText;
+import com.intellij.testFramework.LightCodeInsightTestCase;
+
+/**
+ * @author mike
+ */
+public class XmlTextTest extends LightCodeInsightTestCase {
+  public void testInsertAtOffset() throws Exception {
+    new WriteCommandAction(getProject()) {
+
+      @Override
+      protected void run(final Result result) throws Throwable {
+        String xml = "<root>0123456789</root>";
+        XmlFile file = (XmlFile)PsiFileFactory.getInstance(getProject())
+          .createFileFromText("foo.xml", StdFileTypes.XML, xml, (long)1, true, false);
+        //System.out.println(DebugUtil.psiToString(file, false));
+        XmlTag root = file.getDocument().getRootTag();
+        final XmlText text1 = root.getValue().getTextElements()[0];
+
+        assertFalse(CodeEditUtil.isNodeGenerated(root.getNode()));
+        final XmlText text = text1;
+
+        final XmlElement element = text.insertAtOffset(XmlElementFactory.getInstance(getProject()).createTagFromText("<bar/>"), 5);
+        assertNotNull(element);
+        assertTrue(element instanceof XmlText);
+        assertEquals("01234", element.getText());
+        assertEquals("<root>01234<bar/>56789</root>", text.getContainingFile().getText());
+      }
+    }.execute();
+  }
+
+  public void testPhysicalToDisplayIfHasGaps2() throws Exception {
+    String xml = "<div>&amp;abc</div>";
+    XmlFile file = (XmlFile)PsiFileFactory.getInstance(getProject()).createFileFromText("foo.xml", xml);
+    XmlTag root = file.getDocument().getRootTag();
+    final XmlText text = root.getValue().getTextElements()[0];
+
+    assertEquals("&abc", text.getValue());
+    assertEquals(0, text.physicalToDisplay(0));
+    assertEquals(1, text.physicalToDisplay(5));
+    assertEquals(2, text.physicalToDisplay(6));
+    assertEquals(3, text.physicalToDisplay(7));
+    assertEquals(4, text.physicalToDisplay(8));
+  }
+
+  public void testDisplayToPhysical() throws Exception {
+    String xml = "<div>&amp;abc</div>";
+    XmlFile file = (XmlFile)PsiFileFactory.getInstance(getProject()).createFileFromText("foo.xml", xml);
+    XmlTag root = file.getDocument().getRootTag();
+    final XmlText text = root.getValue().getTextElements()[0];
+                                                              
+    assertEquals("&abc", text.getValue());
+    assertEquals(0, text.displayToPhysical(0));
+    assertEquals(5, text.displayToPhysical(1));
+    assertEquals(6, text.displayToPhysical(2));
+    assertEquals(7, text.displayToPhysical(3));
+    assertEquals(8, text.displayToPhysical(4));
+  }
+
+  public void testDisplayToPhysical2() throws Exception {
+    String xml = "<div><![CDATA[ ]]></div>";
+    XmlFile file = (XmlFile)PsiFileFactory.getInstance(getProject()).createFileFromText("foo.xml", xml);
+    XmlTag root = file.getDocument().getRootTag();
+    final XmlText text = root.getValue().getTextElements()[0];
+
+    assertEquals(" ", text.getValue());
+    assertEquals(9, text.displayToPhysical(0));
+    assertEquals(13, text.displayToPhysical(1));
+  }
+
+}
diff --git a/xml/tests/src/com/intellij/codeInsight/XmlWrongClosingTagNameInspectionTest.java b/xml/tests/src/com/intellij/codeInsight/XmlWrongClosingTagNameInspectionTest.java
new file mode 100644
index 000000000000..66db22990a8c
--- /dev/null
+++ b/xml/tests/src/com/intellij/codeInsight/XmlWrongClosingTagNameInspectionTest.java
@@ -0,0 +1,23 @@
+package com.intellij.codeInsight;
+
+import com.intellij.codeInsight.daemon.quickFix.LightQuickFixTestCase;
+import com.intellij.testFramework.PlatformTestUtil;
+
+import java.io.File;
+
+/**
+ * @author spleaner
+ */
+public class XmlWrongClosingTagNameInspectionTest extends LightQuickFixTestCase {
+  public void test() throws Exception { doAllTests(); }
+
+  @Override
+  protected String getBasePath() {
+    return "/wrongClosingTagName";
+  }
+
+  @Override
+  protected String getTestDataPath() {
+    return PlatformTestUtil.getCommunityPath().replace(File.separatorChar, '/') + "/xml/tests/testData/inspections";
+  }
+}
diff --git a/xml/tests/src/com/intellij/codeInsight/XmlXIncludeTest.groovy b/xml/tests/src/com/intellij/codeInsight/XmlXIncludeTest.groovy
new file mode 100644
index 000000000000..161eda9f3236
--- /dev/null
+++ b/xml/tests/src/com/intellij/codeInsight/XmlXIncludeTest.groovy
@@ -0,0 +1,99 @@
+package com.intellij.codeInsight;
+
+
+import com.intellij.openapi.fileEditor.FileDocumentManager
+import com.intellij.openapi.util.text.StringUtil
+import com.intellij.psi.PsiDocumentManager
+import com.intellij.psi.xml.XmlFile
+import com.intellij.psi.xml.XmlTag
+import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
+import com.intellij.openapi.vfs.VirtualFile
+import com.intellij.openapi.application.WriteAction
+
+/**
+ * @author mike
+ */
+public class XmlXIncludeTest extends LightCodeInsightFixtureTestCase {
+  private static final String BASE_PATH = "/psi/xi";
+
+  public void testBasicXi() throws Exception {
+    configure();
+    assertSubtagNames("before", "include1", "after");
+  }
+
+  public void testXpointerXi1() throws Exception {
+    configure();
+    assertSubtagNames("before", "foo", "bar", "after");
+  }
+
+  @Override
+  protected String getBasePath() {
+    return "/xml/tests/testData/" + BASE_PATH;
+  }
+
+  private void assertSubtagNames(String... expectedNames) {
+    final XmlTag tag = ((XmlFile)myFixture.file).document.rootTag
+    final List<String> names = tag.getSubTags().collect { it.name }
+
+    assertEquals(
+      "subtags are different",
+      StringUtil.join(expectedNames, "\n"), StringUtil.join(names, "\n")
+    );
+  }
+
+  private void configure() throws Exception {
+    myFixture.configureByFiles(getName() + ".xml", "/include1.xml");
+  }
+
+  public void testModifyingIncludedFile() {
+    myFixture.configureByText 'a.xml', '''
+<root xmlns:xi="http://www.w3.org/2001/XInclude">
+  <before/>
+  <xi:include href="include1.xml" xpointer="xpointer(/include1/*)"/>
+  <after/>
+</root>
+'''
+    def inc1 = myFixture.copyFileToProject("include1.xml")
+    assertSubtagNames("before", "foo", "bar", "after")
+
+    changeText inc1, '<include1><a/></include1>'
+    
+    assertSubtagNames("before", "a", "after")
+  }
+
+  public void testModifyingTransitivelyIncludedFile() {
+    myFixture.configureByText 'a.xml', '''
+<root xmlns:xi="http://www.w3.org/2001/XInclude">
+  <before/>
+  <xi:include href="include1.xml" xpointer="xpointer(/include1/*)"/>
+  <after/>
+</root>
+'''
+    myFixture.addFileToProject("include1.xml", """
+<include1 xmlns:xi="http://www.w3.org/2001/XInclude">
+  <foo attr1="val1"> <fooChild/> </foo>
+  <bar/>
+  <xi:include href="include2.xml""/>
+</include1>
+""")
+    def inc2 = myFixture.addFileToProject("include2.xml", '<a/>')
+
+    assertSubtagNames("before", "foo", "bar", "a", "after")
+
+    changeText inc2.virtualFile, '<b/>'
+
+    assertSubtagNames("before", "foo", "bar", "b", "after")
+
+  }
+
+  private changeText(VirtualFile inc1, String s) {
+    def token = WriteAction.start()
+    try {
+      FileDocumentManager.instance.getDocument(inc1).setText s
+      PsiDocumentManager.getInstance(project).commitAllDocuments()
+    }
+    finally {
+      token.finish()
+    }
+  }
+}
diff --git a/xml/tests/src/com/intellij/codeInsight/completion/XmlSmartEnterTest.java b/xml/tests/src/com/intellij/codeInsight/completion/XmlSmartEnterTest.java
new file mode 100644
index 000000000000..51682c9ff124
--- /dev/null
+++ b/xml/tests/src/com/intellij/codeInsight/completion/XmlSmartEnterTest.java
@@ -0,0 +1,121 @@
+package com.intellij.codeInsight.completion;
+
+import com.intellij.codeInsight.CodeInsightSettings;
+import com.intellij.codeInsight.lookup.Lookup;
+import com.intellij.codeInsight.lookup.LookupElement;
+import com.intellij.codeInsight.lookup.LookupManager;
+import com.intellij.codeInsight.lookup.impl.LookupImpl;
+import com.intellij.codeInsight.lookup.impl.LookupManagerImpl;
+import com.intellij.openapi.application.Result;
+import com.intellij.openapi.command.WriteCommandAction;
+import com.intellij.testFramework.LightCodeInsightTestCase;
+import com.intellij.testFramework.PlatformTestUtil;
+
+import java.io.File;
+
+/**
+ * @author spleaner
+ */
+@SuppressWarnings({"ALL"})
+public class XmlSmartEnterTest extends LightCodeInsightTestCase {
+  private static final String BASE_PATH = "/smartEnter";
+  private LookupElement[] myItems;
+
+  public void testSmartFinish1() throws Throwable {
+    doCompletionPopupTest(getTestName(false));
+  }
+
+  public void testSmartFinish2() throws Throwable {
+    boolean old = CodeInsightSettings.getInstance().AUTOCOMPLETE_ON_CODE_COMPLETION;
+    CodeInsightSettings.getInstance().AUTOCOMPLETE_ON_CODE_COMPLETION = false;
+    try {
+      doCompletionPopupTest(getTestName(false));
+    }
+    finally {
+      CodeInsightSettings.getInstance().AUTOCOMPLETE_ON_CODE_COMPLETION = old;
+    }
+  }
+
+  public void testSmartFinish3() throws Exception {
+    doSmartEnterTest("SmartFinish1");
+  }
+
+  public void testSmartFinish4() throws Exception {
+    doSmartEnterTest("SmartFinish2");
+  }
+
+  public void testSmartFinish5() throws Exception {
+    doSmartEnterTest("SmartFinish3");
+  }
+
+  public void testSmartFinish_IDEADEV_29628() throws Exception {
+    doSmartEnterTest("IDEADEV_29628");
+  }
+
+  public void testSmartFinishWithWrongAttribute() throws Exception {
+    doSmartEnterTest("WrongAttribute");
+  }
+
+  public void testOpenAttribute() throws Exception {
+    doSmartEnterTest("OpenAttribute");
+  }
+
+  public void testComplete1() throws Exception {
+    _doTest("Tag.xml", "Tag_after.xml");
+  }
+
+  private void doCompletionPopupTest(String baseName) throws Exception {
+    _doTestCompletion(baseName + ".xml", baseName + "_after.xml");
+  }
+
+  private void _doTestCompletion(final String name, final String after_name) throws Exception {
+    configureByFile(BASE_PATH + "/" + name);
+    performCompletionAction();
+    select(Lookup.COMPLETE_STATEMENT_SELECT_CHAR);
+    checkResultByFile(BASE_PATH + "/" + after_name);
+  }
+
+  private void doSmartEnterTest(String baseName) throws Exception {
+    _doTest(baseName + ".xml", baseName + "_after.xml");
+  }
+
+  private void _doTest(String filename, String filename_after) throws Exception {
+    configureByFile(BASE_PATH + "/" + filename);
+
+    new WriteCommandAction(getProject()) {
+      protected void run(final Result result) throws Throwable {
+        new XmlSmartEnterProcessor().process(getProject(), getEditor(), getFile());
+      }
+    }.execute();
+
+    checkResultByFile("", BASE_PATH + "/" + filename_after, true);
+  }
+
+  private void performCompletionAction() {
+    new CodeCompletionHandlerBase(CompletionType.BASIC).invokeCompletion(getProject(), getEditor());
+    final LookupImpl lookup = (LookupImpl)LookupManager.getActiveLookup(getEditor());
+    myItems = lookup == null ? null : lookup.getItems().toArray(LookupElement.EMPTY_ARRAY);
+  }
+
+  private void select(final char c) {
+    if (c != '\n' && c != '\t' && c != Lookup.COMPLETE_STATEMENT_SELECT_CHAR) {
+      type(c);
+      return;
+    }
+
+    final LookupManagerImpl manager = (LookupManagerImpl) LookupManager.getInstance(getProject());
+    final Lookup lookup = manager.getActiveLookup();
+    if(lookup != null) {
+      manager.forceSelection(c, lookup.getCurrentItem());
+    }
+  }
+
+  protected String getBasePath() {
+    return "";
+  }
+
+  @Override
+  protected String getTestDataPath() {
+    return PlatformTestUtil.getCommunityPath().replace(File.separatorChar, '/') + "/xml/tests/testData/";
+  }
+}
diff --git a/xml/tests/src/com/intellij/codeInsight/editorActions/moveUpDown/XmlMoverTest.java b/xml/tests/src/com/intellij/codeInsight/editorActions/moveUpDown/XmlMoverTest.java
new file mode 100644
index 000000000000..8c9c78494ecd
--- /dev/null
+++ b/xml/tests/src/com/intellij/codeInsight/editorActions/moveUpDown/XmlMoverTest.java
@@ -0,0 +1,66 @@
+package com.intellij.codeInsight.editorActions.moveUpDown;
+
+import com.intellij.codeInsight.CodeInsightTestCase;
+import com.intellij.openapi.editor.actionSystem.EditorActionHandler;
+import com.intellij.testFramework.PlatformTestUtil;
+import org.jetbrains.annotations.NonNls;
+
+import java.io.File;
+
+/**
+ * @author spleaner
+ */
+@SuppressWarnings({"ALL"})
+public class XmlMoverTest extends CodeInsightTestCase {
+
+  public void testTag() throws Exception { doTest("xml"); }
+  public void testTag2() throws Exception { doTest("xml"); }
+  public void testTag3() throws Exception { doTest("xml"); }
+  public void testTag4() throws Exception { doTest("xml"); }
+  public void testTag5() throws Exception { doTest("xml"); }
+  public void testTag6() throws Exception { doTest("xml"); }
+  public void testTag7() throws Exception { doTest("xml"); }
+  public void testTag8() throws Exception { doTest("xml"); }
+  public void testTag9() throws Exception { doTest("xml"); }
+  public void testTag10() throws Exception { doTest("xml"); }
+  public void testTag11() throws Exception { doTest("xml"); }
+
+  public void test1() throws Exception { doTest("html"); }
+
+  private void doTest(String ext) throws Exception {
+    final String baseName = getBasePath() + '/' + getTestName(true);
+    final String fileName = baseName + "."+ext;
+
+    try {
+      @NonNls String afterFileName = baseName + "_afterUp." + ext;
+      EditorActionHandler handler = new MoveStatementUpAction().getHandler();
+      performAction(fileName, handler, afterFileName);
+
+      afterFileName = baseName + "_afterDown." + ext;
+      handler = new MoveStatementDownAction().getHandler();
+      performAction(fileName, handler, afterFileName);
+    }
+    finally {
+      //CodeStyleSettingsManager.getInstance(myProject).dropTemporarySettings();
+    }
+  }
+
+  private void performAction(final String fileName, final EditorActionHandler handler, final String afterFileName) throws Exception {
+    configureByFile(fileName);
+    final boolean enabled = handler.isEnabled(myEditor, null);
+    assertEquals(new File(getTestDataPath(), afterFileName).exists(), enabled);
+    if (enabled) {
+      handler.execute(myEditor, null);
+      checkResultByFile(afterFileName);
+    }
+  }
+
+  protected String getBasePath() {
+    return "/mover";
+  }
+
+  @Override
+  protected String getTestDataPath() {
+    return PlatformTestUtil.getCommunityPath().replace(File.separatorChar, '/') + "/xml/tests/testData";
+  }
+}
\ No newline at end of file
diff --git a/xml/tests/src/com/intellij/psi/formatter/XmlFormatterTestBase.java b/xml/tests/src/com/intellij/psi/formatter/XmlFormatterTestBase.java
new file mode 100644
index 000000000000..73727548743d
--- /dev/null
+++ b/xml/tests/src/com/intellij/psi/formatter/XmlFormatterTestBase.java
@@ -0,0 +1,54 @@
+package com.intellij.psi.formatter;
+
+import com.intellij.psi.impl.source.xml.XmlFileImpl;
+import com.intellij.openapi.util.TextRange;
+import com.intellij.openapi.command.CommandProcessor;
+import com.intellij.openapi.application.ApplicationManager;
+
+/**
+ * @author yole
+ */
+public abstract class XmlFormatterTestBase extends XmlFormatterTestCase {
+  protected void checkFormattingDoesNotProduceException(String name) throws Exception {
+
+    String text = loadFile(name + ".xml", null);
+    final XmlFileImpl file = (XmlFileImpl)createFile(name + ".xml", text);
+    myTextRange = new TextRange(10000, 10001);
+    CommandProcessor.getInstance().executeCommand(getProject(), new Runnable() {
+      @Override
+      public void run() {
+        ApplicationManager.getApplication().runWriteAction(new Runnable() {
+          @Override
+          public void run() {
+            performFormatting(file);
+          }
+        });
+      }
+    }, "", "");
+
+    myTextRange = new TextRange(1000000, 1000001);
+    CommandProcessor.getInstance().executeCommand(getProject(), new Runnable() {
+      @Override
+      public void run() {
+        ApplicationManager.getApplication().runWriteAction(new Runnable() {
+          @Override
+          public void run() {
+            performFormatting(file);
+          }
+        });
+      }
+    }, "", "");
+    myTextRange = new TextRange(0, text.length());
+    CommandProcessor.getInstance().executeCommand(getProject(), new Runnable() {
+      @Override
+      public void run() {
+        ApplicationManager.getApplication().runWriteAction(new Runnable() {
+          @Override
+          public void run() {
+            performFormatting(file);
+          }
+        });
+      }
+    }, "", "");
+  }
+}
diff --git a/xml/tests/src/com/intellij/psi/formatter/XmlFormatterTestCase.java b/xml/tests/src/com/intellij/psi/formatter/XmlFormatterTestCase.java
new file mode 100644
index 000000000000..70cd87904c4d
--- /dev/null
+++ b/xml/tests/src/com/intellij/psi/formatter/XmlFormatterTestCase.java
@@ -0,0 +1,25 @@
+package com.intellij.psi.formatter;
+
+import com.intellij.psi.codeStyle.CodeStyleSettings;
+import com.intellij.psi.formatter.xml.XmlCodeStyleSettings;
+
+/**
+ * @author peter
+ */
+public abstract class XmlFormatterTestCase extends FormatterTestCase{
+
+  public void testDontKeepLineBreaksInText() throws Throwable {
+    final CodeStyleSettings settings = getSettings();
+    final XmlCodeStyleSettings xmlSettings = settings.getCustomSettings(XmlCodeStyleSettings.class);
+    settings.RIGHT_MARGIN = 15;
+
+    settings.HTML_KEEP_LINE_BREAKS_IN_TEXT = false;
+    xmlSettings.XML_KEEP_LINE_BREAKS_IN_TEXT = false;
+    doTextTest("<tag>aaa\nbbb\nccc\nddd\n</tag>", "<tag>aaa bbb\n    ccc ddd\n</tag>");
+
+    settings.HTML_TEXT_WRAP = CodeStyleSettings.DO_NOT_WRAP;
+    xmlSettings.XML_TEXT_WRAP = CodeStyleSettings.DO_NOT_WRAP;
+    doTextTest("<tag>aaa\nbbb\nccc\nddd\n</tag>", "<tag>aaa bbb ccc ddd\n</tag>");
+  }
+
+}
diff --git a/xml/tests/src/com/intellij/psi/impl/source/html/HtmlConditionalCommentInjectionTest.java b/xml/tests/src/com/intellij/psi/impl/source/html/HtmlConditionalCommentInjectionTest.java
new file mode 100644
index 000000000000..2db52d88e6ed
--- /dev/null
+++ b/xml/tests/src/com/intellij/psi/impl/source/html/HtmlConditionalCommentInjectionTest.java
@@ -0,0 +1,28 @@
+package com.intellij.psi.impl.source.html;
+
+import com.intellij.codeInsight.completion.CompletionTestCase;
+import com.intellij.testFramework.PlatformTestUtil;
+
+import java.io.File;
+
+/**
+ * @author spleaner
+ */
+@SuppressWarnings({"ALL"})
+public class HtmlConditionalCommentInjectionTest extends CompletionTestCase {
+
+  public void testHtmlCompletion() throws Exception {
+    configureByFile("complete.html");
+    checkResultByFile("complete_after.html");
+  }
+
+  public void testXhtmlCompletion() throws Exception {
+    configureByFile("complete.xhtml");
+    checkResultByFile("complete_after.xhtml");
+  }
+
+  @Override
+  protected String getTestDataPath() {
+    return PlatformTestUtil.getCommunityPath().replace(File.separatorChar, '/') + "/xml/tests/testData/commentInjection/";
+  }
+}
diff --git a/xml/tests/src/com/intellij/xml/XmlConstraintsTest.java b/xml/tests/src/com/intellij/xml/XmlConstraintsTest.java
new file mode 100644
index 000000000000..c70bc1b09aee
--- /dev/null
+++ b/xml/tests/src/com/intellij/xml/XmlConstraintsTest.java
@@ -0,0 +1,145 @@
+package com.intellij.xml;
+
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.psi.xml.XmlFile;
+import com.intellij.psi.xml.XmlTag;
+import com.intellij.testFramework.fixtures.CodeInsightFixtureTestCase;
+import com.intellij.util.containers.ContainerUtil;
+import com.intellij.util.containers.Convertor;
+import com.intellij.xml.actions.ValidateXmlActionHandler;
+import org.apache.xerces.impl.Constants;
+import org.apache.xerces.impl.xs.XSComplexTypeDecl;
+import org.apache.xerces.impl.xs.XSElementDecl;
+import org.apache.xerces.impl.xs.models.CMBuilder;
+import org.apache.xerces.impl.xs.models.CMNodeFactory;
+import org.apache.xerces.impl.xs.models.XSCMValidator;
+import org.apache.xerces.xni.grammars.Grammar;
+import org.apache.xerces.xni.grammars.XMLGrammarDescription;
+import org.apache.xerces.xni.grammars.XMLGrammarPool;
+import org.apache.xerces.xni.grammars.XSGrammar;
+import org.apache.xerces.xs.XSComplexTypeDefinition;
+import org.apache.xerces.xs.XSElementDeclaration;
+import org.apache.xerces.xs.XSModel;
+import org.xml.sax.SAXException;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Vector;
+
+/**
+ * @author Dmitry Avdeev
+ */
+@SuppressWarnings({"UseOfObsoleteCollectionType"})
+public class XmlConstraintsTest extends CodeInsightFixtureTestCase {
+
+  public void testXercesGrammar() throws Exception {
+    XSModel xsModel = getXSModel("test.xml", "test.xsd");
+    XSElementDeclaration elementDeclaration = xsModel.getElementDeclaration("a", "");
+    XSComplexTypeDefinition typeDefinition = (XSComplexTypeDefinition)elementDeclaration.getTypeDefinition();
+    CMBuilder cmBuilder = new CMBuilder(new CMNodeFactory());
+    XSCMValidator validator = cmBuilder.getContentModel((XSComplexTypeDecl)typeDefinition, true);
+    int[] ints = validator.startContentModel();
+    Vector vector = validator.whatCanGoHere(ints);
+    XSElementDecl o = (XSElementDecl)vector.get(0);
+    assertEquals("b", o.getName());
+  }
+
+  public void testXercesIncomplete() throws Exception {
+    XSModel xsModel = getXSModel("testIncomplete.xml", "test.xsd");
+    XSElementDeclaration elementDeclaration = xsModel.getElementDeclaration("a", "");
+    XSComplexTypeDefinition typeDefinition = (XSComplexTypeDefinition)elementDeclaration.getTypeDefinition();
+    CMBuilder cmBuilder = new CMBuilder(new CMNodeFactory());
+    XSCMValidator validator = cmBuilder.getContentModel((XSComplexTypeDecl)typeDefinition, true);
+    int[] ints = validator.startContentModel();
+    Vector vector = validator.whatCanGoHere(ints);
+    XSElementDecl o = (XSElementDecl)vector.get(0);
+    assertEquals("b", o.getName());
+  }
+
+  public void testXercesForCompletion() throws Exception {
+    XSModel xsModel = getXSModel("testCompletion.xml", "test.xsd");
+    PsiElement element = myFixture.getFile().findElementAt(getEditor().getCaretModel().getOffset());
+    XmlTag tag = PsiTreeUtil.getParentOfType(element, XmlTag.class);
+
+    assert tag != null;
+    XSElementDeclaration elementDeclaration = xsModel.getElementDeclaration(tag.getLocalName(), tag.getNamespace());
+    XSComplexTypeDefinition typeDefinition = (XSComplexTypeDefinition)elementDeclaration.getTypeDefinition();
+    CMBuilder cmBuilder = new CMBuilder(new CMNodeFactory());
+    XSCMValidator validator = cmBuilder.getContentModel((XSComplexTypeDecl)typeDefinition, true);
+    int[] ints = validator.startContentModel();
+    Vector vector = validator.whatCanGoHere(ints);
+    XSElementDecl o = (XSElementDecl)vector.get(0);
+    assertEquals("b", o.getName());
+  }
+
+  private XSModel getXSModel(String... files) {
+    myFixture.configureByFiles(files);
+
+    XmlFile file = (XmlFile)myFixture.getFile();
+    ValidateXmlActionHandler handler = new ValidateXmlActionHandler(false) {
+      @Override
+      protected SAXParser createParser() throws SAXException, ParserConfigurationException {
+        SAXParser parser = super.createParser();
+        parser.getXMLReader().setFeature(Constants.XERCES_FEATURE_PREFIX + Constants.CONTINUE_AFTER_FATAL_ERROR_FEATURE, true);
+        return parser;
+      }
+    };
+    handler.setErrorReporter(handler.new TestErrorReporter());
+    handler.doValidate(file);
+    XMLGrammarPool grammarPool = ValidateXmlActionHandler.getGrammarPool(file);
+    assert grammarPool != null;
+    Grammar[] grammars = grammarPool.retrieveInitialGrammarSet(XMLGrammarDescription.XML_SCHEMA);
+    XSGrammar grammar = (XSGrammar)grammars[0];
+    return grammar.toXSModel();
+  }
+
+  public void testXsdConstraints() throws Exception {
+    Map<String, XmlElementDescriptor> map = configure("test.xml", "test.xsd");
+    XmlElementDescriptor a = map.get("a");
+    XmlElementsGroup topGroup = a.getTopGroup();
+  }
+
+  public void testDtdConstraints() throws Exception {
+
+    Map<String, XmlElementDescriptor> map = configure("testDtd.xml");
+    XmlElementDescriptor a = map.get("a");
+    XmlElementDescriptor b = map.get("b");
+
+    XmlElementDescriptor c = map.get("c");
+
+    XmlElementDescriptor d = map.get("d");
+
+    XmlElementDescriptor e = map.get("e");
+  }
+
+  private Map<String, XmlElementDescriptor> configure(String... files) {
+    myFixture.configureByFiles(files);
+    XmlTag tag = ((XmlFile)getFile()).getRootTag();
+    assertNotNull(tag);
+    XmlElementDescriptor descriptor = tag.getDescriptor();
+    assertNotNull(descriptor);
+    XmlElementDescriptor[] descriptors = descriptor.getElementsDescriptors(tag);
+    Map<String, XmlElementDescriptor> map =
+      ContainerUtil.assignKeys(Arrays.asList(descriptors).iterator(), new Convertor<XmlElementDescriptor, String>() {
+        @Override
+        public String convert(XmlElementDescriptor o) {
+          return o.getName();
+        }
+      });
+    map.put(tag.getName(), tag.getDescriptor());
+    return map;
+  }
+
+  @Override
+  protected String getBasePath() {
+    return "/xml/tests/testData/constraints";
+  }
+
+  @Override
+  protected boolean isCommunity() {
+    return true;
+  }
+}
diff --git a/xml/tests/src/com/intellij/xml/XmlNamespacesTest.java b/xml/tests/src/com/intellij/xml/XmlNamespacesTest.java
new file mode 100644
index 000000000000..a7d27d5a7008
--- /dev/null
+++ b/xml/tests/src/com/intellij/xml/XmlNamespacesTest.java
@@ -0,0 +1,249 @@
+package com.intellij.xml;
+
+import com.intellij.codeInsight.actions.OptimizeImportsProcessor;
+import com.intellij.codeInsight.daemon.impl.analysis.XmlUnusedNamespaceInspection;
+import com.intellij.codeInsight.intention.IntentionAction;
+import com.intellij.codeInspection.htmlInspections.XmlInspectionToolProvider;
+import com.intellij.javaee.ExternalResourceManagerImpl;
+import com.intellij.openapi.application.Result;
+import com.intellij.openapi.command.WriteCommandAction;
+import com.intellij.testFramework.IdeaTestCase;
+import com.intellij.testFramework.fixtures.CodeInsightFixtureTestCase;
+
+/**
+ * @author Dmitry Avdeev
+ */
+public class XmlNamespacesTest extends CodeInsightFixtureTestCase {
+
+  @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors")
+  public XmlNamespacesTest() {
+    IdeaTestCase.initPlatformPrefix();
+  }
+
+  public void testUnusedNamespaces() throws Exception {
+    doUnusedDeclarationTest(
+      "<all xmlns=\"http://www.w3.org/2001/XMLSchema\" <warning descr=\"Namespace declaration is never used\">xmlns:xsi=\"http://www.w3.org/2001/XMLSc<caret>hema-instance\"</warning>/>",
+      "<all xmlns=\"http://www.w3.org/2001/XMLSchema\"/>", XmlUnusedNamespaceInspection.RemoveNamespaceDeclarationFix.NAME);
+  }
+
+  public void testUnusedDefaultNamespace() throws Exception {
+    doUnusedDeclarationTest("<schema:schema \n" +
+                            "            xmlns:schema=\"http://www.w3.org/2001/XMLSchema\"\n" +
+                            "            <warning descr=\"Namespace declaration is never used\">xmlns=\"http://www.w3.org/2001/X<caret>Include\"</warning>\n" +
+                            "            xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+                            "            <warning descr=\"Namespace location is never used\">xsi:noNamespaceSchemaLocation=\"http://www.w3.org/2001/XInclude\"</warning>>\n" +
+                            "</schema:schema>",
+
+                            "<schema:schema\n" +
+                            "        xmlns:schema=\"http://www.w3.org/2001/XMLSchema\"\n" +
+                            "        xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+                            "        >\n" +
+                            "</schema:schema>", XmlUnusedNamespaceInspection.RemoveNamespaceDeclarationFix.NAME, false);
+
+    doOptimizeImportsTest("<schema:schema \n" +
+                          "            xmlns:schema=\"http://www.w3.org/2001/XMLSchema\"\n" +
+                          "            xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+                          "        >\n" +
+                          "</schema:schema>");
+  }
+
+  public void testDifferentPrefixes() throws Exception {
+    doUnusedDeclarationTest(
+      "<x:all  <warning descr=\"Namespace declaration is never used\">xmlns=\"http://www.w3.org/2001/XMLS<caret>chema\"</warning>\n" +
+      "        xmlns:x=\"http://www.w3.org/2001/XMLSchema\"\n" +
+      "        <warning descr=\"Namespace declaration is never used\">xmlns:y=\"http://www.w3.org/2001/XMLSchema\"</warning>/>",
+
+      "<x:all\n" +
+      "        xmlns:x=\"http://www.w3.org/2001/XMLSchema\"\n" +
+      "        xmlns:y=\"http://www.w3.org/2001/XMLSchema\"/>",
+      XmlUnusedNamespaceInspection.RemoveNamespaceDeclarationFix.NAME, false);
+
+    doOptimizeImportsTest("<x:all\n" +
+                          "        xmlns:x=\"http://www.w3.org/2001/XMLSchema\"\n" +
+                          "        />");
+  }
+
+  public void testUnusedLocation() throws Exception {
+    doUnusedDeclarationTest("<x:all\n" +
+                            "        xmlns:x=\"http://www.w3.org/2001/XMLSchema\"\n" +
+                            "        xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+                            "        xsi:schemaLocation=\"<warning descr=\"Namespace location is never used\">http://www.w3.org/2001/XML<caret>Sche</warning> " +
+                            "<warning descr=\"Namespace location is never used\">http://www.w3.org/2001/XMLSchema.xsd</warning>\"/>",
+                            "<x:all\n" +
+                            "        xmlns:x=\"http://www.w3.org/2001/XMLSchema\"\n" +
+                            "        xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+                            "        />",
+                            XmlUnusedNamespaceInspection.RemoveNamespaceLocationFix.NAME);
+  }
+
+  public void testUnusedLocationOnly() throws Exception {
+    doUnusedDeclarationTest("<x:all\n" +
+                            "        xmlns:x=\"http://www.w3.org/2001/XMLSchema\"\n" +
+                            "        <warning descr=\"Namespace declaration is never used\">xmlns:y=\"http://www.w3.org/2001/XInclude\"</warning>\n" +
+                            "        xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+                            "        xsi:schemaLocation=\"<warning descr=\"Namespace location is never used\">http://www.w3.org/2001/XI<caret>nclude</warning> <warning descr=\"Namespace location is never used\">http://www.w3.org/2001/XInclude.xsd</warning>\n" +
+                            "        http://www.w3.org/2001/XMLSchema http://www.w3.org/2001/XMLSchema.xsd\"/>",
+                            "<x:all\n" +
+                            "        xmlns:x=\"http://www.w3.org/2001/XMLSchema\"\n" +
+                            "        xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+                            "        xsi:schemaLocation=\"http://www.w3.org/2001/XMLSchema http://www.w3.org/2001/XMLSchema.xsd\"/>",
+                            XmlUnusedNamespaceInspection.RemoveNamespaceDeclarationFix.NAME);
+  }
+
+  public void testUnusedDefaultLocation() throws Exception {
+    doUnusedDeclarationTest("<x:all\n" +
+                            "        xmlns:x=\"http://www.w3.org/2001/XMLSchema\"\n" +
+                            "        xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+                            "        <warning descr=\"Namespace location is never used\">xsi:noNamespaceSc<caret>hemaLocation=\"<error descr=\"Cannot resolve file 'zzz'\">zzz</error>\"</warning> />",
+                            "<x:all\n" +
+                            "        xmlns:x=\"http://www.w3.org/2001/XMLSchema\"\n" +
+                            "        xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+                            "        />",
+                            XmlUnusedNamespaceInspection.RemoveNamespaceLocationFix.NAME);
+  }
+
+  public void testKeepFormatting() throws Exception {
+    doUnusedDeclarationTest("<xs:schema attributeFormDefault=\"unqualified\"\n" +
+                            "           <warning descr=\"Namespace declaration is never used\">xmlns:xsi=\"http://www.w3.org/20<caret>01/XMLSchema-instance\"</warning>\n" +
+                            "           elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">\n" +
+                            "\n" +
+                            "        <!-- keep formatting here-->\n" +
+                            "    <xs:element name=\"a\" type=\"aType\"/>\n" +
+                            "  <xs:complexType name=\"aType\">\n" +
+                            "\n" +
+                            "  </xs:complexType>\n" +
+                            "</xs:schema>",
+                            "<xs:schema attributeFormDefault=\"unqualified\"\n" +
+                            "           elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">\n" +
+                            "\n" +
+                            "        <!-- keep formatting here-->\n" +
+                            "    <xs:element name=\"a\" type=\"aType\"/>\n" +
+                            "  <xs:complexType name=\"aType\">\n" +
+                            "\n" +
+                            "  </xs:complexType>\n" +
+                            "</xs:schema>",
+                            XmlUnusedNamespaceInspection.RemoveNamespaceDeclarationFix.NAME);
+  }
+
+  public void testImplicitPrefixUsage() throws Exception {
+    myFixture.configureByText("a.xml", "<xs:schema xmlns:xs=\"http://www.w3.org/2001/XMLSchema\"\n" +
+                                       "           xmlns:x2=\"http://www.w3.org/2001/XMLSchema\"\n" +
+                                       "           <warning descr=\"Namespace declaration is never used\">xmlns:x3=\"http://www.w3.org/2001/XMLSchema\"</warning> >\n" +
+                                       "  <xs:element name=\"a\" type=\"x2:string\"/>\n" +
+                                       "</xs:schema>");
+    myFixture.testHighlighting();
+  }
+
+  public void testUnusedLocationDetection() throws Exception {
+    myFixture.configureByFile("web-app_2_5.xsd");
+    myFixture.configureByText("a.xml", "<web-app xmlns=\"http://java.sun.com/xml/ns/javaee\"\n" +
+                                       "         xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+                                       "         <warning descr=\"Namespace declaration is never used\">xmlns:web=\"http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd\"</warning>\n" +
+                                       "         xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee\n" +
+                                       "         web-app_2_5.xsd\"\n" +
+                                       "         version=\"2.5\">\n" +
+                                       "</web-app>");
+    myFixture.testHighlighting();
+  }
+
+  public void testWSDD() throws Exception {
+    myFixture.configureByText("a.xml",
+                              "<deployment xmlns=\"http://xml.apache.org/axis/wsdd/\" xmlns:java=\"http://xml.apache.org/axis/wsdd/providers/java\">\n" +
+                              "<typeMapping deserializer=\"org.apache.axis.encoding.ser.BeanDeserializerFactory\" encodingStyle=\"\" qname=\"ns38:AxisAnalysis\" serializer=\"org.apache.axis.encoding.ser.BeanSerializerFactory\" languageSpecificType=\"java:com.pls.xactservice.axis.bindings.AxisAnalysis\"/>\n" +
+                              "</deployment>");
+    myFixture.testHighlighting();
+  }
+
+  public void testPrefixesInTagValues() throws Exception {
+    myFixture.configureByText("a.xml",
+                              "<<info descr=\"Namespace '' is not bound\">nodeTypes</info> xmlns:nt=\"<error descr=\"URI is not registered (Settings | Project Settings | Schemas and DTDs)\">http://www.jcp.org/jcr/nt/1.0</error>\" xmlns:customns=\"<error descr=\"URI is not registered (Settings | Project Settings | Schemas and DTDs)\">http://customurl</error>\">\n" +
+                              "<nodeType name=\"customns:item\" isMixin=\"false\" hasOrderableChildNodes=\"false\">\n" +
+                              "   <supertypes>\n" +
+                              "      <supertype>nt:folder</supertype>\n" +
+                              "   </supertypes>\n" +
+                              "</nodeType>\n" +
+                              "</<info descr=\"Namespace '' is not bound\">nodeTypes</info>>");
+    myFixture.testHighlighting();
+  }
+
+  public void testLocallyUsedNamespace() throws Exception {
+    myFixture.configureByText("a.xml", "<x:all\n" +
+                                       "        xmlns:x=\"http://www.w3.org/2001/XMLSchema\"\n" +
+                                       "        xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+                                       "        xsi:schemaLocation=\"http://www.w3.org/2001/XMLSchema http://www.w3.org/2001/XMLSchema.xsd\n" +
+                                       "                http://www.w3.org/2001/XInclude http://www.w3.org/2001/XInclude.xsd\">\n" +
+                                       "\n" +
+                                       "    <include xmlns=\"http://www.w3.org/2001/XInclude\" href=\"<error descr=\"Cannot resolve file 'a.xml'\">a.xml</error>\"/>\n" +
+                                       "</x:all>");
+    myFixture.testHighlighting();
+  }
+
+  public void testSubDirectory() throws Exception {
+    myFixture.testHighlighting("moved.xml", "trg/move-def.xsd");
+  }
+
+  public void testSuppressedOptimize() throws Exception {
+    myFixture.configureByFile("web-app_2_5.xsd");
+    String text = "<!--suppress XmlUnusedNamespaceDeclaration -->\n" +
+                  "<web-app xmlns=\"http://java.sun.com/xml/ns/javaee\"\n" +
+                  "         xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+                  "         xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee\n" +
+                  "         web-app_2_5.xsd\"\n" +
+                  "         version=\"2.5\">\n" +
+                  "</web-app>";
+    myFixture.configureByText("a.xml", text);
+
+    doOptimizeImportsTest(text);
+  }
+
+  private void doUnusedDeclarationTest(String text, String after, String name) throws Exception {
+    doUnusedDeclarationTest(text, after, name, true);
+  }
+
+  private void doUnusedDeclarationTest(String text, String after, String name, boolean testOptimizeImports) throws Exception {
+    myFixture.configureByText("a.xml", text);
+    myFixture.testHighlighting();
+    IntentionAction action = myFixture.getAvailableIntention(name);
+    assertNotNull(name + " not found", action);
+    myFixture.launchAction(action);
+    myFixture.checkResult(after);
+
+    myFixture.configureByText("a.xml", text);
+    if (testOptimizeImports) {
+      doOptimizeImportsTest(after);
+    }
+  }
+
+  private void doOptimizeImportsTest(String after) {
+    myFixture.testHighlighting();
+    new WriteCommandAction(getProject(), getFile()) {
+      @Override
+      protected void run(Result result) throws Throwable {
+        new OptimizeImportsProcessor(getProject(), getFile()).runWithoutProgress();
+      }
+    }.execute();
+    myFixture.checkResult(after);
+  }
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    myFixture.enableInspections(new XmlInspectionToolProvider());
+    ExternalResourceManagerImpl.registerResourceTemporarily("http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd",
+                                                            getTestDataPath() + "/web-app_2_5.xsd", getTestRootDisposable());
+    ExternalResourceManagerImpl.registerResourceTemporarily("http://xml.apache.org/axis/wsdd/",
+                                                            getTestDataPath() + "/wsdd.dtd", getTestRootDisposable());
+    ExternalResourceManagerImpl.registerResourceTemporarily("http://xml.apache.org/axis/wsdd/providers/java",
+                                                            getTestDataPath() + "/wsdd_provider_java.xsd", getTestRootDisposable());
+  }
+
+  @Override
+  protected String getBasePath() {
+    return "/xml/tests/testData/unusedNs";
+  }
+
+  @Override
+  protected boolean isCommunity() {
+    return true;
+  }
+}
diff --git a/xml/tests/src/com/intellij/xml/XmlSchemaPrefixTest.java b/xml/tests/src/com/intellij/xml/XmlSchemaPrefixTest.java
new file mode 100644
index 000000000000..feae6f6f487c
--- /dev/null
+++ b/xml/tests/src/com/intellij/xml/XmlSchemaPrefixTest.java
@@ -0,0 +1,47 @@
+package com.intellij.xml;
+
+import com.intellij.testFramework.fixtures.CodeInsightFixtureTestCase;
+import com.intellij.testFramework.fixtures.CodeInsightTestUtil;
+import com.intellij.xml.refactoring.SchemaPrefixRenameHandler;
+
+/**
+ * @author Konstantin Bulenkov
+ */
+public class XmlSchemaPrefixTest extends CodeInsightFixtureTestCase {
+
+  public void testPrefixUsages() throws Exception {
+    doFindUsages("usages.xml", 16);
+    doFindUsages("usages1.xml", 16);
+  }
+
+  public void testRename() throws Exception {doRename();}
+  public void testRename1() throws Exception {doRename();}
+
+  public void testRename2() throws Exception {doRename();}
+  public void testRenameFromClosingTag() throws Exception {doRename();}
+
+  private void doRename() throws Exception {
+    doRename("xsd");
+  }
+
+  private void doRename(String newValue) throws Exception {
+    final String name = getTestName(true);
+    CodeInsightTestUtil.doInlineRenameTest(new SchemaPrefixRenameHandler(), name, "xml", newValue, myFixture);
+  }
+
+  @Override
+  protected String getBasePath() {
+    return "/xml/tests/testData/schemaPrefix";
+  }
+
+  @Override
+  protected boolean isCommunity() {
+    return true;
+  }
+
+  protected void doFindUsages(String filename, int usages) {
+    final int size = myFixture.testFindUsages(filename).size();
+    assert size == usages : "Threre should be " + usages + " usages, but found " + size + ". File: " + filename;
+  }
+
+}
diff --git a/xml/tests/src/com/intellij/xml/XmlSmartCompletionTest.java b/xml/tests/src/com/intellij/xml/XmlSmartCompletionTest.java
new file mode 100644
index 000000000000..4a01392b3fb2
--- /dev/null
+++ b/xml/tests/src/com/intellij/xml/XmlSmartCompletionTest.java
@@ -0,0 +1,118 @@
+package com.intellij.xml;
+
+import com.intellij.codeInsight.CodeInsightSettings;
+import com.intellij.codeInsight.completion.CompletionType;
+import com.intellij.codeInsight.lookup.LookupElement;
+import com.intellij.javaee.ExternalResourceManagerImpl;
+import com.intellij.testFramework.IdeaTestCase;
+import com.intellij.testFramework.PlatformTestUtil;
+import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
+import com.intellij.util.Function;
+import com.intellij.util.containers.ContainerUtil;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author Dmitry Avdeev
+ */
+public class XmlSmartCompletionTest extends LightPlatformCodeInsightFixtureTestCase {
+
+  @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors")
+  public XmlSmartCompletionTest() {
+    IdeaTestCase.initPlatformPrefix();
+  }
+
+  public void testCompletion() throws Exception {
+    doTest(new String[]{"testCompletion.xml", "test.xsd"}, "b");
+  }
+
+  public void testCompletionNext() throws Exception {
+    doTest(new String[]{"testCompletionNext.xml", "test.xsd"}, "c");
+  }
+
+  public void testCompletion3() throws Exception {
+    doTest(new String[]{"testCompletion3.xml", "test.xsd"}, "c", "d");
+  }
+
+  public void testServlet() throws Exception {
+    doTest(new String[]{"Servlet.xml"}, "icon", "servlet-name");
+  }
+
+  public void testServletName() throws Exception {
+
+    doForText("<!DOCTYPE web-app\n" +
+              "        PUBLIC \"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN\"\n" +
+              "        \"http://java.sun.com/j2ee/dtds/web-app_2_3.dtd\">\n" +
+              "<web-app>\n" +
+              "\n" +
+              "    <servlet>\n" +
+              "        <s<caret>\n" +
+              "    </servlet>\n" +
+              "</web-app>",
+              "<!DOCTYPE web-app\n" +
+              "        PUBLIC \"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN\"\n" +
+              "        \"http://java.sun.com/j2ee/dtds/web-app_2_3.dtd\">\n" +
+              "<web-app>\n" +
+              "\n" +
+              "    <servlet>\n" +
+              "        <servlet-name\n" +
+              "    </servlet>\n" +
+              "</web-app>");
+  }
+
+  public void testPrefix() throws Exception {
+    doForText("<xs:schema xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">\n" +
+              "    <ann<caret>\n" +
+              "</xs:schema>",
+              "<xs:schema xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">\n" +
+              "    <xs:annotation\n" +
+              "</xs:schema>");
+  }
+
+  private void doForText(String before, String after) {
+    myFixture.configureByText("a.xml", before);
+    myFixture.complete(CompletionType.SMART);
+    myFixture.checkResult(after);
+  }
+
+  private void doTest(String[] files, String... items) {
+    myFixture.configureByFiles(files);
+    LookupElement[] elements;
+    try {
+      CodeInsightSettings.getInstance().AUTOCOMPLETE_ON_SMART_TYPE_COMPLETION = false;
+      elements = myFixture.complete(CompletionType.SMART);
+    }
+    finally {
+      CodeInsightSettings.getInstance().AUTOCOMPLETE_ON_SMART_TYPE_COMPLETION = true;
+    }
+    assert elements != null;
+    List<String> strings = ContainerUtil.map(elements, new Function<LookupElement, String>() {
+      @Override
+      public String fun(LookupElement lookupElement) {
+        return lookupElement.getLookupString();
+      }
+    });
+    assertEquals(Arrays.asList(items), strings);
+  }
+
+
+  @Override
+  public void setUp() throws Exception {
+    super.setUp();
+    ExternalResourceManagerImpl.registerResourceTemporarily("http://java.sun.com/j2ee/dtds/web-app_2_3.dtd",
+                                                            getTestDataPath() + "/web-app_2_3.dtd", getTestRootDisposable());
+  }
+
+  @Override
+  protected String getBasePath() {
+    return "/xml/tests/testData/smartCompletion";
+  }
+
+  @Override
+  protected String getTestDataPath() {
+    return PlatformTestUtil.getCommunityPath().replace(File.separatorChar, '/') + getBasePath();
+  }
+
+}
diff --git a/xml/tests/src/com/intellij/xml/actions/GenerateXmlTagTest.java b/xml/tests/src/com/intellij/xml/actions/GenerateXmlTagTest.java
new file mode 100644
index 000000000000..fca9d694ed39
--- /dev/null
+++ b/xml/tests/src/com/intellij/xml/actions/GenerateXmlTagTest.java
@@ -0,0 +1,84 @@
+package com.intellij.xml.actions;
+
+import com.intellij.javaee.ExternalResourceManagerImpl;
+import com.intellij.testFramework.IdeaTestCase;
+import com.intellij.testFramework.PlatformTestUtil;
+import com.intellij.testFramework.fixtures.CodeInsightTestUtil;
+import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
+
+import java.io.File;
+
+/**
+ * @author Dmitry Avdeev
+ */
+public class GenerateXmlTagTest extends LightPlatformCodeInsightFixtureTestCase {
+
+  public GenerateXmlTagTest() {
+    IdeaTestCase.initPlatformPrefix();
+  }
+
+  public void testGenerate() throws Exception {
+    myFixture.configureByFile("web-app_2_5.xsd");
+    doTest("generate.xml", "security-constraint");
+  }
+
+  public void testGenerateEmpty() throws Exception {
+    myFixture.configureByFile("javaee_5.xsd");
+    myFixture.configureByFile("web-app_2_5.xsd");
+    doTest("generateEmpty.xml", "distributable");
+  }
+
+  public void testGenerateDTD() throws Exception {
+    doTest("generateDTD.xml", "b");
+  }
+
+  public void testGenerateDTDComplex() throws Exception {
+    doTest("generateDTDComplex.xml", "b");
+  }
+
+  public void testSpring() throws Exception {
+    myFixture.configureByFile("spring-beans_3.0.xsd");
+    doTest("spring.xml", "bean");
+  }
+
+  public void testSpringAtCaret() throws Exception {
+    myFixture.configureByFile("spring-beans_3.0.xsd");
+    doTest("springAtCaret.xml", "bean");
+  }
+
+  public void testSpringAfterBean() throws Exception {
+    myFixture.configureByFile("spring-beans_3.0.xsd");
+    doTest("springAfterBean.xml", "bean");
+  }
+
+  public void testSpringAlias() throws Exception {
+    myFixture.configureByFile("spring-beans_3.0.xsd");
+    doTest("springAlias.xml", "alias");
+  }
+
+  public void testInitParam() throws Exception {
+    doTest("initParam.xml", "context-param");
+  }
+
+  private void doTest(String file, String tagName) {
+    GenerateXmlTagAction.TEST_THREAD_LOCAL.set(tagName);
+    CodeInsightTestUtil.doActionTest(new GenerateXmlTagAction(), file, myFixture);
+  }
+
+  @Override
+  public void setUp() throws Exception {
+    super.setUp();
+    ExternalResourceManagerImpl.registerResourceTemporarily("http://java.sun.com/j2ee/dtds/web-app_2_3.dtd",
+                                                            getTestDataPath() + "/web-app_2_3.dtd", getTestRootDisposable());
+  }
+
+  @Override
+  protected String getBasePath() {
+    return "/xml/tests/testData/generateTag";
+  }
+
+  @Override
+  protected String getTestDataPath() {
+    return PlatformTestUtil.getCommunityPath().replace(File.separatorChar, '/') + getBasePath();
+  }
+}
diff --git a/xml/tests/src/com/intellij/xml/actions/SplitTagActionTest.java b/xml/tests/src/com/intellij/xml/actions/SplitTagActionTest.java
new file mode 100644
index 000000000000..629b088a47df
--- /dev/null
+++ b/xml/tests/src/com/intellij/xml/actions/SplitTagActionTest.java
@@ -0,0 +1,26 @@
+package com.intellij.xml.actions;
+
+import com.intellij.codeInsight.daemon.LightIntentionActionTestCase;
+import com.intellij.testFramework.PlatformTestUtil;
+
+/**
+ * @author spleaner
+ */
+@SuppressWarnings({"ALL"})
+public class SplitTagActionTest extends LightIntentionActionTestCase {
+  public void test() throws Exception { doAllTests(); }
+
+  @Override
+  protected boolean shouldBeAvailableAfterExecution() {
+    return true;
+  }
+
+  @Override
+  protected String getBasePath() {
+    return "";
+  }
+
+  protected String getTestDataPath() {
+    return PlatformTestUtil.getCommunityPath() + "/xml/tests/testData/intentions/splitTag";
+  }
+}
\ No newline at end of file
diff --git a/xml/tests/src/com/intellij/xml/index/XmlSchemaIndexTest.java b/xml/tests/src/com/intellij/xml/index/XmlSchemaIndexTest.java
new file mode 100644
index 000000000000..abb7f4bdfd57
--- /dev/null
+++ b/xml/tests/src/com/intellij/xml/index/XmlSchemaIndexTest.java
@@ -0,0 +1,91 @@
+package com.intellij.xml.index;
+
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.testFramework.IdeaTestCase;
+import com.intellij.testFramework.fixtures.CodeInsightFixtureTestCase;
+import com.intellij.util.Function;
+import com.intellij.util.containers.ContainerUtil;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * @author Dmitry Avdeev
+ */
+public class XmlSchemaIndexTest extends CodeInsightFixtureTestCase {
+
+  @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors")
+  public XmlSchemaIndexTest() {
+    IdeaTestCase.initPlatformPrefix();
+  }
+
+  public void testBuilder() throws IOException {
+
+    VirtualFile file = myFixture.copyFileToProject("spring-beans-2.0.xsd");
+    assert file != null;
+    final Collection<String> tags = XsdTagNameBuilder.computeTagNames(file.getInputStream());
+    assert tags != null;
+    assertEquals(22, tags.size());
+
+    final String ns = XsdNamespaceBuilder.computeNamespace(file.getInputStream());
+    assertEquals("http://www.springframework.org/schema/beans", ns);
+
+    final VirtualFile xsd = myFixture.copyFileToProject("XMLSchema.xsd");
+    assert xsd != null;
+    final String xsns = XsdNamespaceBuilder.computeNamespace(xsd.getInputStream());
+    assertEquals("http://www.w3.org/2001/XMLSchema", xsns);
+
+    final Collection<String> xstags = XsdTagNameBuilder.computeTagNames(xsd.getInputStream());
+    assert xstags != null;
+    assertEquals(69, xstags.size());
+    assertTrue(xstags.contains("schema"));
+  }
+
+  public void testTagNameIndex() {
+
+    myFixture.copyDirectoryToProject("", "");
+
+    final Project project = getProject();
+    final Collection<String> tags = XmlTagNamesIndex.getAllTagNames(project);
+    assertTrue(tags.size() > 26);
+    final Collection<VirtualFile> files = XmlTagNamesIndex.getFilesByTagName("bean", project);
+    assertEquals(1, files.size());
+
+    final Collection<VirtualFile> files1 = XmlTagNamesIndex.getFilesByTagName("schema", project);
+    assertEquals(files1.toString(), 2, files1.size());
+
+    Collection<String> names = ContainerUtil.map(files1, new Function<VirtualFile, String>() {
+      @Override
+      public String fun(VirtualFile virtualFile) {
+        return virtualFile.getName();
+      }
+    });
+    List<String> expected = Arrays.asList("XMLSchema.xsd", "XMLSchema.xsd");
+    names.removeAll(expected);
+    assertTrue(files1.toString(), names.isEmpty());
+  }
+
+  public void testNamespaceIndex() {
+
+    myFixture.copyDirectoryToProject("", "");
+
+    final List<IndexedRelevantResource<String, String>> files =
+      XmlNamespaceIndex.getResourcesByNamespace("http://www.springframework.org/schema/beans",
+                                                getProject(),
+                                                myModule);
+    assertEquals(1, files.size());
+  }
+
+  @Override
+  protected String getBasePath() {
+    return "/xml/tests/testData/index";
+  }
+
+  @Override
+  protected boolean isCommunity() {
+    return true;
+  }
+}
diff --git a/xml/tests/testData/commentInjection/broken_syntax.html b/xml/tests/testData/commentInjection/broken_syntax.html
new file mode 100644
index 000000000000..d13549dda5ce
--- /dev/null
+++ b/xml/tests/testData/commentInjection/broken_syntax.html
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>title</title>
+  <!--[if IE]
+  <link rel="stylesheet" type="text/css" should not be highlighted href="1.css"/>
+  should not be highlighted
+  <![endif]-->
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/commentInjection/broken_syntax.xhtml b/xml/tests/testData/commentInjection/broken_syntax.xhtml
new file mode 100644
index 000000000000..f37fe59ae6bb
--- /dev/null
+++ b/xml/tests/testData/commentInjection/broken_syntax.xhtml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>title</title>
+  <!--[if IE]
+  <link rel="stylesheet" type="text/css" href="1.css"/>
+  <![endif]-->
+</head>
+<body>
+
+</body>
+</html>
diff --git a/xml/tests/testData/commentInjection/broken_syntax2.html b/xml/tests/testData/commentInjection/broken_syntax2.html
new file mode 100644
index 000000000000..b164bded4475
--- /dev/null
+++ b/xml/tests/testData/commentInjection/broken_syntax2.html
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>title</title>
+  <!--[if IE]>
+  <link rel="stylesheet" type="text/css" href="1.css"/>
+  should not be highlighted
+  <![endif-->
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/commentInjection/broken_syntax2.xhtml b/xml/tests/testData/commentInjection/broken_syntax2.xhtml
new file mode 100644
index 000000000000..9154f2cd2e62
--- /dev/null
+++ b/xml/tests/testData/commentInjection/broken_syntax2.xhtml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>title</title>
+  <!--[if IE]>
+  <link rel="stylesheet" type="text/css" href="1.css"/>
+  <![endif-->
+</head>
+<body>
+
+</body>
+</html>
diff --git a/xml/tests/testData/commentInjection/complete.html b/xml/tests/testData/commentInjection/complete.html
new file mode 100644
index 000000000000..0b7c20cd1947
--- /dev/null
+++ b/xml/tests/testData/commentInjection/complete.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>title</title>
+  <!--[if IE]>
+  <link rel="sty<caret>
+  <![endif]-->
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/commentInjection/complete.xhtml b/xml/tests/testData/commentInjection/complete.xhtml
new file mode 100644
index 000000000000..a570e87dbd37
--- /dev/null
+++ b/xml/tests/testData/commentInjection/complete.xhtml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>title</title>
+  <!--[if IE]>
+  <link rel="sty<caret>
+  <![endif]-->
+</head>
+<body>
+
+</body>
+</html>
diff --git a/xml/tests/testData/commentInjection/complete_after.html b/xml/tests/testData/commentInjection/complete_after.html
new file mode 100644
index 000000000000..e8ee0bfcb8bf
--- /dev/null
+++ b/xml/tests/testData/commentInjection/complete_after.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>title</title>
+  <!--[if IE]>
+  <link rel="stylesheet<caret>
+  <![endif]-->
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/commentInjection/complete_after.xhtml b/xml/tests/testData/commentInjection/complete_after.xhtml
new file mode 100644
index 000000000000..5577d12d196b
--- /dev/null
+++ b/xml/tests/testData/commentInjection/complete_after.xhtml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>title</title>
+  <!--[if IE]>
+  <link rel="stylesheet<caret>
+  <![endif]-->
+</head>
+<body>
+
+</body>
+</html>
diff --git a/xml/tests/testData/commentInjection/injected1.html b/xml/tests/testData/commentInjection/injected1.html
new file mode 100644
index 000000000000..c7281d9f69ff
--- /dev/null
+++ b/xml/tests/testData/commentInjection/injected1.html
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>title</title>
+  <!--[if IE]>
+  <link rel="stylesheet" type="text/css" <warning>ref</warning>="1.css"/>
+  <link rel="stylesheet" type="text/css" href="<warning>xxx.css</warning>"/>
+  <![endif]-->
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/commentInjection/injected1.xhtml b/xml/tests/testData/commentInjection/injected1.xhtml
new file mode 100644
index 000000000000..78748c7ec712
--- /dev/null
+++ b/xml/tests/testData/commentInjection/injected1.xhtml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>title</title>
+  <!--[if IE]>
+  <link rel="stylesheet" <error descr="Attribute typ is not allowed here">typ</error><error descr="'=' expected"> </error><error descr="Attribute e is not allowed here">e</error>="text/css" href="<warning descr="Cannot resolve file '1.css'"><error descr="Cannot resolve file '1.css'">1.css</error></warning>"/>
+  <link rel="stylesheet" type="text/css" href="<warning descr="Cannot resolve file '2.css'"><error descr="Cannot resolve file '2.css'">2.css</error></warning>"/>
+  <![endif]-->
+</head>
+<body>
+
+</body>
+</html>
diff --git a/xml/tests/testData/commentInjection/injected2.html b/xml/tests/testData/commentInjection/injected2.html
new file mode 100644
index 000000000000..f43a71f11f7d
--- /dev/null
+++ b/xml/tests/testData/commentInjection/injected2.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<body>
+
+<style type="text/css">
+    .regular {
+        color: <error>INVALID</error>;
+    }
+</style>
+
+<!--[if ie]>
+<div class="ccc">something</div>
+<style type="text/css">
+    .injected {
+        color: <error>INVALID</error>;
+    }
+</style>
+<![endif]-->
+
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/commentInjectionFormatting/formatting1.html b/xml/tests/testData/commentInjectionFormatting/formatting1.html
new file mode 100644
index 000000000000..ed2850eecec2
--- /dev/null
+++ b/xml/tests/testData/commentInjectionFormatting/formatting1.html
@@ -0,0 +1,18 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<title>title</title>
+<!--[if IE]>
+<link rel="stylesheet" type="text/css" href="1.css"/>
+<style type="text/css">
+.test {
+color: aqua;
+}
+</style>
+<link rel="stylesheet" type="text/css" href="1.css"/>
+<![endif]-->
+</head>
+<body>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/commentInjectionFormatting/formatting1_after.html b/xml/tests/testData/commentInjectionFormatting/formatting1_after.html
new file mode 100644
index 000000000000..53c4a712ae18
--- /dev/null
+++ b/xml/tests/testData/commentInjectionFormatting/formatting1_after.html
@@ -0,0 +1,18 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+    <title>title</title>
+    <!--[if IE]>
+    <link rel="stylesheet" type="text/css" href="1.css"/>
+    <style type="text/css">
+        .test {
+            color: aqua;
+        }
+    </style>
+    <link rel="stylesheet" type="text/css" href="1.css"/>
+    <![endif]-->
+</head>
+<body>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/commentInjectionFormatting/formatting2.html b/xml/tests/testData/commentInjectionFormatting/formatting2.html
new file mode 100644
index 000000000000..5487ba9dff53
--- /dev/null
+++ b/xml/tests/testData/commentInjectionFormatting/formatting2.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<title>title</title><!--[if IE]>
+<link rel="stylesheet" type="text/css" href="1.css"/>
+<style type="text/css">
+.test {
+color: aqua;
+}
+</style>
+<link rel="stylesheet" type="text/css" href="1.css"/>
+<![endif]--><!--[if lt IE 6]>
+<style type="text/css">
+.test {
+color: aqua;
+}
+</style>
+  <![endif]-->
+<!--[if lte IE 5.5]>
+<style type="text/css">
+.test {
+color: aqua;
+}
+</style>
+  <![endif]-->
+<!--[if gt IE 6]>
+<style type="text/css">
+.test {
+color: aqua;
+}
+</style>
+  <![endif]--></head>
+<body>
+</body>
+</html>
diff --git a/xml/tests/testData/commentInjectionFormatting/formatting2_after.html b/xml/tests/testData/commentInjectionFormatting/formatting2_after.html
new file mode 100644
index 000000000000..d74a7b1fd0af
--- /dev/null
+++ b/xml/tests/testData/commentInjectionFormatting/formatting2_after.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+    <title>title</title><!--[if IE]>
+    <link rel="stylesheet" type="text/css" href="1.css"/>
+    <style type="text/css">
+        .test {
+            color: aqua;
+        }
+    </style>
+    <link rel="stylesheet" type="text/css" href="1.css"/>
+    <![endif]--><!--[if lt IE 6]>
+    <style type="text/css">
+        .test {
+            color: aqua;
+        }
+    </style>
+    <![endif]-->
+    <!--[if lte IE 5.5]>
+    <style type="text/css">
+        .test {
+            color: aqua;
+        }
+    </style>
+    <![endif]-->
+    <!--[if gt IE 6]>
+    <style type="text/css">
+        .test {
+            color: aqua;
+        }
+    </style>
+    <![endif]--></head>
+<body>
+</body>
+</html>
diff --git a/xml/tests/testData/commentInjectionFormatting/xhtmlFormatting1.xhtml b/xml/tests/testData/commentInjectionFormatting/xhtmlFormatting1.xhtml
new file mode 100644
index 000000000000..2b8603650a4f
--- /dev/null
+++ b/xml/tests/testData/commentInjectionFormatting/xhtmlFormatting1.xhtml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<title>title</title>
+<!--[if IE]>
+<link rel="stylesheet" type="text/css" href="1.css"/>
+<style type="text/css">
+.test {
+color: aqua;
+}
+</style>
+<link rel="stylesheet" type="text/css" href="1.css"/>
+<![endif]-->
+</head>
+<body>
+
+</body>
+</html>
diff --git a/xml/tests/testData/commentInjectionFormatting/xhtmlFormatting1_after.xhtml b/xml/tests/testData/commentInjectionFormatting/xhtmlFormatting1_after.xhtml
new file mode 100644
index 000000000000..6d961243af5b
--- /dev/null
+++ b/xml/tests/testData/commentInjectionFormatting/xhtmlFormatting1_after.xhtml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+        PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+    <title>title</title>
+    <!--[if IE]>
+    <link rel="stylesheet" type="text/css" href="1.css"/>
+    <style type="text/css">
+    .test {
+        color: aqua;
+    }
+    </style>
+    <link rel="stylesheet" type="text/css" href="1.css"/>
+    <![endif]-->
+</head>
+<body>
+
+</body>
+</html>
diff --git a/xml/tests/testData/commentInjectionFormatting/xhtmlFormatting2.xhtml b/xml/tests/testData/commentInjectionFormatting/xhtmlFormatting2.xhtml
new file mode 100644
index 000000000000..21b38f34a783
--- /dev/null
+++ b/xml/tests/testData/commentInjectionFormatting/xhtmlFormatting2.xhtml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<title>title</title><!--[if IE]>
+<link rel="stylesheet" type="text/css" href="1.css"/>
+<style type="text/css">
+.test {
+color: aqua;
+}
+</style>
+<link rel="stylesheet" type="text/css" href="1.css"/>
+<![endif]--><!--[if lt IE 6]>
+<style type="text/css">
+.test {
+color: aqua;
+}
+</style>
+  <![endif]-->
+<!--[if lte IE 5.5]>
+<style type="text/css">
+.test {
+color: aqua;
+}
+</style>
+  <![endif]-->
+<!--[if gt IE 6]>
+<style type="text/css">
+.test {
+color: aqua;
+}
+</style>
+  <![endif]--></head>
+<body>
+
+</body>
+</html>
diff --git a/xml/tests/testData/commentInjectionFormatting/xhtmlFormatting2_after.xhtml b/xml/tests/testData/commentInjectionFormatting/xhtmlFormatting2_after.xhtml
new file mode 100644
index 000000000000..d0d7ecb8e4d7
--- /dev/null
+++ b/xml/tests/testData/commentInjectionFormatting/xhtmlFormatting2_after.xhtml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+        PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+    <title>title</title><!--[if IE]>
+    <link rel="stylesheet" type="text/css" href="1.css"/>
+    <style type="text/css">
+    .test {
+        color: aqua;
+    }
+    </style>
+    <link rel="stylesheet" type="text/css" href="1.css"/>
+    <![endif]--><!--[if lt IE 6]>
+    <style type="text/css">
+        .test {
+            color: aqua;
+        }
+    </style>
+    <![endif]-->
+    <!--[if lte IE 5.5]>
+    <style type="text/css">
+        .test {
+            color: aqua;
+        }
+    </style>
+    <![endif]-->
+    <!--[if gt IE 6]>
+    <style type="text/css">
+        .test {
+            color: aqua;
+        }
+    </style>
+    <![endif]--></head>
+<body>
+
+</body>
+</html>
diff --git a/xml/tests/testData/constraints/test.xml b/xml/tests/testData/constraints/test.xml
new file mode 100644
index 000000000000..624fb3646d02
--- /dev/null
+++ b/xml/tests/testData/constraints/test.xml
@@ -0,0 +1,3 @@
+<a xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="test.xsd">
+
+</a>
diff --git a/xml/tests/testData/constraints/test.xsd b/xml/tests/testData/constraints/test.xsd
new file mode 100644
index 000000000000..64a520eb0103
--- /dev/null
+++ b/xml/tests/testData/constraints/test.xsd
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema attributeFormDefault="unqualified"
+           elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:element name="a" type="aType"/>
+  <xs:complexType name="aType">
+    <xs:sequence>
+      <xs:element type="xs:string" name="b"/>
+      <xs:element type="xs:string" name="c" minOccurs="1" maxOccurs="5"/>
+      <xs:element type="xs:string" name="d" minOccurs="z" maxOccurs="x"/>
+      <xs:element type="xs:string" name="e" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>
diff --git a/xml/tests/testData/constraints/testCompletion.xml b/xml/tests/testData/constraints/testCompletion.xml
new file mode 100644
index 000000000000..7345f6a1fc2e
--- /dev/null
+++ b/xml/tests/testData/constraints/testCompletion.xml
@@ -0,0 +1,4 @@
+<a xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="test.xsd">
+  <b></b>
+  <<caret>
+</a>
diff --git a/xml/tests/testData/constraints/testDtd.xml b/xml/tests/testData/constraints/testDtd.xml
new file mode 100644
index 000000000000..4d8c5e68aa7b
--- /dev/null
+++ b/xml/tests/testData/constraints/testDtd.xml
@@ -0,0 +1,10 @@
+<!DOCTYPE a [
+        <!ELEMENT a (b, c?, d+, e*)>
+        <!ELEMENT b (#PCDATA)>
+        <!ELEMENT c (#PCDATA)>
+        <!ELEMENT d (#PCDATA)>
+        <!ELEMENT e (#PCDATA)>
+        ]>
+<a >
+
+</a>
diff --git a/xml/tests/testData/constraints/testIncomplete.xml b/xml/tests/testData/constraints/testIncomplete.xml
new file mode 100644
index 000000000000..007f560105f9
--- /dev/null
+++ b/xml/tests/testData/constraints/testIncomplete.xml
@@ -0,0 +1,3 @@
+<a xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="test.xsd">
+  <
+</a>
diff --git a/xml/tests/testData/generateTag/generate.xml b/xml/tests/testData/generateTag/generate.xml
new file mode 100644
index 000000000000..ba0d537e4aeb
--- /dev/null
+++ b/xml/tests/testData/generateTag/generate.xml
@@ -0,0 +1,8 @@
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+		  web-app_2_5.xsd"
+         version="2.5">
+
+  <caret>
+</web-app>
\ No newline at end of file
diff --git a/xml/tests/testData/generateTag/generateDTD.xml b/xml/tests/testData/generateTag/generateDTD.xml
new file mode 100644
index 000000000000..d35500a6d389
--- /dev/null
+++ b/xml/tests/testData/generateTag/generateDTD.xml
@@ -0,0 +1,17 @@
+<!DOCTYPE a [
+
+        <!ELEMENT a (b)* >
+
+        <!ELEMENT  b  (c, d)>
+        <!ELEMENT  c  (#PCDATA)>
+        <!ATTLIST b
+                x       CDATA          #REQUIRED
+                y       CDATA          #IMPLIED
+        >
+
+        <!ELEMENT  d  (#PCDATA)>
+        ]>
+
+<a>
+    <caret>
+</a>
diff --git a/xml/tests/testData/generateTag/generateDTDComplex.xml b/xml/tests/testData/generateTag/generateDTDComplex.xml
new file mode 100644
index 000000000000..b35503e1f3b4
--- /dev/null
+++ b/xml/tests/testData/generateTag/generateDTDComplex.xml
@@ -0,0 +1,19 @@
+<!DOCTYPE a [
+
+        <!ELEMENT a (b)* >
+
+        <!ELEMENT  b  (c, d)>
+        <!ELEMENT  c  (#PCDATA)>
+        <!ATTLIST b
+                x       CDATA          #REQUIRED
+                y       CDATA          #IMPLIED
+        >
+
+        <!ELEMENT  d  EMPTY>
+        <!ATTLIST d
+                z       CDATA          #REQUIRED
+        >
+        ]>
+<a>
+  <caret>
+</a>
diff --git a/xml/tests/testData/generateTag/generateDTDComplex_after.xml b/xml/tests/testData/generateTag/generateDTDComplex_after.xml
new file mode 100644
index 000000000000..2f2db8a9ba4d
--- /dev/null
+++ b/xml/tests/testData/generateTag/generateDTDComplex_after.xml
@@ -0,0 +1,22 @@
+<!DOCTYPE a [
+
+        <!ELEMENT a (b)* >
+
+        <!ELEMENT  b  (c, d)>
+        <!ELEMENT  c  (#PCDATA)>
+        <!ATTLIST b
+                x       CDATA          #REQUIRED
+                y       CDATA          #IMPLIED
+        >
+
+        <!ELEMENT  d  EMPTY>
+        <!ATTLIST d
+                z       CDATA          #REQUIRED
+        >
+        ]>
+<a>
+  <b x="">
+      <c></c>
+      <d z=""/>
+  </b>
+</a>
diff --git a/xml/tests/testData/generateTag/generateDTD_after.xml b/xml/tests/testData/generateTag/generateDTD_after.xml
new file mode 100644
index 000000000000..f401f5139e87
--- /dev/null
+++ b/xml/tests/testData/generateTag/generateDTD_after.xml
@@ -0,0 +1,20 @@
+<!DOCTYPE a [
+
+        <!ELEMENT a (b)* >
+
+        <!ELEMENT  b  (c, d)>
+        <!ELEMENT  c  (#PCDATA)>
+        <!ATTLIST b
+                x       CDATA          #REQUIRED
+                y       CDATA          #IMPLIED
+        >
+
+        <!ELEMENT  d  (#PCDATA)>
+        ]>
+
+<a>
+    <b x="">
+        <c></c>
+        <d></d>
+    </b>
+</a>
diff --git a/xml/tests/testData/generateTag/generateEmpty.xml b/xml/tests/testData/generateTag/generateEmpty.xml
new file mode 100644
index 000000000000..ba0d537e4aeb
--- /dev/null
+++ b/xml/tests/testData/generateTag/generateEmpty.xml
@@ -0,0 +1,8 @@
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+		  web-app_2_5.xsd"
+         version="2.5">
+
+  <caret>
+</web-app>
\ No newline at end of file
diff --git a/xml/tests/testData/generateTag/generateEmpty_after.xml b/xml/tests/testData/generateTag/generateEmpty_after.xml
new file mode 100644
index 000000000000..707c8d3d8abf
--- /dev/null
+++ b/xml/tests/testData/generateTag/generateEmpty_after.xml
@@ -0,0 +1,8 @@
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+		  web-app_2_5.xsd"
+         version="2.5">
+
+  <distributable/>
+</web-app>
\ No newline at end of file
diff --git a/xml/tests/testData/generateTag/generate_after.xml b/xml/tests/testData/generateTag/generate_after.xml
new file mode 100644
index 000000000000..58b865b3d270
--- /dev/null
+++ b/xml/tests/testData/generateTag/generate_after.xml
@@ -0,0 +1,13 @@
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+		  web-app_2_5.xsd"
+         version="2.5">
+
+  <security-constraint>
+      <web-resource-collection>
+          <web-resource-name></web-resource-name>
+          <url-pattern></url-pattern>
+      </web-resource-collection>
+  </security-constraint>
+</web-app>
\ No newline at end of file
diff --git a/xml/tests/testData/generateTag/initParam.xml b/xml/tests/testData/generateTag/initParam.xml
new file mode 100644
index 000000000000..ec73f0e4644c
--- /dev/null
+++ b/xml/tests/testData/generateTag/initParam.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app
+        PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+        "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
+<web-app>
+
+  <caret>
+
+</web-app>
\ No newline at end of file
diff --git a/xml/tests/testData/generateTag/initParam_after.xml b/xml/tests/testData/generateTag/initParam_after.xml
new file mode 100644
index 000000000000..c57f8026f498
--- /dev/null
+++ b/xml/tests/testData/generateTag/initParam_after.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app
+        PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+        "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
+<web-app>
+
+  <context-param>
+      <param-name></param-name>
+      <param-value></param-value>
+  </context-param>
+
+</web-app>
\ No newline at end of file
diff --git a/xml/tests/testData/generateTag/javaee_5.xsd b/xml/tests/testData/generateTag/javaee_5.xsd
new file mode 100644
index 000000000000..59b6575b2c3c
--- /dev/null
+++ b/xml/tests/testData/generateTag/javaee_5.xsd
@@ -0,0 +1,2117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ The contents of this file are subject to the terms
+ of the Common Development and Distribution License
+ (the "License").  You may not use this file except
+ in compliance with the License.
+
+ You can obtain a copy of the license at
+ glassfish/bootstrap/legal/CDDLv1.0.txt or
+ https://glassfish.dev.java.net/public/CDDLv1.0.html.
+ See the License for the specific language governing
+ permissions and limitations under the License.
+
+ When distributing Covered Code, include this CDDL
+ HEADER in each file and include the License file at
+ glassfish/bootstrap/legal/CDDLv1.0.txt.  If applicable,
+ add the following below this CDDL HEADER, with the
+ fields enclosed by brackets "[]" replaced with your
+ own identifying information: Portions Copyright [yyyy]
+ [name of copyright owner]
+-->
+
+<xsd:schema
+     targetNamespace="http://java.sun.com/xml/ns/javaee"
+     xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+     elementFormDefault="qualified"
+     attributeFormDefault="unqualified"
+     version="5">
+  <xsd:annotation>
+    <xsd:documentation>
+      @(#)javaee_5.xsds	1.63 06/02/07
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
+
+      Copyright 2003-2005 Sun Microsystems, Inc.
+      4150 Network Circle
+      Santa Clara, California 95054
+      U.S.A
+      All rights reserved.
+
+      Sun Microsystems, Inc. has intellectual property rights
+      relating to technology described in this document. In
+      particular, and without limitation, these intellectual
+      property rights may include one or more of the U.S. patents
+      listed at http://www.sun.com/patents and one or more
+      additional patents or pending patent applications in the
+      U.S. and other countries.
+
+      This document and the technology which it describes are
+      distributed under licenses restricting their use, copying,
+      distribution, and decompilation. No part of this document
+      may be reproduced in any form by any means without prior
+      written authorization of Sun and its licensors, if any.
+
+      Third-party software, including font technology, is
+      copyrighted and licensed from Sun suppliers.
+
+      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
+      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
+      Cup logo are trademarks or registered trademarks of Sun
+      Microsystems, Inc. in the U.S. and other countries.
+
+      Federal Acquisitions: Commercial Software - Government Users
+      Subject to Standard License Terms and Conditions.
+
+    </xsd:documentation>
+  </xsd:annotation>
+
+<xsd:annotation>
+<xsd:documentation>
+
+The following definitions that appear in the common
+shareable schema(s) of J2EE deployment descriptors should be
+interpreted with respect to the context they are included:
+
+Deployment Component may indicate one of the following:
+    j2ee application;
+    application client;
+    web application;
+    enterprise bean;
+    resource adapter;
+
+Deployment File may indicate one of the following:
+    ear file;
+    war file;
+    jar file;
+    rar file;
+
+</xsd:documentation>
+</xsd:annotation>
+
+  <xsd:import namespace="http://www.w3.org/XML/1998/namespace"
+	      schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+
+  <xsd:include schemaLocation="javaee_web_services_client_1_2.xsd"/>
+
+
+<!-- **************************************************** -->
+
+  <xsd:group name="descriptionGroup">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	This group keeps the usage of the contained description related
+	elements consistent across Java EE deployment descriptors.
+
+	All elements may occur multiple times with different languages,
+	to support localization of the content.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="display-name"
+		   type="javaee:display-nameType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="icon"
+		   type="javaee:iconType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:group>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="descriptionType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The description type is used by a description element to
+	provide text describing the parent element.  The elements
+	that use this type should include any information that the
+	Deployment Component's Deployment File file producer wants
+	to provide to the consumer of the Deployment Component's
+	Deployment File (i.e., to the Deployer). Typically, the
+	tools used by such a Deployment File consumer will display
+	the description when processing the parent element that
+	contains the description.
+
+	The lang attribute defines the language that the
+	description is provided in. The default value is "en" (English).
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="javaee:xsdStringType">
+	<xsd:attribute ref="xml:lang"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:simpleType name="dewey-versionType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	This type defines a dewey decimal that is used
+	to describe versions of documents.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:restriction base="xsd:token">
+      <xsd:pattern value="\.?[0-9]+(\.[0-9]+)*"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="display-nameType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
+
+	  The display-name type contains a short name that is intended
+	  to be displayed by tools. It is used by display-name
+	  elements.  The display name need not be unique.
+
+	  Example:
+
+	  ...
+	     <display-name xml:lang="en">
+	       Employee Self Service
+	     </display-name>
+
+	  The value of the xml:lang attribute is "en" (English) by default.
+
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="javaee:string">
+	<xsd:attribute ref="xml:lang"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="ejb-linkType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
+
+	  The ejb-linkType is used by ejb-link
+	  elements in the ejb-ref or ejb-local-ref elements to specify
+	  that an EJB reference is linked to enterprise bean.
+
+	  The value of the ejb-link element must be the ejb-name of an
+	  enterprise bean in the same ejb-jar file or in another ejb-jar
+	  file in the same Java EE application unit.
+
+	  Alternatively, the name in the ejb-link element may be
+	  composed of a path name specifying the ejb-jar containing the
+	  referenced enterprise bean with the ejb-name of the target
+	  bean appended and separated from the path name by "#".  The
+	  path name is relative to the Deployment File containing
+	  Deployment Component that is referencing the enterprise
+	  bean.  This allows multiple enterprise beans with the same
+	  ejb-name to be uniquely identified.
+
+	  Examples:
+
+	      <ejb-link>EmployeeRecord</ejb-link>
+
+	      <ejb-link>../products/product.jar#ProductEJB</ejb-link>
+
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="ejb-local-refType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The ejb-local-refType is used by ejb-local-ref elements for
+	the declaration of a reference to an enterprise bean's local
+	home or to the local business interface of a 3.0 bean.
+        The declaration consists of:
+
+	    - an optional description
+	    - the EJB reference name used in the code of the Deployment
+	      Component that's referencing the enterprise bean.
+	    - the optional expected type of the referenced enterprise bean
+	    - the optional expected local interface of the referenced
+              enterprise bean or the local business interface of the
+              referenced enterprise bean.
+	    - the optional expected local home interface of the referenced
+              enterprise bean. Not applicable if this ejb-local-ref refers
+              to the local business interface of a 3.0 bean.
+	    - optional ejb-link information, used to specify the
+	      referenced enterprise bean
+            - optional elements to define injection of the named enterprise
+              bean into a component field or property.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="ejb-ref-name"
+		   type="javaee:ejb-ref-nameType"/>
+      <xsd:element name="ejb-ref-type"
+		   type="javaee:ejb-ref-typeType"
+                   minOccurs="0"/>
+      <xsd:element name="local-home"
+		   type="javaee:local-homeType"
+                   minOccurs="0"/>
+      <xsd:element name="local"
+		   type="javaee:localType"
+                   minOccurs="0"/>
+      <xsd:element name="ejb-link"
+		   type="javaee:ejb-linkType"
+		   minOccurs="0"/>
+      <xsd:group ref="javaee:resourceGroup"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="ejb-ref-nameType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
+
+	  The ejb-ref-name element contains the name of an EJB
+	  reference. The EJB reference is an entry in the
+	  Deployment Component's environment and is relative to the
+	  java:comp/env context.  The name must be unique within the
+	  Deployment Component.
+
+	  It is recommended that name is prefixed with "ejb/".
+
+	  Example:
+
+	  <ejb-ref-name>ejb/Payroll</ejb-ref-name>
+
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:jndi-nameType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="ejb-ref-typeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The ejb-ref-typeType contains the expected type of the
+	referenced enterprise bean.
+
+	The ejb-ref-type designates a value
+	that must be one of the following:
+
+	    Entity
+	    Session
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:enumeration value="Entity"/>
+	<xsd:enumeration value="Session"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="ejb-refType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The ejb-refType is used by ejb-ref elements for the
+	declaration of a reference to an enterprise bean's home or
+        to the remote business interface of a 3.0 bean.
+	The declaration consists of:
+
+	    - an optional description
+	    - the EJB reference name used in the code of
+	      the Deployment Component that's referencing the enterprise
+	      bean.
+	    - the optional expected type of the referenced enterprise bean
+            - the optional remote interface of the referenced enterprise bean
+              or the remote business interface of the referenced enterprise
+              bean
+	    - the optional expected home interface of the referenced
+              enterprise bean.  Not applicable if this ejb-ref
+              refers to the remote business interface of a 3.0 bean.
+	    - optional ejb-link information, used to specify the
+	      referenced enterprise bean
+            - optional elements to define injection of the named enterprise
+              bean into a component field or property
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="ejb-ref-name"
+		   type="javaee:ejb-ref-nameType"/>
+      <xsd:element name="ejb-ref-type"
+		   type="javaee:ejb-ref-typeType"
+		   minOccurs="0"/>
+      <xsd:element name="home"
+		   type="javaee:homeType"
+		   minOccurs="0"/>
+      <xsd:element name="remote"
+		   type="javaee:remoteType"
+                   minOccurs="0"/>
+      <xsd:element name="ejb-link"
+		   type="javaee:ejb-linkType"
+		   minOccurs="0"/>
+      <xsd:group ref="javaee:resourceGroup"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="emptyType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	This type is used to designate an empty
+	element when used.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="env-entry-type-valuesType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
+
+	  This type contains the fully-qualified Java type of the
+	  environment entry value that is expected by the
+	  application's code.
+
+	  The following are the legal values of env-entry-type-valuesType:
+
+	      java.lang.Boolean
+	      java.lang.Byte
+	      java.lang.Character
+	      java.lang.String
+	      java.lang.Short
+	      java.lang.Integer
+	      java.lang.Long
+	      java.lang.Float
+	      java.lang.Double
+
+	  Example:
+
+	  <env-entry-type>java.lang.Boolean</env-entry-type>
+
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:enumeration value="java.lang.Boolean"/>
+	<xsd:enumeration value="java.lang.Byte"/>
+	<xsd:enumeration value="java.lang.Character"/>
+	<xsd:enumeration value="java.lang.String"/>
+	<xsd:enumeration value="java.lang.Short"/>
+	<xsd:enumeration value="java.lang.Integer"/>
+	<xsd:enumeration value="java.lang.Long"/>
+	<xsd:enumeration value="java.lang.Float"/>
+	<xsd:enumeration value="java.lang.Double"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="env-entryType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The env-entryType is used to declare an application's
+	environment entry. The declaration consists of an optional
+	description, the name of the environment entry, a type
+	(optional if the value is injected, otherwise required), and
+	an optional value.
+
+	It also includes optional elements to define injection of
+	the named resource into fields or JavaBeans properties.
+
+	If a value is not specified and injection is requested,
+	no injection will occur and no entry of the specified name
+	will be created.  This allows an initial value to be
+	specified in the source code without being incorrectly
+	changed when no override has been specified.
+
+	If a value is not specified and no injection is requested,
+	a value must be supplied during deployment.
+
+	This type is used by env-entry elements.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="env-entry-name"
+		   type="javaee:jndi-nameType">
+	<xsd:annotation>
+	  <xsd:documentation>
+	    <![CDATA[
+
+	      The env-entry-name element contains the name of a
+	      Deployment Component's environment entry.  The name
+	      is a JNDI name relative to the java:comp/env
+	      context.  The name must be unique within a
+	      Deployment Component. The uniqueness
+	      constraints must be defined within the declared
+	      context.
+
+	      Example:
+
+	      <env-entry-name>minAmount</env-entry-name>
+
+	      ]]>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="env-entry-type"
+		   type="javaee:env-entry-type-valuesType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+	    <![CDATA[
+
+	      The env-entry-type element contains the Java language
+	      type of the environment entry.  If an injection target
+	      is specified for the environment entry, the type may
+	      be omitted, or must match the type of the injection
+	      target.  If no injection target is specified, the type
+	      is required.
+
+	      Example:
+
+	      <env-entry-type>java.lang.Integer</env-entry-type>
+
+	      ]]>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="env-entry-value"
+		   type="javaee:xsdStringType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+	    <![CDATA[
+
+	      The env-entry-value designates the value of a
+	      Deployment Component's environment entry. The value
+	      must be a String that is valid for the
+	      constructor of the specified type that takes a
+	      single String parameter, or for java.lang.Character,
+	      a single character.
+
+	      Example:
+
+	      <env-entry-value>100.00</env-entry-value>
+
+	      ]]>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:group ref="javaee:resourceGroup"/>
+
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="fully-qualified-classType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The elements that use this type designate the name of a
+	Java class or interface.  The name is in the form of a
+	"binary name", as defined in the JLS.  This is the form
+	of name used in Class.forName().  Tools that need the
+	canonical name (the name used in source code) will need
+	to convert this binary name to the canonical name.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="generic-booleanType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	This type defines four different values which can designate
+	boolean values. This includes values yes and no which are
+	not designated by xsd:boolean
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:enumeration value="true"/>
+	<xsd:enumeration value="false"/>
+	<xsd:enumeration value="yes"/>
+	<xsd:enumeration value="no"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="homeType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
+
+	  The homeType defines the fully-qualified name of
+	  an enterprise bean's home interface.
+
+	  Example:
+
+	      <home>com.aardvark.payroll.PayrollHome</home>
+
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:fully-qualified-classType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="iconType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The icon type contains small-icon and large-icon elements
+	that specify the file names for small and large GIF, JPEG,
+	or PNG icon images used to represent the parent element in a
+	GUI tool.
+
+	The xml:lang attribute defines the language that the
+	icon file names are provided in. Its value is "en" (English)
+	by default.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="small-icon" type="javaee:pathType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+	    <![CDATA[
+
+	      The small-icon element contains the name of a file
+	      containing a small (16 x 16) icon image. The file
+	      name is a relative path within the Deployment
+	      Component's Deployment File.
+
+	      The image may be in the GIF, JPEG, or PNG format.
+	      The icon can be used by tools.
+
+	      Example:
+
+	      <small-icon>employee-service-icon16x16.jpg</small-icon>
+
+	      ]]>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="large-icon" type="javaee:pathType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+	    <![CDATA[
+
+	      The large-icon element contains the name of a file
+	      containing a large
+	      (32 x 32) icon image. The file name is a relative
+	      path within the Deployment Component's Deployment
+	      File.
+
+	      The image may be in the GIF, JPEG, or PNG format.
+	      The icon can be used by tools.
+
+	      Example:
+
+	      <large-icon>employee-service-icon32x32.jpg</large-icon>
+
+	      ]]>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+    </xsd:sequence>
+
+    <xsd:attribute ref="xml:lang"/>
+    <xsd:attribute name="id" type="xsd:ID"/>
+
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="injection-targetType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	An injection target specifies a class and a name within
+	that class into which a resource should be injected.
+
+	The injection target class specifies the fully qualified
+	class name that is the target of the injection.  The
+	Java EE specifications describe which classes can be an
+	injection target.
+
+	The injection target name specifies the target within
+	the specified class.  The target is first looked for as a
+	JavaBeans property name.  If not found, the target is
+	looked for as a field name.
+
+	The specified resource will be injected into the target
+	during initialization of the class by either calling the
+	set method for the target property or by setting a value
+	into the named field.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="injection-target-class"
+		   type="javaee:fully-qualified-classType"/>
+      <xsd:element name="injection-target-name"
+		   type="javaee:java-identifierType"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="java-identifierType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The java-identifierType defines a Java identifier.
+	The users of this type should further verify that
+	the content does not contain Java reserved keywords.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:pattern value="($|_|\p{L})(\p{L}|\p{Nd}|_|$)*"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="java-typeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	This is a generic type that designates a Java primitive
+	type or a fully qualified name of a Java interface/type,
+	or an array of such types.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:pattern value="[^\p{Z}]*"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="jndi-nameType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The jndi-nameType type designates a JNDI name in the
+	Deployment Component's environment and is relative to the
+	java:comp/env context.  A JNDI name must be unique within the
+	Deployment Component.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:group name="jndiEnvironmentRefsGroup">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	This group keeps the usage of the contained JNDI environment
+	reference elements consistent across Java EE deployment descriptors.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="env-entry"
+		   type="javaee:env-entryType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="ejb-ref"
+		   type="javaee:ejb-refType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="ejb-local-ref"
+		   type="javaee:ejb-local-refType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:group ref="javaee:service-refGroup"/>
+      <xsd:element name="resource-ref"
+		   type="javaee:resource-refType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="resource-env-ref"
+		   type="javaee:resource-env-refType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="message-destination-ref"
+		   type="javaee:message-destination-refType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="persistence-context-ref"
+		   type="javaee:persistence-context-refType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="persistence-unit-ref"
+		   type="javaee:persistence-unit-refType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="post-construct"
+		   type="javaee:lifecycle-callbackType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="pre-destroy"
+		   type="javaee:lifecycle-callbackType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:group>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="lifecycle-callbackType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The lifecycle-callback type specifies a method on a
+	class to be called when a lifecycle event occurs.
+	Note that each class may have only one lifecycle callback
+        method for any given event and that the method may not
+	be overloaded.
+
+        If the lifefycle-callback-class element is missing then
+        the class defining the callback is assumed to be the
+        component class in scope at the place in the descriptor
+        in which the callback definition appears.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="lifecycle-callback-class"
+		   type="javaee:fully-qualified-classType"
+                   minOccurs="0"/>
+      <xsd:element name="lifecycle-callback-method"
+		   type="javaee:java-identifierType"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="listenerType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The listenerType indicates the deployment properties for a web
+	application listener bean.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:group ref="javaee:descriptionGroup"/>
+      <xsd:element name="listener-class"
+		   type="javaee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The listener-class element declares a class in the
+	    application must be registered as a web
+	    application listener bean. The value is the fully
+	    qualified classname of the listener class.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="local-homeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The local-homeType defines the fully-qualified
+	name of an enterprise bean's local home interface.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:fully-qualified-classType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="localType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The localType defines the fully-qualified name of an
+	enterprise bean's local interface.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:fully-qualified-classType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="message-destination-linkType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The message-destination-linkType is used to link a message
+	destination reference or message-driven bean to a message
+	destination.
+
+	The Assembler sets the value to reflect the flow of messages
+	between producers and consumers in the application.
+
+	The value must be the message-destination-name of a message
+	destination in the same Deployment File or in another
+	Deployment File in the same Java EE application unit.
+
+	Alternatively, the value may be composed of a path name
+	specifying a Deployment File containing the referenced
+	message destination with the message-destination-name of the
+	destination appended and separated from the path name by
+	"#". The path name is relative to the Deployment File
+	containing Deployment Component that is referencing the
+	message destination.  This allows multiple message
+	destinations with the same name to be uniquely identified.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="message-destination-refType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
+
+	  The message-destination-ref element contains a declaration
+	  of Deployment Component's reference to a message destination
+	  associated with a resource in Deployment Component's
+	  environment. It consists of:
+
+		  - an optional description
+		  - the message destination reference name
+		  - an optional message destination type
+		  - an optional specification as to whether
+		    the destination is used for
+		    consuming or producing messages, or both.
+		    if not specified, "both" is assumed.
+		  - an optional link to the message destination
+		  - optional injection targets
+
+	  The message destination type must be supplied unless an
+	  injection target is specified, in which case the type
+	  of the target is used.  If both are specified, the type
+	  must be assignment compatible with the type of the injection
+	  target.
+
+	  Examples:
+
+	  <message-destination-ref>
+		  <message-destination-ref-name>jms/StockQueue
+		  </message-destination-ref-name>
+		  <message-destination-type>javax.jms.Queue
+		  </message-destination-type>
+		  <message-destination-usage>Consumes
+		  </message-destination-usage>
+		  <message-destination-link>CorporateStocks
+		  </message-destination-link>
+	  </message-destination-ref>
+
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="message-destination-ref-name"
+		   type="javaee:jndi-nameType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The message-destination-ref-name element specifies
+	    the name of a message destination reference; its
+	    value is the environment entry name used in
+	    Deployment Component code.  The name is a JNDI name
+	    relative to the java:comp/env context and must be
+	    unique within an ejb-jar (for enterprise beans) or a
+	    Deployment File (for others).
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="message-destination-type"
+		   type="javaee:message-destination-typeType"
+		   minOccurs="0"/>
+      <xsd:element name="message-destination-usage"
+		   type="javaee:message-destination-usageType"
+		   minOccurs="0"/>
+      <xsd:element name="message-destination-link"
+		   type="javaee:message-destination-linkType"
+		   minOccurs="0"/>
+
+      <xsd:group ref="javaee:resourceGroup"/>
+
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="message-destination-typeType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
+
+	  The message-destination-typeType specifies the type of
+	  the destination. The type is specified by the Java interface
+	  expected to be implemented by the destination.
+
+	  Example:
+
+	    <message-destination-type>javax.jms.Queue
+	    </message-destination-type>
+
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:fully-qualified-classType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="message-destination-usageType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The message-destination-usageType specifies the use of the
+	message destination indicated by the reference.  The value
+	indicates whether messages are consumed from the message
+	destination, produced for the destination, or both.  The
+	Assembler makes use of this information in linking producers
+	of a destination with its consumers.
+
+	The value of the message-destination-usage element must be
+	one of the following:
+	    Consumes
+	    Produces
+	    ConsumesProduces
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:enumeration value="Consumes"/>
+	<xsd:enumeration value="Produces"/>
+	<xsd:enumeration value="ConsumesProduces"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="message-destinationType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
+
+	  The message-destinationType specifies a message
+	  destination. The logical destination described by this
+	  element is mapped to a physical destination by the Deployer.
+
+	  The message destination element contains:
+
+		  - an optional description
+		  - an optional display-name
+		  - an optional icon
+		  - a message destination name which must be unique
+		    among message destination names within the same
+		    Deployment File.
+		  - an optional mapped name
+
+	  Example:
+
+	  <message-destination>
+		  <message-destination-name>CorporateStocks
+		  </message-destination-name>
+	  </message-destination>
+
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:group ref="javaee:descriptionGroup"/>
+      <xsd:element name="message-destination-name"
+		   type="javaee:string">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The message-destination-name element specifies a
+	    name for a message destination.  This name must be
+	    unique among the names of message destinations
+	    within the Deployment File.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="mapped-name"
+		   type="javaee:xsdStringType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+	    <![CDATA[
+
+	      A product specific name that this message destination
+	      should be mapped to.  Each message-destination-ref
+	      element that references this message destination will
+	      define a name in the namespace of the referencing
+	      component.  (It's a name in the JNDI java:comp/env
+	      namespace.)  Many application servers provide a way to
+	      map these local names to names of resources known to the
+	      application server.  This mapped name is often a global
+	      JNDI name, but may be a name of any form.  Each of the
+	      local names should be mapped to this same global name.
+
+	      Application servers are not required to support any
+	      particular form or type of mapped name, nor the ability
+	      to use mapped names.  The mapped name is
+	      product-dependent and often installation-dependent.  No
+	      use of a mapped name is portable.
+
+	      ]]>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="param-valueType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	This type is a general type that can be used to declare
+	parameter/value lists.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="param-name"
+		   type="javaee:string">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The param-name element contains the name of a
+	    parameter.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="param-value"
+		   type="javaee:xsdStringType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The param-value element contains the value of a
+	    parameter.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="pathType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The elements that use this type designate either a relative
+	path or an absolute path starting with a "/".
+
+	In elements that specify a pathname to a file within the
+	same Deployment File, relative filenames (i.e., those not
+	starting with "/") are considered relative to the root of
+	the Deployment File's namespace.  Absolute filenames (i.e.,
+	those starting with "/") also specify names in the root of
+	the Deployment File's namespace.  In general, relative names
+	are preferred.  The exception is .war files where absolute
+	names are preferred for consistency with the Servlet API.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="persistence-context-refType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
+
+	  The persistence-context-ref element contains a declaration
+	  of Deployment Component's reference to a persistence context
+	  associated within a Deployment Component's
+	  environment. It consists of:
+
+		  - an optional description
+		  - the persistence context reference name
+		  - an optional persistence unit name.  If not specified,
+                    the default persistence unit is assumed.
+		  - an optional specification as to whether
+		    the persistence context is Transactional or
+		    Extended.  If not specificed, Transactional is assumed.
+                  - an optional list of persistence properties
+		  - optional injection targets
+
+	  Examples:
+
+            <persistence-context-ref>
+              <persistence-context-ref-name>myPersistenceContext
+              </persistence-context-ref-name>
+            </persistence-context-ref>
+
+            <persistence-context-ref>
+              <persistence-context-ref-name>myPersistenceContext
+                </persistence-context-ref-name>
+              <persistence-unit-name>PersistenceUnit1
+                </persistence-unit-name>
+              <persistence-context-type>Extended</persistence-context-type>
+            </persistence-context-ref>
+
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="persistence-context-ref-name"
+		   type="javaee:jndi-nameType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The persistence-context-ref-name element specifies
+	    the name of a persistence context reference; its
+	    value is the environment entry name used in
+	    Deployment Component code.  The name is a JNDI name
+	    relative to the java:comp/env context.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="persistence-unit-name"
+		   type="javaee:string"
+		   minOccurs="0">
+        <xsd:annotation>
+	  <xsd:documentation>
+
+            The Application Assembler(or BeanProvider) may use the
+            following syntax to avoid the need to rename persistence
+            units to have unique names within a Java EE application.
+
+            The Application Assembler specifies the pathname of the
+            root of the persistence.xml file for the referenced
+            persistence unit and appends the name of the persistence
+            unit separated from the pathname by #. The pathname is
+            relative to the referencing application component jar file.
+            In this manner, multiple persistence units with the same
+            persistence unit name may be uniquely identified when the
+            Application Assembler cannot change persistence unit names.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="persistence-context-type"
+		   type="javaee:persistence-context-typeType"
+		   minOccurs="0"/>
+
+      <xsd:element name="persistence-property"
+		   type="javaee:propertyType"
+		   minOccurs="0"
+		   maxOccurs="unbounded">
+        <xsd:annotation>
+	  <xsd:documentation>
+
+            Used to specify properties for the container or persistence
+            provider.  Vendor-specific properties may be included in
+            the set of properties.  Properties that are not recognized
+            by a vendor must be ignored.  Entries that make use of the
+            namespace javax.persistence and its subnamespaces must not
+            be used for vendor-specific properties.  The namespace
+            javax.persistence is reserved for use by the specification.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:group ref="javaee:resourceGroup"/>
+
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="persistence-context-typeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The persistence-context-typeType specifies the transactional
+	nature of a persistence context reference.
+
+	The value of the persistence-context-type element must be
+	one of the following:
+	    Transactional
+            Extended
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:enumeration value="Transactional"/>
+	<xsd:enumeration value="Extended"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="persistence-unit-refType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
+
+	  The persistence-unit-ref element contains a declaration
+	  of Deployment Component's reference to a persistence unit
+	  associated within a Deployment Component's
+	  environment. It consists of:
+
+		  - an optional description
+		  - the persistence unit reference name
+		  - an optional persistence unit name.  If not specified,
+                    the default persistence unit is assumed.
+		  - optional injection targets
+
+	  Examples:
+
+            <persistence-unit-ref>
+              <persistence-unit-ref-name>myPersistenceUnit
+              </persistence-unit-ref-name>
+            </persistence-unit-ref>
+
+            <persistence-unit-ref>
+              <persistence-unit-ref-name>myPersistenceUnit
+                </persistence-unit-ref-name>
+              <persistence-unit-name>PersistenceUnit1
+                </persistence-unit-name>
+            </persistence-unit-ref>
+
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="persistence-unit-ref-name"
+		   type="javaee:jndi-nameType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The persistence-unit-ref-name element specifies
+	    the name of a persistence unit reference; its
+	    value is the environment entry name used in
+	    Deployment Component code.  The name is a JNDI name
+	    relative to the java:comp/env context.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="persistence-unit-name"
+		   type="javaee:string"
+		   minOccurs="0">
+        <xsd:annotation>
+	  <xsd:documentation>
+
+            The Application Assembler(or BeanProvider) may use the
+            following syntax to avoid the need to rename persistence
+            units to have unique names within a Java EE application.
+
+            The Application Assembler specifies the pathname of the
+            root of the persistence.xml file for the referenced
+            persistence unit and appends the name of the persistence
+            unit separated from the pathname by #. The pathname is
+            relative to the referencing application component jar file.
+            In this manner, multiple persistence units with the same
+            persistence unit name may be uniquely identified when the
+            Application Assembler cannot change persistence unit names.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:group ref="javaee:resourceGroup"/>
+
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="propertyType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	Specifies a name/value pair.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="name"
+		   type="javaee:xsdStringType">
+      </xsd:element>
+      <xsd:element name="value"
+		   type="javaee:xsdStringType">
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="remoteType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
+
+	  The remote element contains the fully-qualified name
+	  of the enterprise bean's remote interface.
+
+	  Example:
+
+	      <remote>com.wombat.empl.EmployeeService</remote>
+
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:fully-qualified-classType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="res-authType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The res-authType specifies whether the Deployment Component
+	code signs on programmatically to the resource manager, or
+	whether the Container will sign on to the resource manager
+	on behalf of the Deployment Component. In the latter case,
+	the Container uses information that is supplied by the
+	Deployer.
+
+	The value must be one of the two following:
+
+	    Application
+	    Container
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:enumeration value="Application"/>
+	<xsd:enumeration value="Container"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="res-sharing-scopeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The res-sharing-scope type specifies whether connections
+	obtained through the given resource manager connection
+	factory reference can be shared. The value, if specified,
+	must be one of the two following:
+
+	    Shareable
+	    Unshareable
+
+	The default value is Shareable.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:enumeration value="Shareable"/>
+	<xsd:enumeration value="Unshareable"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="resource-env-refType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
+
+	  The resource-env-refType is used to define
+	  resource-env-type elements.  It contains a declaration of a
+	  Deployment Component's reference to an administered object
+	  associated with a resource in the Deployment Component's
+	  environment.  It consists of an optional description, the
+	  resource environment reference name, and an optional
+	  indication of the resource environment reference type
+	  expected by the Deployment Component code.
+
+	  It also includes optional elements to define injection of
+	  the named resource into fields or JavaBeans properties.
+
+	  The resource environment type must be supplied unless an
+	  injection target is specified, in which case the type
+	  of the target is used.  If both are specified, the type
+	  must be assignment compatible with the type of the injection
+	  target.
+
+	  Example:
+
+	  <resource-env-ref>
+	      <resource-env-ref-name>jms/StockQueue
+	      </resource-env-ref-name>
+	      <resource-env-ref-type>javax.jms.Queue
+	      </resource-env-ref-type>
+	  </resource-env-ref>
+
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="resource-env-ref-name"
+		   type="javaee:jndi-nameType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The resource-env-ref-name element specifies the name
+	    of a resource environment reference; its value is
+	    the environment entry name used in
+	    the Deployment Component code.  The name is a JNDI
+	    name relative to the java:comp/env context and must
+	    be unique within a Deployment Component.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="resource-env-ref-type"
+		   type="javaee:fully-qualified-classType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The resource-env-ref-type element specifies the type
+	    of a resource environment reference.  It is the
+	    fully qualified name of a Java language class or
+	    interface.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:group ref="javaee:resourceGroup"/>
+
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="resource-refType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
+
+	  The resource-refType contains a declaration of a
+	  Deployment Component's reference to an external resource. It
+	  consists of an optional description, the resource manager
+	  connection factory reference name, an optional indication of
+	  the resource manager connection factory type expected by the
+	  Deployment Component code, an optional type of authentication
+	  (Application or Container), and an optional specification of
+	  the shareability of connections obtained from the resource
+	  (Shareable or Unshareable).
+
+	  It also includes optional elements to define injection of
+	  the named resource into fields or JavaBeans properties.
+
+	  The connection factory type must be supplied unless an
+	  injection target is specified, in which case the type
+	  of the target is used.  If both are specified, the type
+	  must be assignment compatible with the type of the injection
+	  target.
+
+	  Example:
+
+	  <resource-ref>
+	      <res-ref-name>jdbc/EmployeeAppDB</res-ref-name>
+	      <res-type>javax.sql.DataSource</res-type>
+	      <res-auth>Container</res-auth>
+	      <res-sharing-scope>Shareable</res-sharing-scope>
+	  </resource-ref>
+
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="res-ref-name"
+		   type="javaee:jndi-nameType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The res-ref-name element specifies the name of a
+	    resource manager connection factory reference.
+	    The name is a JNDI name relative to the
+	    java:comp/env context.
+	    The name must be unique within a Deployment File.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="res-type"
+		   type="javaee:fully-qualified-classType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The res-type element specifies the type of the data
+	    source. The type is specified by the fully qualified
+	    Java language class or interface
+	    expected to be implemented by the data source.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="res-auth"
+		   type="javaee:res-authType"
+		   minOccurs="0"/>
+
+      <xsd:element name="res-sharing-scope"
+		   type="javaee:res-sharing-scopeType"
+		   minOccurs="0"/>
+
+      <xsd:group ref="javaee:resourceGroup"/>
+
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:group name="resourceGroup">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	This group collects elements that are common to all the
+	JNDI resource elements.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="mapped-name"
+		   type="javaee:xsdStringType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+	    <![CDATA[
+
+	      A product specific name that this resource should be
+	      mapped to.  The name of this resource, as defined by the
+	      resource's name element or defaulted, is a name that is
+	      local to the application component using the resource.
+	      (It's a name in the JNDI java:comp/env namespace.)  Many
+	      application servers provide a way to map these local
+	      names to names of resources known to the application
+	      server.  This mapped name is often a global JNDI name,
+	      but may be a name of any form.
+
+	      Application servers are not required to support any
+	      particular form or type of mapped name, nor the ability
+	      to use mapped names.  The mapped name is
+	      product-dependent and often installation-dependent.  No
+	      use of a mapped name is portable.
+
+	      ]]>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="injection-target"
+		   type="javaee:injection-targetType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:group>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="role-nameType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The role-nameType designates the name of a security role.
+
+	The name must conform to the lexical rules for a token.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="run-asType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The run-asType specifies the run-as identity to be
+	used for the execution of a component. It contains an
+	optional description, and the name of a security role.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="role-name"
+		   type="javaee:role-nameType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="security-role-refType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The security-role-refType contains the declaration of a
+	security role reference in a component's or a
+	Deployment Component's code. The declaration consists of an
+	optional description, the security role name used in the
+	code, and an optional link to a security role. If the
+	security role is not specified, the Deployer must choose an
+	appropriate security role.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="role-name"
+		   type="javaee:role-nameType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The value of the role-name element must be the String used
+	    as the parameter to the
+	    EJBContext.isCallerInRole(String roleName) method or the
+	    HttpServletRequest.isUserInRole(String role) method.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="role-link"
+		   type="javaee:role-nameType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The role-link element is a reference to a defined
+	    security role. The role-link element must contain
+	    the name of one of the security roles defined in the
+	    security-role elements.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="security-roleType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
+
+	  The security-roleType contains the definition of a security
+	  role. The definition consists of an optional description of
+	  the security role, and the security role name.
+
+	  Example:
+
+	      <security-role>
+	      <description>
+		  This role includes all employees who are authorized
+		  to access the employee service application.
+	      </description>
+	      <role-name>employee</role-name>
+	      </security-role>
+
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="role-name"
+		   type="javaee:role-nameType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="string">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	This is a special string datatype that is defined by Java EE as
+	a base type for defining collapsed strings. When schemas
+	require trailing/leading space elimination as well as
+	collapsing the existing whitespace, this base type may be
+	used.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:token">
+	<xsd:attribute name="id" type="xsd:ID"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="true-falseType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	This simple type designates a boolean with only two
+	permissible values
+
+	- true
+	- false
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:xsdBooleanType">
+	<xsd:pattern value="(true|false)"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="url-patternType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The url-patternType contains the url pattern of the mapping.
+	It must follow the rules specified in Section 11.2 of the
+	Servlet API Specification. This pattern is assumed to be in
+	URL-decoded form and must not contain CR(#xD) or LF(#xA).
+	If it contains those characters, the container must inform
+	the developer with a descriptive error message.
+	The container must preserve all characters including whitespaces.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:string"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="xsdAnyURIType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	This type adds an "id" attribute to xsd:anyURI.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:anyURI">
+	<xsd:attribute name="id" type="xsd:ID"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="xsdBooleanType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	This type adds an "id" attribute to xsd:boolean.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:boolean">
+	<xsd:attribute name="id" type="xsd:ID"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="xsdIntegerType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	This type adds an "id" attribute to xsd:integer.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:integer">
+	<xsd:attribute name="id" type="xsd:ID"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="xsdNMTOKENType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	This type adds an "id" attribute to xsd:NMTOKEN.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:NMTOKEN">
+	<xsd:attribute name="id" type="xsd:ID"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="xsdNonNegativeIntegerType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	This type adds an "id" attribute to xsd:nonNegativeInteger.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:nonNegativeInteger">
+	<xsd:attribute name="id" type="xsd:ID"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="xsdPositiveIntegerType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	This type adds an "id" attribute to xsd:positiveInteger.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:positiveInteger">
+	<xsd:attribute name="id" type="xsd:ID"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="xsdQNameType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	This type adds an "id" attribute to xsd:QName.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:QName">
+	<xsd:attribute name="id" type="xsd:ID"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="xsdStringType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	This type adds an "id" attribute to xsd:string.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:string">
+	<xsd:attribute name="id" type="xsd:ID"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+</xsd:schema>
+
diff --git a/xml/tests/testData/generateTag/spring-beans_3.0.xsd b/xml/tests/testData/generateTag/spring-beans_3.0.xsd
new file mode 100644
index 000000000000..0d6b8483de2b
--- /dev/null
+++ b/xml/tests/testData/generateTag/spring-beans_3.0.xsd
@@ -0,0 +1,1162 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<xsd:schema xmlns="http://www.springframework.org/schema/beans"
+		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+		targetNamespace="http://www.springframework.org/schema/beans">
+
+	<xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+
+	<xsd:annotation>
+		<xsd:documentation><![CDATA[
+	Spring XML Beans Schema, version 2.5
+	Authors: Rob Harrop, Juergen Hoeller, Mark Fisher
+
+	This defines a simple and consistent way of creating a namespace
+	of JavaBeans objects, managed by a Spring BeanFactory, read by
+	XmlBeanDefinitionReader (with DefaultBeanDefinitionDocumentReader).
+
+	This document type is used by most Spring functionality, including
+	web application contexts, which are based on bean factories.
+
+	Each "bean" element in this document defines a JavaBean.
+	Typically the bean class is specified, along with JavaBean properties
+	and/or constructor arguments.
+
+	A bean instance can be a "singleton" (shared instance) or a "prototype"
+	(independent instance). Further scopes can be provided by extended
+	bean factories, for example in a web environment.
+
+	References among beans are supported, that is, setting a JavaBean property
+	or a constructor argument to refer to another bean in the same factory
+	(or an ancestor factory).
+
+	As alternative to bean references, "inner bean definitions" can be used.
+	Singleton flags of such inner bean definitions are effectively ignored:
+	inner beans are typically anonymous prototypes.
+
+	There is also support for lists, sets, maps, and java.util.Properties
+	as bean property types or constructor argument types.
+		]]></xsd:documentation>
+	</xsd:annotation>
+
+	<!-- base types -->
+	<xsd:complexType name="identifiedType" abstract="true">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	The unique identifier for a bean. The scope of the identifier
+	is the enclosing bean factory.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:attribute name="id" type="xsd:ID">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	The unique identifier for a bean.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<!-- Top-level <beans> tag -->
+	<xsd:element name="beans">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	The top level (typically root) element. Allows the definition
+	of default values for all nested bean definitions.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element ref="description" minOccurs="0"/>
+				<xsd:choice minOccurs="0" maxOccurs="unbounded">
+					<xsd:element ref="import"/>
+					<xsd:element ref="alias"/>
+					<xsd:element ref="bean"/>
+					<xsd:any namespace="##other" processContents="strict" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:choice>
+			</xsd:sequence>
+			<xsd:attribute name="default-lazy-init" default="false" type="xsd:boolean">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The default 'lazy-init' value; see the documentation for the
+	'lazy-init' attribute of the '<bean>/' element.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="default-merge" default="false" type="xsd:boolean">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The default 'merge' value; see the documentation for the
+	'merge' attribute of the various collection elements.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="default-autowire" default="no">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The default 'autowire' value; see the documentation for the
+	'autowire' attribute of the '<bean>/' element.
+					]]></xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:restriction base="xsd:NMTOKEN">
+						<xsd:enumeration value="no"/>
+						<xsd:enumeration value="byName"/>
+						<xsd:enumeration value="byType"/>
+						<xsd:enumeration value="constructor"/>
+						<xsd:enumeration value="autodetect"/>
+					</xsd:restriction>
+				</xsd:simpleType>
+			</xsd:attribute>
+			<xsd:attribute name="default-dependency-check" default="none">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The default 'dependency-check' value; see the documentation for the
+	'dependency-check' attribute of the '<bean>/' element.
+					]]></xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:restriction base="xsd:NMTOKEN">
+						<xsd:enumeration value="none"/>
+						<xsd:enumeration value="simple"/>
+						<xsd:enumeration value="objects"/>
+						<xsd:enumeration value="all"/>
+					</xsd:restriction>
+				</xsd:simpleType>
+			</xsd:attribute>
+			<xsd:attribute name="default-autowire-candidates" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	A default bean name pattern for identifying autowire candidates:
+	e.g. "*Service", "data*", "*Service*", "data*Service".
+	Also accepts a comma-separated list of patterns: e.g. "*Service,*Dao".
+	See the documentation for the 'autowire-candidate' attribute of the
+	'<bean/>' element for the semantic details of autowire candidate beans.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="default-init-method" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The default 'init-method' value; see the documentation for the
+	'init-method' attribute of the '<bean>/' element.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="default-destroy-method" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The default 'destroy-method' value; see the documentation for the
+	'destroy-method' attribute of the '<bean>/' element.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:anyAttribute namespace="##other" processContents="lax"/>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="description">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Contains informative text describing the purpose of the enclosing element.
+	Used primarily for user documentation of XML bean definition documents.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType mixed="true">
+			<xsd:choice minOccurs="0" maxOccurs="unbounded"/>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="import">
+		<xsd:annotation>
+			<xsd:documentation source="java:org.springframework.core.io.Resource"><![CDATA[
+	Specifies an XML bean definition resource to import.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:restriction base="xsd:anyType">
+					<xsd:attribute name="resource" type="xsd:string" use="required">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	The relative resource location of the XML (bean definition) file to import,
+	for example "myImport.xml" or "includes/myImport.xml" or "../myImport.xml".
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+				</xsd:restriction>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="alias">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Defines an alias for a bean (which can reside in a different definition
+	resource).
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:restriction base="xsd:anyType">
+					<xsd:attribute name="name" type="xsd:string" use="required">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	The name of the bean to define an alias for.
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+					<xsd:attribute name="alias" type="xsd:string" use="required">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	The alias name to define for the bean.
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+				</xsd:restriction>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:group name="beanElements">
+		<xsd:sequence>
+			<xsd:element ref="description" minOccurs="0"/>
+			<xsd:choice minOccurs="0" maxOccurs="unbounded">
+				<xsd:element ref="meta"/>
+				<xsd:element ref="constructor-arg"/>
+				<xsd:element ref="property"/>
+				<xsd:element ref="qualifier"/>
+				<xsd:element ref="lookup-method"/>
+				<xsd:element ref="replaced-method"/>
+				<xsd:any namespace="##other" processContents="strict" minOccurs="0" maxOccurs="unbounded"/>
+			</xsd:choice>
+		</xsd:sequence>
+	</xsd:group>
+
+	<xsd:attributeGroup name="beanAttributes">
+		<xsd:attribute name="name" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	Can be used to create one or more aliases illegal in an (XML) id.
+	Multiple aliases can be separated by any number of spaces, commas,
+	or semi-colons (or indeed any mixture of the three).
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="class" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:java.lang.Class"><![CDATA[
+	The fully qualified name of the bean's class, except if it serves only
+	as a parent definition for child bean definitions.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="parent" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	The name of the parent bean definition.
+
+	Will use the bean class of the parent if none is specified, but can
+	also override it. In the latter case, the child bean class must be
+	compatible with the parent, i.e. accept the parent's property values
+	and constructor argument values, if any.
+
+	A child bean definition will inherit constructor argument values,
+	property values and method overrides from the parent, with the option
+	to add new values. If init method, destroy method, factory bean and/or
+	factory method are specified, they will override the corresponding
+	parent settings.
+
+	The remaining settings will always be taken from the child definition:
+	depends on, autowire mode, dependency check, scope, lazy init.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="scope" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	The scope of this bean: typically "singleton" (one shared instance,
+	which will be returned by all calls to getBean with the given id), or
+	"prototype" (independent instance resulting from each call to getBean).
+	Default is "singleton".
+
+	Singletons are most commonly used, and are ideal for multi-threaded
+	service objects. Further scopes, such as "request" or "session", might
+	be supported by extended bean factories (e.g. in a web environment).
+
+	Note: This attribute will not be inherited by child bean definitions.
+	Hence, it needs to be specified per concrete bean definition.
+
+	Inner bean definitions inherit the singleton status of their containing
+	bean definition, unless explicitly specified: The inner bean will be a
+	singleton if the containing bean is a singleton, and a prototype if
+	the containing bean has any other scope.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="abstract" type="xsd:boolean">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	Is this bean "abstract", that is, not meant to be instantiated itself
+	but rather just serving as parent for concrete child bean definitions?
+	The default is "false". Specify "true" to tell the bean factory to not
+	try to instantiate that particular bean in any case.
+
+	Note: This attribute will not be inherited by child bean definitions.
+	Hence, it needs to be specified per abstract bean definition.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="lazy-init" default="default" type="defaultable-boolean">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	Indicates whether or not this bean is to be lazily initialized.
+	If false, it will be instantiated on startup by bean factories
+	that perform eager initialization of singletons. The default is
+	"false".
+
+	Note: This attribute will not be inherited by child bean definitions.
+	Hence, it needs to be specified per concrete bean definition.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="autowire" default="default">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	Controls whether bean properties are "autowired".
+	This is an automagical process in which bean references don't need
+	to be coded explicitly in the XML bean definition file, but rather the
+	Spring container works out dependencies.
+
+	There are 5 modes:
+
+	1. "no"
+	The traditional Spring default. No automagical wiring. Bean references
+	must be defined in the XML file via the <ref/> element (or "ref"
+	attribute). We recommend this in most cases as it makes documentation
+	more explicit.
+
+	2. "byName"
+	Autowiring by property name. If a bean of class Cat exposes a dog
+	property, Spring will try to set this to the value of the bean "dog"
+	in the current container. If there is no matching bean by name, nothing
+	special happens; use dependency-check="objects" to raise an error in
+	that case.
+
+	3. "byType"
+	Autowiring if there is exactly one bean of the property type in the
+	container. If there is more than one, a fatal error is raised, and
+	you cannot use byType autowiring for that bean. If there is none,
+	nothing special happens; use dependency-check="objects" to raise an
+	error in that case.
+
+	4. "constructor"
+	Analogous to "byType" for constructor arguments. If there is not exactly
+	one bean of the constructor argument type in the bean factory, a fatal
+	error is raised.
+
+	5. "autodetect"
+	Chooses "constructor" or "byType" through introspection of the bean
+	class. If a default constructor is found, "byType" gets applied.
+
+	Note that explicit dependencies, i.e. "property" and "constructor-arg"
+	elements, always override autowiring. Autowire behavior can be combined
+	with dependency checking, which will be performed after all autowiring
+	has been completed.
+
+	Note: This attribute will not be inherited by child bean definitions.
+	Hence, it needs to be specified per concrete bean definition.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:restriction base="xsd:NMTOKEN">
+					<xsd:enumeration value="default"/>
+					<xsd:enumeration value="no"/>
+					<xsd:enumeration value="byName"/>
+					<xsd:enumeration value="byType"/>
+					<xsd:enumeration value="constructor"/>
+					<xsd:enumeration value="autodetect"/>
+				</xsd:restriction>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="dependency-check" default="default">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	Controls whether or not to check whether all of this
+	bean's dependencies, expressed in its properties, are satisfied.
+	The default is to perform no dependency checking.
+
+	"simple" type dependency checking includes primitives and String;
+	"objects" includes collaborators (other beans in the factory);
+	"all" includes both types of dependency checking.
+
+	Note: This attribute will not be inherited by child bean definitions.
+	Hence, it needs to be specified per concrete bean definition.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:restriction base="xsd:NMTOKEN">
+					<xsd:enumeration value="default"/>
+					<xsd:enumeration value="none"/>
+					<xsd:enumeration value="simple"/>
+					<xsd:enumeration value="objects"/>
+					<xsd:enumeration value="all"/>
+				</xsd:restriction>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="depends-on" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	The names of the beans that this bean depends on being initialized.
+	The bean factory will guarantee that these beans get initialized
+	before this bean.
+
+	Note that dependencies are normally expressed through bean properties
+	or constructor arguments. This property should just be necessary for
+	other kinds of dependencies like statics (*ugh*) or database preparation
+	on startup.
+
+	Note: This attribute will not be inherited by child bean definitions.
+	Hence, it needs to be specified per concrete bean definition.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="autowire-candidate" default="default" type="defaultable-boolean">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	Indicates whether or not this bean should be considered when looking
+	for matching candidates to satisfy another bean's autowiring requirements.
+	Note that this does not affect explicit references by name, which will get
+	resolved even if the specified bean is not marked as an autowire candidate.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="primary" type="xsd:boolean">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	Specifies that this bean should be given preference when multiple
+	candidates are qualified to autowire a single-valued dependency.
+	If exactly one 'primary' bean exists among the candidates, it
+	will be the autowired value.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="init-method" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	The name of the custom initialization method to invoke after setting
+	bean properties. The method must have no arguments, but may throw any
+	exception.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="destroy-method" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	The name of the custom destroy method to invoke on bean factory
+	shutdown. The method must have no arguments, but may throw any
+	exception.
+
+	Note: Only invoked on beans whose lifecycle is under the full
+	control of the factory - which is always the case for singletons,
+	but not guaranteed for any other scope.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="factory-method" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	The name of a factory method to use to create this object. Use
+	constructor-arg elements to specify arguments to the factory method,
+	if it takes arguments. Autowiring does not apply to factory methods.
+
+	If the "class" attribute is present, the factory method will be a static
+	method on the class specified by the "class" attribute on this bean
+	definition. Often this will be the same class as that of the constructed
+	object - for example, when the factory method is used as an alternative
+	to a constructor. However, it may be on a different class. In that case,
+	the created object will *not* be of the class specified in the "class"
+	attribute. This is analogous to FactoryBean behavior.
+
+	If the "factory-bean" attribute is present, the "class" attribute is not
+	used, and the factory method will be an instance method on the object
+	returned from a getBean call with the specified bean name. The factory
+	bean may be defined as a singleton or a prototype.
+
+	The factory method can have any number of arguments. Autowiring is not
+	supported. Use indexed constructor-arg elements in conjunction with the
+	factory-method attribute.
+
+	Setter Injection can be used in conjunction with a factory method.
+	Method Injection cannot, as the factory method returns an instance,
+	which will be used when the container creates the bean.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="factory-bean" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	Alternative to class attribute for factory-method usage.
+	If this is specified, no class attribute should be used.
+	This must be set to the name of a bean in the current or
+	ancestor factories that contains the relevant factory method.
+	This allows the factory itself to be configured using Dependency
+	Injection, and an instance (rather than static) method to be used.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:anyAttribute namespace="##other" processContents="lax"/>
+	</xsd:attributeGroup>
+
+	<xsd:element name="meta" type="metaType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Arbitrary metadata attached to a bean definition.
+			]]></xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+
+	<xsd:complexType name="metaType">
+		<xsd:attribute name="key" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	The key name of the metadata attribute being defined.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="value" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	The value of the metadata attribute being defined (as a simple String).
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<xsd:element name="bean">
+		<xsd:annotation>
+			<xsd:documentation source="java:org.springframework.beans.factory.config.BeanDefinition"><![CDATA[
+	Defines a single (usually named) bean.
+
+	A bean definition may contain nested tags for constructor arguments,
+	property values, lookup methods, and replaced methods. Mixing constructor
+	injection and setter injection on the same bean is explicitly supported.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:extension base="identifiedType">
+					<xsd:group ref="beanElements"/>
+					<xsd:attributeGroup ref="beanAttributes"/>
+				</xsd:extension>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="constructor-arg">
+		<xsd:annotation>
+			<xsd:documentation source="java:org.springframework.beans.factory.config.ConstructorArgumentValues">
+				<![CDATA[
+	Bean definitions can specify zero or more constructor arguments.
+	This is an alternative to "autowire constructor".
+	Arguments correspond to either a specific index of the constructor
+	argument list or are supposed to be matched generically by type.
+
+	Note: A single generic argument value will just be used once, rather
+	than potentially matched multiple times (as of Spring 1.1).
+
+	constructor-arg elements are also used in conjunction with the
+	factory-method element to construct beans using static or instance
+	factory methods.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element ref="description" minOccurs="0"/>
+				<xsd:choice minOccurs="0" maxOccurs="1">
+					<xsd:element ref="bean"/>
+					<xsd:element ref="ref"/>
+					<xsd:element ref="idref"/>
+					<xsd:element ref="value"/>
+					<xsd:element ref="null"/>
+					<xsd:element ref="list"/>
+					<xsd:element ref="set"/>
+					<xsd:element ref="map"/>
+					<xsd:element ref="props"/>
+					<xsd:any namespace="##other" processContents="strict"/>
+				</xsd:choice>
+			</xsd:sequence>
+			<xsd:attribute name="index" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The exact index of the argument in the constructor argument list.
+	Only needed to avoid ambiguities, e.g. in case of 2 arguments of
+	the exact same type.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="type" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The exact type of the constructor argument. Only needed to avoid
+	ambiguities, e.g. in case of 2 single argument constructors
+	that can both be converted from a String.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="ref" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	A short-cut alternative to a nested "<ref bean='...'/>" element.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="value" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	A short-cut alternative to a nested "<value>...<value/>" element.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="property" type="propertyType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Bean definitions can have zero or more properties.
+	Property elements correspond to JavaBean setter methods exposed
+	by the bean classes. Spring supports primitives, references to other
+	beans in the same or related factories, lists, maps and properties.
+			]]></xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+
+	<xsd:element name="qualifier">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Bean definitions can provide qualifiers to match against annotations
+	on a field or parameter for fine-grained autowire candidate resolution.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element ref="attribute" minOccurs="0" maxOccurs="unbounded"/>
+			</xsd:sequence>
+			<xsd:attribute name="type" type="xsd:string" default="org.springframework.beans.factory.annotation.Qualifier"/>
+			<xsd:attribute name="value" type="xsd:string"/>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="attribute" type="metaType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	A qualifier element may contain attribute child elements as key-value
+	pairs. These will be available for matching against attributes of a
+	qualifier annotation on an autowired field or parameter if present.
+			]]></xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+
+	<xsd:element name="lookup-method">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	A lookup method causes the IoC container to override the given method
+	and return the bean with the name given in the bean attribute. This is
+	a form of Method Injection. It is particularly useful as an alternative
+	to implementing the BeanFactoryAware interface, in order to be able to
+	make getBean() calls for non-singleton instances at runtime. In this
+	case, Method Injection is a less invasive alternative.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:restriction base="xsd:anyType">
+					<xsd:attribute name="name" type="xsd:string">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	The name of the lookup method. This method must take no arguments.
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+					<xsd:attribute name="bean" type="xsd:string">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	The name of the bean in the current or ancestor factories that
+	the lookup method should resolve to. Often this bean will be a
+	prototype, in which case the lookup method will return a distinct
+	instance on every invocation. This is useful for single-threaded objects.
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+				</xsd:restriction>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="replaced-method">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Similar to the lookup method mechanism, the replaced-method element
+	is used to control IoC container method overriding: Method Injection.
+	This mechanism allows the overriding of a method with arbitrary code.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:choice minOccurs="0" maxOccurs="unbounded">
+					<xsd:element ref="arg-type"/>
+				</xsd:choice>
+			</xsd:sequence>
+			<xsd:attribute name="name" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The name of the method whose implementation must be replaced by the
+	IoC container. If this method is not overloaded, there is no need
+	to use arg-type subelements. If this method is overloaded, arg-type
+	subelements must be used for all override definitions for the method.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="replacer" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation source="java:org.springframework.beans.factory.support.MethodReplacer"><![CDATA[
+	Bean name of an implementation of the MethodReplacer interface in the
+	current or ancestor factories. This may be a singleton or prototype
+	bean. If it is a prototype, a new instance will be used for each
+	method replacement. Singleton usage is the norm.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="arg-type">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Identifies an argument for a replaced method in the event of
+	method overloading.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType mixed="true">
+			<xsd:choice minOccurs="0" maxOccurs="unbounded"/>
+			<xsd:attribute name="match" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	Specification of the type of an overloaded method argument as a String.
+	For convenience, this may be a substring of the FQN. E.g. all the
+	following would match "java.lang.String":
+	- java.lang.String
+	- String
+	- Str
+
+	As the number of arguments will be checked also, this convenience
+	can often be used to save typing.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="ref">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Defines a reference to another bean in this factory or an external
+	factory (parent or included factory).
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:restriction base="xsd:anyType">
+					<xsd:attribute name="bean" type="xsd:string">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	The name of the referenced bean.
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+					<xsd:attribute name="local" type="xsd:IDREF">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	The name of the referenced bean. The value must be a bean ID and thus can
+	be checked by the XML parser. This is therefore the preferred technique
+	for referencing beans within the same bean factory XML file.
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+					<xsd:attribute name="parent" type="xsd:string">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	The name of the referenced bean in a parent factory.
+						]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+				</xsd:restriction>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="idref">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	The id of another bean in this factory or an external factory
+	(parent or included factory).
+	While a regular 'value' element could instead be used for the
+	same effect, using idref in this case allows validation of local
+	bean ids by the XML parser, and name completion by supporting tools.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:restriction base="xsd:anyType">
+					<xsd:attribute name="bean" type="xsd:string">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	The name of the referenced bean.
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+					<xsd:attribute name="local" type="xsd:IDREF">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	The name of the referenced bean. The value must be a bean ID and thus can
+	be checked by the XML parser. This is therefore the preferred technique
+	for referencing beans within the same bean factory XML file.
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+				</xsd:restriction>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="value">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Contains a string representation of a property value.
+	The property may be a string, or may be converted to the required
+	type using the JavaBeans PropertyEditor machinery. This makes it
+	possible for application developers to write custom PropertyEditor
+	implementations that can convert strings to arbitrary target objects.
+
+	Note that this is recommended for simple objects only. Configure
+	more complex objects by populating JavaBean properties with
+	references to other beans.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType mixed="true">
+			<xsd:choice minOccurs="0" maxOccurs="unbounded"/>
+			<xsd:attribute name="type" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The exact type that the value should be converted to. Only needed
+	if the type of the target property or constructor argument is
+	too generic: for example, in case of a collection element.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="null">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Denotes a Java null value. Necessary because an empty "value" tag
+	will resolve to an empty String, which will not be resolved to a
+	null value unless a special PropertyEditor does so.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType mixed="true">
+			<xsd:choice minOccurs="0" maxOccurs="unbounded"/>
+		</xsd:complexType>
+	</xsd:element>
+
+	<!-- Collection Elements -->
+	<xsd:group name="collectionElements">
+		<xsd:sequence>
+			<xsd:choice minOccurs="0" maxOccurs="unbounded">
+				<xsd:element ref="bean"/>
+				<xsd:element ref="ref"/>
+				<xsd:element ref="idref"/>
+				<xsd:element ref="value"/>
+				<xsd:element ref="null"/>
+				<xsd:element ref="list"/>
+				<xsd:element ref="set"/>
+				<xsd:element ref="map"/>
+				<xsd:element ref="props"/>
+				<xsd:any namespace="##other" processContents="strict" minOccurs="0" maxOccurs="unbounded"/>
+			</xsd:choice>
+		</xsd:sequence>
+	</xsd:group>
+
+	<xsd:element name="list">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	A list can contain multiple inner bean, ref, collection, or value elements.
+	A list can also map to an array type; the necessary conversion is performed
+	automatically.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:extension base="listOrSetType">
+					<xsd:attribute name="merge" type="defaultable-boolean">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	Enables/disables merging for collections when using parent/child beans.
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+				</xsd:extension>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="set">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	A set can contain multiple inner bean, ref, collection, or value elements.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:extension base="listOrSetType">
+					<xsd:attribute name="merge" type="defaultable-boolean">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	Enables/disables merging for collections when using parent/child beans.
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+				</xsd:extension>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="map">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	A mapping from a key to an object. Maps may be empty.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:extension base="mapType">
+					<xsd:attribute name="merge" type="defaultable-boolean">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	Enables/disables merging for collections when using parent/child beans.
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+				</xsd:extension>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="entry" type="entryType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	A map entry can be an inner bean, ref, value, or collection.
+	The key of the entry is given by the "key" attribute or child element.
+			]]></xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+
+	<xsd:element name="props">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Props elements differ from map elements in that values must be strings.
+	Props may be empty.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:extension base="propsType">
+					<xsd:attribute name="merge" type="defaultable-boolean">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	Enables/disables merging for collections when using parent/child beans.
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+				</xsd:extension>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="key">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	A key element can contain an inner bean, ref, value, or collection.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:group ref="collectionElements"/>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="prop">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	The string value of the property. Note that whitespace is trimmed
+	off to avoid unwanted whitespace caused by typical XML formatting.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType mixed="true">
+			<xsd:choice minOccurs="0" maxOccurs="unbounded"/>
+			<xsd:attribute name="key" type="xsd:string" use="required">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The key of the property entry.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:complexType name="propertyType">
+		<xsd:sequence>
+			<xsd:element ref="description" minOccurs="0"/>
+			<xsd:choice minOccurs="0" maxOccurs="1">
+				<xsd:element ref="meta"/>
+				<xsd:element ref="bean"/>
+				<xsd:element ref="ref"/>
+				<xsd:element ref="idref"/>
+				<xsd:element ref="value"/>
+				<xsd:element ref="null"/>
+				<xsd:element ref="list"/>
+				<xsd:element ref="set"/>
+				<xsd:element ref="map"/>
+				<xsd:element ref="props"/>
+				<xsd:any namespace="##other" processContents="strict"/>
+			</xsd:choice>
+		</xsd:sequence>
+		<xsd:attribute name="name" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	The name of the property, following JavaBean naming conventions.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="ref" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	A short-cut alternative to a nested "<ref bean='...'/>".
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="value" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	A short-cut alternative to a nested "<value>...</value>" element.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<!-- Collection Types -->
+
+	<!-- base type for collections that have (possibly) typed nested values -->
+	<xsd:complexType name="collectionType">
+		<xsd:attribute name="value-type" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:java.lang.Class"><![CDATA[
+	The default Java type for nested values. Must be a fully qualified
+	class name.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<!-- 'list' and 'set' collection type -->
+	<xsd:complexType name="listOrSetType">
+		<xsd:complexContent>
+			<xsd:extension base="collectionType">
+				<xsd:group ref="collectionElements"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<!-- 'map' element type -->
+	<xsd:complexType name="mapType">
+		<xsd:complexContent>
+			<xsd:extension base="collectionType">
+				<xsd:sequence>
+					<xsd:choice minOccurs="0" maxOccurs="unbounded">
+						<xsd:element ref="entry"/>
+					</xsd:choice>
+				</xsd:sequence>
+				<xsd:attribute name="key-type" type="xsd:string">
+					<xsd:annotation>
+						<xsd:documentation source="java:java.lang.Class"><![CDATA[
+	The default Java type for nested entry keys. Must be a fully qualified
+	class name.
+						]]></xsd:documentation>
+					</xsd:annotation>
+				</xsd:attribute>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<!-- 'entry' element type -->
+	<xsd:complexType name="entryType">
+		<xsd:sequence>
+			<xsd:element ref="key" minOccurs="0"/>
+			<xsd:group ref="collectionElements"/>
+		</xsd:sequence>
+		<xsd:attribute name="key" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	Each map element must specify its key as attribute or as child element.
+	A key attribute is always a String value.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="key-ref" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	A short-cut alternative to a to a "key" element with a nested
+	"<ref bean='...'/>".
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="value" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	A short-cut alternative to a nested "<value>...</value>"
+	element.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="value-ref" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	A short-cut alternative to a nested "<ref bean='...'/>".
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<!-- 'props' collection type -->
+	<xsd:complexType name="propsType">
+		<xsd:complexContent>
+			<xsd:extension base="collectionType">
+				<xsd:sequence>
+					<xsd:choice minOccurs="0" maxOccurs="unbounded">
+						<xsd:element ref="prop"/>
+					</xsd:choice>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<!-- simple internal types -->
+	<xsd:simpleType name="defaultable-boolean">
+		<xsd:restriction base="xsd:NMTOKEN">
+			<xsd:enumeration value="default"/>
+			<xsd:enumeration value="true"/>
+			<xsd:enumeration value="false"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+</xsd:schema>
diff --git a/xml/tests/testData/generateTag/spring.xml b/xml/tests/testData/generateTag/spring.xml
new file mode 100644
index 000000000000..d1de923b46c3
--- /dev/null
+++ b/xml/tests/testData/generateTag/spring.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+       spring-beans_3.0.xsd">
+
+  <caret>
+</beans>
\ No newline at end of file
diff --git a/xml/tests/testData/generateTag/springAfterBean.xml b/xml/tests/testData/generateTag/springAfterBean.xml
new file mode 100644
index 000000000000..060afedb5f53
--- /dev/null
+++ b/xml/tests/testData/generateTag/springAfterBean.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+       spring-beans_3.0.xsd">
+
+  <bean id="old"/>
+
+  <caret>
+
+</beans>
\ No newline at end of file
diff --git a/xml/tests/testData/generateTag/springAfterBean_after.xml b/xml/tests/testData/generateTag/springAfterBean_after.xml
new file mode 100644
index 000000000000..34f3dd701250
--- /dev/null
+++ b/xml/tests/testData/generateTag/springAfterBean_after.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+       spring-beans_3.0.xsd">
+
+  <bean id="old"/>
+
+  <bean
+
+</beans>
\ No newline at end of file
diff --git a/xml/tests/testData/generateTag/springAlias.xml b/xml/tests/testData/generateTag/springAlias.xml
new file mode 100644
index 000000000000..d1de923b46c3
--- /dev/null
+++ b/xml/tests/testData/generateTag/springAlias.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+       spring-beans_3.0.xsd">
+
+  <caret>
+</beans>
\ No newline at end of file
diff --git a/xml/tests/testData/generateTag/springAlias_after.xml b/xml/tests/testData/generateTag/springAlias_after.xml
new file mode 100644
index 000000000000..43b11320d9a0
--- /dev/null
+++ b/xml/tests/testData/generateTag/springAlias_after.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+       spring-beans_3.0.xsd">
+
+  <alias name="" alias=""/>
+</beans>
\ No newline at end of file
diff --git a/xml/tests/testData/generateTag/springAtCaret.xml b/xml/tests/testData/generateTag/springAtCaret.xml
new file mode 100644
index 000000000000..694aec7797af
--- /dev/null
+++ b/xml/tests/testData/generateTag/springAtCaret.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+       spring-beans_3.0.xsd">
+
+  <caret>
+  <bean id="old"/>
+</beans>
\ No newline at end of file
diff --git a/xml/tests/testData/generateTag/springAtCaret_after.xml b/xml/tests/testData/generateTag/springAtCaret_after.xml
new file mode 100644
index 000000000000..35a9c23a2264
--- /dev/null
+++ b/xml/tests/testData/generateTag/springAtCaret_after.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+       spring-beans_3.0.xsd">
+
+  <bean
+  <bean id="old"/>
+</beans>
\ No newline at end of file
diff --git a/xml/tests/testData/generateTag/spring_after.xml b/xml/tests/testData/generateTag/spring_after.xml
new file mode 100644
index 000000000000..9de096a1a2dc
--- /dev/null
+++ b/xml/tests/testData/generateTag/spring_after.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+       spring-beans_3.0.xsd">
+
+  <bean
+</beans>
\ No newline at end of file
diff --git a/xml/tests/testData/generateTag/web-app_2_3.dtd b/xml/tests/testData/generateTag/web-app_2_3.dtd
new file mode 100644
index 000000000000..5e3ab01c0fe8
--- /dev/null
+++ b/xml/tests/testData/generateTag/web-app_2_3.dtd
@@ -0,0 +1,1063 @@
+<!--
+Copyright (c) 2000 Sun Microsystems, Inc.,
+901 San Antonio Road,
+Palo Alto, California 94303, U.S.A.
+All rights reserved.
+
+Sun Microsystems, Inc. has intellectual property rights relating to
+technology embodied in the product that is described in this document.
+In particular, and without limitation, these intellectual property
+rights may include one or more of the U.S. patents listed at
+http://www.sun.com/patents and one or more additional patents or
+pending patent applications in the U.S. and in other countries.
+
+This document and the product to which it pertains are distributed
+under licenses restricting their use, copying, distribution, and
+decompilation.  This document may be reproduced and distributed but may
+not be changed without prior written authorization of Sun and its
+licensors, if any.
+
+Third-party software, including font technology, is copyrighted and
+licensed from Sun suppliers.
+
+Sun,  Sun Microsystems,  the Sun logo,  Java,  JavaServer Pages,  Java
+Naming and Directory Interface,  JDBC,  JDK,  JavaMail and  and
+Enterprise JavaBeans are trademarks or registered trademarks of Sun
+Microsystems, Inc. in the U.S. and other countries.
+
+Federal Acquisitions: Commercial Software - Government Users Subject to
+Standard License Terms and Conditions.
+
+DOCUMENTATION IS PROVIDED "AS IS" AND ALL EXPRESS OR IMPLIED
+CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED
+WARRANTY OF MERCHANTABILITY, FITNESS FOR FOR A PARTICULAR PURPOSE OR
+NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH
+DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
+
+
+_________________________________________________________________________
+
+Copyright (c) 2000 Sun Microsystems, Inc.,
+901 San Antonio Road,
+Palo Alto, California 94303, E'tats-Unis.
+Tous droits re'serve's.
+
+Sun Microsystems, Inc. a les droits de proprie'te' intellectuels
+relatants a` la technologie incorpore'e dans le produit qui est de'crit
+dans ce document. En particulier, et sans la limitation, ces droits de
+proprie'te' intellectuels peuvent inclure un ou plus des brevets
+ame'ricains e'nume're's a` http://www.sun.com/patents et un ou les
+brevets plus supple'mentaires ou les applications de brevet en attente
+dans les E'tats-Unis et dans les autres pays.
+
+Ce produit ou document est prote'ge' par un copyright et distribue'
+avec des licences qui en restreignent l'utilisation, la copie, la
+distribution, et la de'compilation.  Ce documention associe n peut
+e^tre reproduite et distribuer, par quelque moyen que ce soit, sans
+l'autorisation pre'alable et e'crite de Sun et de ses bailleurs de
+licence, le cas e'che'ant.
+
+Le logiciel de'tenu par des tiers, et qui comprend la technologie
+relative aux polices de caracte`res, est prote'ge' par un copyright et
+licencie' par des fournisseurs de Sun.
+
+Sun,  Sun Microsystems,  le logo Sun,  Java,  JavaServer Pages,  Java
+Naming and Directory Interface,  JDBC,  JDK,  JavaMail et  and
+Enterprise JavaBeans sont des marques de fabrique ou des marques
+de'pose'es de Sun Microsystems, Inc. aux E'tats-Unis et dans d'autres
+pays.
+
+LA DOCUMENTATION EST FOURNIE "EN L'E'TAT" ET TOUTES AUTRES CONDITIONS,
+DECLARATIONS ET GARANTIES EXPRESSES OU TACITES SONT FORMELLEMENT
+EXCLUES, DANS LA MESURE AUTORISEE PAR LA LOI APPLICABLE, Y COMPRIS
+NOTAMMENT TOUTE GARANTIE IMPLICITE RELATIVE A LA QUALITE MARCHANDE, A
+L'APTITUDE A UNE UTILISATION PARTICULIERE OU A L'ABSENCE DE
+CONTREFAC,ON.
+-->
+
+<!--
+This is the XML DTD for the Servlet 2.3 deployment descriptor.
+All Servlet 2.3 deployment descriptors must include a DOCTYPE
+of the following form:
+
+  <!DOCTYPE web-app PUBLIC
+	"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+	"http://java.sun.com/dtd/web-app_2_3.dtd">
+
+-->
+
+<!--
+The following conventions apply to all J2EE deployment descriptor
+elements unless indicated otherwise.
+
+- In elements that contain PCDATA, leading and trailing whitespace
+  in the data may be ignored.
+
+- In elements whose value is an "enumerated type", the value is
+  case sensitive.
+
+- In elements that specify a pathname to a file within the same
+  JAR file, relative filenames (i.e., those not starting with "/")
+  are considered relative to the root of the JAR file's namespace.
+  Absolute filenames (i.e., those starting with "/") also specify
+  names in the root of the JAR file's namespace.  In general, relative
+  names are preferred.  The exception is .war files where absolute
+  names are preferred for consistency with the servlet API.
+-->
+
+
+<!--
+The web-app element is the root of the deployment descriptor for
+a web application.
+-->
+<!ELEMENT web-app (icon?, display-name?, description?, distributable?,
+context-param*, filter*, filter-mapping*, listener*, servlet*,
+servlet-mapping*, session-config?, mime-mapping*, welcome-file-list?,
+error-page*, taglib*, resource-env-ref*, resource-ref*, security-constraint*,
+login-config?, security-role*, env-entry*, ejb-ref*,  ejb-local-ref*)>
+
+<!--
+The auth-constraint element indicates the user roles that should
+be permitted access to this resource collection. The role-name
+used here must either correspond to the role-name of one of the
+security-role elements defined for this web application, or be
+the specially reserved role-name "*" that is a compact syntax for
+indicating all roles in the web application. If both "*" and
+rolenames appear, the container interprets this as all roles.
+If no roles are defined, no user is allowed access to the portion of
+the web application described by the containing security-constraint.
+The container matches role names case sensitively when determining
+access.
+
+
+Used in: security-constraint
+-->
+<!ELEMENT auth-constraint (description?, role-name*)>
+
+<!--
+The auth-method element is used to configure the authentication
+mechanism for the web application. As a prerequisite to gaining access to any web resources which are protected by an authorization
+constraint, a user must have authenticated using the configured
+mechanism. Legal values for this element are "BASIC", "DIGEST",
+"FORM", or "CLIENT-CERT".
+
+Used in: login-config
+-->
+<!ELEMENT auth-method (#PCDATA)>
+
+<!--
+The context-param element contains the declaration of a web
+application's servlet context initialization parameters.
+
+Used in: web-app
+-->
+<!ELEMENT context-param (param-name, param-value, description?)>
+
+<!--
+The description element is used to provide text describing the parent
+element.  The description element should include any information that
+the web application war file producer wants to provide to the consumer of
+the web application war file (i.e., to the Deployer). Typically, the tools
+used by the web application war file consumer will display the description
+when processing the parent element that contains the description.
+
+Used in: auth-constraint, context-param, ejb-local-ref, ejb-ref,
+env-entry, filter, init-param, resource-env-ref, resource-ref, run-as,
+security-role, security-role-ref, servlet, user-data-constraint,
+web-app, web-resource-collection
+-->
+<!ELEMENT description (#PCDATA)>
+
+<!--
+The display-name element contains a short name that is intended to be
+displayed by tools.  The display name need not be unique.
+
+Used in: filter, security-constraint, servlet, web-app
+
+Example:
+
+<display-name>Employee Self Service</display-name>
+-->
+<!ELEMENT display-name (#PCDATA)>
+
+<!--
+The distributable element, by its presence in a web application
+deployment descriptor, indicates that this web application is
+programmed appropriately to be deployed into a distributed servlet
+container
+
+Used in: web-app
+-->
+<!ELEMENT distributable EMPTY>
+
+<!--
+The ejb-link element is used in the ejb-ref or ejb-local-ref
+elements to specify that an EJB reference is linked to an
+enterprise bean.
+
+The name in the ejb-link element is composed of a
+path name specifying the ejb-jar containing the referenced enterprise
+bean with the ejb-name of the target bean appended and separated from
+the path name by "#".  The path name is relative to the war file
+containing the web application that is referencing the enterprise bean.
+This allows multiple enterprise beans with the same ejb-name to be
+uniquely identified.
+
+Used in: ejb-local-ref, ejb-ref
+
+Examples:
+
+	<ejb-link>EmployeeRecord</ejb-link>
+
+	<ejb-link>../products/product.jar#ProductEJB</ejb-link>
+
+-->
+<!ELEMENT ejb-link (#PCDATA)>
+
+<!--
+The ejb-local-ref element is used for the declaration of a reference to
+an enterprise bean's local home. The declaration consists of:
+
+	- an optional description
+	- the EJB reference name used in the code of the web application
+	  that's referencing the enterprise bean
+	- the expected type of the referenced enterprise bean
+	- the expected local home and local interfaces of the referenced
+	  enterprise bean
+	- optional ejb-link information, used to specify the referenced
+	  enterprise bean
+
+Used in: web-app
+-->
+<!ELEMENT ejb-local-ref (description?, ejb-ref-name, ejb-ref-type,
+		local-home, local, ejb-link?)>
+
+<!--
+The ejb-ref element is used for the declaration of a reference to
+an enterprise bean's home. The declaration consists of:
+
+	- an optional description
+	- the EJB reference name used in the code of
+	  the web application that's referencing the enterprise bean
+	- the expected type of the referenced enterprise bean
+	- the expected home and remote interfaces of the referenced
+	  enterprise bean
+	- optional ejb-link information, used to specify the referenced
+	  enterprise bean
+
+Used in: web-app
+-->
+<!ELEMENT ejb-ref (description?, ejb-ref-name, ejb-ref-type,
+		home, remote, ejb-link?)>
+
+<!--
+The ejb-ref-name element contains the name of an EJB reference. The
+EJB reference is an entry in the web application's environment and is
+relative to the java:comp/env context.  The name must be unique
+within the web application.
+
+It is recommended that name is prefixed with "ejb/".
+
+Used in: ejb-local-ref, ejb-ref
+
+Example:
+
+<ejb-ref-name>ejb/Payroll</ejb-ref-name>
+-->
+<!ELEMENT ejb-ref-name (#PCDATA)>
+
+<!--
+The ejb-ref-type element contains the expected type of the
+referenced enterprise bean.
+
+The ejb-ref-type element must be one of the following:
+
+	<ejb-ref-type>Entity</ejb-ref-type>
+	<ejb-ref-type>Session</ejb-ref-type>
+
+Used in: ejb-local-ref, ejb-ref
+-->
+<!ELEMENT ejb-ref-type (#PCDATA)>
+
+<!--
+The env-entry element contains the declaration of a web application's
+environment entry. The declaration consists of an optional
+description, the name of the environment entry, and an optional
+value.  If a value is not specified, one must be supplied
+during deployment.
+-->
+<!ELEMENT env-entry (description?, env-entry-name, env-entry-value?,
+env-entry-type)>
+
+<!--
+The env-entry-name element contains the name of a web applications's
+environment entry.  The name is a JNDI name relative to the
+java:comp/env context.  The name must be unique within a web application.
+
+Example:
+
+<env-entry-name>minAmount</env-entry-name>
+
+Used in: env-entry
+-->
+<!ELEMENT env-entry-name (#PCDATA)>
+
+<!--
+The env-entry-type element contains the fully-qualified Java type of
+the environment entry value that is expected by the web application's
+code.
+
+The following are the legal values of env-entry-type:
+
+	java.lang.Boolean
+	java.lang.Byte
+	java.lang.Character
+	java.lang.String
+	java.lang.Short
+	java.lang.Integer
+	java.lang.Long
+	java.lang.Float
+	java.lang.Double
+
+Used in: env-entry
+-->
+<!ELEMENT env-entry-type (#PCDATA)>
+
+<!--
+The env-entry-value element contains the value of a web application's
+environment entry. The value must be a String that is valid for the
+constructor of the specified type that takes a single String
+parameter, or for java.lang.Character, a single character.
+
+Example:
+
+<env-entry-value>100.00</env-entry-value>
+
+Used in: env-entry
+-->
+<!ELEMENT env-entry-value (#PCDATA)>
+
+<!--
+The error-code contains an HTTP error code, ex: 404
+
+Used in: error-page
+-->
+<!ELEMENT error-code (#PCDATA)>
+
+<!--
+The error-page element contains a mapping between an error code
+or exception type to the path of a resource in the web application
+
+Used in: web-app
+-->
+<!ELEMENT error-page ((error-code | exception-type), location)>
+
+<!--
+The exception type contains a fully qualified class name of a
+Java exception type.
+
+Used in: error-page
+-->
+<!ELEMENT exception-type (#PCDATA)>
+
+<!--
+The extension element contains a string describing an
+extension. example: "txt"
+
+Used in: mime-mapping
+-->
+<!ELEMENT extension (#PCDATA)>
+
+<!--
+Declares a filter in the web application. The filter is mapped to
+either a servlet or a URL pattern in the filter-mapping element, using
+the filter-name value to reference. Filters can access the
+initialization parameters declared in the deployment descriptor at
+runtime via the FilterConfig interface.
+
+Used in: web-app
+-->
+<!ELEMENT filter (icon?, filter-name, display-name?, description?,
+filter-class, init-param*)>
+
+<!--
+The fully qualified classname of the filter.
+
+Used in: filter
+-->
+<!ELEMENT filter-class (#PCDATA)>
+
+<!--
+Declaration of the filter mappings in this web application. The
+container uses the filter-mapping declarations to decide which filters
+to apply to a request, and in what order. The container matches the
+request URI to a Servlet in the normal way. To determine which filters
+to apply it matches filter-mapping declarations either on servlet-name,
+or on url-pattern for each filter-mapping element, depending on which
+style is used. The order in which filters are invoked is the order in
+which filter-mapping declarations that match a request URI for a
+servlet appear in the list of filter-mapping elements.The filter-name
+value must be the value of the <filter-name> sub-elements of one of the
+<filter> declarations in the deployment descriptor.
+
+Used in: web-app
+-->
+<!ELEMENT filter-mapping (filter-name, (url-pattern | servlet-name))>
+
+<!--
+The logical name of the filter. This name is used to map the filter.
+Each filter name is unique within the web application.
+
+Used in: filter, filter-mapping
+-->
+<!ELEMENT filter-name (#PCDATA)>
+
+<!--
+The form-error-page element defines the location in the web app
+where the error page that is displayed when login is not successful
+can be found. The path begins with a leading / and is interpreted
+relative to the root of the WAR.
+
+Used in: form-login-config
+-->
+<!ELEMENT form-error-page (#PCDATA)>
+
+<!--
+The form-login-config element specifies the login and error pages
+that should be used in form based login. If form based authentication
+is not used, these elements are ignored.
+
+Used in: login-config
+-->
+<!ELEMENT form-login-config (form-login-page, form-error-page)>
+
+<!--
+The form-login-page element defines the location in the web app
+where the page that can be used for login can be found. The path
+begins with a leading / and is interpreted relative to the root of the WAR.
+
+Used in: form-login-config
+-->
+<!ELEMENT form-login-page (#PCDATA)>
+
+<!--
+The home element contains the fully-qualified name of the enterprise
+bean's home interface.
+
+Used in: ejb-ref
+
+Example:
+
+<home>com.aardvark.payroll.PayrollHome</home>
+-->
+<!ELEMENT home (#PCDATA)>
+
+<!--
+The http-method contains an HTTP method (GET | POST |...).
+
+Used in: web-resource-collection
+-->
+<!ELEMENT http-method (#PCDATA)>
+
+<!--
+The icon element contains small-icon and large-icon elements that
+specify the file names for small and a large GIF or JPEG icon images
+used to represent the parent element in a GUI tool.
+
+Used in: filter, servlet, web-app
+-->
+<!ELEMENT icon (small-icon?, large-icon?)>
+
+<!--
+The init-param element contains a name/value pair as an
+initialization param of the servlet
+
+Used in: filter, servlet
+-->
+<!ELEMENT init-param (param-name, param-value, description?)>
+
+<!--
+The jsp-file element contains the full path to a JSP file within
+the web application beginning with a `/'.
+
+Used in: servlet
+-->
+<!ELEMENT jsp-file (#PCDATA)>
+
+<!--
+The large-icon element contains the name of a file
+containing a large (32 x 32) icon image. The file
+name is a relative path within the web application's
+war file.
+
+The image may be either in the JPEG or GIF format.
+The icon can be used by tools.
+
+Used in: icon
+
+Example:
+
+<large-icon>employee-service-icon32x32.jpg</large-icon>
+-->
+<!ELEMENT large-icon (#PCDATA)>
+
+<!--
+The listener element indicates the deployment properties for a web
+application listener bean.
+
+Used in: web-app
+-->
+<!ELEMENT listener (listener-class)>
+
+<!--
+The listener-class element declares a class in the application must be
+registered as a web application listener bean. The value is the fully qualified classname of the listener class.
+
+
+Used in: listener
+-->
+<!ELEMENT listener-class (#PCDATA)>
+
+<!--
+The load-on-startup element indicates that this servlet should be
+loaded (instantiated and have its init() called) on the startup
+of the web application. The optional contents of
+these element must be an integer indicating the order in which
+the servlet should be loaded. If the value is a negative integer,
+or the element is not present, the container is free to load the
+servlet whenever it chooses. If the value is a positive integer
+or 0, the container must load and initialize the servlet as the
+application is deployed. The container must guarantee that
+servlets marked with lower integers are loaded before servlets
+marked with higher integers. The container may choose the order
+of loading of servlets with the same load-on-start-up value.
+
+Used in: servlet
+-->
+<!ELEMENT load-on-startup (#PCDATA)>
+
+<!--
+
+The local element contains the fully-qualified name of the
+enterprise bean's local interface.
+
+Used in: ejb-local-ref
+
+-->
+<!ELEMENT local (#PCDATA)>
+
+<!--
+
+The local-home element contains the fully-qualified name of the
+enterprise bean's local home interface.
+
+Used in: ejb-local-ref
+-->
+<!ELEMENT local-home (#PCDATA)>
+
+<!--
+The location element contains the location of the resource in the web
+application relative to the root of the web application. The value of
+the location must have a leading `/'.
+
+Used in: error-page
+-->
+<!ELEMENT location (#PCDATA)>
+
+<!--
+The login-config element is used to configure the authentication
+method that should be used, the realm name that should be used for
+this application, and the attributes that are needed by the form login
+mechanism.
+
+Used in: web-app
+-->
+<!ELEMENT login-config (auth-method?, realm-name?, form-login-config?)>
+
+<!--
+The mime-mapping element defines a mapping between an extension
+and a mime type.
+
+Used in: web-app
+-->
+<!ELEMENT mime-mapping (extension, mime-type)>
+
+<!--
+The mime-type element contains a defined mime type. example:
+"text/plain"
+
+Used in: mime-mapping
+-->
+<!ELEMENT mime-type (#PCDATA)>
+
+<!--
+The param-name element contains the name of a parameter. Each parameter
+name must be unique in the web application.
+
+
+Used in: context-param, init-param
+-->
+<!ELEMENT param-name (#PCDATA)>
+
+<!--
+The param-value element contains the value of a parameter.
+
+Used in: context-param, init-param
+-->
+<!ELEMENT param-value (#PCDATA)>
+
+<!--
+The realm name element specifies the realm name to use in HTTP
+Basic authorization.
+
+Used in: login-config
+-->
+<!ELEMENT realm-name (#PCDATA)>
+
+<!--
+The remote element contains the fully-qualified name of the enterprise
+bean's remote interface.
+
+Used in: ejb-ref
+
+Example:
+
+<remote>com.wombat.empl.EmployeeService</remote>
+-->
+<!ELEMENT remote (#PCDATA)>
+
+<!--
+The res-auth element specifies whether the web application code signs
+on programmatically to the resource manager, or whether the Container
+will sign on to the resource manager on behalf of the web application. In the
+latter case, the Container uses information that is supplied by the
+Deployer.
+
+The value of this element must be one of the two following:
+
+	<res-auth>Application</res-auth>
+	<res-auth>Container</res-auth>
+
+Used in: resource-ref
+-->
+<!ELEMENT res-auth (#PCDATA)>
+
+<!--
+The res-ref-name element specifies the name of a resource manager
+connection factory reference.  The name is a JNDI name relative to the
+java:comp/env context.  The name must be unique within a web application.
+
+Used in: resource-ref
+-->
+<!ELEMENT res-ref-name (#PCDATA)>
+
+<!--
+The res-sharing-scope element specifies whether connections obtained
+through the given resource manager connection factory reference can be
+shared. The value of this element, if specified, must be one of the
+two following:
+
+	<res-sharing-scope>Shareable</res-sharing-scope>
+	<res-sharing-scope>Unshareable</res-sharing-scope>
+
+The default value is Shareable.
+
+Used in: resource-ref
+-->
+<!ELEMENT res-sharing-scope (#PCDATA)>
+
+<!--
+The res-type element specifies the type of the data source. The type
+is specified by the fully qualified Java language class or interface
+expected to be implemented by the data source.
+
+Used in: resource-ref
+-->
+<!ELEMENT res-type (#PCDATA)>
+
+<!--
+The resource-env-ref element contains a declaration of a web application's
+reference to an administered object associated with a resource
+in the web application's environment.  It consists of an optional
+description, the resource environment reference name, and an
+indication of the resource environment reference type expected by
+the web application code.
+
+Used in: web-app
+
+Example:
+
+<resource-env-ref>
+    <resource-env-ref-name>jms/StockQueue</resource-env-ref-name>
+    <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+</resource-env-ref>
+-->
+<!ELEMENT resource-env-ref (description?, resource-env-ref-name,
+		resource-env-ref-type)>
+
+<!--
+The resource-env-ref-name element specifies the name of a resource
+environment reference; its value is the environment entry name used in
+the web application code.  The name is a JNDI name relative to the
+java:comp/env context and must be unique within a web application.
+
+Used in: resource-env-ref
+-->
+<!ELEMENT resource-env-ref-name (#PCDATA)>
+
+<!--
+The resource-env-ref-type element specifies the type of a resource
+environment reference.  It is the fully qualified name of a Java
+language class or interface.
+
+Used in: resource-env-ref
+-->
+<!ELEMENT resource-env-ref-type (#PCDATA)>
+
+<!--
+The resource-ref element contains a declaration of a web application's
+reference to an external resource. It consists of an optional
+description, the resource manager connection factory reference name,
+the indication of the resource manager connection factory type
+expected by the web application code, the type of authentication
+(Application or Container), and an optional specification of the
+shareability of connections obtained from the resource (Shareable or
+Unshareable).
+
+Used in: web-app
+
+Example:
+
+    <resource-ref>
+	<res-ref-name>jdbc/EmployeeAppDB</res-ref-name>
+	<res-type>javax.sql.DataSource</res-type>
+	<res-auth>Container</res-auth>
+	<res-sharing-scope>Shareable</res-sharing-scope>
+    </resource-ref>
+-->
+<!ELEMENT resource-ref (description?, res-ref-name, res-type, res-auth,
+		res-sharing-scope?)>
+
+<!--
+The role-link element is a reference to a defined security role. The
+role-link element must contain the name of one of the security roles
+defined in the security-role elements.
+
+Used in: security-role-ref
+-->
+<!ELEMENT role-link (#PCDATA)>
+
+<!--
+The role-name element contains the name of a security role.
+
+The name must conform to the lexical rules for an NMTOKEN.
+
+Used in: auth-constraint, run-as, security-role, security-role-ref
+-->
+<!ELEMENT role-name (#PCDATA)>
+
+<!--
+The run-as element specifies the run-as identity to be used for the
+execution of the web application. It contains an optional description, and
+the name of a security role.
+
+Used in: servlet
+-->
+<!ELEMENT run-as (description?, role-name)>
+
+<!--
+The security-constraint element is used to associate security
+constraints with one or more web resource collections
+
+Used in: web-app
+-->
+<!ELEMENT security-constraint (display-name?, web-resource-collection+,
+auth-constraint?, user-data-constraint?)>
+
+<!--
+The security-role element contains the definition of a security
+role. The definition consists of an optional description of the
+security role, and the security role name.
+
+Used in: web-app
+
+Example:
+
+    <security-role>
+	<description>
+	    This role includes all employees who are authorized
+	    to access the employee service application.
+	</description>
+	<role-name>employee</role-name>
+    </security-role>
+-->
+<!ELEMENT security-role (description?, role-name)>
+
+<!--
+The security-role-ref element contains the declaration of a security
+role reference in the web application's code. The declaration consists
+of an optional description, the security role name used in the code,
+and an optional link to a security role. If the security role is not
+specified, the Deployer must choose an appropriate security role.
+
+The value of the role-name element must be the String used as the
+parameter to the EJBContext.isCallerInRole(String roleName) method
+or the HttpServletRequest.isUserInRole(String role) method.
+
+Used in: servlet
+
+-->
+<!ELEMENT security-role-ref (description?, role-name, role-link?)>
+
+<!--
+The servlet element contains the declarative data of a
+servlet. If a jsp-file is specified and the load-on-startup element is
+present, then the JSP should be precompiled and loaded.
+
+Used in: web-app
+-->
+<!ELEMENT servlet (icon?, servlet-name, display-name?, description?,
+(servlet-class|jsp-file), init-param*, load-on-startup?, run-as?, security-role-ref*)>
+
+<!--
+The servlet-class element contains the fully qualified class name
+of the servlet.
+
+Used in: servlet
+-->
+<!ELEMENT servlet-class (#PCDATA)>
+
+<!--
+The servlet-mapping element defines a mapping between a servlet
+and a url pattern
+
+Used in: web-app
+-->
+<!ELEMENT servlet-mapping (servlet-name, url-pattern)>
+
+<!--
+The servlet-name element contains the canonical name of the
+servlet. Each servlet name is unique within the web application.
+
+Used in: filter-mapping, servlet, servlet-mapping
+-->
+<!ELEMENT servlet-name (#PCDATA)>
+
+<!--
+The session-config element defines the session parameters for
+this web application.
+
+Used in: web-app
+-->
+<!ELEMENT session-config (session-timeout?)>
+
+<!--
+The session-timeout element defines the default session timeout
+interval for all sessions created in this web application. The
+specified timeout must be expressed in a whole number of minutes.
+If the timeout is 0 or less, the container ensures the default
+behaviour of sessions is never to time out.
+
+Used in: session-config
+-->
+<!ELEMENT session-timeout (#PCDATA)>
+
+<!--
+The small-icon element contains the name of a file
+containing a small (16 x 16) icon image. The file
+name is a relative path within the web application's
+war file.
+
+The image may be either in the JPEG or GIF format.
+The icon can be used by tools.
+
+Used in: icon
+
+Example:
+
+<small-icon>employee-service-icon16x16.jpg</small-icon>
+-->
+<!ELEMENT small-icon (#PCDATA)>
+
+<!--
+The taglib element is used to describe a JSP tag library.
+
+Used in: web-app
+-->
+<!ELEMENT taglib (taglib-uri, taglib-location)>
+
+<!--
+the taglib-location element contains the location (as a resource
+relative to the root of the web application) where to find the Tag
+Libary Description file for the tag library.
+
+Used in: taglib
+-->
+<!ELEMENT taglib-location (#PCDATA)>
+
+<!--
+The taglib-uri element describes a URI, relative to the location
+of the web.xml document, identifying a Tag Library used in the Web
+Application.
+
+Used in: taglib
+-->
+<!ELEMENT taglib-uri (#PCDATA)>
+
+<!--
+The transport-guarantee element specifies that the communication
+between client and server should be NONE, INTEGRAL, or
+CONFIDENTIAL. NONE means that the application does not require any
+transport guarantees. A value of INTEGRAL means that the application
+requires that the data sent between the client and server be sent in
+such a way that it can't be changed in transit. CONFIDENTIAL means
+that the application requires that the data be transmitted in a
+fashion that prevents other entities from observing the contents of
+the transmission. In most cases, the presence of the INTEGRAL or
+CONFIDENTIAL flag will indicate that the use of SSL is required.
+
+Used in: user-data-constraint
+-->
+<!ELEMENT transport-guarantee (#PCDATA)>
+
+<!--
+The url-pattern element contains the url pattern of the mapping. Must
+follow the rules specified in Section 11.2 of the Servlet API
+Specification.
+
+Used in: filter-mapping, servlet-mapping, web-resource-collection
+-->
+<!ELEMENT url-pattern (#PCDATA)>
+
+<!--
+The user-data-constraint element is used to indicate how data
+communicated between the client and container should be protected.
+
+Used in: security-constraint
+-->
+<!ELEMENT user-data-constraint (description?, transport-guarantee)>
+
+<!--
+The web-resource-collection element is used to identify a subset
+of the resources and HTTP methods on those resources within a web
+application to which a security constraint applies. If no HTTP methods
+are specified, then the security constraint applies to all HTTP
+methods.
+
+Used in: security-constraint
+-->
+<!ELEMENT web-resource-collection (web-resource-name, description?,
+url-pattern*, http-method*)>
+
+<!--
+The web-resource-name contains the name of this web resource
+collection.
+
+Used in: web-resource-collection
+-->
+<!ELEMENT web-resource-name (#PCDATA)>
+
+<!--
+The welcome-file element contains file name to use as a default
+welcome file, such as index.html
+
+Used in: welcome-file-list
+-->
+<!ELEMENT welcome-file (#PCDATA)>
+
+<!--
+The welcome-file-list contains an ordered list of welcome files
+elements.
+
+Used in: web-app
+-->
+<!ELEMENT welcome-file-list (welcome-file+)>
+
+<!--
+The ID mechanism is to allow tools that produce additional deployment
+information (i.e., information beyond the standard deployment
+descriptor information) to store the non-standard information in a
+separate file, and easily refer from these tool-specific files to the
+information in the standard deployment descriptor.
+
+Tools are not allowed to add the non-standard information into the
+standard deployment descriptor.
+-->
+
+<!ATTLIST auth-constraint id ID #IMPLIED>
+<!ATTLIST auth-method id ID #IMPLIED>
+<!ATTLIST context-param id ID #IMPLIED>
+<!ATTLIST description id ID #IMPLIED>
+<!ATTLIST display-name id ID #IMPLIED>
+<!ATTLIST distributable id ID #IMPLIED>
+<!ATTLIST ejb-link id ID #IMPLIED>
+<!ATTLIST ejb-local-ref id ID #IMPLIED>
+<!ATTLIST ejb-ref id ID #IMPLIED>
+<!ATTLIST ejb-ref-name id ID #IMPLIED>
+<!ATTLIST ejb-ref-type id ID #IMPLIED>
+<!ATTLIST env-entry id ID #IMPLIED>
+<!ATTLIST env-entry-name id ID #IMPLIED>
+<!ATTLIST env-entry-type id ID #IMPLIED>
+<!ATTLIST env-entry-value id ID #IMPLIED>
+<!ATTLIST error-code id ID #IMPLIED>
+<!ATTLIST error-page id ID #IMPLIED>
+<!ATTLIST exception-type id ID #IMPLIED>
+<!ATTLIST extension id ID #IMPLIED>
+<!ATTLIST filter id ID #IMPLIED>
+<!ATTLIST filter-class id ID #IMPLIED>
+<!ATTLIST filter-mapping id ID #IMPLIED>
+<!ATTLIST filter-name id ID #IMPLIED>
+<!ATTLIST form-error-page id ID #IMPLIED>
+<!ATTLIST form-login-config id ID #IMPLIED>
+<!ATTLIST form-login-page id ID #IMPLIED>
+<!ATTLIST home id ID #IMPLIED>
+<!ATTLIST http-method id ID #IMPLIED>
+<!ATTLIST icon id ID #IMPLIED>
+<!ATTLIST init-param id ID #IMPLIED>
+<!ATTLIST jsp-file id ID #IMPLIED>
+<!ATTLIST large-icon id ID #IMPLIED>
+<!ATTLIST listener id ID #IMPLIED>
+<!ATTLIST listener-class id ID #IMPLIED>
+<!ATTLIST load-on-startup id ID #IMPLIED>
+<!ATTLIST local id ID #IMPLIED>
+<!ATTLIST local-home id ID #IMPLIED>
+<!ATTLIST location id ID #IMPLIED>
+<!ATTLIST login-config id ID #IMPLIED>
+<!ATTLIST mime-mapping id ID #IMPLIED>
+<!ATTLIST mime-type id ID #IMPLIED>
+<!ATTLIST param-name id ID #IMPLIED>
+<!ATTLIST param-value id ID #IMPLIED>
+<!ATTLIST realm-name id ID #IMPLIED>
+<!ATTLIST remote id ID #IMPLIED>
+<!ATTLIST res-auth id ID #IMPLIED>
+<!ATTLIST res-ref-name id ID #IMPLIED>
+<!ATTLIST res-sharing-scope id ID #IMPLIED>
+<!ATTLIST res-type id ID #IMPLIED>
+<!ATTLIST resource-env-ref id ID #IMPLIED>
+<!ATTLIST resource-env-ref-name id ID #IMPLIED>
+<!ATTLIST resource-env-ref-type id ID #IMPLIED>
+<!ATTLIST resource-ref id ID #IMPLIED>
+<!ATTLIST role-link id ID #IMPLIED>
+<!ATTLIST role-name id ID #IMPLIED>
+<!ATTLIST run-as id ID #IMPLIED>
+<!ATTLIST security-constraint id ID #IMPLIED>
+<!ATTLIST security-role id ID #IMPLIED>
+<!ATTLIST security-role-ref id ID #IMPLIED>
+<!ATTLIST servlet id ID #IMPLIED>
+<!ATTLIST servlet-class id ID #IMPLIED>
+<!ATTLIST servlet-mapping id ID #IMPLIED>
+<!ATTLIST servlet-name id ID #IMPLIED>
+<!ATTLIST session-config id ID #IMPLIED>
+<!ATTLIST session-timeout id ID #IMPLIED>
+<!ATTLIST small-icon id ID #IMPLIED>
+<!ATTLIST taglib id ID #IMPLIED>
+<!ATTLIST taglib-location id ID #IMPLIED>
+<!ATTLIST taglib-uri id ID #IMPLIED>
+<!ATTLIST transport-guarantee id ID #IMPLIED>
+<!ATTLIST url-pattern id ID #IMPLIED>
+<!ATTLIST user-data-constraint id ID #IMPLIED>
+<!ATTLIST web-app id ID #IMPLIED>
+<!ATTLIST web-resource-collection id ID #IMPLIED>
+<!ATTLIST web-resource-name id ID #IMPLIED>
+<!ATTLIST welcome-file id ID #IMPLIED>
+<!ATTLIST welcome-file-list id ID #IMPLIED>
diff --git a/xml/tests/testData/generateTag/web-app_2_5.xsd b/xml/tests/testData/generateTag/web-app_2_5.xsd
new file mode 100644
index 000000000000..28e956fd8ccf
--- /dev/null
+++ b/xml/tests/testData/generateTag/web-app_2_5.xsd
@@ -0,0 +1,1290 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ The contents of this file are subject to the terms
+ of the Common Development and Distribution License
+ (the "License").  You may not use this file except
+ in compliance with the License.
+
+ You can obtain a copy of the license at
+ glassfish/bootstrap/legal/CDDLv1.0.txt or
+ https://glassfish.dev.java.net/public/CDDLv1.0.html.
+ See the License for the specific language governing
+ permissions and limitations under the License.
+
+ When distributing Covered Code, include this CDDL
+ HEADER in each file and include the License file at
+ glassfish/bootstrap/legal/CDDLv1.0.txt.  If applicable,
+ add the following below this CDDL HEADER, with the
+ fields enclosed by brackets "[]" replaced with your
+ own identifying information: Portions Copyright [yyyy]
+ [name of copyright owner]
+-->
+
+<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+	    targetNamespace="http://java.sun.com/xml/ns/javaee"
+	    xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	    elementFormDefault="qualified"
+	    attributeFormDefault="unqualified"
+	    version="2.5">
+  <xsd:annotation>
+    <xsd:documentation>
+      @(#)web-app_2_5.xsds	1.62 05/08/06
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
+
+      Copyright 2003-2005 Sun Microsystems, Inc.
+      4150 Network Circle
+      Santa Clara, California 95054
+      U.S.A
+      All rights reserved.
+
+      Sun Microsystems, Inc. has intellectual property rights
+      relating to technology described in this document. In
+      particular, and without limitation, these intellectual
+      property rights may include one or more of the U.S. patents
+      listed at http://www.sun.com/patents and one or more
+      additional patents or pending patent applications in the
+      U.S. and other countries.
+
+      This document and the technology which it describes are
+      distributed under licenses restricting their use, copying,
+      distribution, and decompilation. No part of this document
+      may be reproduced in any form by any means without prior
+      written authorization of Sun and its licensors, if any.
+
+      Third-party software, including font technology, is
+      copyrighted and licensed from Sun suppliers.
+
+      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
+      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
+      Cup logo are trademarks or registered trademarks of Sun
+      Microsystems, Inc. in the U.S. and other countries.
+
+      Federal Acquisitions: Commercial Software - Government Users
+      Subject to Standard License Terms and Conditions.
+
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
+      <![CDATA[
+
+	This is the XML Schema for the Servlet 2.5 deployment descriptor.
+	The deployment descriptor must be named "WEB-INF/web.xml" in the
+	web application's war file.  All Servlet deployment descriptors
+	must indicate the web application schema by using the Java EE
+	namespace:
+
+	http://java.sun.com/xml/ns/javaee
+
+	and by indicating the version of the schema by
+	using the version element as shown below:
+
+	    <web-app xmlns="http://java.sun.com/xml/ns/javaee"
+	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	      xsi:schemaLocation="..."
+	      version="2.5">
+	      ...
+	    </web-app>
+
+	The instance documents may indicate the published version of
+	the schema using the xsi:schemaLocation attribute for Java EE
+	namespace with the following location:
+
+	http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd
+
+	]]>
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
+
+      The following conventions apply to all Java EE
+      deployment descriptor elements unless indicated otherwise.
+
+      - In elements that specify a pathname to a file within the
+	same JAR file, relative filenames (i.e., those not
+	starting with "/") are considered relative to the root of
+	the JAR file's namespace.  Absolute filenames (i.e., those
+	starting with "/") also specify names in the root of the
+	JAR file's namespace.  In general, relative names are
+	preferred.  The exception is .war files where absolute
+	names are preferred for consistency with the Servlet API.
+
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:include schemaLocation="javaee_5.xsd"/>
+  <xsd:include schemaLocation="jsp_2_1.xsd"/>
+
+
+<!-- **************************************************** -->
+
+  <xsd:element name="web-app" type="javaee:web-appType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The web-app element is the root of the deployment
+	descriptor for a web application.  Note that the sub-elements
+	of this element can be in the arbitrary order. Because of
+	that, the multiplicity of the elements of distributable,
+	session-config, welcome-file-list, jsp-config, login-config,
+	and locale-encoding-mapping-list was changed from "?" to "*"
+	in this schema.  However, the deployment descriptor instance
+	file must not contain multiple elements of session-config,
+	jsp-config, and login-config. When there are multiple elements of
+	welcome-file-list or locale-encoding-mapping-list, the container
+	must concatenate the element contents.  The multiple occurence
+	of the element distributable is redundant and the container
+	treats that case exactly in the same way when there is only
+	one distributable.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:unique name="web-app-servlet-name-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The servlet element contains the name of a servlet.
+	  The name must be unique within the web application.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:servlet"/>
+      <xsd:field    xpath="javaee:servlet-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="web-app-filter-name-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The filter element contains the name of a filter.
+	  The name must be unique within the web application.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:filter"/>
+      <xsd:field    xpath="javaee:filter-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="web-app-ejb-local-ref-name-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The ejb-local-ref-name element contains the name of an EJB
+	  reference. The EJB reference is an entry in the web
+	  application's environment and is relative to the
+	  java:comp/env context.  The name must be unique within
+	  the web application.
+
+	  It is recommended that name is prefixed with "ejb/".
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:ejb-local-ref"/>
+      <xsd:field    xpath="javaee:ejb-ref-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="web-app-ejb-ref-name-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The ejb-ref-name element contains the name of an EJB
+	  reference. The EJB reference is an entry in the web
+	  application's environment and is relative to the
+	  java:comp/env context.  The name must be unique within
+	  the web application.
+
+	  It is recommended that name is prefixed with "ejb/".
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:ejb-ref"/>
+      <xsd:field    xpath="javaee:ejb-ref-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="web-app-resource-env-ref-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The resource-env-ref-name element specifies the name of
+	  a resource environment reference; its value is the
+	  environment entry name used in the web application code.
+	  The name is a JNDI name relative to the java:comp/env
+	  context and must be unique within a web application.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:resource-env-ref"/>
+      <xsd:field    xpath="javaee:resource-env-ref-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="web-app-message-destination-ref-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The message-destination-ref-name element specifies the name of
+	  a message destination reference; its value is the
+	  environment entry name used in the web application code.
+	  The name is a JNDI name relative to the java:comp/env
+	  context and must be unique within a web application.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:message-destination-ref"/>
+      <xsd:field    xpath="javaee:message-destination-ref-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="web-app-res-ref-name-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The res-ref-name element specifies the name of a
+	  resource manager connection factory reference.  The name
+	  is a JNDI name relative to the java:comp/env context.
+	  The name must be unique within a web application.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:resource-ref"/>
+      <xsd:field    xpath="javaee:res-ref-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="web-app-env-entry-name-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The env-entry-name element contains the name of a web
+	  application's environment entry.  The name is a JNDI
+	  name relative to the java:comp/env context.  The name
+	  must be unique within a web application.
+
+	</xsd:documentation>
+      </xsd:annotation>
+
+      <xsd:selector xpath="javaee:env-entry"/>
+      <xsd:field    xpath="javaee:env-entry-name"/>
+    </xsd:unique>
+
+    <xsd:key name="web-app-role-name-key">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  A role-name-key is specified to allow the references
+	  from the security-role-refs.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:security-role"/>
+      <xsd:field    xpath="javaee:role-name"/>
+    </xsd:key>
+
+    <xsd:keyref name="web-app-role-name-references"
+		refer="javaee:web-app-role-name-key">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The keyref indicates the references from
+	  security-role-ref to a specified role-name.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:servlet/javaee:security-role-ref"/>
+      <xsd:field    xpath="javaee:role-link"/>
+    </xsd:keyref>
+  </xsd:element>
+
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="auth-constraintType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The auth-constraintType indicates the user roles that
+	should be permitted access to this resource
+	collection. The role-name used here must either correspond
+	to the role-name of one of the security-role elements
+	defined for this web application, or be the specially
+	reserved role-name "*" that is a compact syntax for
+	indicating all roles in the web application. If both "*"
+	and rolenames appear, the container interprets this as all
+	roles.  If no roles are defined, no user is allowed access
+	to the portion of the web application described by the
+	containing security-constraint.  The container matches
+	role names case sensitively when determining access.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="role-name"
+		   type="javaee:role-nameType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="auth-methodType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The auth-methodType is used to configure the authentication
+	mechanism for the web application. As a prerequisite to
+	gaining access to any web resources which are protected by
+	an authorization constraint, a user must have authenticated
+	using the configured mechanism. Legal values are "BASIC",
+	"DIGEST", "FORM", "CLIENT-CERT", or a vendor-specific
+	authentication scheme.
+
+	Used in: login-config
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="dispatcherType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The dispatcher has four legal values: FORWARD, REQUEST, INCLUDE,
+	and ERROR. A value of FORWARD means the Filter will be applied
+	under RequestDispatcher.forward() calls.  A value of REQUEST
+	means the Filter will be applied under ordinary client calls to
+	the path or servlet. A value of INCLUDE means the Filter will be
+	applied under RequestDispatcher.include() calls.  A value of
+	ERROR means the Filter will be applied under the error page
+	mechanism.  The absence of any dispatcher elements in a
+	filter-mapping indicates a default of applying filters only under
+	ordinary client calls to the path or servlet.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:enumeration value="FORWARD"/>
+	<xsd:enumeration value="INCLUDE"/>
+	<xsd:enumeration value="REQUEST"/>
+	<xsd:enumeration value="ERROR"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:simpleType name="encodingType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The encodingType defines IANA character sets.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:restriction base="xsd:string">
+      <xsd:pattern value="[^\s]+"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="error-codeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The error-code contains an HTTP error code, ex: 404
+
+	Used in: error-page
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:xsdPositiveIntegerType">
+	<xsd:pattern value="\d{3}"/>
+	<xsd:attribute name="id" type="xsd:ID"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="error-pageType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The error-pageType contains a mapping between an error code
+	or exception type to the path of a resource in the web
+	application.
+
+	Used in: web-app
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:choice>
+	<xsd:element name="error-code"
+		     type="javaee:error-codeType"/>
+
+	<xsd:element name="exception-type"
+		     type="javaee:fully-qualified-classType">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The exception-type contains a fully qualified class
+	      name of a Java exception type.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	</xsd:element>
+      </xsd:choice>
+
+      <xsd:element name="location"
+		   type="javaee:war-pathType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The location element contains the location of the
+	    resource in the web application relative to the root of
+	    the web application. The value of the location must have
+	    a leading `/'.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="filter-mappingType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	Declaration of the filter mappings in this web
+	application is done by using filter-mappingType.
+	The container uses the filter-mapping
+	declarations to decide which filters to apply to a request,
+	and in what order. The container matches the request URI to
+	a Servlet in the normal way. To determine which filters to
+	apply it matches filter-mapping declarations either on
+	servlet-name, or on url-pattern for each filter-mapping
+	element, depending on which style is used. The order in
+	which filters are invoked is the order in which
+	filter-mapping declarations that match a request URI for a
+	servlet appear in the list of filter-mapping elements.The
+	filter-name value must be the value of the filter-name
+	sub-elements of one of the filter declarations in the
+	deployment descriptor.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="filter-name"
+		   type="javaee:filter-nameType"/>
+      <xsd:choice minOccurs="1" maxOccurs="unbounded">
+	<xsd:element name="url-pattern"
+		     type="javaee:url-patternType"/>
+	<xsd:element name="servlet-name"
+		     type="javaee:servlet-nameType"/>
+      </xsd:choice>
+      <xsd:element name="dispatcher"
+		   type="javaee:dispatcherType"
+		   minOccurs="0" maxOccurs="4"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="filter-nameType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The logical name of the filter is declare
+	by using filter-nameType. This name is used to map the
+	filter.  Each filter name is unique within the web
+	application.
+
+	Used in: filter, filter-mapping
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:simpleContent>
+      <xsd:extension base="javaee:nonEmptyStringType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="filterType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The filterType is used to declare a filter in the web
+	application. The filter is mapped to either a servlet or a
+	URL pattern in the filter-mapping element, using the
+	filter-name value to reference. Filters can access the
+	initialization parameters declared in the deployment
+	descriptor at runtime via the FilterConfig interface.
+
+	Used in: web-app
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:group ref="javaee:descriptionGroup"/>
+      <xsd:element name="filter-name"
+		   type="javaee:filter-nameType"/>
+      <xsd:element name="filter-class"
+		   type="javaee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The fully qualified classname of the filter.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="init-param"
+		   type="javaee:param-valueType"
+		   minOccurs="0" maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The init-param element contains a name/value pair as
+	    an initialization param of a servlet filter
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="form-login-configType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The form-login-configType specifies the login and error
+	pages that should be used in form based login. If form based
+	authentication is not used, these elements are ignored.
+
+	Used in: login-config
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+
+      <xsd:element name="form-login-page"
+		   type="javaee:war-pathType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The form-login-page element defines the location in the web
+	    app where the page that can be used for login can be
+	    found.  The path begins with a leading / and is interpreted
+	    relative to the root of the WAR.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="form-error-page"
+		   type="javaee:war-pathType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The form-error-page element defines the location in
+	    the web app where the error page that is displayed
+	    when login is not successful can be found.
+	    The path begins with a leading / and is interpreted
+	    relative to the root of the WAR.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:simpleType name="http-methodType">
+    <xsd:annotation>
+
+      <xsd:documentation>
+
+	A HTTP method type as defined in HTTP 1.1 section 2.2.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+     <xsd:restriction base="xsd:token">
+         <xsd:pattern value="[\p{L}-[\p{Cc}\p{Z}]]+"/>
+     </xsd:restriction>
+
+  </xsd:simpleType>
+
+<!-- **************************************************** -->
+
+  <xsd:simpleType name="load-on-startupType">
+    <xsd:union memberTypes="javaee:null-charType xsd:integer"/>
+  </xsd:simpleType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="locale-encoding-mapping-listType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The locale-encoding-mapping-list contains one or more
+	locale-encoding-mapping(s).
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="locale-encoding-mapping"
+		   type="javaee:locale-encoding-mappingType"
+		   maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="locale-encoding-mappingType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The locale-encoding-mapping contains locale name and
+	encoding name. The locale name must be either "Language-code",
+	such as "ja", defined by ISO-639 or "Language-code_Country-code",
+	such as "ja_JP".  "Country code" is defined by ISO-3166.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="locale"
+		   type="javaee:localeType"/>
+      <xsd:element name="encoding"
+		   type="javaee:encodingType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:simpleType name="localeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The localeType defines valid locale defined by ISO-639-1
+	and ISO-3166.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:restriction base="xsd:string">
+      <xsd:pattern value="[a-z]{2}(_|-)?([\p{L}\-\p{Nd}]{2})?"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="login-configType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The login-configType is used to configure the authentication
+	method that should be used, the realm name that should be
+	used for this application, and the attributes that are
+	needed by the form login mechanism.
+
+	Used in: web-app
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="auth-method"
+		   type="javaee:auth-methodType"
+		   minOccurs="0"/>
+      <xsd:element name="realm-name"
+		   type="javaee:string" minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The realm name element specifies the realm name to
+	    use in HTTP Basic authorization.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="form-login-config"
+		   type="javaee:form-login-configType"
+		   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="mime-mappingType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The mime-mappingType defines a mapping between an extension
+	and a mime type.
+
+	Used in: web-app
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The extension element contains a string describing an
+	  extension. example: "txt"
+
+	</xsd:documentation>
+      </xsd:annotation>
+
+      <xsd:element name="extension"
+		   type="javaee:string"/>
+      <xsd:element name="mime-type"
+		   type="javaee:mime-typeType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="mime-typeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The mime-typeType is used to indicate a defined mime type.
+
+	Example:
+	"text/plain"
+
+	Used in: mime-mapping
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:pattern value="[^\p{Cc}^\s]+/[^\p{Cc}^\s]+"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="nonEmptyStringType">
+    <xsd:annotation>
+      <xsd:documentation>
+	This type defines a string which contains at least one
+	character.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:minLength value="1"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:simpleType name="null-charType">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value=""/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="security-constraintType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The security-constraintType is used to associate
+	security constraints with one or more web resource
+	collections
+
+	Used in: web-app
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="display-name"
+		   type="javaee:display-nameType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="web-resource-collection"
+		   type="javaee:web-resource-collectionType"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="auth-constraint"
+		   type="javaee:auth-constraintType"
+		   minOccurs="0"/>
+      <xsd:element name="user-data-constraint"
+		   type="javaee:user-data-constraintType"
+		   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="servlet-mappingType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The servlet-mappingType defines a mapping between a
+	servlet and a url pattern.
+
+	Used in: web-app
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="servlet-name"
+		   type="javaee:servlet-nameType"/>
+      <xsd:element name="url-pattern"
+		   type="javaee:url-patternType"
+           minOccurs="1" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="servlet-nameType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The servlet-name element contains the canonical name of the
+	servlet. Each servlet name is unique within the web
+	application.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:simpleContent>
+      <xsd:extension base="javaee:nonEmptyStringType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="servletType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The servletType is used to declare a servlet.
+	It contains the declarative data of a
+	servlet. If a jsp-file is specified and the load-on-startup
+	element is present, then the JSP should be precompiled and
+	loaded.
+
+	Used in: web-app
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:group ref="javaee:descriptionGroup"/>
+      <xsd:element name="servlet-name"
+		   type="javaee:servlet-nameType"/>
+      <xsd:choice>
+	<xsd:element name="servlet-class"
+		     type="javaee:fully-qualified-classType">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The servlet-class element contains the fully
+	      qualified class name of the servlet.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	</xsd:element>
+
+	<xsd:element name="jsp-file"
+		     type="javaee:jsp-fileType"/>
+
+      </xsd:choice>
+
+      <xsd:element name="init-param"
+		   type="javaee:param-valueType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="load-on-startup"
+		   type="javaee:load-on-startupType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The load-on-startup element indicates that this
+	    servlet should be loaded (instantiated and have
+	    its init() called) on the startup of the web
+	    application. The optional contents of these
+	    element must be an integer indicating the order in
+	    which the servlet should be loaded. If the value
+	    is a negative integer, or the element is not
+	    present, the container is free to load the servlet
+	    whenever it chooses. If the value is a positive
+	    integer or 0, the container must load and
+	    initialize the servlet as the application is
+	    deployed. The container must guarantee that
+	    servlets marked with lower integers are loaded
+	    before servlets marked with higher integers. The
+	    container may choose the order of loading of
+	    servlets with the same load-on-start-up value.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="run-as"
+		   type="javaee:run-asType"
+		   minOccurs="0"/>
+      <xsd:element name="security-role-ref"
+		   type="javaee:security-role-refType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="session-configType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The session-configType defines the session parameters
+	for this web application.
+
+	Used in: web-app
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="session-timeout"
+		   type="javaee:xsdIntegerType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The session-timeout element defines the default
+	    session timeout interval for all sessions created
+	    in this web application. The specified timeout
+	    must be expressed in a whole number of minutes.
+	    If the timeout is 0 or less, the container ensures
+	    the default behaviour of sessions is never to time
+	    out. If this element is not specified, the container
+	    must set its default timeout period.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="transport-guaranteeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The transport-guaranteeType specifies that the communication
+	between client and server should be NONE, INTEGRAL, or
+	CONFIDENTIAL. NONE means that the application does not
+	require any transport guarantees. A value of INTEGRAL means
+	that the application requires that the data sent between the
+	client and server be sent in such a way that it can't be
+	changed in transit. CONFIDENTIAL means that the application
+	requires that the data be transmitted in a fashion that
+	prevents other entities from observing the contents of the
+	transmission. In most cases, the presence of the INTEGRAL or
+	CONFIDENTIAL flag will indicate that the use of SSL is
+	required.
+
+	Used in: user-data-constraint
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:enumeration value="NONE"/>
+	<xsd:enumeration value="INTEGRAL"/>
+	<xsd:enumeration value="CONFIDENTIAL"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="user-data-constraintType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The user-data-constraintType is used to indicate how
+	data communicated between the client and container should be
+	protected.
+
+	Used in: security-constraint
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="transport-guarantee"
+		   type="javaee:transport-guaranteeType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="war-pathType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The elements that use this type designate a path starting
+	with a "/" and interpreted relative to the root of a WAR
+	file.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:pattern value="/.*"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:simpleType name="web-app-versionType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	This type contains the recognized versions of
+	web-application supported. It is used to designate the
+	version of the web application.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:restriction base="xsd:token">
+      <xsd:enumeration value="2.5"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="web-appType">
+
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:group ref="javaee:descriptionGroup"/>
+      <xsd:element name="distributable"
+		   type="javaee:emptyType"/>
+      <xsd:element name="context-param"
+		   type="javaee:param-valueType">
+
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The context-param element contains the declaration
+	    of a web application's servlet context
+	    initialization parameters.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="filter"
+		   type="javaee:filterType"/>
+      <xsd:element name="filter-mapping"
+		   type="javaee:filter-mappingType"/>
+      <xsd:element name="listener"
+		   type="javaee:listenerType"/>
+      <xsd:element name="servlet"
+		   type="javaee:servletType"/>
+      <xsd:element name="servlet-mapping"
+		   type="javaee:servlet-mappingType"/>
+      <xsd:element name="session-config"
+		   type="javaee:session-configType"/>
+      <xsd:element name="mime-mapping"
+		   type="javaee:mime-mappingType"/>
+      <xsd:element name="welcome-file-list"
+		   type="javaee:welcome-file-listType"/>
+      <xsd:element name="error-page"
+		   type="javaee:error-pageType"/>
+      <xsd:element name="jsp-config"
+		   type="javaee:jsp-configType"/>
+      <xsd:element name="security-constraint"
+		   type="javaee:security-constraintType"/>
+      <xsd:element name="login-config"
+		   type="javaee:login-configType"/>
+      <xsd:element name="security-role"
+		   type="javaee:security-roleType"/>
+      <xsd:group ref="javaee:jndiEnvironmentRefsGroup"/>
+      <xsd:element name="message-destination"
+		   type="javaee:message-destinationType"/>
+      <xsd:element name="locale-encoding-mapping-list"
+		   type="javaee:locale-encoding-mapping-listType"/>
+    </xsd:choice>
+
+    <xsd:attribute name="version"
+		   type="javaee:web-app-versionType"
+		   use="required"/>
+    <xsd:attribute name="id" type="xsd:ID"/>
+
+    <xsd:attribute name="metadata-complete" type="xsd:boolean">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The metadata-complete attribute defines whether this
+	  deployment descriptor and other related deployment
+	  descriptors for this module (e.g., web service
+	  descriptors) are complete, or whether the class
+	  files available to this module and packaged with
+	  this application should be examined for annotations
+	  that specify deployment information.
+
+	  If metadata-complete is set to "true", the deployment
+	  tool must ignore any annotations that specify deployment
+	  information, which might be present in the class files
+	  of the application.
+
+	  If metadata-complete is not specified or is set to
+	  "false", the deployment tool must examine the class
+	  files of the application for annotations, as
+	  specified by the specifications.
+
+	</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="web-resource-collectionType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The web-resource-collectionType is used to identify a subset
+	of the resources and HTTP methods on those resources within
+	a web application to which a security constraint applies. If
+	no HTTP methods are specified, then the security constraint
+	applies to all HTTP methods.
+
+	Used in: security-constraint
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="web-resource-name"
+		   type="javaee:string">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The web-resource-name contains the name of this web
+	    resource collection.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="url-pattern"
+		   type="javaee:url-patternType"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="http-method"
+		   type="javaee:http-methodType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="welcome-file-listType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The welcome-file-list contains an ordered list of welcome
+	files elements.
+
+	Used in: web-app
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="welcome-file"
+		   type="xsd:string"
+		   maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The welcome-file element contains file name to use
+	    as a default welcome file, such as index.html
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+</xsd:schema>
+
diff --git a/xml/tests/testData/generateactions/addColumn/after1.html b/xml/tests/testData/generateactions/addColumn/after1.html
new file mode 100644
index 000000000000..d10a2a3e569e
--- /dev/null
+++ b/xml/tests/testData/generateactions/addColumn/after1.html
@@ -0,0 +1,43 @@
+<!-- "Add a new column to the table after the current one" "true" -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<link rel="stylesheet" href="a.css"/>
+<title>fdgsd</title>
+</head>
+<body>
+<div>dsfgsdgfdg</div>
+<table>
+    <tr>
+        <td>1</td>
+        <td>2</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>.</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td><caret></td>
+        <td>4</td>
+        <td colspan="11">1</td>
+    </tr>
+    <tr>
+        <td colspan="14">1</td>
+        <td>2</td>
+        <td colspan="11">1</td>
+    </tr>
+    <tr>
+        <td colspan="11">1</td>
+        <td>2</td>
+        <td></td>
+        <td>3</td>
+        <td colspan="11">1</td>
+    </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/generateactions/addColumn/after2.xhtml b/xml/tests/testData/generateactions/addColumn/after2.xhtml
new file mode 100644
index 000000000000..41226bfed0bc
--- /dev/null
+++ b/xml/tests/testData/generateactions/addColumn/after2.xhtml
@@ -0,0 +1,41 @@
+<!-- "Add a new column to the table after the current one" "true" -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<link rel="stylesheet" href="a.css"/>
+<title>fdgsd</title>
+</head>
+<body>
+<div>dsfgsdgfdg</div>
+<table>
+    <tr>
+        <td>1</td>
+        <td>2</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>.</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>4</td>
+        <td colspan="12">1</td>
+    </tr>
+    <tr>
+        <td colspan="13">1</td>
+        <td>2</td>
+        <td colspan="12">1</td>
+    </tr>
+    <tr>
+        <td colspan="11">1</td>
+        <td>2</td>
+        <td>3</td>
+        <td colspan="12">1</td>
+    </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/generateactions/addColumn/after3.jsp b/xml/tests/testData/generateactions/addColumn/after3.jsp
new file mode 100644
index 000000000000..31cfd399289d
--- /dev/null
+++ b/xml/tests/testData/generateactions/addColumn/after3.jsp
@@ -0,0 +1,74 @@
+<!-- "Add a new column to the table after the current one" "true" -->
+<html>
+<head>
+    <link rel="stylesheet" href="a.css"/>
+    <title>fdgsd</title>
+</head>
+<body>
+<div>dsfgsdgfdg</div>
+<table border="1">
+    <thead>
+    </thead>
+    <tbody>
+    </tbody>
+    <tr>
+        <td colspan="6">1</td>
+        <td rowspan="5">2</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td>2</td>
+        <td><caret></td>
+        <td>5</td>
+        <td>2'</td>
+        <td>3</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td colspan="5">2</td>
+    </tr>
+    <tr>
+        <td rowspan="2" colspan="1">1</td>
+        <td>2</td>
+        <td></td>
+        <td>3</td>
+        <td rowspan="2" colspan="2">3</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td></td>
+        <td>4</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td colspan="5">2</td>
+        <td>5</td>
+    </tr>
+    <tr>
+        <td colspan="4" rowspan="3">1</td>
+        <td colspan="1" rowspan="2">2</td>
+        <td colspan="2" rowspan="4">3</td>
+    </tr>
+    <tr/>
+    <tr>
+        <td>1</td>
+    </tr>
+    <tr>
+        <td>2</td>
+        <td>3</td>
+        <td></td>
+        <td>2</td>
+        <td>4</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td>2</td>
+        <td></td>
+        <td>7</td>
+        <td>3</td>
+        <td>4</td>
+        <td>5</td>
+    </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/generateactions/addColumn/after4.jspx b/xml/tests/testData/generateactions/addColumn/after4.jspx
new file mode 100644
index 000000000000..f491cb9ec5c8
--- /dev/null
+++ b/xml/tests/testData/generateactions/addColumn/after4.jspx
@@ -0,0 +1,74 @@
+<!-- "Add a new column to the table after the current one" "true" -->
+<html>
+<head>
+    <link rel="stylesheet" href="a.css"/>
+    <title>fdgsd</title>
+</head>
+<body>
+<div>dsfgsdgfdg</div>
+<table border="1">
+    <thead>
+    </thead>
+    <tbody>
+    </tbody>
+    <tr>
+        <td colspan="6">1</td>
+        <td rowspan="5">2</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td>2</td>
+        <td>5</td>
+        <td><caret></td>
+        <td>2'</td>
+        <td>3</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td colspan="5">2</td>
+    </tr>
+    <tr>
+        <td rowspan="2" colspan="1">1</td>
+        <td>2</td>
+        <td>3</td>
+        <td></td>
+        <td rowspan="2" colspan="2">3</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td>4</td>
+        <td></td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td colspan="5">2</td>
+        <td>5</td>
+    </tr>
+    <tr>
+        <td colspan="4" rowspan="3">1</td>
+        <td colspan="1" rowspan="2">2</td>
+        <td colspan="2" rowspan="4">3</td>
+    </tr>
+    <tr/>
+    <tr>
+        <td>1</td>
+    </tr>
+    <tr>
+        <td>2</td>
+        <td>3</td>
+        <td>2</td>
+        <td></td>
+        <td>4</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td>2</td>
+        <td>7</td>
+        <td></td>
+        <td>3</td>
+        <td>4</td>
+        <td>5</td>
+    </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/generateactions/addColumn/after5.html b/xml/tests/testData/generateactions/addColumn/after5.html
new file mode 100644
index 000000000000..4f6644ba3152
--- /dev/null
+++ b/xml/tests/testData/generateactions/addColumn/after5.html
@@ -0,0 +1,79 @@
+<!-- "Add a new column to the table before the current one" "true" -->
+<html>
+<head>
+    <link rel="stylesheet" href="a.css"/>
+    <title>fdgsd</title>
+</head>
+<body>
+<div>dsfgsdgfdg</div>
+<table border="1">
+    <thead>
+    </thead>
+    <tbody>
+    </tbody>
+    <tr>
+        <td><caret></td>
+        <td colspan="5">1</td>
+        <td rowspan="5">2</td>
+    </tr>
+    <tr>
+        <td></td>
+        <td>1</td>
+        <td>2</td>
+        <td>5</td>
+        <td>2'</td>
+        <td>3</td>
+    </tr>
+    <tr>
+        <td></td>
+        <td>1</td>
+        <td colspan="4">2</td>
+    </tr>
+    <tr>
+        <td></td>
+        <td rowspan="2" colspan="1">1</td>
+        <td>2</td>
+        <td>3</td>
+        <td rowspan="2" colspan="2">3</td>
+    </tr>
+    <tr>
+        <td></td>
+        <td>1</td>
+        <td>4</td>
+    </tr>
+    <tr>
+        <td></td>
+        <td>1</td>
+        <td colspan="4">2</td>
+        <td>5</td>
+    </tr>
+    <tr>
+        <td></td>
+        <td colspan="3" rowspan="3">1</td>
+        <td colspan="1" rowspan="2">2</td>
+        <td colspan="2" rowspan="4">3</td>
+    </tr>
+    <tr/>
+    <tr>
+        <td></td>
+        <td>1</td>
+    </tr>
+    <tr>
+        <td></td>
+        <td>2</td>
+        <td>3</td>
+        <td>2</td>
+        <td>4</td>
+    </tr>
+    <tr>
+        <td></td>
+        <td>1</td>
+        <td>2</td>
+        <td>7</td>
+        <td>3</td>
+        <td>4</td>
+        <td>5</td>
+    </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/generateactions/addColumn/after6.html b/xml/tests/testData/generateactions/addColumn/after6.html
new file mode 100644
index 000000000000..1be42492521f
--- /dev/null
+++ b/xml/tests/testData/generateactions/addColumn/after6.html
@@ -0,0 +1,11 @@
+<!-- "Add a new column to the table after the current one" "true" -->
+<table border="1">
+<thead> <tr> <th>1 <th>2
+    <th></th>
+    <tr> <th>1 <th> 2
+    <th></th>
+</tr> </thead>
+    <tr><td>1</td> <td> 2</td>
+        <td></td>
+    </tr>
+</table>
\ No newline at end of file
diff --git a/xml/tests/testData/generateactions/addColumn/after7.html b/xml/tests/testData/generateactions/addColumn/after7.html
new file mode 100644
index 000000000000..9e19d63ff403
--- /dev/null
+++ b/xml/tests/testData/generateactions/addColumn/after7.html
@@ -0,0 +1,966 @@
+<!-- "Add a new column to the table after the current one" "true" -->
+<table border=1>
+<thead><tr align=center><th>Name<th>Values<th>Initial value<th>Applies to<br>(Default: all)<th>Inherited?<th>Percentages<br>(Default: N/A)
+<th></th>
+<th>Media groups</thead>
+
+<tr><td><a href="aural.html#propdef-azimuth"><span class="propinst-azimuth xref">'azimuth'</span></a>
+<td><a href="aural.html#value-def-angle" class="noxref"><span class="value-inst-angle">&lt;angle&gt;</span></a> | [[ left-side | far-left | left | center-left | center | center-right | right | far-right | right-side ] || behind ] | leftwards | rightwards | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>center
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+<td></td>
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="colors.html#propdef-background-attachment"><span class="propinst-background-attachment xref">'background-attachment'</span></a>
+<td>scroll | fixed | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>scroll
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="colors.html#propdef-background-color"><span class="propinst-background-color xref">'background-color'</span></a>
+<td><a href="syndata.html#value-def-color" class="noxref"><span class="value-inst-color">&lt;color&gt;</span></a> | transparent | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>transparent
+<td>&nbsp;
+<td>no
+
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="colors.html#propdef-background-image"><span class="propinst-background-image xref">'background-image'</span></a>
+<td><a href="syndata.html#value-def-uri" class="noxref"><span class="value-inst-uri">&lt;uri&gt;</span></a> | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>none
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="colors.html#propdef-background-position"><span class="propinst-background-position xref">'background-position'</span></a>
+<td>[ [ <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | left | center | right ]            [ <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | top | center | bottom ]? ] |          [ [ left | center | right ] || [ top | center | bottom ] ] |          <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>0% 0%
+<td>&nbsp;
+<td>no
+<td>refer to the size of the box itself
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="colors.html#propdef-background-repeat"><span class="propinst-background-repeat xref">'background-repeat'</span></a>
+<td>repeat | repeat-x | repeat-y | no-repeat | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>repeat
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="colors.html#propdef-background"><span class="propinst-background xref">'background'</span></a>
+<td>[<a href="colors.html#propdef-background-color" class="noxref"><span class="propinst-background-color">'background-color'</span></a> || <a href="colors.html#propdef-background-image" class="noxref"><span class="propinst-background-image">'background-image'</span></a> || <a href="colors.html#propdef-background-repeat" class="noxref"><span class="propinst-background-repeat">'background-repeat'</span></a> || <a href="colors.html#propdef-background-attachment" class="noxref"><span class="propinst-background-attachment">'background-attachment'</span></a> || <a href="colors.html#propdef-background-position" class="noxref"><span class="propinst-background-position">'background-position'</span></a>] | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>see individual properties
+<td>&nbsp;
+<td>no
+<td>allowed on 'background-position'
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="tables.html#propdef-border-collapse"><span class="propinst-border-collapse xref">'border-collapse'</span></a>
+<td>collapse | separate | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>separate
+<td>'table' and 'inline-table' elements
+<td>yes
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="box.html#propdef-border-color"><span class="propinst-border-color xref">'border-color'</span></a>
+<td>[ <a href="syndata.html#value-def-color" class="noxref"><span class="value-inst-color">&lt;color&gt;</span></a> | transparent ]{1,4} | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>see individual properties
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="tables.html#propdef-border-spacing"><span class="propinst-border-spacing xref">'border-spacing'</span></a>
+
+<td><a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> <a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a>? | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>0
+<td>'table' and 'inline-table' elements&nbsp;
+<td>yes
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="box.html#propdef-border-style"><span class="propinst-border-style xref">'border-style'</span></a>
+<td><a href="box.html#value-def-border-style" class="noxref"><span class="value-inst-border-style">&lt;border-style&gt;</span></a>{1,4} | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>see individual properties
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="box.html#propdef-border-top"><span class="propinst-border-top xref">'border-top'</span></a>
+<a href="box.html#propdef-border-right"><span class="propinst-border-right xref">'border-right'</span></a>
+<a href="box.html#propdef-border-bottom"><span class="propinst-border-bottom xref">'border-bottom'</span></a>
+<a href="box.html#propdef-border-left"><span class="propinst-border-left xref">'border-left'</span></a>
+<td>[ <a href="box.html#value-def-border-width" class="noxref"><span class="value-inst-border-width">&lt;border-width&gt;</span></a> || <a href="box.html#value-def-border-style" class="noxref"><span class="value-inst-border-style">&lt;border-style&gt;</span></a> || <a href="box.html#propdef-border-top-color" class="noxref"><span class="propinst-border-top-color">'border-top-color'</span></a> ] | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>see individual properties
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="box.html#propdef-border-top-color"><span class="propinst-border-top-color xref">'border-top-color'</span></a>
+<a href="box.html#propdef-border-right-color"><span class="propinst-border-right-color xref">'border-right-color'</span></a>
+<a href="box.html#propdef-border-bottom-color"><span class="propinst-border-bottom-color xref">'border-bottom-color'</span></a>
+<a href="box.html#propdef-border-left-color"><span class="propinst-border-left-color xref">'border-left-color'</span></a>
+<td><a href="syndata.html#value-def-color" class="noxref"><span class="value-inst-color">&lt;color&gt;</span></a> | transparent | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>the value of the 'color' property
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="box.html#propdef-border-top-style"><span class="propinst-border-top-style xref">'border-top-style'</span></a>
+<a href="box.html#propdef-border-right-style"><span class="propinst-border-right-style xref">'border-right-style'</span></a>
+<a href="box.html#propdef-border-bottom-style"><span class="propinst-border-bottom-style xref">'border-bottom-style'</span></a>
+<a href="box.html#propdef-border-left-style"><span class="propinst-border-left-style xref">'border-left-style'</span></a>
+<td><a href="box.html#value-def-border-style" class="noxref"><span class="value-inst-border-style">&lt;border-style&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>none
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="box.html#propdef-border-top-width"><span class="propinst-border-top-width xref">'border-top-width'</span></a>
+<a href="box.html#propdef-border-right-width"><span class="propinst-border-right-width xref">'border-right-width'</span></a>
+<a href="box.html#propdef-border-bottom-width"><span class="propinst-border-bottom-width xref">'border-bottom-width'</span></a>
+<a href="box.html#propdef-border-left-width"><span class="propinst-border-left-width xref">'border-left-width'</span></a>
+<td><a href="box.html#value-def-border-width" class="noxref"><span class="value-inst-border-width">&lt;border-width&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>medium
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="box.html#propdef-border-width"><span class="propinst-border-width xref">'border-width'</span></a>
+<td><a href="box.html#value-def-border-width" class="noxref"><span class="value-inst-border-width">&lt;border-width&gt;</span></a>{1,4} | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>see individual properties
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="box.html#propdef-border"><span class="propinst-border xref">'border'</span></a>
+<td>[ <a href="box.html#value-def-border-width" class="noxref"><span class="value-inst-border-width">&lt;border-width&gt;</span></a> || <a href="box.html#value-def-border-style" class="noxref"><span class="value-inst-border-style">&lt;border-style&gt;</span></a> || <a href="box.html#propdef-border-top-color" class="noxref"><span class="propinst-border-top-color">'border-top-color'</span></a> ] | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>see individual properties
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visuren.html#propdef-bottom"><span class="propinst-bottom xref">'bottom'</span></a>
+<td><a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | auto | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>auto
+<td>positioned elements
+<td>no
+<td>refer to height of containing block
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="tables.html#propdef-caption-side"><span class="propinst-caption-side xref">'caption-side'</span></a>
+<td>top | bottom | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>top
+<td>'table-caption' elements
+<td>yes
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visuren.html#propdef-clear"><span class="propinst-clear xref">'clear'</span></a>
+<td>none | left | right | both | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>none
+<td>block-level elements
+<td>no
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visufx.html#propdef-clip"><span class="propinst-clip xref">'clip'</span></a>
+<td><a href="visufx.html#value-def-shape" class="noxref"><span class="value-inst-shape">&lt;shape&gt;</span></a> | auto | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>auto
+<td>absolutely positioned elements
+<td>no
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="colors.html#propdef-color"><span class="propinst-color xref">'color'</span></a>
+<td><a href="syndata.html#value-def-color" class="noxref"><span class="value-inst-color">&lt;color&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>depends on user agent
+<td>&nbsp;
+<td>yes
+
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="generate.html#propdef-content"><span class="propinst-content xref">'content'</span></a>
+<td>normal | none | [ <a href="syndata.html#value-def-string" class="noxref"><span class="value-inst-string">&lt;string&gt;</span></a> | <a href="syndata.html#value-def-uri" class="noxref"><span class="value-inst-uri">&lt;uri&gt;</span></a> | <a href="syndata.html#value-def-counter" class="noxref"><span class="value-inst-counter">&lt;counter&gt;</span></a> | attr(<a href="syndata.html#value-def-identifier" class="noxref"><span class="value-inst-identifier">&lt;identifier&gt;</span></a>) | open-quote | close-quote | no-open-quote | no-close-quote ]+ | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>normal
+<td>:before and :after pseudo-elements
+<td>no
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#all-media-group">all</a>
+
+<tr><td><a href="generate.html#propdef-counter-increment"><span class="propinst-counter-increment xref">'counter-increment'</span></a>
+<td>[ <a href="syndata.html#value-def-identifier" class="noxref"><span class="value-inst-identifier">&lt;identifier&gt;</span></a> <a href="syndata.html#value-def-integer" class="noxref"><span class="value-inst-integer">&lt;integer&gt;</span></a>? ]+ | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>none
+
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#all-media-group">all</a>
+
+<tr><td><a href="generate.html#propdef-counter-reset"><span class="propinst-counter-reset xref">'counter-reset'</span></a>
+<td>[ <a href="syndata.html#value-def-identifier" class="noxref"><span class="value-inst-identifier">&lt;identifier&gt;</span></a> <a href="syndata.html#value-def-integer" class="noxref"><span class="value-inst-integer">&lt;integer&gt;</span></a>? ]+ | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>none
+<td>&nbsp;
+
+<td>no
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#all-media-group">all</a>
+
+<tr><td><a href="aural.html#propdef-cue-after"><span class="propinst-cue-after xref">'cue-after'</span></a>
+<td><a href="syndata.html#value-def-uri" class="noxref"><span class="value-inst-uri">&lt;uri&gt;</span></a> | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>none
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td></td>
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="aural.html#propdef-cue-before"><span class="propinst-cue-before xref">'cue-before'</span></a>
+<td><a href="syndata.html#value-def-uri" class="noxref"><span class="value-inst-uri">&lt;uri&gt;</span></a> | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>none
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td></td>
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="aural.html#propdef-cue"><span class="propinst-cue xref">'cue'</span></a>
+
+<td>[ <a href="aural.html#propdef-cue-before" class="noxref"><span class="propinst-cue-before">'cue-before'</span></a> || <a href="aural.html#propdef-cue-after" class="noxref"><span class="propinst-cue-after">'cue-after'</span></a> ] | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>see individual properties
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td></td>
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="ui.html#propdef-cursor"><span class="propinst-cursor xref">'cursor'</span></a>
+
+<td>[ [<a href="syndata.html#value-def-uri" class="noxref"><span class="value-inst-uri">&lt;uri&gt;</span></a> ,]* [ auto | crosshair | default | pointer | move | e-resize | ne-resize | nw-resize | n-resize | se-resize | sw-resize | s-resize | w-resize | text | wait | help | progress ] ] | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>auto
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>, <a href="media.html#interactive-media-group">interactive</a>
+
+<tr><td><a href="visuren.html#propdef-direction"><span class="propinst-direction xref">'direction'</span></a>
+
+<td>ltr | rtl | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>ltr
+<td>all elements, but see prose
+<td>yes
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visuren.html#propdef-display"><span class="propinst-display xref">'display'</span></a>
+<td>inline | block | list-item | run-in | inline-block | table | inline-table | table-row-group | table-header-group | table-footer-group | table-row | table-column-group | table-column | table-cell | table-caption | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>inline
+<td>&nbsp;
+
+<td>no
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#all-media-group">all</a>
+
+<tr><td><a href="aural.html#propdef-elevation"><span class="propinst-elevation xref">'elevation'</span></a>
+<td><a href="aural.html#value-def-angle" class="noxref"><span class="value-inst-angle">&lt;angle&gt;</span></a>  | below | level | above | higher | lower | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>level
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+<td></td>
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="tables.html#propdef-empty-cells"><span class="propinst-empty-cells xref">'empty-cells'</span></a>
+<td>show | hide | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>show
+<td>'table-cell' elements
+<td>yes
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visuren.html#propdef-float"><span class="propinst-float xref">'float'</span></a>
+<td>left | right | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>none
+<td>all, but see <a href="visuren.html#dis-pos-flo">9.7</a>
+<td>no
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="fonts.html#propdef-font-family"><span class="propinst-font-family xref">'font-family'</span></a>
+<td>[[ <a href="fonts.html#value-def-family-name" class="noxref"><span class="value-inst-family-name">&lt;family-name&gt;</span></a> | <a href="fonts.html#value-def-generic-family" class="noxref"><span class="value-inst-generic-family">&lt;generic-family&gt;</span></a> ] [, <a href="fonts.html#value-def-family-name" class="noxref"><span class="value-inst-family-name">&lt;family-name&gt;</span></a>| <a href="fonts.html#value-def-generic-family" class="noxref"><span class="value-inst-generic-family">&lt;generic-family&gt;</span></a>]* ] | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>depends on user agent
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="fonts.html#propdef-font-size"><span class="propinst-font-size xref">'font-size'</span></a>
+<td><a href="fonts.html#value-def-absolute-size" class="noxref"><span class="value-inst-absolute-size">&lt;absolute-size&gt;</span></a> | <a href="fonts.html#value-def-relative-size" class="noxref"><span class="value-inst-relative-size">&lt;relative-size&gt;</span></a> | <a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>medium
+<td>&nbsp;
+<td>yes
+<td>refer to parent element's font size
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="fonts.html#propdef-font-style"><span class="propinst-font-style xref">'font-style'</span></a>
+<td>normal | italic | oblique | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>normal
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="fonts.html#propdef-font-variant"><span class="propinst-font-variant xref">'font-variant'</span></a>
+<td>normal | small-caps | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>normal
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="fonts.html#propdef-font-weight"><span class="propinst-font-weight xref">'font-weight'</span></a>
+<td>normal | bold | bolder | lighter | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900 | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>normal
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="fonts.html#propdef-font"><span class="propinst-font xref">'font'</span></a>
+<td>[ [ <a href="fonts.html#propdef-font-style" class="noxref"><span class="propinst-font-style">'font-style'</span></a> || <a href="fonts.html#propdef-font-variant" class="noxref"><span class="propinst-font-variant">'font-variant'</span></a> || <a href="fonts.html#propdef-font-weight" class="noxref"><span class="propinst-font-weight">'font-weight'</span></a> ]? <a href="fonts.html#propdef-font-size" class="noxref"><span class="propinst-font-size">'font-size'</span></a> [ / <a href="visudet.html#propdef-line-height" class="noxref"><span class="propinst-line-height">'line-height'</span></a> ]? <a href="fonts.html#propdef-font-family" class="noxref"><span class="propinst-font-family">'font-family'</span></a> ] | caption | icon | menu | message-box | small-caption | status-bar | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>see individual properties
+<td>&nbsp;
+<td>yes
+<td>see individual properties
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visudet.html#propdef-height"><span class="propinst-height xref">'height'</span></a>
+<td><a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | auto | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>auto
+<td>all elements but non-replaced inline elements, table columns, and column groups
+<td>no
+<td>see prose
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visuren.html#propdef-left"><span class="propinst-left xref">'left'</span></a>
+<td><a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | auto | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>auto
+<td>positioned elements
+<td>no
+<td>refer to width of containing block
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="text.html#propdef-letter-spacing"><span class="propinst-letter-spacing xref">'letter-spacing'</span></a>
+<td>normal | <a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>normal
+<td>&nbsp;
+
+<td>yes
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visudet.html#propdef-line-height"><span class="propinst-line-height xref">'line-height'</span></a>
+<td>normal | <a href="syndata.html#value-def-number" class="noxref"><span class="value-inst-number">&lt;number&gt;</span></a> | <a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>normal
+<td>&nbsp;
+<td>yes
+<td>refer to the font size of the element itself
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="generate.html#propdef-list-style-image"><span class="propinst-list-style-image xref">'list-style-image'</span></a>
+<td><a href="syndata.html#value-def-uri" class="noxref"><span class="value-inst-uri">&lt;uri&gt;</span></a> | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>none
+<td>elements with 'display: list-item'
+<td>yes
+
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="generate.html#propdef-list-style-position"><span class="propinst-list-style-position xref">'list-style-position'</span></a>
+<td>inside | outside | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>outside
+<td>elements with 'display: list-item'
+<td>yes
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="generate.html#propdef-list-style-type"><span class="propinst-list-style-type xref">'list-style-type'</span></a>
+
+<td>disc | circle | square | decimal | decimal-leading-zero |   lower-roman | upper-roman | lower-greek |  lower-latin | upper-latin | armenian | georgian |  lower-alpha | upper-alpha |  none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>disc
+<td>elements with 'display: list-item'
+<td>yes
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="generate.html#propdef-list-style"><span class="propinst-list-style xref">'list-style'</span></a>
+<td>[ <a href="generate.html#propdef-list-style-type" class="noxref"><span class="propinst-list-style-type">'list-style-type'</span></a> || <a href="generate.html#propdef-list-style-position" class="noxref"><span class="propinst-list-style-position">'list-style-position'</span></a> || <a href="generate.html#propdef-list-style-image" class="noxref"><span class="propinst-list-style-image">'list-style-image'</span></a> ] | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>see individual properties
+<td>elements with 'display: list-item'
+<td>yes
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="box.html#propdef-margin-right"><span class="propinst-margin-right xref">'margin-right'</span></a>
+<a href="box.html#propdef-margin-left"><span class="propinst-margin-left xref">'margin-left'</span></a>
+<td><a href="box.html#value-def-margin-width" class="noxref"><span class="value-inst-margin-width">&lt;margin-width&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>0
+
+<td>all elements except elements with table display     types other than table-caption, table and inline-table
+<td>no
+<td>refer to width of containing block
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="box.html#propdef-margin-top"><span class="propinst-margin-top xref">'margin-top'</span></a>
+<a href="box.html#propdef-margin-bottom"><span class="propinst-margin-bottom xref">'margin-bottom'</span></a>
+<td><a href="box.html#value-def-margin-width" class="noxref"><span class="value-inst-margin-width">&lt;margin-width&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>0
+<td>all elements except elements with table display     types other than table-caption, table and inline-table
+
+<td>no
+<td>refer to width of containing block
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="box.html#propdef-margin"><span class="propinst-margin xref">'margin'</span></a>
+<td><a href="box.html#value-def-margin-width" class="noxref"><span class="value-inst-margin-width">&lt;margin-width&gt;</span></a>{1,4} | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>see individual properties
+<td>all elements except elements with table display     types other than table-caption, table and inline-table
+<td>no
+<td>refer to width of containing block
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visudet.html#propdef-max-height"><span class="propinst-max-height xref">'max-height'</span></a>
+<td><a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>none
+<td>all elements but non-replaced inline elements, table columns, and column groups
+<td>no
+<td>see prose
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visudet.html#propdef-max-width"><span class="propinst-max-width xref">'max-width'</span></a>
+<td><a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>none
+<td>all elements but non-replaced inline elements, table rows, and row groups
+<td>no
+<td>refer to width of containing block
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visudet.html#propdef-min-height"><span class="propinst-min-height xref">'min-height'</span></a>
+<td><a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>0
+<td>all elements but non-replaced inline elements, table columns, and column groups
+<td>no
+<td>see prose
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visudet.html#propdef-min-width"><span class="propinst-min-width xref">'min-width'</span></a>
+<td><a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>0
+<td>all elements but non-replaced inline elements, table rows, and row groups
+<td>no
+<td>refer to width of containing block
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="page.html#propdef-orphans"><span class="propinst-orphans xref">'orphans'</span></a>
+<td><a href="syndata.html#value-def-integer" class="noxref"><span class="value-inst-integer">&lt;integer&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>2
+<td>block-level elements
+<td>yes
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>, <a href="media.html#paged-media-group">paged</a>
+
+<tr><td><a href="ui.html#propdef-outline-color"><span class="propinst-outline-color xref">'outline-color'</span></a>
+<td><a href="syndata.html#value-def-color" class="noxref"><span class="value-inst-color">&lt;color&gt;</span></a> | invert | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>invert
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>, <a href="media.html#interactive-media-group">interactive</a>
+
+<tr><td><a href="ui.html#propdef-outline-style"><span class="propinst-outline-style xref">'outline-style'</span></a>
+
+<td><a href="box.html#value-def-border-style" class="noxref"><span class="value-inst-border-style">&lt;border-style&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>none
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>, <a href="media.html#interactive-media-group">interactive</a>
+
+<tr><td><a href="ui.html#propdef-outline-width"><span class="propinst-outline-width xref">'outline-width'</span></a>
+<td><a href="box.html#value-def-border-width" class="noxref"><span class="value-inst-border-width">&lt;border-width&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>medium
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>, <a href="media.html#interactive-media-group">interactive</a>
+
+<tr><td><a href="ui.html#propdef-outline"><span class="propinst-outline xref">'outline'</span></a>
+<td>[ <a href="ui.html#propdef-outline-color" class="noxref"><span class="propinst-outline-color">'outline-color'</span></a> || <a href="ui.html#propdef-outline-style" class="noxref"><span class="propinst-outline-style">'outline-style'</span></a> || <a href="ui.html#propdef-outline-width" class="noxref"><span class="propinst-outline-width">'outline-width'</span></a> ] | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>see individual properties
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>, <a href="media.html#interactive-media-group">interactive</a>
+
+<tr><td><a href="visufx.html#propdef-overflow"><span class="propinst-overflow xref">'overflow'</span></a>
+<td>visible | hidden | scroll | auto | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>visible
+<td>non-replaced block-level elements, table cells, and inline-block elements
+<td>no
+
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="box.html#propdef-padding-top"><span class="propinst-padding-top xref">'padding-top'</span></a>
+<a href="box.html#propdef-padding-right"><span class="propinst-padding-right xref">'padding-right'</span></a>
+<a href="box.html#propdef-padding-bottom"><span class="propinst-padding-bottom xref">'padding-bottom'</span></a>
+<a href="box.html#propdef-padding-left"><span class="propinst-padding-left xref">'padding-left'</span></a>
+<td><a href="box.html#value-def-padding-width" class="noxref"><span class="value-inst-padding-width">&lt;padding-width&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>0
+<td>all elements except table-row-group, table-header-group, table-footer-group, table-row, table-column-group and table-column
+<td>no
+<td>refer to width of containing block
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="box.html#propdef-padding"><span class="propinst-padding xref">'padding'</span></a>
+<td><a href="box.html#value-def-padding-width" class="noxref"><span class="value-inst-padding-width">&lt;padding-width&gt;</span></a>{1,4} | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>see individual properties
+<td>all elements except table-row-group, table-header-group, table-footer-group, table-row, table-column-group and table-column
+<td>no
+<td>refer to width of containing block
+
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="page.html#propdef-page-break-after"><span class="propinst-page-break-after xref">'page-break-after'</span></a>
+<td>auto | always | avoid | left | right | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>auto
+<td>block-level elements
+<td>no
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>, <a href="media.html#paged-media-group">paged</a>
+
+<tr><td><a href="page.html#propdef-page-break-before"><span class="propinst-page-break-before xref">'page-break-before'</span></a>
+<td>auto | always | avoid | left | right | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>auto
+<td>block-level elements
+<td>no
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>, <a href="media.html#paged-media-group">paged</a>
+
+<tr><td><a href="page.html#propdef-page-break-inside"><span class="propinst-page-break-inside xref">'page-break-inside'</span></a>
+<td>avoid | auto | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>auto
+<td>block-level elements
+<td>yes
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>, <a href="media.html#paged-media-group">paged</a>
+
+<tr><td><a href="aural.html#propdef-pause-after"><span class="propinst-pause-after xref">'pause-after'</span></a>
+<td><a href="aural.html#value-def-time" class="noxref"><span class="value-inst-time">&lt;time&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>0
+<td>&nbsp;
+<td>no
+<td>see prose
+<td></td>
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="aural.html#propdef-pause-before"><span class="propinst-pause-before xref">'pause-before'</span></a>
+<td><a href="aural.html#value-def-time" class="noxref"><span class="value-inst-time">&lt;time&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>0
+<td>&nbsp;
+<td>no
+<td>see prose
+<td></td>
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="aural.html#propdef-pause"><span class="propinst-pause xref">'pause'</span></a>
+<td>[ [<a href="aural.html#value-def-time" class="noxref"><span class="value-inst-time">&lt;time&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a>]{1,2} ] | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>see individual properties
+<td>&nbsp;
+<td>no
+<td>see descriptions of 'pause-before' and 'pause-after'
+<td></td>
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="aural.html#propdef-pitch-range"><span class="propinst-pitch-range xref">'pitch-range'</span></a>
+<td><a href="syndata.html#value-def-number" class="noxref"><span class="value-inst-number">&lt;number&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>50
+<td>&nbsp;
+<td>yes
+
+<td>&nbsp;
+<td></td>
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="aural.html#propdef-pitch"><span class="propinst-pitch xref">'pitch'</span></a>
+<td><a href="aural.html#value-def-frequency" class="noxref"><span class="value-inst-frequency">&lt;frequency&gt;</span></a> | x-low | low | medium | high | x-high | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>medium
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+<td></td>
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="aural.html#propdef-play-during"><span class="propinst-play-during xref">'play-during'</span></a>
+<td><a href="syndata.html#value-def-uri" class="noxref"><span class="value-inst-uri">&lt;uri&gt;</span></a> [ mix || repeat ]? | auto | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>auto
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td></td>
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="visuren.html#propdef-position"><span class="propinst-position xref">'position'</span></a>
+
+<td>static | relative | absolute | fixed | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>static
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="generate.html#propdef-quotes"><span class="propinst-quotes xref">'quotes'</span></a>
+<td>[<a href="syndata.html#value-def-string" class="noxref"><span class="value-inst-string">&lt;string&gt;</span></a> <a href="syndata.html#value-def-string" class="noxref"><span class="value-inst-string">&lt;string&gt;</span></a>]+ | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>depends on user agent
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+<td></td>
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="aural.html#propdef-richness"><span class="propinst-richness xref">'richness'</span></a>
+<td><a href="syndata.html#value-def-number" class="noxref"><span class="value-inst-number">&lt;number&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>50
+<td>&nbsp;
+<td>yes
+
+<td>&nbsp;
+    <td></td>
+    <td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="visuren.html#propdef-right"><span class="propinst-right xref">'right'</span></a>
+<td><a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | auto | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>auto
+<td>positioned elements
+<td>no
+
+<td>refer to width of containing block
+    <td></td>
+    <td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="aural.html#propdef-speak-header"><span class="propinst-speak-header xref">'speak-header'</span></a>
+<td>once | always | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>once
+<td>elements that have table header information
+<td>yes
+<td>&nbsp;
+    <td></td>
+    <td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="aural.html#propdef-speak-numeral"><span class="propinst-speak-numeral xref">'speak-numeral'</span></a>
+
+<td>digits | continuous | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>continuous
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+    <td></td>
+    <td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="aural.html#propdef-speak-punctuation"><span class="propinst-speak-punctuation xref">'speak-punctuation'</span></a>
+<td>code | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>none
+<td>&nbsp;
+
+<td>yes
+<td>&nbsp;
+    <td></td>
+    <td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="aural.html#propdef-speak"><span class="propinst-speak xref">'speak'</span></a>
+<td>normal | none | spell-out | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>normal
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+    <td></td>
+    <td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="aural.html#propdef-speech-rate"><span class="propinst-speech-rate xref">'speech-rate'</span></a>
+<td><a href="syndata.html#value-def-number" class="noxref"><span class="value-inst-number">&lt;number&gt;</span></a>  | x-slow | slow | medium | fast | x-fast | faster | slower | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>medium
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+    <td></td>
+    <td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="aural.html#propdef-stress"><span class="propinst-stress xref">'stress'</span></a>
+<td><a href="syndata.html#value-def-number" class="noxref"><span class="value-inst-number">&lt;number&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>50
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+    <td></td>
+    <td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="tables.html#propdef-table-layout"><span class="propinst-table-layout xref">'table-layout'</span></a>
+<td>auto | fixed | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>auto
+<td>'table' and 'inline-table' elements
+<td>no
+<td>&nbsp;
+    <td></td>
+    <td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="text.html#propdef-text-align"><span class="propinst-text-align xref">'text-align'</span></a>
+<td>left | right | center | justify | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>a nameless value that acts as 'left' if 'direction' is 'ltr',   'right' if 'direction' is 'rtl'
+<td>block-level elements, table cells and inline blocks
+<td>yes
+<td>&nbsp;
+    <td></td>
+    <td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="text.html#propdef-text-decoration"><span class="propinst-text-decoration xref">'text-decoration'</span></a>
+<td>none | [ underline || overline || line-through || blink ] | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>none
+<td>&nbsp;
+<td>no (see prose)
+<td>&nbsp;
+    <td></td>
+    <td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="text.html#propdef-text-indent"><span class="propinst-text-indent xref">'text-indent'</span></a>
+<td><a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>0
+<td>block-level elements, table cells and inline blocks
+<td>yes
+<td>refer to width of containing block
+    <td></td>
+    <td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="text.html#propdef-text-transform"><span class="propinst-text-transform xref">'text-transform'</span></a>
+<td>capitalize | uppercase | lowercase | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>none
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+    <td></td>
+    <td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visuren.html#propdef-top"><span class="propinst-top xref">'top'</span></a>
+<td><a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | auto | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>auto
+<td>positioned elements
+<td>no
+<td>refer to height of containing block
+    <td></td>
+    <td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visuren.html#propdef-unicode-bidi"><span class="propinst-unicode-bidi xref">'unicode-bidi'</span></a>
+<td>normal | embed | bidi-override | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>normal
+<td>all elements, but see prose
+<td>no
+<td>&nbsp;
+    <td></td>
+    <td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visudet.html#propdef-vertical-align"><span class="propinst-vertical-align xref">'vertical-align'</span></a>
+<td>baseline | sub | super | top | text-top | middle |     bottom | text-bottom | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>baseline
+<td>inline-level and 'table-cell' elements
+<td>no
+<td>refer to the 'line-height' of the element itself
+    <td></td>
+    <td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visufx.html#propdef-visibility"><span class="propinst-visibility xref">'visibility'</span></a>
+<td>visible | hidden | collapse | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>visible
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+    <td></td>
+    <td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="aural.html#propdef-voice-family"><span class="propinst-voice-family xref">'voice-family'</span></a>
+<td>[[<a href="aural.html#value-def-specific-voice" class="noxref"><span class="value-inst-specific-voice">&lt;specific-voice&gt;</span></a>  | <a href="aural.html#value-def-generic-voice" class="noxref"><span class="value-inst-generic-voice">&lt;generic-voice&gt;</span></a> ],]* [<a href="aural.html#value-def-specific-voice" class="noxref"><span class="value-inst-specific-voice">&lt;specific-voice&gt;</span></a>  | <a href="aural.html#value-def-generic-voice" class="noxref"><span class="value-inst-generic-voice">&lt;generic-voice&gt;</span></a> ] | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>depends on user agent
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+    <td></td>
+    <td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="aural.html#propdef-volume"><span class="propinst-volume xref">'volume'</span></a>
+<td><a href="syndata.html#value-def-number" class="noxref"><span class="value-inst-number">&lt;number&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | silent | x-soft | soft | medium | loud | x-loud | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>medium
+<td>&nbsp;
+<td>yes
+<td>refer to inherited value
+    <td></td>
+    <td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="text.html#propdef-white-space"><span class="propinst-white-space xref">'white-space'</span></a>
+<td>normal | pre | nowrap | pre-wrap | pre-line | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>normal
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+    <td></td>
+    <td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="page.html#propdef-widows"><span class="propinst-widows xref">'widows'</span></a>
+<td><a href="syndata.html#value-def-integer" class="noxref"><span class="value-inst-integer">&lt;integer&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>2
+<td>block-level elements
+<td>yes
+<td>&nbsp;
+    <td></td>
+    <td><a href="media.html#visual-media-group">visual</a>, <a href="media.html#paged-media-group">paged</a>
+
+<tr><td><a href="visudet.html#propdef-width"><span class="propinst-width xref">'width'</span></a>
+<td><a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | auto | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>auto
+<td>all elements but non-replaced inline elements, table rows, and row groups
+<td>no
+<td>refer to width of containing block
+    <td></td>
+    <td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="text.html#propdef-word-spacing"><span class="propinst-word-spacing xref">'word-spacing'</span></a>
+<td>normal | <a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>normal
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+    <td></td>
+    <td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visuren.html#propdef-z-index"><span class="propinst-z-index xref">'z-index'</span></a>
+
+<td>auto | <a href="syndata.html#value-def-integer" class="noxref"><span class="value-inst-integer">&lt;integer&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>auto
+<td>positioned elements
+<td>no
+<td>&nbsp;
+    <td></td>
+    <td><a href="media.html#visual-media-group">visual</a>
+
+</table>
diff --git a/xml/tests/testData/generateactions/addColumn/after8.xml b/xml/tests/testData/generateactions/addColumn/after8.xml
new file mode 100644
index 000000000000..1b4b1a7d970c
--- /dev/null
+++ b/xml/tests/testData/generateactions/addColumn/after8.xml
@@ -0,0 +1,41 @@
+<!-- "Add a new column to the table after the current one" "true" -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<link rel="stylesheet" href="a.css"/>
+<title>fdgsd</title>
+</head>
+<body>
+<div>dsfgsdgfdg</div>
+<table>
+    <tr>
+        <td>1</td>
+        <td>2</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>.</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <t<caret>d>3</td>
+        <td>4</td>
+        <td colspan="11">1</td>
+    </tr>
+    <tr>
+        <td colspan="13">1</td>
+        <td>2</td>
+        <td colspan="11">1</td>
+    </tr>
+    <tr>
+        <td colspan="11">1</td>
+        <td>2</td>
+        <td>3</td>
+        <td colspan="11">1</td>
+    </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/generateactions/addColumn/before1.html b/xml/tests/testData/generateactions/addColumn/before1.html
new file mode 100644
index 000000000000..1b4b1a7d970c
--- /dev/null
+++ b/xml/tests/testData/generateactions/addColumn/before1.html
@@ -0,0 +1,41 @@
+<!-- "Add a new column to the table after the current one" "true" -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<link rel="stylesheet" href="a.css"/>
+<title>fdgsd</title>
+</head>
+<body>
+<div>dsfgsdgfdg</div>
+<table>
+    <tr>
+        <td>1</td>
+        <td>2</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>.</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <t<caret>d>3</td>
+        <td>4</td>
+        <td colspan="11">1</td>
+    </tr>
+    <tr>
+        <td colspan="13">1</td>
+        <td>2</td>
+        <td colspan="11">1</td>
+    </tr>
+    <tr>
+        <td colspan="11">1</td>
+        <td>2</td>
+        <td>3</td>
+        <td colspan="11">1</td>
+    </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/generateactions/addColumn/before2.xhtml b/xml/tests/testData/generateactions/addColumn/before2.xhtml
new file mode 100644
index 000000000000..c2545b19f3d0
--- /dev/null
+++ b/xml/tests/testData/generateactions/addColumn/before2.xhtml
@@ -0,0 +1,41 @@
+<!-- "Add a new column to the table after the current one" "true" -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<link rel="stylesheet" href="a.css"/>
+<title>fdgsd</title>
+</head>
+<body>
+<div>dsfgsdgfdg</div>
+<table>
+    <tr>
+        <td>1</td>
+        <td>2</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>.</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>4</td>
+        <td colspan="11">1</td>
+    </tr>
+    <tr>
+        <td colspan="13">1</td>
+        <td>2</td>
+        <td colspan="11">1</td>
+    </tr>
+    <tr>
+        <td colspan="11">1</td>
+        <td>2</td>
+        <td>3</td>
+        <t<caret>d colspan="11">1</td>
+    </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/generateactions/addColumn/before3.jsp b/xml/tests/testData/generateactions/addColumn/before3.jsp
new file mode 100644
index 000000000000..f4e9cd48e072
--- /dev/null
+++ b/xml/tests/testData/generateactions/addColumn/before3.jsp
@@ -0,0 +1,69 @@
+<!-- "Add a new column to the table after the current one" "true" -->
+<html>
+<head>
+    <link rel="stylesheet" href="a.css"/>
+    <title>fdgsd</title>
+</head>
+<body>
+<div>dsfgsdgfdg</div>
+<table border="1">
+    <thead>
+    </thead>
+    <tbody>
+    </tbody>
+    <tr>
+        <td colspan="5">1</td>
+        <td rowspan="5">2</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td>2</td>
+        <td>5</td>
+        <td>2'</td>
+        <td>3</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td colspan="4">2</td>
+    </tr>
+    <tr>
+        <td rowspan="2" colspan="1">1</td>
+        <td>2</td>
+        <td>3</td>
+        <td rowspan="2" colspan="2">3</td>
+    </tr>
+    <tr>
+        <td><caret>1</td>
+        <td>4</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td colspan="4">2</td>
+        <td>5</td>
+    </tr>
+    <tr>
+        <td colspan="3" rowspan="3">1</td>
+        <td colspan="1" rowspan="2">2</td>
+        <td colspan="2" rowspan="4">3</td>
+    </tr>
+    <tr/>
+    <tr>
+        <td>1</td>
+    </tr>
+    <tr>
+        <td>2</td>
+        <td>3</td>
+        <td>2</td>
+        <td>4</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td>2</td>
+        <td>7</td>
+        <td>3</td>
+        <td>4</td>
+        <td>5</td>
+    </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/generateactions/addColumn/before4.jspx b/xml/tests/testData/generateactions/addColumn/before4.jspx
new file mode 100644
index 000000000000..d5d6fe721c0a
--- /dev/null
+++ b/xml/tests/testData/generateactions/addColumn/before4.jspx
@@ -0,0 +1,69 @@
+<!-- "Add a new column to the table after the current one" "true" -->
+<html>
+<head>
+    <link rel="stylesheet" href="a.css"/>
+    <title>fdgsd</title>
+</head>
+<body>
+<div>dsfgsdgfdg</div>
+<table border="1">
+    <thead>
+    </thead>
+    <tbody>
+    </tbody>
+    <tr>
+        <td colspan="5">1</td>
+        <td rowspan="5">2</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td>2</td>
+        <td>5</td>
+        <td>2'</td>
+        <td>3</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td colspan="4">2</td>
+    </tr>
+    <tr>
+        <td rowspan="2" colspan="1">1</td>
+        <td>2</td>
+        <td>3</td>
+        <td rowspan="2" colspan="2">3</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td>4</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td colspan="4">2</td>
+        <td>5</td>
+    </tr>
+    <tr>
+        <t<caret>d colspan="3" rowspan="3">1</td>
+        <td colspan="1" rowspan="2">2</td>
+        <td colspan="2" rowspan="4">3</td>
+    </tr>
+    <tr/>
+    <tr>
+        <td>1</td>
+    </tr>
+    <tr>
+        <td>2</td>
+        <td>3</td>
+        <td>2</td>
+        <td>4</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td>2</td>
+        <td>7</td>
+        <td>3</td>
+        <td>4</td>
+        <td>5</td>
+    </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/generateactions/addColumn/before5.html b/xml/tests/testData/generateactions/addColumn/before5.html
new file mode 100644
index 000000000000..02024f534af6
--- /dev/null
+++ b/xml/tests/testData/generateactions/addColumn/before5.html
@@ -0,0 +1,69 @@
+<!-- "Add a new column to the table before the current one" "true" -->
+<html>
+<head>
+    <link rel="stylesheet" href="a.css"/>
+    <title>fdgsd</title>
+</head>
+<body>
+<div>dsfgsdgfdg</div>
+<table border="1">
+    <thead>
+    </thead>
+    <tbody>
+    </tbody>
+    <tr>
+        <td colspan="5">1</td>
+        <td rowspan="5">2</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td>2</td>
+        <td>5</td>
+        <td>2'</td>
+        <td>3</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td colspan="4">2</td>
+    </tr>
+    <tr>
+        <td rowspan="2" colspan="1">1</td>
+        <td>2</td>
+        <td>3</td>
+        <td rowspan="2" colspan="2">3</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td>4</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td colspan="4">2</td>
+        <td>5</td>
+    </tr>
+    <tr>
+        <td colspan="3" rowspan="3">1</td>
+        <td colspan="1" rowspan="2">2</td>
+        <td colspan="2" rowspan="4">3</td>
+    </tr>
+    <tr/>
+    <tr>
+        <td>1</td>
+    </tr>
+    <tr>
+        <td>2</td>
+        <td>3</td>
+        <td>2</td>
+        <td>4</td>
+    </tr>
+    <tr>
+        <t<caret>d>1</td>
+        <td>2</td>
+        <td>7</td>
+        <td>3</td>
+        <td>4</td>
+        <td>5</td>
+    </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/generateactions/addColumn/before6.html b/xml/tests/testData/generateactions/addColumn/before6.html
new file mode 100644
index 000000000000..f1826d6ae995
--- /dev/null
+++ b/xml/tests/testData/generateactions/addColumn/before6.html
@@ -0,0 +1,6 @@
+<!-- "Add a new column to the table after the current one" "true" -->
+<table border="1">
+<thead> <tr> <th>1 <t<caret>h>2
+<tr> <th>1 <th> 2 </tr> </thead>
+    <tr><td>1</td> <td> 2</td></tr>
+</table>
\ No newline at end of file
diff --git a/xml/tests/testData/generateactions/addColumn/before7.html b/xml/tests/testData/generateactions/addColumn/before7.html
new file mode 100644
index 000000000000..77015e0eb175
--- /dev/null
+++ b/xml/tests/testData/generateactions/addColumn/before7.html
@@ -0,0 +1,866 @@
+<!-- "Add a new column to the table after the current one" "true" -->
+<table border=1>
+<thead><tr align=center><th>Name<th>Values<th>Initial value<th>Applies to<br>(Default: all)<th>Inherited?<th>Percentages<br>(Default: N/A)<th>Media groups</thead>
+
+<tr><td><a href="aural.html#propdef-azimuth"><span class="propinst-azimuth xref">'azimuth'</span></a>
+<td><a href="aural.html#value-def-angle" class="noxref"><span class="value-inst-angle">&lt;angle&gt;</span></a> | [[ left-side | far-left | left | center-left | center | center-right | right | far-right | right-side ] || behind ] | leftwards | rightwards | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>center
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="colors.html#propdef-background-attachment"><span class="propinst-background-attachment xref">'background-attachment'</span></a>
+<td>scroll | fixed | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>scroll
+<td>&nbsp;
+<td>no
+<t<caret>d>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="colors.html#propdef-background-color"><span class="propinst-background-color xref">'background-color'</span></a>
+<td><a href="syndata.html#value-def-color" class="noxref"><span class="value-inst-color">&lt;color&gt;</span></a> | transparent | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>transparent
+<td>&nbsp;
+<td>no
+
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="colors.html#propdef-background-image"><span class="propinst-background-image xref">'background-image'</span></a>
+<td><a href="syndata.html#value-def-uri" class="noxref"><span class="value-inst-uri">&lt;uri&gt;</span></a> | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>none
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="colors.html#propdef-background-position"><span class="propinst-background-position xref">'background-position'</span></a>
+<td>[ [ <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | left | center | right ]            [ <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | top | center | bottom ]? ] |          [ [ left | center | right ] || [ top | center | bottom ] ] |          <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>0% 0%
+<td>&nbsp;
+<td>no
+<td>refer to the size of the box itself
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="colors.html#propdef-background-repeat"><span class="propinst-background-repeat xref">'background-repeat'</span></a>
+<td>repeat | repeat-x | repeat-y | no-repeat | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>repeat
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="colors.html#propdef-background"><span class="propinst-background xref">'background'</span></a>
+<td>[<a href="colors.html#propdef-background-color" class="noxref"><span class="propinst-background-color">'background-color'</span></a> || <a href="colors.html#propdef-background-image" class="noxref"><span class="propinst-background-image">'background-image'</span></a> || <a href="colors.html#propdef-background-repeat" class="noxref"><span class="propinst-background-repeat">'background-repeat'</span></a> || <a href="colors.html#propdef-background-attachment" class="noxref"><span class="propinst-background-attachment">'background-attachment'</span></a> || <a href="colors.html#propdef-background-position" class="noxref"><span class="propinst-background-position">'background-position'</span></a>] | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>see individual properties
+<td>&nbsp;
+<td>no
+<td>allowed on 'background-position'
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="tables.html#propdef-border-collapse"><span class="propinst-border-collapse xref">'border-collapse'</span></a>
+<td>collapse | separate | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>separate
+<td>'table' and 'inline-table' elements
+<td>yes
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="box.html#propdef-border-color"><span class="propinst-border-color xref">'border-color'</span></a>
+<td>[ <a href="syndata.html#value-def-color" class="noxref"><span class="value-inst-color">&lt;color&gt;</span></a> | transparent ]{1,4} | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>see individual properties
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="tables.html#propdef-border-spacing"><span class="propinst-border-spacing xref">'border-spacing'</span></a>
+
+<td><a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> <a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a>? | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>0
+<td>'table' and 'inline-table' elements&nbsp;
+<td>yes
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="box.html#propdef-border-style"><span class="propinst-border-style xref">'border-style'</span></a>
+<td><a href="box.html#value-def-border-style" class="noxref"><span class="value-inst-border-style">&lt;border-style&gt;</span></a>{1,4} | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>see individual properties
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="box.html#propdef-border-top"><span class="propinst-border-top xref">'border-top'</span></a>
+<a href="box.html#propdef-border-right"><span class="propinst-border-right xref">'border-right'</span></a>
+<a href="box.html#propdef-border-bottom"><span class="propinst-border-bottom xref">'border-bottom'</span></a>
+<a href="box.html#propdef-border-left"><span class="propinst-border-left xref">'border-left'</span></a>
+<td>[ <a href="box.html#value-def-border-width" class="noxref"><span class="value-inst-border-width">&lt;border-width&gt;</span></a> || <a href="box.html#value-def-border-style" class="noxref"><span class="value-inst-border-style">&lt;border-style&gt;</span></a> || <a href="box.html#propdef-border-top-color" class="noxref"><span class="propinst-border-top-color">'border-top-color'</span></a> ] | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>see individual properties
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="box.html#propdef-border-top-color"><span class="propinst-border-top-color xref">'border-top-color'</span></a>
+<a href="box.html#propdef-border-right-color"><span class="propinst-border-right-color xref">'border-right-color'</span></a>
+<a href="box.html#propdef-border-bottom-color"><span class="propinst-border-bottom-color xref">'border-bottom-color'</span></a>
+<a href="box.html#propdef-border-left-color"><span class="propinst-border-left-color xref">'border-left-color'</span></a>
+<td><a href="syndata.html#value-def-color" class="noxref"><span class="value-inst-color">&lt;color&gt;</span></a> | transparent | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>the value of the 'color' property
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="box.html#propdef-border-top-style"><span class="propinst-border-top-style xref">'border-top-style'</span></a>
+<a href="box.html#propdef-border-right-style"><span class="propinst-border-right-style xref">'border-right-style'</span></a>
+<a href="box.html#propdef-border-bottom-style"><span class="propinst-border-bottom-style xref">'border-bottom-style'</span></a>
+<a href="box.html#propdef-border-left-style"><span class="propinst-border-left-style xref">'border-left-style'</span></a>
+<td><a href="box.html#value-def-border-style" class="noxref"><span class="value-inst-border-style">&lt;border-style&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>none
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="box.html#propdef-border-top-width"><span class="propinst-border-top-width xref">'border-top-width'</span></a>
+<a href="box.html#propdef-border-right-width"><span class="propinst-border-right-width xref">'border-right-width'</span></a>
+<a href="box.html#propdef-border-bottom-width"><span class="propinst-border-bottom-width xref">'border-bottom-width'</span></a>
+<a href="box.html#propdef-border-left-width"><span class="propinst-border-left-width xref">'border-left-width'</span></a>
+<td><a href="box.html#value-def-border-width" class="noxref"><span class="value-inst-border-width">&lt;border-width&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>medium
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="box.html#propdef-border-width"><span class="propinst-border-width xref">'border-width'</span></a>
+<td><a href="box.html#value-def-border-width" class="noxref"><span class="value-inst-border-width">&lt;border-width&gt;</span></a>{1,4} | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>see individual properties
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="box.html#propdef-border"><span class="propinst-border xref">'border'</span></a>
+<td>[ <a href="box.html#value-def-border-width" class="noxref"><span class="value-inst-border-width">&lt;border-width&gt;</span></a> || <a href="box.html#value-def-border-style" class="noxref"><span class="value-inst-border-style">&lt;border-style&gt;</span></a> || <a href="box.html#propdef-border-top-color" class="noxref"><span class="propinst-border-top-color">'border-top-color'</span></a> ] | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>see individual properties
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visuren.html#propdef-bottom"><span class="propinst-bottom xref">'bottom'</span></a>
+<td><a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | auto | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>auto
+<td>positioned elements
+<td>no
+<td>refer to height of containing block
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="tables.html#propdef-caption-side"><span class="propinst-caption-side xref">'caption-side'</span></a>
+<td>top | bottom | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>top
+<td>'table-caption' elements
+<td>yes
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visuren.html#propdef-clear"><span class="propinst-clear xref">'clear'</span></a>
+<td>none | left | right | both | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>none
+<td>block-level elements
+<td>no
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visufx.html#propdef-clip"><span class="propinst-clip xref">'clip'</span></a>
+<td><a href="visufx.html#value-def-shape" class="noxref"><span class="value-inst-shape">&lt;shape&gt;</span></a> | auto | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>auto
+<td>absolutely positioned elements
+<td>no
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="colors.html#propdef-color"><span class="propinst-color xref">'color'</span></a>
+<td><a href="syndata.html#value-def-color" class="noxref"><span class="value-inst-color">&lt;color&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>depends on user agent
+<td>&nbsp;
+<td>yes
+
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="generate.html#propdef-content"><span class="propinst-content xref">'content'</span></a>
+<td>normal | none | [ <a href="syndata.html#value-def-string" class="noxref"><span class="value-inst-string">&lt;string&gt;</span></a> | <a href="syndata.html#value-def-uri" class="noxref"><span class="value-inst-uri">&lt;uri&gt;</span></a> | <a href="syndata.html#value-def-counter" class="noxref"><span class="value-inst-counter">&lt;counter&gt;</span></a> | attr(<a href="syndata.html#value-def-identifier" class="noxref"><span class="value-inst-identifier">&lt;identifier&gt;</span></a>) | open-quote | close-quote | no-open-quote | no-close-quote ]+ | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>normal
+<td>:before and :after pseudo-elements
+<td>no
+<td>&nbsp;
+<td><a href="media.html#all-media-group">all</a>
+
+<tr><td><a href="generate.html#propdef-counter-increment"><span class="propinst-counter-increment xref">'counter-increment'</span></a>
+<td>[ <a href="syndata.html#value-def-identifier" class="noxref"><span class="value-inst-identifier">&lt;identifier&gt;</span></a> <a href="syndata.html#value-def-integer" class="noxref"><span class="value-inst-integer">&lt;integer&gt;</span></a>? ]+ | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>none
+
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td><a href="media.html#all-media-group">all</a>
+
+<tr><td><a href="generate.html#propdef-counter-reset"><span class="propinst-counter-reset xref">'counter-reset'</span></a>
+<td>[ <a href="syndata.html#value-def-identifier" class="noxref"><span class="value-inst-identifier">&lt;identifier&gt;</span></a> <a href="syndata.html#value-def-integer" class="noxref"><span class="value-inst-integer">&lt;integer&gt;</span></a>? ]+ | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>none
+<td>&nbsp;
+
+<td>no
+<td>&nbsp;
+<td><a href="media.html#all-media-group">all</a>
+
+<tr><td><a href="aural.html#propdef-cue-after"><span class="propinst-cue-after xref">'cue-after'</span></a>
+<td><a href="syndata.html#value-def-uri" class="noxref"><span class="value-inst-uri">&lt;uri&gt;</span></a> | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>none
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="aural.html#propdef-cue-before"><span class="propinst-cue-before xref">'cue-before'</span></a>
+<td><a href="syndata.html#value-def-uri" class="noxref"><span class="value-inst-uri">&lt;uri&gt;</span></a> | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>none
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="aural.html#propdef-cue"><span class="propinst-cue xref">'cue'</span></a>
+
+<td>[ <a href="aural.html#propdef-cue-before" class="noxref"><span class="propinst-cue-before">'cue-before'</span></a> || <a href="aural.html#propdef-cue-after" class="noxref"><span class="propinst-cue-after">'cue-after'</span></a> ] | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>see individual properties
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="ui.html#propdef-cursor"><span class="propinst-cursor xref">'cursor'</span></a>
+
+<td>[ [<a href="syndata.html#value-def-uri" class="noxref"><span class="value-inst-uri">&lt;uri&gt;</span></a> ,]* [ auto | crosshair | default | pointer | move | e-resize | ne-resize | nw-resize | n-resize | se-resize | sw-resize | s-resize | w-resize | text | wait | help | progress ] ] | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>auto
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>, <a href="media.html#interactive-media-group">interactive</a>
+
+<tr><td><a href="visuren.html#propdef-direction"><span class="propinst-direction xref">'direction'</span></a>
+
+<td>ltr | rtl | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>ltr
+<td>all elements, but see prose
+<td>yes
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visuren.html#propdef-display"><span class="propinst-display xref">'display'</span></a>
+<td>inline | block | list-item | run-in | inline-block | table | inline-table | table-row-group | table-header-group | table-footer-group | table-row | table-column-group | table-column | table-cell | table-caption | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>inline
+<td>&nbsp;
+
+<td>no
+<td>&nbsp;
+<td><a href="media.html#all-media-group">all</a>
+
+<tr><td><a href="aural.html#propdef-elevation"><span class="propinst-elevation xref">'elevation'</span></a>
+<td><a href="aural.html#value-def-angle" class="noxref"><span class="value-inst-angle">&lt;angle&gt;</span></a>  | below | level | above | higher | lower | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>level
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="tables.html#propdef-empty-cells"><span class="propinst-empty-cells xref">'empty-cells'</span></a>
+<td>show | hide | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>show
+<td>'table-cell' elements
+<td>yes
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visuren.html#propdef-float"><span class="propinst-float xref">'float'</span></a>
+<td>left | right | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>none
+<td>all, but see <a href="visuren.html#dis-pos-flo">9.7</a>
+<td>no
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="fonts.html#propdef-font-family"><span class="propinst-font-family xref">'font-family'</span></a>
+<td>[[ <a href="fonts.html#value-def-family-name" class="noxref"><span class="value-inst-family-name">&lt;family-name&gt;</span></a> | <a href="fonts.html#value-def-generic-family" class="noxref"><span class="value-inst-generic-family">&lt;generic-family&gt;</span></a> ] [, <a href="fonts.html#value-def-family-name" class="noxref"><span class="value-inst-family-name">&lt;family-name&gt;</span></a>| <a href="fonts.html#value-def-generic-family" class="noxref"><span class="value-inst-generic-family">&lt;generic-family&gt;</span></a>]* ] | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>depends on user agent
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="fonts.html#propdef-font-size"><span class="propinst-font-size xref">'font-size'</span></a>
+<td><a href="fonts.html#value-def-absolute-size" class="noxref"><span class="value-inst-absolute-size">&lt;absolute-size&gt;</span></a> | <a href="fonts.html#value-def-relative-size" class="noxref"><span class="value-inst-relative-size">&lt;relative-size&gt;</span></a> | <a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>medium
+<td>&nbsp;
+<td>yes
+<td>refer to parent element's font size
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="fonts.html#propdef-font-style"><span class="propinst-font-style xref">'font-style'</span></a>
+<td>normal | italic | oblique | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>normal
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="fonts.html#propdef-font-variant"><span class="propinst-font-variant xref">'font-variant'</span></a>
+<td>normal | small-caps | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>normal
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="fonts.html#propdef-font-weight"><span class="propinst-font-weight xref">'font-weight'</span></a>
+<td>normal | bold | bolder | lighter | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900 | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>normal
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="fonts.html#propdef-font"><span class="propinst-font xref">'font'</span></a>
+<td>[ [ <a href="fonts.html#propdef-font-style" class="noxref"><span class="propinst-font-style">'font-style'</span></a> || <a href="fonts.html#propdef-font-variant" class="noxref"><span class="propinst-font-variant">'font-variant'</span></a> || <a href="fonts.html#propdef-font-weight" class="noxref"><span class="propinst-font-weight">'font-weight'</span></a> ]? <a href="fonts.html#propdef-font-size" class="noxref"><span class="propinst-font-size">'font-size'</span></a> [ / <a href="visudet.html#propdef-line-height" class="noxref"><span class="propinst-line-height">'line-height'</span></a> ]? <a href="fonts.html#propdef-font-family" class="noxref"><span class="propinst-font-family">'font-family'</span></a> ] | caption | icon | menu | message-box | small-caption | status-bar | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>see individual properties
+<td>&nbsp;
+<td>yes
+<td>see individual properties
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visudet.html#propdef-height"><span class="propinst-height xref">'height'</span></a>
+<td><a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | auto | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>auto
+<td>all elements but non-replaced inline elements, table columns, and column groups
+<td>no
+<td>see prose
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visuren.html#propdef-left"><span class="propinst-left xref">'left'</span></a>
+<td><a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | auto | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>auto
+<td>positioned elements
+<td>no
+<td>refer to width of containing block
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="text.html#propdef-letter-spacing"><span class="propinst-letter-spacing xref">'letter-spacing'</span></a>
+<td>normal | <a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>normal
+<td>&nbsp;
+
+<td>yes
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visudet.html#propdef-line-height"><span class="propinst-line-height xref">'line-height'</span></a>
+<td>normal | <a href="syndata.html#value-def-number" class="noxref"><span class="value-inst-number">&lt;number&gt;</span></a> | <a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>normal
+<td>&nbsp;
+<td>yes
+<td>refer to the font size of the element itself
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="generate.html#propdef-list-style-image"><span class="propinst-list-style-image xref">'list-style-image'</span></a>
+<td><a href="syndata.html#value-def-uri" class="noxref"><span class="value-inst-uri">&lt;uri&gt;</span></a> | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>none
+<td>elements with 'display: list-item'
+<td>yes
+
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="generate.html#propdef-list-style-position"><span class="propinst-list-style-position xref">'list-style-position'</span></a>
+<td>inside | outside | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>outside
+<td>elements with 'display: list-item'
+<td>yes
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="generate.html#propdef-list-style-type"><span class="propinst-list-style-type xref">'list-style-type'</span></a>
+
+<td>disc | circle | square | decimal | decimal-leading-zero |   lower-roman | upper-roman | lower-greek |  lower-latin | upper-latin | armenian | georgian |  lower-alpha | upper-alpha |  none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>disc
+<td>elements with 'display: list-item'
+<td>yes
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="generate.html#propdef-list-style"><span class="propinst-list-style xref">'list-style'</span></a>
+<td>[ <a href="generate.html#propdef-list-style-type" class="noxref"><span class="propinst-list-style-type">'list-style-type'</span></a> || <a href="generate.html#propdef-list-style-position" class="noxref"><span class="propinst-list-style-position">'list-style-position'</span></a> || <a href="generate.html#propdef-list-style-image" class="noxref"><span class="propinst-list-style-image">'list-style-image'</span></a> ] | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>see individual properties
+<td>elements with 'display: list-item'
+<td>yes
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="box.html#propdef-margin-right"><span class="propinst-margin-right xref">'margin-right'</span></a>
+<a href="box.html#propdef-margin-left"><span class="propinst-margin-left xref">'margin-left'</span></a>
+<td><a href="box.html#value-def-margin-width" class="noxref"><span class="value-inst-margin-width">&lt;margin-width&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>0
+
+<td>all elements except elements with table display     types other than table-caption, table and inline-table
+<td>no
+<td>refer to width of containing block
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="box.html#propdef-margin-top"><span class="propinst-margin-top xref">'margin-top'</span></a>
+<a href="box.html#propdef-margin-bottom"><span class="propinst-margin-bottom xref">'margin-bottom'</span></a>
+<td><a href="box.html#value-def-margin-width" class="noxref"><span class="value-inst-margin-width">&lt;margin-width&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>0
+<td>all elements except elements with table display     types other than table-caption, table and inline-table
+
+<td>no
+<td>refer to width of containing block
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="box.html#propdef-margin"><span class="propinst-margin xref">'margin'</span></a>
+<td><a href="box.html#value-def-margin-width" class="noxref"><span class="value-inst-margin-width">&lt;margin-width&gt;</span></a>{1,4} | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>see individual properties
+<td>all elements except elements with table display     types other than table-caption, table and inline-table
+<td>no
+<td>refer to width of containing block
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visudet.html#propdef-max-height"><span class="propinst-max-height xref">'max-height'</span></a>
+<td><a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>none
+<td>all elements but non-replaced inline elements, table columns, and column groups
+<td>no
+<td>see prose
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visudet.html#propdef-max-width"><span class="propinst-max-width xref">'max-width'</span></a>
+<td><a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>none
+<td>all elements but non-replaced inline elements, table rows, and row groups
+<td>no
+<td>refer to width of containing block
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visudet.html#propdef-min-height"><span class="propinst-min-height xref">'min-height'</span></a>
+<td><a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>0
+<td>all elements but non-replaced inline elements, table columns, and column groups
+<td>no
+<td>see prose
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visudet.html#propdef-min-width"><span class="propinst-min-width xref">'min-width'</span></a>
+<td><a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>0
+<td>all elements but non-replaced inline elements, table rows, and row groups
+<td>no
+<td>refer to width of containing block
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="page.html#propdef-orphans"><span class="propinst-orphans xref">'orphans'</span></a>
+<td><a href="syndata.html#value-def-integer" class="noxref"><span class="value-inst-integer">&lt;integer&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>2
+<td>block-level elements
+<td>yes
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>, <a href="media.html#paged-media-group">paged</a>
+
+<tr><td><a href="ui.html#propdef-outline-color"><span class="propinst-outline-color xref">'outline-color'</span></a>
+<td><a href="syndata.html#value-def-color" class="noxref"><span class="value-inst-color">&lt;color&gt;</span></a> | invert | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>invert
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>, <a href="media.html#interactive-media-group">interactive</a>
+
+<tr><td><a href="ui.html#propdef-outline-style"><span class="propinst-outline-style xref">'outline-style'</span></a>
+
+<td><a href="box.html#value-def-border-style" class="noxref"><span class="value-inst-border-style">&lt;border-style&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>none
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>, <a href="media.html#interactive-media-group">interactive</a>
+
+<tr><td><a href="ui.html#propdef-outline-width"><span class="propinst-outline-width xref">'outline-width'</span></a>
+<td><a href="box.html#value-def-border-width" class="noxref"><span class="value-inst-border-width">&lt;border-width&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>medium
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>, <a href="media.html#interactive-media-group">interactive</a>
+
+<tr><td><a href="ui.html#propdef-outline"><span class="propinst-outline xref">'outline'</span></a>
+<td>[ <a href="ui.html#propdef-outline-color" class="noxref"><span class="propinst-outline-color">'outline-color'</span></a> || <a href="ui.html#propdef-outline-style" class="noxref"><span class="propinst-outline-style">'outline-style'</span></a> || <a href="ui.html#propdef-outline-width" class="noxref"><span class="propinst-outline-width">'outline-width'</span></a> ] | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>see individual properties
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>, <a href="media.html#interactive-media-group">interactive</a>
+
+<tr><td><a href="visufx.html#propdef-overflow"><span class="propinst-overflow xref">'overflow'</span></a>
+<td>visible | hidden | scroll | auto | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>visible
+<td>non-replaced block-level elements, table cells, and inline-block elements
+<td>no
+
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="box.html#propdef-padding-top"><span class="propinst-padding-top xref">'padding-top'</span></a>
+<a href="box.html#propdef-padding-right"><span class="propinst-padding-right xref">'padding-right'</span></a>
+<a href="box.html#propdef-padding-bottom"><span class="propinst-padding-bottom xref">'padding-bottom'</span></a>
+<a href="box.html#propdef-padding-left"><span class="propinst-padding-left xref">'padding-left'</span></a>
+<td><a href="box.html#value-def-padding-width" class="noxref"><span class="value-inst-padding-width">&lt;padding-width&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>0
+<td>all elements except table-row-group, table-header-group, table-footer-group, table-row, table-column-group and table-column
+<td>no
+<td>refer to width of containing block
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="box.html#propdef-padding"><span class="propinst-padding xref">'padding'</span></a>
+<td><a href="box.html#value-def-padding-width" class="noxref"><span class="value-inst-padding-width">&lt;padding-width&gt;</span></a>{1,4} | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>see individual properties
+<td>all elements except table-row-group, table-header-group, table-footer-group, table-row, table-column-group and table-column
+<td>no
+<td>refer to width of containing block
+
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="page.html#propdef-page-break-after"><span class="propinst-page-break-after xref">'page-break-after'</span></a>
+<td>auto | always | avoid | left | right | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>auto
+<td>block-level elements
+<td>no
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>, <a href="media.html#paged-media-group">paged</a>
+
+<tr><td><a href="page.html#propdef-page-break-before"><span class="propinst-page-break-before xref">'page-break-before'</span></a>
+<td>auto | always | avoid | left | right | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>auto
+<td>block-level elements
+<td>no
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>, <a href="media.html#paged-media-group">paged</a>
+
+<tr><td><a href="page.html#propdef-page-break-inside"><span class="propinst-page-break-inside xref">'page-break-inside'</span></a>
+<td>avoid | auto | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>auto
+<td>block-level elements
+<td>yes
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>, <a href="media.html#paged-media-group">paged</a>
+
+<tr><td><a href="aural.html#propdef-pause-after"><span class="propinst-pause-after xref">'pause-after'</span></a>
+<td><a href="aural.html#value-def-time" class="noxref"><span class="value-inst-time">&lt;time&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>0
+<td>&nbsp;
+<td>no
+<td>see prose
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="aural.html#propdef-pause-before"><span class="propinst-pause-before xref">'pause-before'</span></a>
+<td><a href="aural.html#value-def-time" class="noxref"><span class="value-inst-time">&lt;time&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>0
+<td>&nbsp;
+<td>no
+<td>see prose
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="aural.html#propdef-pause"><span class="propinst-pause xref">'pause'</span></a>
+<td>[ [<a href="aural.html#value-def-time" class="noxref"><span class="value-inst-time">&lt;time&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a>]{1,2} ] | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>see individual properties
+<td>&nbsp;
+<td>no
+<td>see descriptions of 'pause-before' and 'pause-after'
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="aural.html#propdef-pitch-range"><span class="propinst-pitch-range xref">'pitch-range'</span></a>
+<td><a href="syndata.html#value-def-number" class="noxref"><span class="value-inst-number">&lt;number&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>50
+<td>&nbsp;
+<td>yes
+
+<td>&nbsp;
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="aural.html#propdef-pitch"><span class="propinst-pitch xref">'pitch'</span></a>
+<td><a href="aural.html#value-def-frequency" class="noxref"><span class="value-inst-frequency">&lt;frequency&gt;</span></a> | x-low | low | medium | high | x-high | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>medium
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="aural.html#propdef-play-during"><span class="propinst-play-during xref">'play-during'</span></a>
+<td><a href="syndata.html#value-def-uri" class="noxref"><span class="value-inst-uri">&lt;uri&gt;</span></a> [ mix || repeat ]? | auto | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>auto
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="visuren.html#propdef-position"><span class="propinst-position xref">'position'</span></a>
+
+<td>static | relative | absolute | fixed | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>static
+<td>&nbsp;
+<td>no
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="generate.html#propdef-quotes"><span class="propinst-quotes xref">'quotes'</span></a>
+<td>[<a href="syndata.html#value-def-string" class="noxref"><span class="value-inst-string">&lt;string&gt;</span></a> <a href="syndata.html#value-def-string" class="noxref"><span class="value-inst-string">&lt;string&gt;</span></a>]+ | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>depends on user agent
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="aural.html#propdef-richness"><span class="propinst-richness xref">'richness'</span></a>
+<td><a href="syndata.html#value-def-number" class="noxref"><span class="value-inst-number">&lt;number&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>50
+<td>&nbsp;
+<td>yes
+
+<td>&nbsp;
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="visuren.html#propdef-right"><span class="propinst-right xref">'right'</span></a>
+<td><a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | auto | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>auto
+<td>positioned elements
+<td>no
+
+<td>refer to width of containing block
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="aural.html#propdef-speak-header"><span class="propinst-speak-header xref">'speak-header'</span></a>
+<td>once | always | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>once
+<td>elements that have table header information
+<td>yes
+<td>&nbsp;
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="aural.html#propdef-speak-numeral"><span class="propinst-speak-numeral xref">'speak-numeral'</span></a>
+
+<td>digits | continuous | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>continuous
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="aural.html#propdef-speak-punctuation"><span class="propinst-speak-punctuation xref">'speak-punctuation'</span></a>
+<td>code | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>none
+<td>&nbsp;
+
+<td>yes
+<td>&nbsp;
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="aural.html#propdef-speak"><span class="propinst-speak xref">'speak'</span></a>
+<td>normal | none | spell-out | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>normal
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="aural.html#propdef-speech-rate"><span class="propinst-speech-rate xref">'speech-rate'</span></a>
+<td><a href="syndata.html#value-def-number" class="noxref"><span class="value-inst-number">&lt;number&gt;</span></a>  | x-slow | slow | medium | fast | x-fast | faster | slower | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>medium
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="aural.html#propdef-stress"><span class="propinst-stress xref">'stress'</span></a>
+<td><a href="syndata.html#value-def-number" class="noxref"><span class="value-inst-number">&lt;number&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>50
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="tables.html#propdef-table-layout"><span class="propinst-table-layout xref">'table-layout'</span></a>
+<td>auto | fixed | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>auto
+<td>'table' and 'inline-table' elements
+<td>no
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="text.html#propdef-text-align"><span class="propinst-text-align xref">'text-align'</span></a>
+<td>left | right | center | justify | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>a nameless value that acts as 'left' if 'direction' is 'ltr',   'right' if 'direction' is 'rtl'
+<td>block-level elements, table cells and inline blocks
+<td>yes
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="text.html#propdef-text-decoration"><span class="propinst-text-decoration xref">'text-decoration'</span></a>
+<td>none | [ underline || overline || line-through || blink ] | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>none
+<td>&nbsp;
+<td>no (see prose)
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="text.html#propdef-text-indent"><span class="propinst-text-indent xref">'text-indent'</span></a>
+<td><a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>0
+<td>block-level elements, table cells and inline blocks
+<td>yes
+<td>refer to width of containing block
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="text.html#propdef-text-transform"><span class="propinst-text-transform xref">'text-transform'</span></a>
+<td>capitalize | uppercase | lowercase | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>none
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visuren.html#propdef-top"><span class="propinst-top xref">'top'</span></a>
+<td><a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | auto | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>auto
+<td>positioned elements
+<td>no
+<td>refer to height of containing block
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visuren.html#propdef-unicode-bidi"><span class="propinst-unicode-bidi xref">'unicode-bidi'</span></a>
+<td>normal | embed | bidi-override | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>normal
+<td>all elements, but see prose
+<td>no
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visudet.html#propdef-vertical-align"><span class="propinst-vertical-align xref">'vertical-align'</span></a>
+<td>baseline | sub | super | top | text-top | middle |     bottom | text-bottom | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>baseline
+<td>inline-level and 'table-cell' elements
+<td>no
+<td>refer to the 'line-height' of the element itself
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visufx.html#propdef-visibility"><span class="propinst-visibility xref">'visibility'</span></a>
+<td>visible | hidden | collapse | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>visible
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="aural.html#propdef-voice-family"><span class="propinst-voice-family xref">'voice-family'</span></a>
+<td>[[<a href="aural.html#value-def-specific-voice" class="noxref"><span class="value-inst-specific-voice">&lt;specific-voice&gt;</span></a>  | <a href="aural.html#value-def-generic-voice" class="noxref"><span class="value-inst-generic-voice">&lt;generic-voice&gt;</span></a> ],]* [<a href="aural.html#value-def-specific-voice" class="noxref"><span class="value-inst-specific-voice">&lt;specific-voice&gt;</span></a>  | <a href="aural.html#value-def-generic-voice" class="noxref"><span class="value-inst-generic-voice">&lt;generic-voice&gt;</span></a> ] | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>depends on user agent
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="aural.html#propdef-volume"><span class="propinst-volume xref">'volume'</span></a>
+<td><a href="syndata.html#value-def-number" class="noxref"><span class="value-inst-number">&lt;number&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | silent | x-soft | soft | medium | loud | x-loud | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+
+<td>medium
+<td>&nbsp;
+<td>yes
+<td>refer to inherited value
+<td><a href="aural.html#aural-media-group">aural</a>
+
+<tr><td><a href="text.html#propdef-white-space"><span class="propinst-white-space xref">'white-space'</span></a>
+<td>normal | pre | nowrap | pre-wrap | pre-line | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>normal
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="page.html#propdef-widows"><span class="propinst-widows xref">'widows'</span></a>
+<td><a href="syndata.html#value-def-integer" class="noxref"><span class="value-inst-integer">&lt;integer&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>2
+<td>block-level elements
+<td>yes
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>, <a href="media.html#paged-media-group">paged</a>
+
+<tr><td><a href="visudet.html#propdef-width"><span class="propinst-width xref">'width'</span></a>
+<td><a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | auto | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>auto
+<td>all elements but non-replaced inline elements, table rows, and row groups
+<td>no
+<td>refer to width of containing block
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="text.html#propdef-word-spacing"><span class="propinst-word-spacing xref">'word-spacing'</span></a>
+<td>normal | <a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>normal
+<td>&nbsp;
+<td>yes
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+<tr><td><a href="visuren.html#propdef-z-index"><span class="propinst-z-index xref">'z-index'</span></a>
+
+<td>auto | <a href="syndata.html#value-def-integer" class="noxref"><span class="value-inst-integer">&lt;integer&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
+<td>auto
+<td>positioned elements
+<td>no
+<td>&nbsp;
+<td><a href="media.html#visual-media-group">visual</a>
+
+</table>
diff --git a/xml/tests/testData/generateactions/addColumn/before8.xml b/xml/tests/testData/generateactions/addColumn/before8.xml
new file mode 100644
index 000000000000..1b4b1a7d970c
--- /dev/null
+++ b/xml/tests/testData/generateactions/addColumn/before8.xml
@@ -0,0 +1,41 @@
+<!-- "Add a new column to the table after the current one" "true" -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<link rel="stylesheet" href="a.css"/>
+<title>fdgsd</title>
+</head>
+<body>
+<div>dsfgsdgfdg</div>
+<table>
+    <tr>
+        <td>1</td>
+        <td>2</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>.</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <t<caret>d>3</td>
+        <td>4</td>
+        <td colspan="11">1</td>
+    </tr>
+    <tr>
+        <td colspan="13">1</td>
+        <td>2</td>
+        <td colspan="11">1</td>
+    </tr>
+    <tr>
+        <td colspan="11">1</td>
+        <td>2</td>
+        <td>3</td>
+        <td colspan="11">1</td>
+    </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/index/XMLSchema.xsd b/xml/tests/testData/index/XMLSchema.xsd
new file mode 100644
index 000000000000..07e8e428b369
--- /dev/null
+++ b/xml/tests/testData/index/XMLSchema.xsd
@@ -0,0 +1,2468 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<xs:schema targetNamespace="http://www.w3.org/2001/XMLSchema" blockDefault="#all" elementFormDefault="qualified" version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="EN" xmlns:hfp="http://www.w3.org/2001/XMLSchema-hasFacetAndProperty">
+ <xs:annotation>
+  <xs:documentation>
+    Part 1 version: Id: structures.xsd,v 1.2 2004/01/15 11:34:25 ht Exp 
+    Part 2 version: Id: datatypes.xsd,v 1.3 2004/01/23 18:11:13 ht Exp 
+  </xs:documentation>
+ </xs:annotation>
+
+ <xs:annotation>
+   <xs:documentation source="http://www.w3.org/TR/2004/PER-xmlschema-1-20040318/structures.html">
+   The schema corresponding to this document is normative,
+   with respect to the syntactic constraints it expresses in the
+   XML Schema language.  The documentation (within &lt;documentation> elements)
+   below, is not normative, but rather highlights important aspects of
+   the W3C Recommendation of which this is a part</xs:documentation>
+ </xs:annotation>
+
+ <xs:annotation>
+   <xs:documentation>
+   The simpleType element and all of its members are defined
+      towards the end of this schema document</xs:documentation>
+ </xs:annotation>
+
+ <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd">
+   <xs:annotation>
+     <xs:documentation>
+       Get access to the xml: attribute groups for xml:lang
+       as declared on 'schema' and 'documentation' below
+     </xs:documentation>
+   </xs:annotation>
+ </xs:import>
+
+ <xs:complexType name="openAttrs">
+   <xs:annotation>
+     <xs:documentation>
+       This type is extended by almost all schema types
+       to allow attributes from other namespaces to be
+       added to user schemas.
+     </xs:documentation>
+   </xs:annotation>
+   <xs:complexContent>
+     <xs:restriction base="xs:anyType">
+       <xs:anyAttribute namespace="##other" processContents="lax"/>
+     </xs:restriction>
+   </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="annotated">
+   <xs:annotation>
+     <xs:documentation>
+       This type is extended by all types which allow annotation
+       other than &lt;schema&gt; itself
+     </xs:documentation>
+   </xs:annotation>
+   <xs:complexContent>
+     <xs:extension base="xs:openAttrs">
+       <xs:sequence>
+         <xs:element ref="xs:annotation" minOccurs="0"/>
+       </xs:sequence>
+       <xs:attribute name="id" type="xs:ID"/>
+     </xs:extension>
+   </xs:complexContent>
+ </xs:complexType>
+
+ <xs:group name="schemaTop">
+  <xs:annotation>
+   <xs:documentation>
+   This group is for the
+   elements which occur freely at the top level of schemas.
+   All of their types are based on the "annotated" type by extension.</xs:documentation>
+  </xs:annotation>
+  <xs:choice>
+   <xs:group ref="xs:redefinable"/>
+   <xs:element ref="xs:element"/>
+   <xs:element ref="xs:attribute"/>
+   <xs:element ref="xs:notation"/>
+  </xs:choice>
+ </xs:group>
+ 
+ <xs:group name="redefinable">
+  <xs:annotation>
+   <xs:documentation>
+   This group is for the
+   elements which can self-redefine (see &lt;redefine> below).</xs:documentation>
+  </xs:annotation>
+  <xs:choice>
+   <xs:element ref="xs:simpleType"/>
+   <xs:element ref="xs:complexType"/>
+   <xs:element ref="xs:group"/>
+   <xs:element ref="xs:attributeGroup"/>
+  </xs:choice>
+ </xs:group>
+
+ <xs:simpleType name="formChoice">
+  <xs:annotation>
+   <xs:documentation>
+   A utility type, not for public use</xs:documentation>
+  </xs:annotation>
+  <xs:restriction base="xs:NMTOKEN">
+   <xs:enumeration value="qualified"/>
+   <xs:enumeration value="unqualified"/>
+  </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="reducedDerivationControl">
+  <xs:annotation>
+   <xs:documentation>
+   A utility type, not for public use</xs:documentation>
+  </xs:annotation>
+  <xs:restriction base="xs:derivationControl">
+   <xs:enumeration value="extension"/>
+   <xs:enumeration value="restriction"/>
+  </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="derivationSet">
+  <xs:annotation>
+   <xs:documentation>
+   A utility type, not for public use</xs:documentation>
+   <xs:documentation>
+   #all or (possibly empty) subset of {extension, restriction}</xs:documentation>
+  </xs:annotation>
+  <xs:union>
+   <xs:simpleType>    
+    <xs:restriction base="xs:token">
+     <xs:enumeration value="#all"/>
+    </xs:restriction>
+   </xs:simpleType>
+   <xs:simpleType>
+    <xs:list itemType="xs:reducedDerivationControl"/>
+   </xs:simpleType>
+  </xs:union>
+ </xs:simpleType>
+
+ <xs:simpleType name="typeDerivationControl">
+  <xs:annotation>
+   <xs:documentation>
+   A utility type, not for public use</xs:documentation>
+  </xs:annotation>
+  <xs:restriction base="xs:derivationControl">
+   <xs:enumeration value="extension"/>
+   <xs:enumeration value="restriction"/>
+   <xs:enumeration value="list"/>
+   <xs:enumeration value="union"/>
+  </xs:restriction>
+ </xs:simpleType>
+
+  <xs:simpleType name="fullDerivationSet">
+  <xs:annotation>
+   <xs:documentation>
+   A utility type, not for public use</xs:documentation>
+   <xs:documentation>
+   #all or (possibly empty) subset of {extension, restriction, list, union}</xs:documentation>
+  </xs:annotation>
+  <xs:union>
+   <xs:simpleType>    
+    <xs:restriction base="xs:token">
+     <xs:enumeration value="#all"/>
+    </xs:restriction>
+   </xs:simpleType>
+   <xs:simpleType>
+    <xs:list itemType="xs:typeDerivationControl"/>
+   </xs:simpleType>
+  </xs:union>
+ </xs:simpleType>
+
+ <xs:element name="schema" id="schema">
+  <xs:annotation>
+    <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-schema"/>
+  </xs:annotation>
+  <xs:complexType>
+   <xs:complexContent>
+    <xs:extension base="xs:openAttrs">
+     <xs:sequence>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+       <xs:element ref="xs:include"/>
+       <xs:element ref="xs:import"/>
+       <xs:element ref="xs:redefine"/>
+       <xs:element ref="xs:annotation"/>
+      </xs:choice>
+      <xs:sequence minOccurs="0" maxOccurs="unbounded">
+       <xs:group ref="xs:schemaTop"/>
+       <xs:element ref="xs:annotation" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+     </xs:sequence>
+     <xs:attribute name="targetNamespace" type="xs:anyURI"/>
+     <xs:attribute name="version" type="xs:token"/>
+     <xs:attribute name="finalDefault" type="xs:fullDerivationSet" use="optional" default=""/>
+     <xs:attribute name="blockDefault" type="xs:blockSet" use="optional" default=""/>
+     <xs:attribute name="attributeFormDefault" type="xs:formChoice" use="optional" default="unqualified"/>
+     <xs:attribute name="elementFormDefault" type="xs:formChoice" use="optional" default="unqualified"/>
+     <xs:attribute name="id" type="xs:ID"/>
+     <xs:attribute ref="xml:lang"/>
+    </xs:extension>
+   </xs:complexContent>
+  </xs:complexType>
+
+  <xs:key name="element">
+   <xs:selector xpath="xs:element"/>
+   <xs:field xpath="@name"/>
+  </xs:key>
+
+  <xs:key name="attribute">
+   <xs:selector xpath="xs:attribute"/>
+   <xs:field xpath="@name"/>
+  </xs:key>
+
+  <xs:key name="type">
+   <xs:selector xpath="xs:complexType|xs:simpleType"/>
+   <xs:field xpath="@name"/>
+  </xs:key>
+ 
+  <xs:key name="group">
+   <xs:selector xpath="xs:group"/>
+   <xs:field xpath="@name"/>
+  </xs:key>
+ 
+  <xs:key name="attributeGroup">
+   <xs:selector xpath="xs:attributeGroup"/>
+   <xs:field xpath="@name"/>
+  </xs:key>
+ 
+  <xs:key name="notation">
+   <xs:selector xpath="xs:notation"/>
+   <xs:field xpath="@name"/>
+  </xs:key>
+
+  <xs:key name="identityConstraint">
+   <xs:selector xpath=".//xs:key|.//xs:unique|.//xs:keyref"/>
+   <xs:field xpath="@name"/>
+  </xs:key>
+
+ </xs:element>
+
+ <xs:simpleType name="allNNI">
+  <xs:annotation><xs:documentation>
+   for maxOccurs</xs:documentation></xs:annotation>
+  <xs:union memberTypes="xs:nonNegativeInteger">
+   <xs:simpleType>
+    <xs:restriction base="xs:NMTOKEN">
+     <xs:enumeration value="unbounded"/>
+    </xs:restriction>
+   </xs:simpleType>
+  </xs:union>
+ </xs:simpleType>
+
+ <xs:attributeGroup name="occurs">
+  <xs:annotation><xs:documentation>
+   for all particles</xs:documentation></xs:annotation>
+  <xs:attribute name="minOccurs" type="xs:nonNegativeInteger" use="optional" default="1"/>
+  <xs:attribute name="maxOccurs" type="xs:allNNI" use="optional" default="1"/>
+ </xs:attributeGroup>
+
+ <xs:attributeGroup name="defRef">
+  <xs:annotation><xs:documentation>
+   for element, group and attributeGroup,
+   which both define and reference</xs:documentation></xs:annotation>
+  <xs:attribute name="name" type="xs:NCName"/>
+  <xs:attribute name="ref" type="xs:QName"/>
+ </xs:attributeGroup>
+
+ <xs:group name="typeDefParticle">
+  <xs:annotation>
+    <xs:documentation>
+   'complexType' uses this</xs:documentation></xs:annotation>
+  <xs:choice>
+   <xs:element name="group" type="xs:groupRef"/>
+   <xs:element ref="xs:all"/>
+   <xs:element ref="xs:choice"/>
+   <xs:element ref="xs:sequence"/>
+  </xs:choice>
+ </xs:group>
+ 
+ 
+
+ <xs:group name="nestedParticle">
+  <xs:choice>
+   <xs:element name="element" type="xs:localElement"/>
+   <xs:element name="group" type="xs:groupRef"/>
+   <xs:element ref="xs:choice"/>
+   <xs:element ref="xs:sequence"/>
+   <xs:element ref="xs:any"/>
+  </xs:choice>
+ </xs:group>
+ 
+ <xs:group name="particle">
+  <xs:choice>
+   <xs:element name="element" type="xs:localElement"/>
+   <xs:element name="group" type="xs:groupRef"/>
+   <xs:element ref="xs:all"/>
+   <xs:element ref="xs:choice"/>
+   <xs:element ref="xs:sequence"/>
+   <xs:element ref="xs:any"/>
+  </xs:choice>
+ </xs:group>
+ 
+ <xs:complexType name="attribute">
+  <xs:complexContent>
+   <xs:extension base="xs:annotated">
+    <xs:sequence>
+     <xs:element name="simpleType" minOccurs="0" type="xs:localSimpleType"/>
+    </xs:sequence>
+    <xs:attributeGroup ref="xs:defRef"/>
+    <xs:attribute name="type" type="xs:QName"/>
+    <xs:attribute name="use" use="optional" default="optional">
+     <xs:simpleType>
+      <xs:restriction base="xs:NMTOKEN">
+       <xs:enumeration value="prohibited"/>
+       <xs:enumeration value="optional"/>
+       <xs:enumeration value="required"/>
+      </xs:restriction>
+     </xs:simpleType>
+    </xs:attribute>
+    <xs:attribute name="default" type="xs:string"/>
+    <xs:attribute name="fixed" type="xs:string"/>
+    <xs:attribute name="form" type="xs:formChoice"/>
+   </xs:extension>
+  </xs:complexContent>
+ </xs:complexType>
+ 
+ <xs:complexType name="topLevelAttribute">
+  <xs:complexContent>
+   <xs:restriction base="xs:attribute">
+    <xs:sequence>
+     <xs:element ref="xs:annotation" minOccurs="0"/>
+     <xs:element name="simpleType" minOccurs="0" type="xs:localSimpleType"/>
+    </xs:sequence>
+    <xs:attribute name="ref" use="prohibited"/>
+    <xs:attribute name="form" use="prohibited"/>
+    <xs:attribute name="use" use="prohibited"/>
+    <xs:attribute name="name" use="required" type="xs:NCName"/>
+    <xs:anyAttribute namespace="##other" processContents="lax"/>
+   </xs:restriction>
+  </xs:complexContent>
+ </xs:complexType>
+
+ <xs:group name="attrDecls">
+  <xs:sequence>
+   <xs:choice minOccurs="0" maxOccurs="unbounded">
+    <xs:element name="attribute" type="xs:attribute"/>
+    <xs:element name="attributeGroup" type="xs:attributeGroupRef"/>
+   </xs:choice>
+   <xs:element ref="xs:anyAttribute" minOccurs="0"/>
+  </xs:sequence>
+ </xs:group>
+
+ <xs:element name="anyAttribute" type="xs:wildcard" id="anyAttribute">
+  <xs:annotation>
+   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-anyAttribute"/>
+  </xs:annotation>
+ </xs:element>
+
+ <xs:group name="complexTypeModel">
+  <xs:choice>
+      <xs:element ref="xs:simpleContent"/>
+      <xs:element ref="xs:complexContent"/>
+      <xs:sequence>
+       <xs:annotation>
+        <xs:documentation>
+   This branch is short for
+   &lt;complexContent>
+   &lt;restriction base="xs:anyType">
+   ...
+   &lt;/restriction>
+   &lt;/complexContent></xs:documentation>
+       </xs:annotation>
+       <xs:group ref="xs:typeDefParticle" minOccurs="0"/>
+       <xs:group ref="xs:attrDecls"/>
+      </xs:sequence>
+  </xs:choice>
+ </xs:group>
+
+ <xs:complexType name="complexType" abstract="true">
+  <xs:complexContent>
+   <xs:extension base="xs:annotated">
+    <xs:group ref="xs:complexTypeModel"/>
+    <xs:attribute name="name" type="xs:NCName">
+     <xs:annotation>
+      <xs:documentation>
+      Will be restricted to required or forbidden</xs:documentation>
+     </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="mixed" type="xs:boolean" use="optional" default="false">
+     <xs:annotation>
+      <xs:documentation>
+      Not allowed if simpleContent child is chosen.
+      May be overriden by setting on complexContent child.</xs:documentation>
+    </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="abstract" type="xs:boolean" use="optional" default="false"/>
+    <xs:attribute name="final" type="xs:derivationSet"/>
+    <xs:attribute name="block" type="xs:derivationSet"/>
+   </xs:extension>
+  </xs:complexContent>
+ </xs:complexType>
+ 
+ <xs:complexType name="topLevelComplexType">
+  <xs:complexContent>
+   <xs:restriction base="xs:complexType">
+    <xs:sequence>
+     <xs:element ref="xs:annotation" minOccurs="0"/>
+     <xs:group ref="xs:complexTypeModel"/>
+    </xs:sequence>
+    <xs:attribute name="name" type="xs:NCName" use="required"/>
+    <xs:anyAttribute namespace="##other" processContents="lax"/>
+   </xs:restriction>
+  </xs:complexContent>
+ </xs:complexType>
+ 
+ <xs:complexType name="localComplexType">
+  <xs:complexContent>
+   <xs:restriction base="xs:complexType">
+    <xs:sequence>
+     <xs:element ref="xs:annotation" minOccurs="0"/>
+     <xs:group ref="xs:complexTypeModel"/>
+    </xs:sequence>
+    <xs:attribute name="name" use="prohibited"/>
+    <xs:attribute name="abstract" use="prohibited"/>
+    <xs:attribute name="final" use="prohibited"/>
+    <xs:attribute name="block" use="prohibited"/>
+    <xs:anyAttribute namespace="##other" processContents="lax"/>
+   </xs:restriction>
+  </xs:complexContent>
+ </xs:complexType>
+ 
+ <xs:complexType name="restrictionType">
+  <xs:complexContent>
+   <xs:extension base="xs:annotated">
+    <xs:sequence>
+     <xs:choice minOccurs="0">
+      <xs:group ref="xs:typeDefParticle"/>
+      <xs:group ref="xs:simpleRestrictionModel"/>
+     </xs:choice>
+     <xs:group ref="xs:attrDecls"/>
+    </xs:sequence>
+    <xs:attribute name="base" type="xs:QName" use="required"/>
+   </xs:extension>
+  </xs:complexContent>       
+ </xs:complexType>
+
+ <xs:complexType name="complexRestrictionType">
+  <xs:complexContent>
+   <xs:restriction base="xs:restrictionType">
+    <xs:sequence>
+     <xs:element ref="xs:annotation" minOccurs="0"/>
+     <xs:choice minOccurs="0">
+      <xs:annotation>
+       <xs:documentation>This choice is added simply to
+                   make this a valid restriction per the REC</xs:documentation>
+      </xs:annotation>
+      <xs:group ref="xs:typeDefParticle"/>
+     </xs:choice>
+     <xs:group ref="xs:attrDecls"/>
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax"/>
+   </xs:restriction>
+  </xs:complexContent>       
+ </xs:complexType>
+
+ <xs:complexType name="extensionType">
+  <xs:complexContent>
+   <xs:extension base="xs:annotated">
+    <xs:sequence>
+     <xs:group ref="xs:typeDefParticle" minOccurs="0"/>
+     <xs:group ref="xs:attrDecls"/>
+    </xs:sequence>
+    <xs:attribute name="base" type="xs:QName" use="required"/>
+   </xs:extension>
+  </xs:complexContent>       
+ </xs:complexType>
+
+ <xs:element name="complexContent" id="complexContent">
+  <xs:annotation>
+   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-complexContent"/>
+  </xs:annotation>
+  <xs:complexType>
+   <xs:complexContent>
+    <xs:extension base="xs:annotated">
+     <xs:choice>
+      <xs:element name="restriction" type="xs:complexRestrictionType"/>
+      <xs:element name="extension" type="xs:extensionType"/>
+     </xs:choice>     
+     <xs:attribute name="mixed" type="xs:boolean">
+      <xs:annotation>
+       <xs:documentation>
+       Overrides any setting on complexType parent.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    </xs:extension>
+   </xs:complexContent>
+  </xs:complexType>
+ </xs:element>
+
+ <xs:complexType name="simpleRestrictionType">
+  <xs:complexContent>
+   <xs:restriction base="xs:restrictionType">
+    <xs:sequence>
+     <xs:element ref="xs:annotation" minOccurs="0"/>
+     <xs:choice minOccurs="0">
+      <xs:annotation>
+       <xs:documentation>This choice is added simply to
+                   make this a valid restriction per the REC</xs:documentation>
+      </xs:annotation>
+      <xs:group ref="xs:simpleRestrictionModel"/>
+     </xs:choice>
+     <xs:group ref="xs:attrDecls"/>
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax"/>
+   </xs:restriction>
+  </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="simpleExtensionType">
+  <xs:complexContent>
+   <xs:restriction base="xs:extensionType">
+    <xs:sequence>
+     <xs:annotation>
+      <xs:documentation>
+      No typeDefParticle group reference</xs:documentation>
+     </xs:annotation>
+     <xs:element ref="xs:annotation" minOccurs="0"/>
+     <xs:group ref="xs:attrDecls"/>
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax"/>
+   </xs:restriction>
+  </xs:complexContent>
+ </xs:complexType>
+
+ <xs:element name="simpleContent" id="simpleContent">
+  <xs:annotation>
+   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-simpleContent"/>
+  </xs:annotation>
+  <xs:complexType>
+   <xs:complexContent>
+    <xs:extension base="xs:annotated">
+     <xs:choice>
+      <xs:element name="restriction" type="xs:simpleRestrictionType"/>
+      <xs:element name="extension" type="xs:simpleExtensionType"/>
+     </xs:choice>
+    </xs:extension>
+   </xs:complexContent>
+  </xs:complexType>
+ </xs:element>
+ 
+ <xs:element name="complexType" type="xs:topLevelComplexType" id="complexType">
+  <xs:annotation>
+   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-complexType"/>
+  </xs:annotation>
+ </xs:element>
+
+
+  <xs:simpleType name="blockSet">
+   <xs:annotation>
+    <xs:documentation>
+    A utility type, not for public use</xs:documentation>
+    <xs:documentation>
+    #all or (possibly empty) subset of {substitution, extension,
+    restriction}</xs:documentation>
+   </xs:annotation>
+   <xs:union>
+    <xs:simpleType>    
+     <xs:restriction base="xs:token">
+      <xs:enumeration value="#all"/>
+     </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType>
+     <xs:list>
+      <xs:simpleType>
+       <xs:restriction base="xs:derivationControl">
+        <xs:enumeration value="extension"/>
+        <xs:enumeration value="restriction"/>
+        <xs:enumeration value="substitution"/>
+       </xs:restriction>
+      </xs:simpleType>
+     </xs:list>
+    </xs:simpleType>
+   </xs:union>  
+  </xs:simpleType>
+
+ <xs:complexType name="element" abstract="true">
+  <xs:annotation>
+   <xs:documentation>
+   The element element can be used either
+   at the top level to define an element-type binding globally,
+   or within a content model to either reference a globally-defined
+   element or type or declare an element-type binding locally.
+   The ref form is not allowed at the top level.</xs:documentation>
+  </xs:annotation>
+
+  <xs:complexContent>
+   <xs:extension base="xs:annotated">
+    <xs:sequence>
+     <xs:choice minOccurs="0">
+      <xs:element name="simpleType" type="xs:localSimpleType"/>
+      <xs:element name="complexType" type="xs:localComplexType"/>
+     </xs:choice>
+     <xs:group ref="xs:identityConstraint" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+    <xs:attributeGroup ref="xs:defRef"/>
+    <xs:attribute name="type" type="xs:QName"/>
+    <xs:attribute name="substitutionGroup" type="xs:QName"/>
+    <xs:attributeGroup ref="xs:occurs"/>
+    <xs:attribute name="default" type="xs:string"/>
+    <xs:attribute name="fixed" type="xs:string"/>
+    <xs:attribute name="nillable" type="xs:boolean" use="optional" default="false"/>
+    <xs:attribute name="abstract" type="xs:boolean" use="optional" default="false"/>
+    <xs:attribute name="final" type="xs:derivationSet"/>
+    <xs:attribute name="block" type="xs:blockSet"/>
+    <xs:attribute name="form" type="xs:formChoice"/>
+   </xs:extension>
+  </xs:complexContent>
+ </xs:complexType>
+ 
+ <xs:complexType name="topLevelElement">
+  <xs:complexContent>
+   <xs:restriction base="xs:element">
+    <xs:sequence>
+     <xs:element ref="xs:annotation" minOccurs="0"/>
+     <xs:choice minOccurs="0">
+      <xs:element name="simpleType" type="xs:localSimpleType"/>
+      <xs:element name="complexType" type="xs:localComplexType"/>
+     </xs:choice>
+     <xs:group ref="xs:identityConstraint" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+    <xs:attribute name="ref" use="prohibited"/>
+    <xs:attribute name="form" use="prohibited"/>
+    <xs:attribute name="minOccurs" use="prohibited"/>
+    <xs:attribute name="maxOccurs" use="prohibited"/>
+    <xs:attribute name="name" use="required" type="xs:NCName"/>
+    <xs:anyAttribute namespace="##other" processContents="lax"/>
+   </xs:restriction>
+  </xs:complexContent>
+ </xs:complexType>
+ 
+ <xs:complexType name="localElement">
+  <xs:complexContent>
+   <xs:restriction base="xs:element">
+    <xs:sequence>
+     <xs:element ref="xs:annotation" minOccurs="0"/>
+     <xs:choice minOccurs="0">
+      <xs:element name="simpleType" type="xs:localSimpleType"/>
+      <xs:element name="complexType" type="xs:localComplexType"/>
+     </xs:choice>
+     <xs:group ref="xs:identityConstraint" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+    <xs:attribute name="substitutionGroup" use="prohibited"/>
+    <xs:attribute name="final" use="prohibited"/>
+    <xs:attribute name="abstract" use="prohibited"/>
+    <xs:anyAttribute namespace="##other" processContents="lax"/>
+   </xs:restriction>
+  </xs:complexContent>
+ </xs:complexType>
+
+ <xs:element name="element" type="xs:topLevelElement" id="element">
+  <xs:annotation>
+   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-element"/>
+  </xs:annotation>
+ </xs:element>
+
+ <xs:complexType name="group" abstract="true">
+  <xs:annotation>
+   <xs:documentation>
+   group type for explicit groups, named top-level groups and
+   group references</xs:documentation>
+  </xs:annotation>
+  <xs:complexContent>
+   <xs:extension base="xs:annotated">
+    <xs:group ref="xs:particle" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:attributeGroup ref="xs:defRef"/>
+    <xs:attributeGroup ref="xs:occurs"/>
+   </xs:extension>
+  </xs:complexContent>
+ </xs:complexType>
+ 
+ <xs:complexType name="realGroup">
+  <xs:complexContent>
+   <xs:restriction base="xs:group">
+    <xs:sequence>
+     <xs:element ref="xs:annotation" minOccurs="0"/>
+     <xs:choice minOccurs="0" maxOccurs="1">
+      <xs:element ref="xs:all"/>
+      <xs:element ref="xs:choice"/>
+      <xs:element ref="xs:sequence"/>
+     </xs:choice>
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax"/>
+   </xs:restriction>
+  </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="namedGroup">
+  <xs:complexContent>
+   <xs:restriction base="xs:realGroup">
+    <xs:sequence>
+     <xs:element ref="xs:annotation" minOccurs="0"/>
+     <xs:choice minOccurs="1" maxOccurs="1">
+      <xs:element name="all">
+       <xs:complexType>
+        <xs:complexContent>
+         <xs:restriction base="xs:all">
+          <xs:group ref="xs:allModel"/>
+          <xs:attribute name="minOccurs" use="prohibited"/>
+          <xs:attribute name="maxOccurs" use="prohibited"/>
+          <xs:anyAttribute namespace="##other" processContents="lax"/>
+         </xs:restriction>
+        </xs:complexContent>
+       </xs:complexType>
+      </xs:element>
+      <xs:element name="choice" type="xs:simpleExplicitGroup"/>
+      <xs:element name="sequence" type="xs:simpleExplicitGroup"/>
+     </xs:choice>
+    </xs:sequence>
+    <xs:attribute name="name" use="required" type="xs:NCName"/>
+    <xs:attribute name="ref" use="prohibited"/>
+    <xs:attribute name="minOccurs" use="prohibited"/>
+    <xs:attribute name="maxOccurs" use="prohibited"/>
+    <xs:anyAttribute namespace="##other" processContents="lax"/>
+   </xs:restriction>
+  </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="groupRef">
+  <xs:complexContent>
+   <xs:restriction base="xs:realGroup">
+    <xs:sequence>
+     <xs:element ref="xs:annotation" minOccurs="0"/>
+    </xs:sequence>
+    <xs:attribute name="ref" use="required" type="xs:QName"/>
+    <xs:attribute name="name" use="prohibited"/>
+    <xs:anyAttribute namespace="##other" processContents="lax"/>
+   </xs:restriction>
+  </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="explicitGroup">
+  <xs:annotation>
+   <xs:documentation>
+   group type for the three kinds of group</xs:documentation>
+  </xs:annotation>
+  <xs:complexContent>
+   <xs:restriction base="xs:group">
+    <xs:sequence>
+     <xs:element ref="xs:annotation" minOccurs="0"/>
+     <xs:group ref="xs:nestedParticle" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+    <xs:attribute name="name" type="xs:NCName" use="prohibited"/>
+    <xs:attribute name="ref" type="xs:QName" use="prohibited"/>
+    <xs:anyAttribute namespace="##other" processContents="lax"/>
+   </xs:restriction>
+  </xs:complexContent>
+ </xs:complexType>
+ 
+ <xs:complexType name="simpleExplicitGroup">
+  <xs:complexContent>
+   <xs:restriction base="xs:explicitGroup">
+    <xs:sequence>
+     <xs:element ref="xs:annotation" minOccurs="0"/>
+     <xs:group ref="xs:nestedParticle" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+    <xs:attribute name="minOccurs" use="prohibited"/>
+    <xs:attribute name="maxOccurs" use="prohibited"/>
+    <xs:anyAttribute namespace="##other" processContents="lax"/>
+   </xs:restriction>
+  </xs:complexContent>
+ </xs:complexType>
+ 
+ <xs:group name="allModel">
+  <xs:sequence>
+      <xs:element ref="xs:annotation" minOccurs="0"/>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+       <xs:annotation>
+        <xs:documentation>This choice with min/max is here to
+                          avoid a pblm with the Elt:All/Choice/Seq
+                          Particle derivation constraint</xs:documentation>
+       </xs:annotation>
+       <xs:element name="element" type="xs:narrowMaxMin"/>
+      </xs:choice>
+     </xs:sequence>
+ </xs:group>
+ 
+ 
+ <xs:complexType name="narrowMaxMin">
+  <xs:annotation>
+   <xs:documentation>restricted max/min</xs:documentation>
+  </xs:annotation>
+  <xs:complexContent>
+   <xs:restriction base="xs:localElement">
+    <xs:sequence>
+     <xs:element ref="xs:annotation" minOccurs="0"/>
+     <xs:choice minOccurs="0">
+      <xs:element name="simpleType" type="xs:localSimpleType"/>
+      <xs:element name="complexType" type="xs:localComplexType"/>
+     </xs:choice>
+     <xs:group ref="xs:identityConstraint" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+    <xs:attribute name="minOccurs" use="optional" default="1">
+     <xs:simpleType>
+      <xs:restriction base="xs:nonNegativeInteger">
+       <xs:enumeration value="0"/>
+       <xs:enumeration value="1"/>
+      </xs:restriction>
+     </xs:simpleType>
+    </xs:attribute>
+    <xs:attribute name="maxOccurs" use="optional" default="1">
+     <xs:simpleType>
+      <xs:restriction base="xs:allNNI">
+       <xs:enumeration value="0"/>
+       <xs:enumeration value="1"/>
+      </xs:restriction>
+     </xs:simpleType>
+    </xs:attribute>
+    <xs:anyAttribute namespace="##other" processContents="lax"/>
+   </xs:restriction>
+  </xs:complexContent>
+ </xs:complexType>
+
+  <xs:complexType name="all">
+   <xs:annotation>
+    <xs:documentation>
+   Only elements allowed inside</xs:documentation>
+   </xs:annotation>
+   <xs:complexContent>
+    <xs:restriction base="xs:explicitGroup">
+     <xs:group ref="xs:allModel"/>
+     <xs:attribute name="minOccurs" use="optional" default="1">
+      <xs:simpleType>
+       <xs:restriction base="xs:nonNegativeInteger">
+        <xs:enumeration value="0"/>
+        <xs:enumeration value="1"/>
+       </xs:restriction>
+      </xs:simpleType>
+     </xs:attribute>
+     <xs:attribute name="maxOccurs" use="optional" default="1">
+      <xs:simpleType>
+       <xs:restriction base="xs:allNNI">
+        <xs:enumeration value="1"/>
+       </xs:restriction>
+      </xs:simpleType>
+     </xs:attribute>
+     <xs:anyAttribute namespace="##other" processContents="lax"/>
+    </xs:restriction>
+   </xs:complexContent>
+  </xs:complexType>
+
+ <xs:element name="all" id="all" type="xs:all">
+  <xs:annotation>
+   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-all"/>
+  </xs:annotation>
+ </xs:element>
+
+ <xs:element name="choice" type="xs:explicitGroup" id="choice">
+  <xs:annotation>
+   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-choice"/>
+  </xs:annotation>
+ </xs:element>
+
+ <xs:element name="sequence" type="xs:explicitGroup" id="sequence">
+  <xs:annotation>
+   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-sequence"/>
+  </xs:annotation>
+ </xs:element>
+
+ <xs:element name="group" type="xs:namedGroup" id="group">
+  <xs:annotation>
+   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-group"/>
+  </xs:annotation>
+ </xs:element>
+
+ <xs:complexType name="wildcard">
+  <xs:complexContent>
+   <xs:extension base="xs:annotated">
+    <xs:attribute name="namespace" type="xs:namespaceList" use="optional" default="##any"/>
+    <xs:attribute name="processContents" use="optional" default="strict">
+     <xs:simpleType>
+      <xs:restriction base="xs:NMTOKEN">
+       <xs:enumeration value="skip"/>
+       <xs:enumeration value="lax"/>
+       <xs:enumeration value="strict"/>
+      </xs:restriction>
+     </xs:simpleType>
+    </xs:attribute>
+   </xs:extension>
+  </xs:complexContent>
+ </xs:complexType>
+
+ <xs:element name="any" id="any">
+  <xs:annotation>
+   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-any"/>
+  </xs:annotation>
+  <xs:complexType>
+   <xs:complexContent>
+    <xs:extension base="xs:wildcard">
+     <xs:attributeGroup ref="xs:occurs"/>
+    </xs:extension>
+   </xs:complexContent>
+  </xs:complexType>
+ </xs:element>
+
+  <xs:annotation>
+   <xs:documentation>
+   simple type for the value of the 'namespace' attr of
+   'any' and 'anyAttribute'</xs:documentation>
+  </xs:annotation>
+  <xs:annotation>
+   <xs:documentation>
+   Value is
+              ##any      - - any non-conflicting WFXML/attribute at all
+
+              ##other    - - any non-conflicting WFXML/attribute from
+                              namespace other than targetNS
+
+              ##local    - - any unqualified non-conflicting WFXML/attribute 
+
+              one or     - - any non-conflicting WFXML/attribute from
+              more URI        the listed namespaces
+              references
+              (space separated)
+
+    ##targetNamespace or ##local may appear in the above list, to
+        refer to the targetNamespace of the enclosing
+        schema or an absent targetNamespace respectively</xs:documentation>
+  </xs:annotation>
+
+ <xs:simpleType name="namespaceList">
+  <xs:annotation>
+   <xs:documentation>
+   A utility type, not for public use</xs:documentation>
+  </xs:annotation>
+  <xs:union>
+   <xs:simpleType>
+    <xs:restriction base="xs:token">
+     <xs:enumeration value="##any"/>
+     <xs:enumeration value="##other"/>
+    </xs:restriction>
+   </xs:simpleType>
+   <xs:simpleType>
+    <xs:list>
+     <xs:simpleType>
+      <xs:union memberTypes="xs:anyURI">
+       <xs:simpleType>
+        <xs:restriction base="xs:token">
+         <xs:enumeration value="##targetNamespace"/>
+         <xs:enumeration value="##local"/>
+        </xs:restriction>
+       </xs:simpleType>
+      </xs:union>
+     </xs:simpleType>
+    </xs:list>
+   </xs:simpleType>
+  </xs:union>
+ </xs:simpleType>
+
+ <xs:element name="attribute" type="xs:topLevelAttribute" id="attribute">
+  <xs:annotation>
+   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-attribute"/>
+  </xs:annotation>
+ </xs:element>
+
+ <xs:complexType name="attributeGroup" abstract="true">
+  <xs:complexContent>
+   <xs:extension base="xs:annotated">
+    <xs:group ref="xs:attrDecls"/>
+    <xs:attributeGroup ref="xs:defRef"/>
+   </xs:extension>
+  </xs:complexContent>
+ </xs:complexType>
+ 
+ <xs:complexType name="namedAttributeGroup">
+  <xs:complexContent>
+   <xs:restriction base="xs:attributeGroup">
+    <xs:sequence>
+     <xs:element ref="xs:annotation" minOccurs="0"/>
+     <xs:group ref="xs:attrDecls"/>
+    </xs:sequence>
+    <xs:attribute name="name" use="required" type="xs:NCName"/>
+    <xs:attribute name="ref" use="prohibited"/>
+    <xs:anyAttribute namespace="##other" processContents="lax"/>
+   </xs:restriction>
+  </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="attributeGroupRef">
+  <xs:complexContent>
+   <xs:restriction base="xs:attributeGroup">
+    <xs:sequence>
+     <xs:element ref="xs:annotation" minOccurs="0"/>
+    </xs:sequence>
+    <xs:attribute name="ref" use="required" type="xs:QName"/>
+    <xs:attribute name="name" use="prohibited"/>
+    <xs:anyAttribute namespace="##other" processContents="lax"/>
+   </xs:restriction>
+  </xs:complexContent>
+ </xs:complexType>
+
+ <xs:element name="attributeGroup" type="xs:namedAttributeGroup" id="attributeGroup">
+  <xs:annotation>
+   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-attributeGroup"/>
+  </xs:annotation>
+ </xs:element>
+
+ <xs:element name="include" id="include">
+  <xs:annotation>
+   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-include"/>
+  </xs:annotation>
+  <xs:complexType>
+   <xs:complexContent>
+    <xs:extension base="xs:annotated">
+     <xs:attribute name="schemaLocation" type="xs:anyURI" use="required"/>
+    </xs:extension>
+   </xs:complexContent>
+  </xs:complexType>
+ </xs:element>
+
+ <xs:element name="redefine" id="redefine">
+  <xs:annotation>
+   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-redefine"/>
+  </xs:annotation>
+  <xs:complexType>
+   <xs:complexContent>
+    <xs:extension base="xs:openAttrs">
+     <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element ref="xs:annotation"/>
+      <xs:group ref="xs:redefinable"/>
+     </xs:choice>
+     <xs:attribute name="schemaLocation" type="xs:anyURI" use="required"/>
+     <xs:attribute name="id" type="xs:ID"/>
+    </xs:extension>
+   </xs:complexContent>
+  </xs:complexType>
+ </xs:element>
+
+ <xs:element name="import" id="import">
+  <xs:annotation>
+   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-import"/>
+  </xs:annotation>
+  <xs:complexType>
+   <xs:complexContent>
+    <xs:extension base="xs:annotated">
+     <xs:attribute name="namespace" type="xs:anyURI"/>
+     <xs:attribute name="schemaLocation" type="xs:anyURI"/>
+    </xs:extension>
+   </xs:complexContent>
+  </xs:complexType>
+ </xs:element>
+
+ <xs:element name="selector" id="selector">
+  <xs:annotation>
+   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-selector"/>
+  </xs:annotation>
+  <xs:complexType>
+  <xs:complexContent>
+   <xs:extension base="xs:annotated">
+     <xs:attribute name="xpath" use="required">
+      <xs:simpleType>
+       <xs:annotation>
+        <xs:documentation>A subset of XPath expressions for use
+in selectors</xs:documentation>
+        <xs:documentation>A utility type, not for public
+use</xs:documentation>
+       </xs:annotation>
+       <xs:restriction base="xs:token">
+        <xs:annotation>
+         <xs:documentation>The following pattern is intended to allow XPath
+                           expressions per the following EBNF:
+          Selector    ::=    Path ( '|' Path )*  
+          Path    ::=    ('.//')? Step ( '/' Step )*  
+          Step    ::=    '.' | NameTest  
+          NameTest    ::=    QName | '*' | NCName ':' '*'  
+                           child:: is also allowed
+         </xs:documentation>
+        </xs:annotation>
+        <xs:pattern value="(\.//)?(((child::)?((\i\c*:)?(\i\c*|\*)))|\.)(/(((child::)?((\i\c*:)?(\i\c*|\*)))|\.))*(\|(\.//)?(((child::)?((\i\c*:)?(\i\c*|\*)))|\.)(/(((child::)?((\i\c*:)?(\i\c*|\*)))|\.))*)*">
+        </xs:pattern>
+       </xs:restriction>
+      </xs:simpleType>
+     </xs:attribute>
+   </xs:extension>
+  </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="field" id="field">
+  <xs:annotation>
+   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-field"/>
+  </xs:annotation>
+  <xs:complexType>
+  <xs:complexContent>
+   <xs:extension base="xs:annotated">
+     <xs:attribute name="xpath" use="required">
+      <xs:simpleType>
+       <xs:annotation>
+        <xs:documentation>A subset of XPath expressions for use
+in fields</xs:documentation>
+        <xs:documentation>A utility type, not for public
+use</xs:documentation>
+       </xs:annotation>
+       <xs:restriction base="xs:token">
+        <xs:annotation>
+         <xs:documentation>The following pattern is intended to allow XPath
+                           expressions per the same EBNF as for selector,
+                           with the following change:
+          Path    ::=    ('.//')? ( Step '/' )* ( Step | '@' NameTest ) 
+         </xs:documentation>
+        </xs:annotation>
+        <xs:pattern value="(\.//)?((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)/)*((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)|((attribute::|@)((\i\c*:)?(\i\c*|\*))))(\|(\.//)?((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)/)*((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)|((attribute::|@)((\i\c*:)?(\i\c*|\*)))))*">
+        </xs:pattern>
+       </xs:restriction>
+      </xs:simpleType>
+     </xs:attribute>
+   </xs:extension>
+  </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:complexType name="keybase">
+  <xs:complexContent>
+   <xs:extension base="xs:annotated">
+    <xs:sequence>
+     <xs:element ref="xs:selector"/>
+     <xs:element ref="xs:field" minOccurs="1" maxOccurs="unbounded"/>
+    </xs:sequence>
+    <xs:attribute name="name" type="xs:NCName" use="required"/>
+   </xs:extension>
+  </xs:complexContent>
+ </xs:complexType>
+
+ <xs:group name="identityConstraint">
+  <xs:annotation>
+   <xs:documentation>The three kinds of identity constraints, all with
+                     type of or derived from 'keybase'.
+   </xs:documentation>
+  </xs:annotation>
+  <xs:choice>
+   <xs:element ref="xs:unique"/>
+   <xs:element ref="xs:key"/>
+   <xs:element ref="xs:keyref"/>
+  </xs:choice>
+ </xs:group>
+
+ <xs:element name="unique" type="xs:keybase" id="unique">
+  <xs:annotation>
+   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-unique"/>
+  </xs:annotation>
+ </xs:element>
+ <xs:element name="key" type="xs:keybase" id="key">
+  <xs:annotation>
+   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-key"/>
+  </xs:annotation>
+ </xs:element>
+ <xs:element name="keyref" id="keyref">
+  <xs:annotation>
+   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-keyref"/>
+  </xs:annotation>
+  <xs:complexType>
+   <xs:complexContent>
+    <xs:extension base="xs:keybase">
+     <xs:attribute name="refer" type="xs:QName" use="required"/>
+    </xs:extension>
+   </xs:complexContent>
+  </xs:complexType>
+ </xs:element>
+
+ <xs:element name="notation" id="notation">
+  <xs:annotation>
+   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-notation"/>
+  </xs:annotation>
+  <xs:complexType>
+   <xs:complexContent>
+    <xs:extension base="xs:annotated">
+     <xs:attribute name="name" type="xs:NCName" use="required"/>
+     <xs:attribute name="public" type="xs:public"/>
+     <xs:attribute name="system" type="xs:anyURI"/>
+    </xs:extension>
+   </xs:complexContent>
+  </xs:complexType>
+ </xs:element>
+
+ <xs:simpleType name="public">
+  <xs:annotation>
+   <xs:documentation>
+   A utility type, not for public use</xs:documentation>
+   <xs:documentation>
+   A public identifier, per ISO 8879</xs:documentation>
+  </xs:annotation>
+  <xs:restriction base="xs:token"/>
+ </xs:simpleType>
+
+ <xs:element name="appinfo" id="appinfo">
+   <xs:annotation>
+     <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-appinfo"/>
+   </xs:annotation>
+   <xs:complexType mixed="true">
+    <xs:sequence minOccurs="0" maxOccurs="unbounded">
+     <xs:any processContents="lax"/>
+    </xs:sequence>
+    <xs:attribute name="source" type="xs:anyURI"/>
+    <xs:anyAttribute namespace="##other" processContents="lax"/>
+   </xs:complexType>
+ </xs:element>
+
+ <xs:element name="documentation" id="documentation">
+   <xs:annotation>
+     <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-documentation"/>
+   </xs:annotation>
+   <xs:complexType mixed="true">
+    <xs:sequence minOccurs="0" maxOccurs="unbounded">
+     <xs:any processContents="lax"/>
+    </xs:sequence>
+    <xs:attribute name="source" type="xs:anyURI"/>
+    <xs:attribute ref="xml:lang"/>
+    <xs:anyAttribute namespace="##other" processContents="lax"/>
+   </xs:complexType>
+ </xs:element>
+
+ <xs:element name="annotation" id="annotation">
+   <xs:annotation>
+     <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-annotation"/>
+   </xs:annotation>
+   <xs:complexType>
+    <xs:complexContent>
+     <xs:extension base="xs:openAttrs">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+       <xs:element ref="xs:appinfo"/>
+       <xs:element ref="xs:documentation"/>
+      </xs:choice>
+      <xs:attribute name="id" type="xs:ID"/>
+     </xs:extension>
+    </xs:complexContent>
+   </xs:complexType>
+ </xs:element>
+
+ <xs:annotation>
+  <xs:documentation>
+   notations for use within XML Schema schemas</xs:documentation>
+ </xs:annotation>
+
+ <xs:notation name="XMLSchemaStructures" public="structures" system="http://www.w3.org/2000/08/XMLSchema.xsd"/>
+ <xs:notation name="XML" public="REC-xml-19980210" system="http://www.w3.org/TR/1998/REC-xml-19980210"/>
+  
+ <xs:complexType name="anyType" mixed="true">
+  <xs:annotation>
+   <xs:documentation>
+   Not the real urType, but as close an approximation as we can
+   get in the XML representation</xs:documentation>
+  </xs:annotation>
+  <xs:sequence>
+   <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
+  </xs:sequence>
+  <xs:anyAttribute processContents="lax"/>
+ </xs:complexType>
+
+  <xs:annotation>
+    <xs:documentation>
+      First the built-in primitive datatypes.  These definitions are for
+      information only, the real built-in definitions are magic.
+    </xs:documentation>
+
+    <xs:documentation>
+      For each built-in datatype in this schema (both primitive and
+      derived) can be uniquely addressed via a URI constructed
+      as follows:
+        1) the base URI is the URI of the XML Schema namespace
+        2) the fragment identifier is the name of the datatype
+
+      For example, to address the int datatype, the URI is:
+
+        http://www.w3.org/2001/XMLSchema#int
+
+      Additionally, each facet definition element can be uniquely
+      addressed via a URI constructed as follows:
+        1) the base URI is the URI of the XML Schema namespace
+        2) the fragment identifier is the name of the facet
+
+      For example, to address the maxInclusive facet, the URI is:
+
+        http://www.w3.org/2001/XMLSchema#maxInclusive
+
+      Additionally, each facet usage in a built-in datatype definition
+      can be uniquely addressed via a URI constructed as follows:
+        1) the base URI is the URI of the XML Schema namespace
+        2) the fragment identifier is the name of the datatype, followed
+           by a period (".") followed by the name of the facet
+
+      For example, to address the usage of the maxInclusive facet in
+      the definition of int, the URI is:
+
+        http://www.w3.org/2001/XMLSchema#int.maxInclusive
+
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:simpleType name="string" id="string">
+    <xs:annotation>
+      <xs:appinfo>
+        <hfp:hasFacet name="length"/>
+        <hfp:hasFacet name="minLength"/>
+        <hfp:hasFacet name="maxLength"/>
+        <hfp:hasFacet name="pattern"/>
+        <hfp:hasFacet name="enumeration"/>
+        <hfp:hasFacet name="whiteSpace"/>
+        <hfp:hasProperty name="ordered" value="false"/>
+        <hfp:hasProperty name="bounded" value="false"/>
+        <hfp:hasProperty name="cardinality" value="countably infinite"/>
+        <hfp:hasProperty name="numeric" value="false"/>
+      </xs:appinfo>
+      <xs:documentation
+                source="http://www.w3.org/TR/xmlschema-2/#string"/>
+    </xs:annotation>
+    <xs:restriction base="xs:anySimpleType">
+      <xs:whiteSpace value="preserve" id="string.preserve"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="boolean" id="boolean">
+    <xs:annotation>
+      <xs:appinfo>
+        <hfp:hasFacet name="pattern"/>
+        <hfp:hasFacet name="whiteSpace"/>
+        <hfp:hasProperty name="ordered" value="false"/>
+        <hfp:hasProperty name="bounded" value="false"/>
+        <hfp:hasProperty name="cardinality" value="finite"/>
+        <hfp:hasProperty name="numeric" value="false"/>
+      </xs:appinfo>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#boolean"/>
+    </xs:annotation>
+    <xs:restriction base="xs:anySimpleType">
+      <xs:whiteSpace value="collapse" fixed="true"
+        id="boolean.whiteSpace"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="float" id="float">
+    <xs:annotation>
+      <xs:appinfo>
+        <hfp:hasFacet name="pattern"/>
+        <hfp:hasFacet name="enumeration"/>
+        <hfp:hasFacet name="whiteSpace"/>
+        <hfp:hasFacet name="maxInclusive"/>
+        <hfp:hasFacet name="maxExclusive"/>
+        <hfp:hasFacet name="minInclusive"/>
+        <hfp:hasFacet name="minExclusive"/>
+        <hfp:hasProperty name="ordered" value="total"/>
+        <hfp:hasProperty name="bounded" value="true"/>
+        <hfp:hasProperty name="cardinality" value="finite"/>
+        <hfp:hasProperty name="numeric" value="true"/>
+      </xs:appinfo>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#float"/>
+    </xs:annotation>
+    <xs:restriction base="xs:anySimpleType">
+      <xs:whiteSpace value="collapse" fixed="true"
+        id="float.whiteSpace"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="double" id="double">
+    <xs:annotation>
+      <xs:appinfo>
+        <hfp:hasFacet name="pattern"/>
+        <hfp:hasFacet name="enumeration"/>
+        <hfp:hasFacet name="whiteSpace"/>
+        <hfp:hasFacet name="maxInclusive"/>
+        <hfp:hasFacet name="maxExclusive"/>
+        <hfp:hasFacet name="minInclusive"/>
+        <hfp:hasFacet name="minExclusive"/>
+        <hfp:hasProperty name="ordered" value="total"/>
+        <hfp:hasProperty name="bounded" value="true"/>
+        <hfp:hasProperty name="cardinality" value="finite"/>
+        <hfp:hasProperty name="numeric" value="true"/>
+      </xs:appinfo>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#double"/>
+    </xs:annotation>
+    <xs:restriction base="xs:anySimpleType">
+      <xs:whiteSpace value="collapse"  fixed="true"
+        id="double.whiteSpace"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="decimal" id="decimal">
+    <xs:annotation>
+      <xs:appinfo>
+        <hfp:hasFacet name="totalDigits"/>
+        <hfp:hasFacet name="fractionDigits"/>
+        <hfp:hasFacet name="pattern"/>
+        <hfp:hasFacet name="whiteSpace"/>
+        <hfp:hasFacet name="enumeration"/>
+        <hfp:hasFacet name="maxInclusive"/>
+        <hfp:hasFacet name="maxExclusive"/>
+        <hfp:hasFacet name="minInclusive"/>
+        <hfp:hasFacet name="minExclusive"/>
+        <hfp:hasProperty name="ordered" value="total"/>
+        <hfp:hasProperty name="bounded" value="false"/>
+        <hfp:hasProperty name="cardinality"
+                value="countably infinite"/>
+        <hfp:hasProperty name="numeric" value="true"/>
+      </xs:appinfo>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#decimal"/>
+    </xs:annotation>
+    <xs:restriction base="xs:anySimpleType">
+      <xs:whiteSpace value="collapse"  fixed="true"
+        id="decimal.whiteSpace"/>
+    </xs:restriction>
+   </xs:simpleType>
+
+   <xs:simpleType name="duration" id="duration">
+    <xs:annotation>
+      <xs:appinfo>
+        <hfp:hasFacet name="pattern"/>
+        <hfp:hasFacet name="enumeration"/>
+        <hfp:hasFacet name="whiteSpace"/>
+        <hfp:hasFacet name="maxInclusive"/>
+        <hfp:hasFacet name="maxExclusive"/>
+        <hfp:hasFacet name="minInclusive"/>
+        <hfp:hasFacet name="minExclusive"/>
+        <hfp:hasProperty name="ordered" value="partial"/>
+        <hfp:hasProperty name="bounded" value="false"/>
+        <hfp:hasProperty name="cardinality"
+                value="countably infinite"/>
+        <hfp:hasProperty name="numeric" value="false"/>
+      </xs:appinfo>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#duration"/>
+    </xs:annotation>
+    <xs:restriction base="xs:anySimpleType">
+      <xs:whiteSpace value="collapse"  fixed="true"
+        id="duration.whiteSpace"/>
+    </xs:restriction>
+   </xs:simpleType>
+
+ <xs:simpleType name="dateTime" id="dateTime">
+    <xs:annotation>
+    <xs:appinfo>
+        <hfp:hasFacet name="pattern"/>
+        <hfp:hasFacet name="enumeration"/>
+        <hfp:hasFacet name="whiteSpace"/>
+        <hfp:hasFacet name="maxInclusive"/>
+        <hfp:hasFacet name="maxExclusive"/>
+        <hfp:hasFacet name="minInclusive"/>
+        <hfp:hasFacet name="minExclusive"/>
+        <hfp:hasProperty name="ordered" value="partial"/>
+        <hfp:hasProperty name="bounded" value="false"/>
+        <hfp:hasProperty name="cardinality"
+                value="countably infinite"/>
+        <hfp:hasProperty name="numeric" value="false"/>
+      </xs:appinfo>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#dateTime"/>
+    </xs:annotation>
+    <xs:restriction base="xs:anySimpleType">
+      <xs:whiteSpace value="collapse"  fixed="true"
+        id="dateTime.whiteSpace"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="time" id="time">
+    <xs:annotation>
+    <xs:appinfo>
+        <hfp:hasFacet name="pattern"/>
+        <hfp:hasFacet name="enumeration"/>
+        <hfp:hasFacet name="whiteSpace"/>
+        <hfp:hasFacet name="maxInclusive"/>
+        <hfp:hasFacet name="maxExclusive"/>
+        <hfp:hasFacet name="minInclusive"/>
+        <hfp:hasFacet name="minExclusive"/>
+        <hfp:hasProperty name="ordered" value="partial"/>
+        <hfp:hasProperty name="bounded" value="false"/>
+        <hfp:hasProperty name="cardinality"
+                value="countably infinite"/>
+        <hfp:hasProperty name="numeric" value="false"/>
+      </xs:appinfo>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#time"/>
+    </xs:annotation>
+    <xs:restriction base="xs:anySimpleType">
+      <xs:whiteSpace value="collapse"  fixed="true"
+        id="time.whiteSpace"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="date" id="date">
+   <xs:annotation>
+    <xs:appinfo>
+        <hfp:hasFacet name="pattern"/>
+        <hfp:hasFacet name="enumeration"/>
+        <hfp:hasFacet name="whiteSpace"/>
+        <hfp:hasFacet name="maxInclusive"/>
+        <hfp:hasFacet name="maxExclusive"/>
+        <hfp:hasFacet name="minInclusive"/>
+        <hfp:hasFacet name="minExclusive"/>
+        <hfp:hasProperty name="ordered" value="partial"/>
+        <hfp:hasProperty name="bounded" value="false"/>
+        <hfp:hasProperty name="cardinality"
+                value="countably infinite"/>
+        <hfp:hasProperty name="numeric" value="false"/>
+      </xs:appinfo>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#date"/>
+    </xs:annotation>
+    <xs:restriction base="xs:anySimpleType">
+      <xs:whiteSpace value="collapse"  fixed="true"
+        id="date.whiteSpace"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="gYearMonth" id="gYearMonth">
+   <xs:annotation>
+    <xs:appinfo>
+        <hfp:hasFacet name="pattern"/>
+        <hfp:hasFacet name="enumeration"/>
+        <hfp:hasFacet name="whiteSpace"/>
+        <hfp:hasFacet name="maxInclusive"/>
+        <hfp:hasFacet name="maxExclusive"/>
+        <hfp:hasFacet name="minInclusive"/>
+        <hfp:hasFacet name="minExclusive"/>
+        <hfp:hasProperty name="ordered" value="partial"/>
+        <hfp:hasProperty name="bounded" value="false"/>
+        <hfp:hasProperty name="cardinality"
+                value="countably infinite"/>
+        <hfp:hasProperty name="numeric" value="false"/>
+      </xs:appinfo>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#gYearMonth"/>
+    </xs:annotation>
+    <xs:restriction base="xs:anySimpleType">
+      <xs:whiteSpace value="collapse"  fixed="true"
+        id="gYearMonth.whiteSpace"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="gYear" id="gYear">
+    <xs:annotation>
+    <xs:appinfo>
+        <hfp:hasFacet name="pattern"/>
+        <hfp:hasFacet name="enumeration"/>
+        <hfp:hasFacet name="whiteSpace"/>
+        <hfp:hasFacet name="maxInclusive"/>
+        <hfp:hasFacet name="maxExclusive"/>
+        <hfp:hasFacet name="minInclusive"/>
+        <hfp:hasFacet name="minExclusive"/>
+        <hfp:hasProperty name="ordered" value="partial"/>
+        <hfp:hasProperty name="bounded" value="false"/>
+        <hfp:hasProperty name="cardinality"
+                value="countably infinite"/>
+        <hfp:hasProperty name="numeric" value="false"/>
+      </xs:appinfo>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#gYear"/>
+    </xs:annotation>
+    <xs:restriction base="xs:anySimpleType">
+      <xs:whiteSpace value="collapse"  fixed="true"
+        id="gYear.whiteSpace"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+ <xs:simpleType name="gMonthDay" id="gMonthDay">
+    <xs:annotation>
+      <xs:appinfo>
+        <hfp:hasFacet name="pattern"/>
+        <hfp:hasFacet name="enumeration"/>
+        <hfp:hasFacet name="whiteSpace"/>
+        <hfp:hasFacet name="maxInclusive"/>
+        <hfp:hasFacet name="maxExclusive"/>
+        <hfp:hasFacet name="minInclusive"/>
+        <hfp:hasFacet name="minExclusive"/>
+        <hfp:hasProperty name="ordered" value="partial"/>
+        <hfp:hasProperty name="bounded" value="false"/>
+        <hfp:hasProperty name="cardinality"
+                value="countably infinite"/>
+        <hfp:hasProperty name="numeric" value="false"/>
+      </xs:appinfo>
+       <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#gMonthDay"/>
+    </xs:annotation>
+    <xs:restriction base="xs:anySimpleType">
+         <xs:whiteSpace value="collapse" fixed="true"
+                id="gMonthDay.whiteSpace"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="gDay" id="gDay">
+    <xs:annotation>
+  <xs:appinfo>
+        <hfp:hasFacet name="pattern"/>
+        <hfp:hasFacet name="enumeration"/>
+        <hfp:hasFacet name="whiteSpace"/>
+        <hfp:hasFacet name="maxInclusive"/>
+        <hfp:hasFacet name="maxExclusive"/>
+        <hfp:hasFacet name="minInclusive"/>
+        <hfp:hasFacet name="minExclusive"/>
+        <hfp:hasProperty name="ordered" value="partial"/>
+        <hfp:hasProperty name="bounded" value="false"/>
+        <hfp:hasProperty name="cardinality"
+                value="countably infinite"/>
+        <hfp:hasProperty name="numeric" value="false"/>
+      </xs:appinfo>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#gDay"/>
+    </xs:annotation>
+    <xs:restriction base="xs:anySimpleType">
+         <xs:whiteSpace value="collapse"  fixed="true"
+                id="gDay.whiteSpace"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+ <xs:simpleType name="gMonth" id="gMonth">
+    <xs:annotation>
+  <xs:appinfo>
+        <hfp:hasFacet name="pattern"/>
+        <hfp:hasFacet name="enumeration"/>
+        <hfp:hasFacet name="whiteSpace"/>
+        <hfp:hasFacet name="maxInclusive"/>
+        <hfp:hasFacet name="maxExclusive"/>
+        <hfp:hasFacet name="minInclusive"/>
+        <hfp:hasFacet name="minExclusive"/>
+        <hfp:hasProperty name="ordered" value="partial"/>
+        <hfp:hasProperty name="bounded" value="false"/>
+        <hfp:hasProperty name="cardinality"
+                value="countably infinite"/>
+        <hfp:hasProperty name="numeric" value="false"/>
+      </xs:appinfo>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#gMonth"/>
+    </xs:annotation>
+    <xs:restriction base="xs:anySimpleType">
+         <xs:whiteSpace value="collapse"  fixed="true"
+                id="gMonth.whiteSpace"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+   <xs:simpleType name="hexBinary" id="hexBinary">
+    <xs:annotation>
+      <xs:appinfo>
+        <hfp:hasFacet name="length"/>
+        <hfp:hasFacet name="minLength"/>
+        <hfp:hasFacet name="maxLength"/>
+        <hfp:hasFacet name="pattern"/>
+        <hfp:hasFacet name="enumeration"/>
+        <hfp:hasFacet name="whiteSpace"/>
+        <hfp:hasProperty name="ordered" value="false"/>
+        <hfp:hasProperty name="bounded" value="false"/>
+        <hfp:hasProperty name="cardinality"
+                value="countably infinite"/>
+        <hfp:hasProperty name="numeric" value="false"/>
+      </xs:appinfo>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#binary"/>
+    </xs:annotation>
+    <xs:restriction base="xs:anySimpleType">
+      <xs:whiteSpace value="collapse" fixed="true"
+        id="hexBinary.whiteSpace"/>
+    </xs:restriction>
+   </xs:simpleType>
+
+ <xs:simpleType name="base64Binary" id="base64Binary">
+    <xs:annotation>
+      <xs:appinfo>
+        <hfp:hasFacet name="length"/>
+        <hfp:hasFacet name="minLength"/>
+        <hfp:hasFacet name="maxLength"/>
+        <hfp:hasFacet name="pattern"/>
+        <hfp:hasFacet name="enumeration"/>
+        <hfp:hasFacet name="whiteSpace"/>
+        <hfp:hasProperty name="ordered" value="false"/>
+        <hfp:hasProperty name="bounded" value="false"/>
+        <hfp:hasProperty name="cardinality"
+                value="countably infinite"/>
+        <hfp:hasProperty name="numeric" value="false"/>
+      </xs:appinfo>
+      <xs:documentation
+                source="http://www.w3.org/TR/xmlschema-2/#base64Binary"/>
+    </xs:annotation>
+    <xs:restriction base="xs:anySimpleType">
+      <xs:whiteSpace value="collapse" fixed="true"
+        id="base64Binary.whiteSpace"/>
+    </xs:restriction>
+   </xs:simpleType>
+
+   <xs:simpleType name="anyURI" id="anyURI">
+    <xs:annotation>
+      <xs:appinfo>
+        <hfp:hasFacet name="length"/>
+        <hfp:hasFacet name="minLength"/>
+        <hfp:hasFacet name="maxLength"/>
+        <hfp:hasFacet name="pattern"/>
+        <hfp:hasFacet name="enumeration"/>
+        <hfp:hasFacet name="whiteSpace"/>
+        <hfp:hasProperty name="ordered" value="false"/>
+        <hfp:hasProperty name="bounded" value="false"/>
+        <hfp:hasProperty name="cardinality"
+                value="countably infinite"/>
+        <hfp:hasProperty name="numeric" value="false"/>
+      </xs:appinfo>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#anyURI"/>
+    </xs:annotation>
+    <xs:restriction base="xs:anySimpleType">
+      <xs:whiteSpace value="collapse"  fixed="true"
+        id="anyURI.whiteSpace"/>
+    </xs:restriction>
+   </xs:simpleType>
+
+  <xs:simpleType name="QName" id="QName">
+    <xs:annotation>
+        <xs:appinfo>
+        <hfp:hasFacet name="length"/>
+        <hfp:hasFacet name="minLength"/>
+        <hfp:hasFacet name="maxLength"/>
+        <hfp:hasFacet name="pattern"/>
+        <hfp:hasFacet name="enumeration"/>
+        <hfp:hasFacet name="whiteSpace"/>
+        <hfp:hasProperty name="ordered" value="false"/>
+        <hfp:hasProperty name="bounded" value="false"/>
+        <hfp:hasProperty name="cardinality"
+                value="countably infinite"/>
+        <hfp:hasProperty name="numeric" value="false"/>
+      </xs:appinfo>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#QName"/>
+    </xs:annotation>
+    <xs:restriction base="xs:anySimpleType">
+      <xs:whiteSpace value="collapse"  fixed="true"
+        id="QName.whiteSpace"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+   <xs:simpleType name="NOTATION" id="NOTATION">
+    <xs:annotation>
+        <xs:appinfo>
+        <hfp:hasFacet name="length"/>
+        <hfp:hasFacet name="minLength"/>
+        <hfp:hasFacet name="maxLength"/>
+        <hfp:hasFacet name="pattern"/>
+        <hfp:hasFacet name="enumeration"/>
+        <hfp:hasFacet name="whiteSpace"/>
+        <hfp:hasProperty name="ordered" value="false"/>
+        <hfp:hasProperty name="bounded" value="false"/>
+        <hfp:hasProperty name="cardinality"
+                value="countably infinite"/>
+        <hfp:hasProperty name="numeric" value="false"/>
+      </xs:appinfo>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#NOTATION"/>
+      <xs:documentation>
+        NOTATION cannot be used directly in a schema; rather a type
+        must be derived from it by specifying at least one enumeration
+        facet whose value is the name of a NOTATION declared in the
+        schema.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:anySimpleType">
+      <xs:whiteSpace value="collapse"  fixed="true"
+        id="NOTATION.whiteSpace"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:annotation>
+    <xs:documentation>
+      Now the derived primitive types
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:simpleType name="normalizedString" id="normalizedString">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#normalizedString"/>
+    </xs:annotation>
+    <xs:restriction base="xs:string">
+      <xs:whiteSpace value="replace"
+        id="normalizedString.whiteSpace"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="token" id="token">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#token"/>
+    </xs:annotation>
+    <xs:restriction base="xs:normalizedString">
+      <xs:whiteSpace value="collapse" id="token.whiteSpace"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="language" id="language">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#language"/>
+    </xs:annotation>
+    <xs:restriction base="xs:token">
+      <xs:pattern
+        value="[a-zA-Z]{1,8}(-[a-zA-Z0-9]{1,8})*"
+                id="language.pattern">
+        <xs:annotation>
+          <xs:documentation
+                source="http://www.ietf.org/rfc/rfc3066.txt">
+            pattern specifies the content of section 2.12 of XML 1.0e2
+            and RFC 3066 (Revised version of RFC 1766).
+          </xs:documentation>
+        </xs:annotation>
+      </xs:pattern>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="IDREFS" id="IDREFS">
+    <xs:annotation>
+      <xs:appinfo>
+        <hfp:hasFacet name="length"/>
+        <hfp:hasFacet name="minLength"/>
+        <hfp:hasFacet name="maxLength"/>
+        <hfp:hasFacet name="enumeration"/>
+        <hfp:hasFacet name="whiteSpace"/>
+        <hfp:hasFacet name="pattern"/>
+        <hfp:hasProperty name="ordered" value="false"/>
+        <hfp:hasProperty name="bounded" value="false"/>
+        <hfp:hasProperty name="cardinality"
+                value="countably infinite"/>
+        <hfp:hasProperty name="numeric" value="false"/>
+      </xs:appinfo>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#IDREFS"/>
+    </xs:annotation>
+    <xs:restriction>
+      <xs:simpleType>
+        <xs:list itemType="xs:IDREF"/>
+      </xs:simpleType>
+        <xs:minLength value="1" id="IDREFS.minLength"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="ENTITIES" id="ENTITIES">
+    <xs:annotation>
+      <xs:appinfo>
+        <hfp:hasFacet name="length"/>
+        <hfp:hasFacet name="minLength"/>
+        <hfp:hasFacet name="maxLength"/>
+        <hfp:hasFacet name="enumeration"/>
+        <hfp:hasFacet name="whiteSpace"/>
+        <hfp:hasFacet name="pattern"/>
+        <hfp:hasProperty name="ordered" value="false"/>
+        <hfp:hasProperty name="bounded" value="false"/>
+        <hfp:hasProperty name="cardinality"
+                value="countably infinite"/>
+        <hfp:hasProperty name="numeric" value="false"/>
+      </xs:appinfo>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#ENTITIES"/>
+    </xs:annotation>
+    <xs:restriction>
+      <xs:simpleType>
+        <xs:list itemType="xs:ENTITY"/>
+      </xs:simpleType>
+        <xs:minLength value="1" id="ENTITIES.minLength"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="NMTOKEN" id="NMTOKEN">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#NMTOKEN"/>
+    </xs:annotation>
+    <xs:restriction base="xs:token">
+      <xs:pattern value="\c+" id="NMTOKEN.pattern">
+        <xs:annotation>
+          <xs:documentation
+                source="http://www.w3.org/TR/REC-xml#NT-Nmtoken">
+            pattern matches production 7 from the XML spec
+          </xs:documentation>
+        </xs:annotation>
+      </xs:pattern>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="NMTOKENS" id="NMTOKENS">
+    <xs:annotation>
+      <xs:appinfo>
+        <hfp:hasFacet name="length"/>
+        <hfp:hasFacet name="minLength"/>
+        <hfp:hasFacet name="maxLength"/>
+        <hfp:hasFacet name="enumeration"/>
+        <hfp:hasFacet name="whiteSpace"/>
+        <hfp:hasFacet name="pattern"/>
+        <hfp:hasProperty name="ordered" value="false"/>
+        <hfp:hasProperty name="bounded" value="false"/>
+        <hfp:hasProperty name="cardinality"
+                value="countably infinite"/>
+        <hfp:hasProperty name="numeric" value="false"/>
+      </xs:appinfo>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#NMTOKENS"/>
+    </xs:annotation>
+    <xs:restriction>
+      <xs:simpleType>
+        <xs:list itemType="xs:NMTOKEN"/>
+      </xs:simpleType>
+        <xs:minLength value="1" id="NMTOKENS.minLength"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="Name" id="Name">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#Name"/>
+    </xs:annotation>
+    <xs:restriction base="xs:token">
+      <xs:pattern value="\i\c*" id="Name.pattern">
+        <xs:annotation>
+          <xs:documentation
+                        source="http://www.w3.org/TR/REC-xml#NT-Name">
+            pattern matches production 5 from the XML spec
+          </xs:documentation>
+        </xs:annotation>
+      </xs:pattern>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="NCName" id="NCName">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#NCName"/>
+    </xs:annotation>
+    <xs:restriction base="xs:Name">
+      <xs:pattern value="[\i-[:]][\c-[:]]*" id="NCName.pattern">
+        <xs:annotation>
+          <xs:documentation
+                source="http://www.w3.org/TR/REC-xml-names/#NT-NCName">
+            pattern matches production 4 from the Namespaces in XML spec
+          </xs:documentation>
+        </xs:annotation>
+      </xs:pattern>
+    </xs:restriction>
+  </xs:simpleType>
+
+   <xs:simpleType name="ID" id="ID">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#ID"/>
+    </xs:annotation>
+    <xs:restriction base="xs:NCName"/>
+   </xs:simpleType>
+
+   <xs:simpleType name="IDREF" id="IDREF">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#IDREF"/>
+    </xs:annotation>
+    <xs:restriction base="xs:NCName"/>
+   </xs:simpleType>
+
+   <xs:simpleType name="ENTITY" id="ENTITY">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#ENTITY"/>
+    </xs:annotation>
+    <xs:restriction base="xs:NCName"/>
+   </xs:simpleType>
+
+  <xs:simpleType name="integer" id="integer">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#integer"/>
+    </xs:annotation>
+    <xs:restriction base="xs:decimal">
+      <xs:fractionDigits value="0" fixed="true" id="integer.fractionDigits"/>
+      <xs:pattern value="[\-+]?[0-9]+"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="nonPositiveInteger" id="nonPositiveInteger">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#nonPositiveInteger"/>
+    </xs:annotation>
+    <xs:restriction base="xs:integer">
+      <xs:maxInclusive value="0" id="nonPositiveInteger.maxInclusive"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="negativeInteger" id="negativeInteger">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#negativeInteger"/>
+    </xs:annotation>
+    <xs:restriction base="xs:nonPositiveInteger">
+      <xs:maxInclusive value="-1" id="negativeInteger.maxInclusive"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="long" id="long">
+    <xs:annotation>
+      <xs:appinfo>
+        <hfp:hasProperty name="bounded" value="true"/>
+        <hfp:hasProperty name="cardinality" value="finite"/>
+      </xs:appinfo>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#long"/>
+    </xs:annotation>
+    <xs:restriction base="xs:integer">
+      <xs:minInclusive value="-9223372036854775808" id="long.minInclusive"/>
+      <xs:maxInclusive value="9223372036854775807" id="long.maxInclusive"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="int" id="int">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#int"/>
+    </xs:annotation>
+    <xs:restriction base="xs:long">
+      <xs:minInclusive value="-2147483648" id="int.minInclusive"/>
+      <xs:maxInclusive value="2147483647" id="int.maxInclusive"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="short" id="short">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#short"/>
+    </xs:annotation>
+    <xs:restriction base="xs:int">
+      <xs:minInclusive value="-32768" id="short.minInclusive"/>
+      <xs:maxInclusive value="32767" id="short.maxInclusive"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="byte" id="byte">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#byte"/>
+    </xs:annotation>
+    <xs:restriction base="xs:short">
+      <xs:minInclusive value="-128" id="byte.minInclusive"/>
+      <xs:maxInclusive value="127" id="byte.maxInclusive"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="nonNegativeInteger" id="nonNegativeInteger">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#nonNegativeInteger"/>
+    </xs:annotation>
+    <xs:restriction base="xs:integer">
+      <xs:minInclusive value="0" id="nonNegativeInteger.minInclusive"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="unsignedLong" id="unsignedLong">
+    <xs:annotation>
+      <xs:appinfo>
+        <hfp:hasProperty name="bounded" value="true"/>
+        <hfp:hasProperty name="cardinality" value="finite"/>
+      </xs:appinfo>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#unsignedLong"/>
+    </xs:annotation>
+    <xs:restriction base="xs:nonNegativeInteger">
+      <xs:maxInclusive value="18446744073709551615"
+        id="unsignedLong.maxInclusive"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="unsignedInt" id="unsignedInt">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#unsignedInt"/>
+    </xs:annotation>
+    <xs:restriction base="xs:unsignedLong">
+      <xs:maxInclusive value="4294967295"
+        id="unsignedInt.maxInclusive"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="unsignedShort" id="unsignedShort">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#unsignedShort"/>
+    </xs:annotation>
+    <xs:restriction base="xs:unsignedInt">
+      <xs:maxInclusive value="65535"
+        id="unsignedShort.maxInclusive"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="unsignedByte" id="unsignedByte">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#unsignedByte"/>
+    </xs:annotation>
+    <xs:restriction base="xs:unsignedShort">
+      <xs:maxInclusive value="255" id="unsignedByte.maxInclusive"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="positiveInteger" id="positiveInteger">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#positiveInteger"/>
+    </xs:annotation>
+    <xs:restriction base="xs:nonNegativeInteger">
+      <xs:minInclusive value="1" id="positiveInteger.minInclusive"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+ <xs:simpleType name="derivationControl">
+  <xs:annotation>
+   <xs:documentation>
+   A utility type, not for public use</xs:documentation>
+  </xs:annotation>
+  <xs:restriction base="xs:NMTOKEN">
+   <xs:enumeration value="substitution"/>
+   <xs:enumeration value="extension"/>
+   <xs:enumeration value="restriction"/>
+   <xs:enumeration value="list"/>
+   <xs:enumeration value="union"/>
+  </xs:restriction>
+ </xs:simpleType>
+
+ <xs:group name="simpleDerivation">
+  <xs:choice>
+    <xs:element ref="xs:restriction"/>
+    <xs:element ref="xs:list"/>
+    <xs:element ref="xs:union"/>
+  </xs:choice>
+ </xs:group>
+
+ <xs:simpleType name="simpleDerivationSet">
+  <xs:annotation>
+   <xs:documentation>
+   #all or (possibly empty) subset of {restriction, union, list}
+   </xs:documentation>
+   <xs:documentation>
+   A utility type, not for public use</xs:documentation>
+  </xs:annotation>
+  <xs:union>
+   <xs:simpleType>
+    <xs:restriction base="xs:token">
+     <xs:enumeration value="#all"/>
+    </xs:restriction>
+   </xs:simpleType>
+   <xs:simpleType>
+    <xs:list>
+     <xs:simpleType>
+      <xs:restriction base="xs:derivationControl">
+       <xs:enumeration value="list"/>
+       <xs:enumeration value="union"/>
+       <xs:enumeration value="restriction"/>
+      </xs:restriction>
+     </xs:simpleType>
+    </xs:list>
+   </xs:simpleType>
+  </xs:union>
+ </xs:simpleType>
+
+  <xs:complexType name="simpleType" abstract="true">
+    <xs:complexContent>
+      <xs:extension base="xs:annotated">
+        <xs:group ref="xs:simpleDerivation"/>
+        <xs:attribute name="final" type="xs:simpleDerivationSet"/>
+        <xs:attribute name="name" type="xs:NCName">
+          <xs:annotation>
+            <xs:documentation>
+              Can be restricted to required or forbidden
+            </xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="topLevelSimpleType">
+    <xs:complexContent>
+      <xs:restriction base="xs:simpleType">
+        <xs:sequence>
+          <xs:element ref="xs:annotation" minOccurs="0"/>
+          <xs:group ref="xs:simpleDerivation"/>
+        </xs:sequence>
+        <xs:attribute name="name" use="required"
+             type="xs:NCName">
+          <xs:annotation>
+            <xs:documentation>
+              Required at the top level
+            </xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+       <xs:anyAttribute namespace="##other" processContents="lax"/>
+      </xs:restriction>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="localSimpleType">
+    <xs:complexContent>
+      <xs:restriction base="xs:simpleType">
+        <xs:sequence>
+          <xs:element ref="xs:annotation" minOccurs="0"/>
+          <xs:group ref="xs:simpleDerivation"/>
+        </xs:sequence>
+        <xs:attribute name="name" use="prohibited">
+          <xs:annotation>
+            <xs:documentation>
+              Forbidden when nested
+            </xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="final" use="prohibited"/>
+       <xs:anyAttribute namespace="##other" processContents="lax"/>
+      </xs:restriction>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:element name="simpleType" type="xs:topLevelSimpleType" id="simpleType">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#element-simpleType"/>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:group name="facets">
+   <xs:annotation>
+    <xs:documentation>
+       We should use a substitution group for facets, but
+       that's ruled out because it would allow users to
+       add their own, which we're not ready for yet.
+    </xs:documentation>
+   </xs:annotation>
+   <xs:choice>
+    <xs:element ref="xs:minExclusive"/>
+    <xs:element ref="xs:minInclusive"/>
+    <xs:element ref="xs:maxExclusive"/>
+    <xs:element ref="xs:maxInclusive"/>
+    <xs:element ref="xs:totalDigits"/>
+    <xs:element ref="xs:fractionDigits"/>
+    <xs:element ref="xs:length"/>
+    <xs:element ref="xs:minLength"/>
+    <xs:element ref="xs:maxLength"/>
+    <xs:element ref="xs:enumeration"/>
+    <xs:element ref="xs:whiteSpace"/>
+    <xs:element ref="xs:pattern"/>
+   </xs:choice>
+  </xs:group>
+
+  <xs:group name="simpleRestrictionModel">
+   <xs:sequence>
+    <xs:element name="simpleType" type="xs:localSimpleType" minOccurs="0"/>
+    <xs:group ref="xs:facets" minOccurs="0" maxOccurs="unbounded"/>
+   </xs:sequence>
+  </xs:group>
+
+  <xs:element name="restriction" id="restriction">
+   <xs:complexType>
+    <xs:annotation>
+      <xs:documentation
+                source="http://www.w3.org/TR/xmlschema-2/#element-restriction">
+          base attribute and simpleType child are mutually
+          exclusive, but one or other is required
+        </xs:documentation>
+      </xs:annotation>
+      <xs:complexContent>
+        <xs:extension base="xs:annotated">
+         <xs:group ref="xs:simpleRestrictionModel"/>
+         <xs:attribute name="base" type="xs:QName" use="optional"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="list" id="list">
+   <xs:complexType>
+    <xs:annotation>
+      <xs:documentation
+                source="http://www.w3.org/TR/xmlschema-2/#element-list">
+          itemType attribute and simpleType child are mutually
+          exclusive, but one or other is required
+        </xs:documentation>
+      </xs:annotation>
+      <xs:complexContent>
+        <xs:extension base="xs:annotated">
+          <xs:sequence>
+            <xs:element name="simpleType" type="xs:localSimpleType"
+                minOccurs="0"/>
+          </xs:sequence>
+          <xs:attribute name="itemType" type="xs:QName" use="optional"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="union" id="union">
+   <xs:complexType>
+    <xs:annotation>
+      <xs:documentation
+                source="http://www.w3.org/TR/xmlschema-2/#element-union">
+          memberTypes attribute must be non-empty or there must be
+          at least one simpleType child
+        </xs:documentation>
+      </xs:annotation>
+      <xs:complexContent>
+        <xs:extension base="xs:annotated">
+          <xs:sequence>
+            <xs:element name="simpleType" type="xs:localSimpleType"
+                minOccurs="0" maxOccurs="unbounded"/>
+          </xs:sequence>
+          <xs:attribute name="memberTypes" use="optional">
+            <xs:simpleType>
+              <xs:list itemType="xs:QName"/>
+            </xs:simpleType>
+          </xs:attribute>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:complexType name="facet">
+    <xs:complexContent>
+      <xs:extension base="xs:annotated">
+        <xs:attribute name="value" use="required"/>
+        <xs:attribute name="fixed" type="xs:boolean" use="optional"
+                      default="false"/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+ <xs:complexType name="noFixedFacet">
+  <xs:complexContent>
+   <xs:restriction base="xs:facet">
+    <xs:sequence>
+     <xs:element ref="xs:annotation" minOccurs="0"/>
+    </xs:sequence>
+    <xs:attribute name="fixed" use="prohibited"/>
+    <xs:anyAttribute namespace="##other" processContents="lax"/>
+   </xs:restriction>
+  </xs:complexContent>
+ </xs:complexType>
+
+  <xs:element name="minExclusive" id="minExclusive" type="xs:facet">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#element-minExclusive"/>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="minInclusive" id="minInclusive" type="xs:facet">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#element-minInclusive"/>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:element name="maxExclusive" id="maxExclusive" type="xs:facet">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#element-maxExclusive"/>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="maxInclusive" id="maxInclusive" type="xs:facet">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#element-maxInclusive"/>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:complexType name="numFacet">
+    <xs:complexContent>
+      <xs:restriction base="xs:facet">
+       <xs:sequence>
+         <xs:element ref="xs:annotation" minOccurs="0"/>
+       </xs:sequence>
+       <xs:attribute name="value" type="xs:nonNegativeInteger" use="required"/>
+       <xs:anyAttribute namespace="##other" processContents="lax"/>
+      </xs:restriction>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:element name="totalDigits" id="totalDigits">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#element-totalDigits"/>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:complexContent>
+        <xs:restriction base="xs:numFacet">
+          <xs:sequence>
+            <xs:element ref="xs:annotation" minOccurs="0"/>
+          </xs:sequence>
+          <xs:attribute name="value" type="xs:positiveInteger" use="required"/>
+         <xs:anyAttribute namespace="##other" processContents="lax"/>
+        </xs:restriction>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="fractionDigits" id="fractionDigits" type="xs:numFacet">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#element-fractionDigits"/>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:element name="length" id="length" type="xs:numFacet">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#element-length"/>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="minLength" id="minLength" type="xs:numFacet">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#element-minLength"/>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="maxLength" id="maxLength" type="xs:numFacet">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#element-maxLength"/>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:element name="enumeration" id="enumeration" type="xs:noFixedFacet">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#element-enumeration"/>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:element name="whiteSpace" id="whiteSpace">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#element-whiteSpace"/>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:complexContent>
+        <xs:restriction base="xs:facet">
+          <xs:sequence>
+            <xs:element ref="xs:annotation" minOccurs="0"/>
+          </xs:sequence>
+          <xs:attribute name="value" use="required">
+            <xs:simpleType>
+              <xs:restriction base="xs:NMTOKEN">
+                <xs:enumeration value="preserve"/>
+                <xs:enumeration value="replace"/>
+                <xs:enumeration value="collapse"/>
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:attribute>
+         <xs:anyAttribute namespace="##other" processContents="lax"/>
+        </xs:restriction>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="pattern" id="pattern">
+    <xs:annotation>
+      <xs:documentation
+        source="http://www.w3.org/TR/xmlschema-2/#element-pattern"/>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:complexContent>
+        <xs:restriction base="xs:noFixedFacet">
+          <xs:sequence>
+            <xs:element ref="xs:annotation" minOccurs="0"/>
+          </xs:sequence>
+          <xs:attribute name="value" type="xs:string" use="required"/>
+         <xs:anyAttribute namespace="##other" processContents="lax"/>
+        </xs:restriction>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+</xs:schema>
diff --git a/xml/tests/testData/index/spring-beans-2.0.xsd b/xml/tests/testData/index/spring-beans-2.0.xsd
new file mode 100644
index 000000000000..6825d93187b9
--- /dev/null
+++ b/xml/tests/testData/index/spring-beans-2.0.xsd
@@ -0,0 +1,1076 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<xsd:schema xmlns="http://www.springframework.org/schema/beans"
+		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+		targetNamespace="http://www.springframework.org/schema/beans">
+
+	<xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+
+	<xsd:annotation>
+		<xsd:documentation><![CDATA[
+	Spring XML Beans Schema, version 2.0
+	Authors: Rob Harrop, Juergen Hoeller
+
+	This defines a simple and consistent way of creating a namespace
+	of JavaBeans objects, managed by a Spring BeanFactory, read by
+	XmlBeanDefinitionReader (with DefaultBeanDefinitionDocumentReader).
+
+	This document type is used by most Spring functionality, including
+	web application contexts, which are based on bean factories.
+
+	Each "bean" element in this document defines a JavaBean.
+	Typically the bean class is specified, along with JavaBean properties
+	and/or constructor arguments.
+
+	A bean instance can be a "singleton" (shared instance) or a "prototype"
+	(independent instance). Further scopes can be provided by extended
+	bean factories, for example in a web environment.
+
+	References among beans are supported, that is, setting a JavaBean property
+	or a constructor argument to refer to another bean in the same factory
+	(or an ancestor factory).
+
+	As alternative to bean references, "inner bean definitions" can be used.
+	Singleton flags of such inner bean definitions are effectively ignored:
+	inner beans are typically anonymous prototypes.
+
+	There is also support for lists, sets, maps, and java.util.Properties
+	as bean property types or constructor argument types.
+		]]></xsd:documentation>
+	</xsd:annotation>
+
+	<!-- base types -->
+	<xsd:complexType name="identifiedType" abstract="true">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	The unique identifier for a bean. The scope of the identifier
+	is the enclosing bean factory.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:attribute name="id" type="xsd:ID">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	The unique identifier for a bean.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<!-- Top-level <beans> tag -->
+	<xsd:element name="beans">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	The top level (typically root) element. Allows the definition
+	of default values for all nested bean definitions.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element ref="description" minOccurs="0"/>
+				<xsd:choice minOccurs="0" maxOccurs="unbounded">
+					<xsd:element ref="import"/>
+					<xsd:element ref="alias"/>
+					<xsd:element ref="bean"/>
+					<xsd:any namespace="##other" processContents="strict" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:choice>
+			</xsd:sequence>
+			<xsd:attribute name="default-lazy-init" default="false" type="xsd:boolean">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The default 'lazy-init' value; see the documentation for the
+	'lazy-init' attribute of the '<bean>/' element. 
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="default-merge" default="false" type="xsd:boolean">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The default 'merge' value; see the documentation for the
+	'merge' attribute of the various collection elements. 
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="default-dependency-check" default="none">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The default 'dependency-check' value; see the documentation for the
+	'dependency-check' attribute of the '<bean>/' element. 
+					]]></xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:restriction base="xsd:NMTOKEN">
+						<xsd:enumeration value="none"/>
+						<xsd:enumeration value="simple"/>
+						<xsd:enumeration value="objects"/>
+						<xsd:enumeration value="all"/>
+					</xsd:restriction>
+				</xsd:simpleType>
+			</xsd:attribute>
+			<xsd:attribute name="default-autowire" default="no">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The default 'autowire' value; see the documentation for the
+	'autowire' attribute of the '<bean>/' element. 
+					]]></xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:restriction base="xsd:NMTOKEN">
+						<xsd:enumeration value="no"/>
+						<xsd:enumeration value="byName"/>
+						<xsd:enumeration value="byType"/>
+						<xsd:enumeration value="constructor"/>
+						<xsd:enumeration value="autodetect"/>
+					</xsd:restriction>
+				</xsd:simpleType>
+			</xsd:attribute>
+			<xsd:attribute name="default-init-method" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The default 'init-method' value; see the documentation for the
+	'init-method' attribute of the '<bean>/' element. 
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="default-destroy-method" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The default 'destroy-method' value; see the documentation for the
+	'destroy-method' attribute of the '<bean>/' element. 
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="description">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Contains informative text describing the purpose of the enclosing
+	element.
+	Used primarily for user documentation of XML bean definition documents.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType mixed="true">
+			<xsd:choice minOccurs="0" maxOccurs="unbounded"/>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="import">
+		<xsd:annotation>
+			<xsd:documentation source="java:org.springframework.core.io.Resource"><![CDATA[
+	Specifies an XML bean definition resource to import.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:restriction base="xsd:anyType">
+					<xsd:attribute name="resource" type="xsd:string" use="required">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	The relative resource location of the XML (bean definition) file to import,
+	for example "myImport.xml" or "includes/myImport.xml" or "../myImport.xml".
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+				</xsd:restriction>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="alias">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Defines an alias for a bean (which can reside in a different definition
+	resource).
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:restriction base="xsd:anyType">
+					<xsd:attribute name="name" type="xsd:string" use="required">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	The name of the bean to define an alias for.
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+					<xsd:attribute name="alias" type="xsd:string" use="required">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	The alias name to define for the bean.
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+				</xsd:restriction>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:group name="beanElements">
+		<xsd:sequence>
+			<xsd:element ref="description" minOccurs="0"/>
+			<xsd:choice minOccurs="0" maxOccurs="unbounded">
+				<xsd:element ref="meta"/>
+				<xsd:element ref="constructor-arg"/>
+				<xsd:element ref="property"/>
+				<xsd:element ref="lookup-method"/>
+				<xsd:element ref="replaced-method"/>
+				<xsd:any namespace="##other" processContents="strict" minOccurs="0" maxOccurs="unbounded"/>
+			</xsd:choice>
+		</xsd:sequence>
+	</xsd:group>
+
+	<xsd:attributeGroup name="beanAttributes">
+		<xsd:attribute name="name" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	Can be used to create one or more aliases illegal in an (XML) id.
+	Multiple aliases can be separated by any number of spaces, commas,
+	or semi-colons (or indeed any mixture of the three).
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="class" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:java.lang.Class"><![CDATA[
+	The fully qualified name of the bean's class, except if it pure serves as parent for child bean definitions.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="parent" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	The name of the parent bean definition.
+
+	Will use the bean class of the parent if none is specified, but can
+	also override it. In the latter case, the child bean class must be
+	compatible with the parent, i.e. accept the parent's property values
+	and constructor argument values, if any.
+
+	A child bean definition will inherit constructor argument values,
+	property values and method overrides from the parent, with the option
+	to add new values. If init method, destroy method, factory bean and/or
+	factory method are specified, they will override the corresponding
+	parent settings.
+
+	The remaining settings will always be taken from the child definition:
+	depends on, autowire mode, dependency check, scope, lazy init.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="scope" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	The scope of this bean: typically "singleton" (one shared instance,
+	which will be returned by all calls to getBean with the given id), or
+	"prototype" (independent instance resulting from each call to getBean).
+	Default is "singleton".
+
+	Singletons are most commonly used, and are ideal for multi-threaded
+	service objects. Further scopes, such as "request" or "session", might
+	be supported by extended bean factories (e.g. in a web environment).
+
+	Note: This attribute will not be inherited by child bean definitions.
+	Hence, it needs to be specified per concrete bean definition.
+
+	Inner bean definitions inherit the singleton status of their containing
+	bean definition, unless explicitly specified: The inner bean will be a
+	singleton if the containing bean is a singleton, and a prototype if
+	the containing bean has any other scope.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="abstract" type="xsd:boolean">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	Is this bean "abstract", that is, not meant to be instantiated itself
+	but rather just serving as parent for concrete child bean definitions?
+	The default is "false". Specify "true" to tell the bean factory to not
+	try to instantiate that particular bean in any case.
+
+	Note: This attribute will not be inherited by child bean definitions.
+	Hence, it needs to be specified per abstract bean definition.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="lazy-init" default="default" type="defaultable-boolean">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	Indicates whether or not this bean is to be lazily initialized.
+	If false, it will be instantiated on startup by bean factories
+	that perform eager initialization of singletons. The default is
+	"false".
+
+	Note: This attribute will not be inherited by child bean definitions.
+	Hence, it needs to be specified per concrete bean definition.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="autowire" default="default">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	Controls whether bean properties are "autowired".
+	This is an automagical process in which bean references don't need
+	to be coded explicitly in the XML bean definition file, but rather the
+	Spring container works out dependencies.
+
+	There are 5 modes:
+
+	1. "no"
+	The traditional Spring default. No automagical wiring. Bean references
+	must be defined in the XML file via the <ref/> element (or "ref"
+	attribute). We recommend this in most cases as it makes documentation
+	more explicit.
+
+	2. "byName"
+	Autowiring by property name. If a bean of class Cat exposes a dog
+	property, Spring will try to set this to the value of the bean "dog"
+	in the current container. If there is no matching bean by name, nothing
+	special happens; use dependency-check="objects" to raise an error in
+	that case.
+
+	3. "byType"
+	Autowiring if there is exactly one bean of the property type in the
+	container. If there is more than one, a fatal error is raised, and
+	you cannot use byType autowiring for that bean. If there is none,
+	nothing special happens; use dependency-check="objects" to raise an
+	error in that case.
+
+	4. "constructor"
+	Analogous to "byType" for constructor arguments. If there is not exactly
+	one bean of the constructor argument type in the bean factory, a fatal
+	error is raised.
+
+	5. "autodetect"
+	Chooses "constructor" or "byType" through introspection of the bean
+	class. If a default constructor is found, "byType" gets applied.
+
+	Note that explicit dependencies, i.e. "property" and "constructor-arg"
+	elements, always override autowiring. Autowire behavior can be combined
+	with dependency checking, which will be performed after all autowiring
+	has been completed.
+
+	Note: This attribute will not be inherited by child bean definitions.
+	Hence, it needs to be specified per concrete bean definition.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:restriction base="xsd:NMTOKEN">
+					<xsd:enumeration value="default"/>
+					<xsd:enumeration value="no"/>
+					<xsd:enumeration value="byName"/>
+					<xsd:enumeration value="byType"/>
+					<xsd:enumeration value="constructor"/>
+					<xsd:enumeration value="autodetect"/>
+				</xsd:restriction>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="dependency-check" default="default">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	Controls whether or not to check whether all of this
+	beans dependencies, expressed in its properties, are satisfied.
+	The default is to perform no dependency checking.
+
+	"simple" type dependency checking includes primitives and String
+	"object" includes collaborators (other beans in the factory)
+	"all" includes both types of dependency checking
+
+	Note: This attribute will not be inherited by child bean definitions.
+	Hence, it needs to be specified per concrete bean definition.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:restriction base="xsd:NMTOKEN">
+					<xsd:enumeration value="default"/>
+					<xsd:enumeration value="none"/>
+					<xsd:enumeration value="simple"/>
+					<xsd:enumeration value="objects"/>
+					<xsd:enumeration value="all"/>
+				</xsd:restriction>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="depends-on" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	The names of the beans that this bean depends on being initialized.
+	The bean factory will guarantee that these beans get initialized
+	before this bean.
+
+	Note that dependencies are normally expressed through bean properties
+	or constructor arguments. This property should just be necessary for
+	other kinds of dependencies like statics (*ugh*) or database preparation
+	on startup.
+
+	Note: This attribute will not be inherited by child bean definitions.
+	Hence, it needs to be specified per concrete bean definition.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="init-method" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	The name of the custom initialization method to invoke after setting
+	bean properties. The method must have no arguments, but may throw any
+	exception.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="destroy-method" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	The name of the custom destroy method to invoke on bean factory
+	shutdown. The method must have no arguments, but may throw any
+	exception.
+
+	Note: Only invoked on beans whose lifecycle is under the full
+	control of the factory - which is always the case for singletons,
+	but not guaranteed for any other scope.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="factory-method" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	The name of a factory method to use to create this object. Use
+	constructor-arg elements to specify arguments to the factory method,
+	if it takes arguments. Autowiring does not apply to factory methods.
+
+	If the "class" attribute is present, the factory method will be a static
+	method on the class specified by the "class" attribute on this bean
+	definition. Often this will be the same class as that of the constructed
+	object - for example, when the factory method is used as an alternative
+	to a constructor. However, it may be on a different class. In that case,
+	the created object will *not* be of the class specified in the "class"
+	attribute. This is analogous to FactoryBean behavior.
+
+	If the "factory-bean" attribute is present, the "class" attribute is not
+	used, and the factory method will be an instance method on the object
+	returned from a getBean call with the specified bean name. The factory
+	bean may be defined as a singleton or a prototype.
+
+	The factory method can have any number of arguments. Autowiring is not
+	supported. Use indexed constructor-arg elements in conjunction with the
+	factory-method attribute.
+
+	Setter Injection can be used in conjunction with a factory method.
+	Method Injection cannot, as the factory method returns an instance,
+	which will be used when the container creates the bean.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="factory-bean" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	Alternative to class attribute for factory-method usage.
+	If this is specified, no class attribute should be used.
+	This must be set to the name of a bean in the current or
+	ancestor factories that contains the relevant factory method.
+	This allows the factory itself to be configured using Dependency
+	Injection, and an instance (rather than static) method to be used.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="autowire-candidate" type="xsd:boolean">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	Indicates whether or not this bean should be considered when looking
+	for candidates to satisfy another bean's autowiring requirements.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:anyAttribute namespace="##other" processContents="lax"/>
+	</xsd:attributeGroup>
+
+	<xsd:element name="meta" type="metaType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Arbitrary metadata attached to a bean definition.
+			]]></xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+
+	<xsd:complexType name="metaType">
+		<xsd:attribute name="key" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	The key name of the metadata parameter being defined.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="value" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	The value of the metadata parameter being defined (as a simple String).
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<xsd:element name="bean">
+		<xsd:annotation>
+			<xsd:documentation source="java:org.springframework.beans.factory.config.BeanDefinition"><![CDATA[
+	Defines a single (usually named) bean.
+
+	A bean definition may contain nested tags for constructor arguments,
+	property values, lookup methods, and replaced methods. Mixing constructor
+	injection and setter injection on the same bean is explicitly supported.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:extension base="identifiedType">
+					<xsd:group ref="beanElements"/>
+					<xsd:attributeGroup ref="beanAttributes"/>
+				</xsd:extension>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="constructor-arg">
+		<xsd:annotation>
+			<xsd:documentation source="java:org.springframework.beans.factory.config.ConstructorArgumentValues">
+				<![CDATA[
+	Bean definitions can specify zero or more constructor arguments.
+	This is an alternative to "autowire constructor".
+	Arguments correspond to either a specific index of the constructor
+	argument list or are supposed to be matched generically by type.
+
+	Note: A single generic argument value will just be used once, rather
+	than potentially matched multiple times (as of Spring 1.1).
+
+	constructor-arg elements are also used in conjunction with the
+	factory-method element to construct beans using static or instance
+	factory methods.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element ref="description" minOccurs="0"/>
+				<xsd:choice minOccurs="0" maxOccurs="1">
+					<xsd:element ref="bean"/>
+					<xsd:element ref="ref"/>
+					<xsd:element ref="idref"/>
+					<xsd:element ref="value"/>
+					<xsd:element ref="null"/>
+					<xsd:element ref="list"/>
+					<xsd:element ref="set"/>
+					<xsd:element ref="map"/>
+					<xsd:element ref="props"/>
+					<xsd:any namespace="##other" processContents="strict"/>
+				</xsd:choice>
+			</xsd:sequence>
+			<xsd:attribute name="index" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The exact index of thr argument in the constructor argument list.
+	Only needed to avoid ambiguities, e.g. in case of 2 arguments of
+	the exact same type.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="type" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The exact type of the constructor argument. Only needed to avoid
+	ambiguities, e.g. in case of 2 single argument constructors
+	that can both be converted from a String.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="ref" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	A short-cut alternative to a nested "<ref bean='...'/>" element.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="value" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	A short-cut alternative to a nested "<value>...<value/>"
+	element.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="property" type="propertyType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Bean definitions can have zero or more properties.
+	Property elements correspond to JavaBean setter methods exposed
+	by the bean classes. Spring supports primitives, references to other
+	beans in the same or related factories, lists, maps and properties.
+			]]></xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+
+	<xsd:element name="lookup-method">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	A lookup method causes the IoC container to override the given method
+	and return the bean with the name given in the bean attribute. This is
+	a form of Method Injection. It is particularly useful as an alternative
+	to implementing the BeanFactoryAware interface, in order to be able to
+	make getBean() calls for non-singleton instances at runtime. In this
+	case, Method Injection is a less invasive alternative.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:restriction base="xsd:anyType">
+					<xsd:attribute name="name" type="xsd:string">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	The name of the lookup method. This method must take no arguments.
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+					<xsd:attribute name="bean" type="xsd:string">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	The name of the bean in the current or ancestor factories that
+	the lookup method should resolve to. Often this bean will be a
+	prototype, in which case the lookup method will return a distinct
+	instance on every invocation. This is useful for single-threaded objects.
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+				</xsd:restriction>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="replaced-method">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Similar to the lookup method mechanism, the replaced-method element
+	is used to control IoC container method overriding: Method Injection.
+	This mechanism allows the overriding of a method with arbitrary code.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:choice minOccurs="0" maxOccurs="unbounded">
+					<xsd:element ref="arg-type"/>
+				</xsd:choice>
+			</xsd:sequence>
+			<xsd:attribute name="name" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The name of the method whose implementation must be replaced by the
+	IoC container. If this method is not overloaded, there is no need
+	to use arg-type subelements. If this method is overloaded, arg-type
+	subelements must be used for all override definitions for the method.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="replacer" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation source="java:org.springframework.beans.factory.support.MethodReplacer"><![CDATA[
+	Bean name of an implementation of the MethodReplacer interface in the
+	current or ancestor factories. This may be a singleton or prototype
+	bean. If it is a prototype, a new instance will be used for each
+	method replacement. Singleton usage is the norm.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="arg-type">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Identifies an argument for a replaced method in the event of
+	method overloading.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType mixed="true">
+			<xsd:choice minOccurs="0" maxOccurs="unbounded"/>
+			<xsd:attribute name="match" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	Specification of the type of an overloaded method argument as a String.
+	For convenience, this may be a substring of the FQN. E.g. all the
+	following would match "java.lang.String":
+	- java.lang.String
+	- String
+	- Str
+
+	As the number of arguments will be checked also, this convenience
+	can often be used to save typing.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="ref">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Defines a reference to another bean in this factory or an external
+	factory (parent or included factory).
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:restriction base="xsd:anyType">
+					<xsd:attribute name="bean" type="xsd:string">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	The name of the referenced bean.
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+					<xsd:attribute name="local" type="xsd:IDREF">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	The name of the referenced bean. The value must be a bean ID,
+	and thus can be checked by the XML parser, thus should be preferred
+	for references within the same bean factory XML file.
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+					<xsd:attribute name="parent" type="xsd:string">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	The name of the referenced bean *in a parent factory*.
+						]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+				</xsd:restriction>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="idref">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	The id of another bean in this factory or an external factory
+	(parent or included factory).
+	While a regular 'value' element could instead be used for the
+	same effect, using idref in this case allows validation of local
+	bean ids by the XML parser, and name completion by supporting tools.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:restriction base="xsd:anyType">
+					<xsd:attribute name="bean" type="xsd:string">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	The name of the referenced bean.
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+					<xsd:attribute name="local" type="xsd:IDREF">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	The name of the referenced bean. The value must be a bean ID,
+	and thus can be checked by the XML parser, thus should be preferred
+	for references within the same bean factory XML file.
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+				</xsd:restriction>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="value">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Contains a string representation of a property value.
+	The property may be a string, or may be converted to the required
+	type using the JavaBeans PropertyEditor machinery. This makes it
+	possible for application developers to write custom PropertyEditor
+	implementations that can convert strings to arbitrary target objects.
+
+	Note that this is recommended for simple objects only. Configure
+	more complex objects by populating JavaBean properties with
+	references to other beans.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType mixed="true">
+			<xsd:choice minOccurs="0" maxOccurs="unbounded"/>
+			<xsd:attribute name="type" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The exact type that the value should be converted to. Only needed
+	if the type of the target property or constructor argument is
+	too generic: for example, in case of a collection element.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="null">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Denotes a Java null value. Necessary because an empty "value" tag
+	will resolve to an empty String, which will not be resolved to a
+	null value unless a special PropertyEditor does so.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType mixed="true">
+			<xsd:choice minOccurs="0" maxOccurs="unbounded"/>
+		</xsd:complexType>
+	</xsd:element>
+
+	<!-- Collection Elements -->
+	<xsd:group name="collectionElements">
+		<xsd:sequence>
+			<xsd:choice minOccurs="0" maxOccurs="unbounded">
+				<xsd:element ref="bean"/>
+				<xsd:element ref="ref"/>
+				<xsd:element ref="idref"/>
+				<xsd:element ref="value"/>
+				<xsd:element ref="null"/>
+				<xsd:element ref="list"/>
+				<xsd:element ref="set"/>
+				<xsd:element ref="map"/>
+				<xsd:element ref="props"/>
+				<xsd:any namespace="##other" processContents="strict" minOccurs="0" maxOccurs="unbounded"/>
+			</xsd:choice>
+		</xsd:sequence>
+	</xsd:group>
+
+	<xsd:element name="list" type="listOrSetType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	A list can contain multiple inner bean, ref, collection, or value
+	elements. Java lists are untyped, pending generics support in Java5,
+	although references will be strongly typed. A list can also map to
+	an array type. The necessary conversion is automatically performed
+	by the BeanFactory.
+			]]></xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+	<xsd:element name="set" type="listOrSetType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	A set can contain multiple inner bean, ref, collection, or value
+	elements. Java sets are untyped, pending generics support in Java5,
+	although references will be strongly typed.
+			]]></xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+	<xsd:element name="map" type="mapType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	A mapping from a key to an object. Maps may be empty.
+			]]></xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+	<xsd:element name="entry" type="entryType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	A map entry can be an inner bean, ref, value, or collection.
+	The key of the entry is given by the "key" attribute or child element.
+			]]></xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+	<xsd:element name="props" type="propsType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Props elements differ from map elements in that values must be strings.
+	Props may be empty.
+			]]></xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+
+	<xsd:element name="key">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	A key element can contain an inner bean, ref, value, or collection.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:group ref="collectionElements"/>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="prop">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	The string value of the property. Note that whitespace is trimmed
+	off to avoid unwanted whitespace caused by typical XML formatting.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType mixed="true">
+			<xsd:choice minOccurs="0" maxOccurs="unbounded"/>
+			<xsd:attribute name="key" type="xsd:string" use="required">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The key of the property entry.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:complexType name="propertyType">
+		<xsd:sequence>
+			<xsd:element ref="description" minOccurs="0"/>
+			<xsd:choice minOccurs="0" maxOccurs="1">
+				<xsd:element ref="meta"/>
+				<xsd:element ref="bean"/>
+				<xsd:element ref="ref"/>
+				<xsd:element ref="idref"/>
+				<xsd:element ref="value"/>
+				<xsd:element ref="null"/>
+				<xsd:element ref="list"/>
+				<xsd:element ref="set"/>
+				<xsd:element ref="map"/>
+				<xsd:element ref="props"/>
+				<xsd:any namespace="##other" processContents="strict"/>
+			</xsd:choice>
+		</xsd:sequence>
+		<xsd:attribute name="name" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	The name of the property, following JavaBean naming conventions.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="ref" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	A short-cut alternative to a nested "<ref bean='...'/>".
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="value" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	A short-cut alternative to a nested "<value>...</value>"
+	element.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<!-- Collection Types -->
+
+	<!-- base collection type -->
+	<xsd:complexType name="baseCollectionType">
+		<xsd:attribute name="merge" type="defaultable-boolean">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	Enables/disables merging for collections when using parent/child beans.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<!-- base type for collections that have (possibly) typed nested values -->
+	<xsd:complexType name="typedCollectionType">
+		<xsd:complexContent>
+			<xsd:extension base="baseCollectionType">
+				<xsd:attribute name="value-type" type="xsd:string">
+					<xsd:annotation>
+						<xsd:documentation source="java:java.lang.Class"><![CDATA[
+	The default Java type for nested values. Must be a fully qualified
+	class name.
+						]]></xsd:documentation>
+					</xsd:annotation>
+				</xsd:attribute>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<!-- 'map' element type -->
+	<xsd:complexType name="mapType">
+		<xsd:complexContent>
+			<xsd:extension base="typedCollectionType">
+				<xsd:sequence>
+					<xsd:choice minOccurs="0" maxOccurs="unbounded">
+						<xsd:element ref="entry"/>
+					</xsd:choice>
+				</xsd:sequence>
+				<xsd:attribute name="key-type" type="xsd:string">
+					<xsd:annotation>
+						<xsd:documentation source="java:java.lang.Class"><![CDATA[
+	The default Java type for nested entry keys. Must be a fully qualified
+	class name. 	
+						]]></xsd:documentation>
+					</xsd:annotation>
+				</xsd:attribute>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<!-- 'entry' element type -->
+	<xsd:complexType name="entryType">
+		<xsd:sequence>
+			<xsd:element ref="key" minOccurs="0"/>
+			<xsd:group ref="collectionElements"/>
+		</xsd:sequence>
+		<xsd:attribute name="key" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	Each map element must specify its key as attribute or as child element.
+	A key attribute is always a String value.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="key-ref" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	A short-cut alternative to a to a "key" element with a nested
+	"<ref bean='...'/>".
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="value" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	A short-cut alternative to a nested "<value>...</value>"
+	element.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="value-ref" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	A short-cut alternative to a nested "<ref bean='...'/>".
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<!-- 'list' and 'set' collection type -->
+	<xsd:complexType name="listOrSetType">
+		<xsd:complexContent>
+			<xsd:extension base="typedCollectionType">
+				<xsd:group ref="collectionElements"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<!-- 'props' collection type -->
+	<xsd:complexType name="propsType">
+		<xsd:complexContent>
+			<xsd:extension base="baseCollectionType">
+				<xsd:sequence>
+					<xsd:choice minOccurs="0" maxOccurs="unbounded">
+						<xsd:element ref="prop"/>
+					</xsd:choice>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<!-- simple internal types -->
+	<xsd:simpleType name="defaultable-boolean">
+		<xsd:restriction base="xsd:NMTOKEN">
+			<xsd:enumeration value="default"/>
+			<xsd:enumeration value="true"/>
+			<xsd:enumeration value="false"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+</xsd:schema>
diff --git a/xml/tests/testData/index/spring-tool-2.0.xsd b/xml/tests/testData/index/spring-tool-2.0.xsd
new file mode 100644
index 000000000000..3d278bf64466
--- /dev/null
+++ b/xml/tests/testData/index/spring-tool-2.0.xsd
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<xsd:schema xmlns="http://www.springframework.org/schema/tool"
+		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+		targetNamespace="http://www.springframework.org/schema/tool"
+		elementFormDefault="qualified">
+
+	<xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+
+	<xsd:annotation>
+		<xsd:documentation><![CDATA[
+	Defines the tool support annotations for Spring's configuration namespaces.
+	Used in other namespace XSD files; not intended for direct use in config files.
+		]]></xsd:documentation>
+	</xsd:annotation>
+
+	<xsd:element name="annotation">
+		<xsd:complexType>
+			<xsd:sequence minOccurs="0">
+				<xsd:element name="expected-type" type="typedParameterType" minOccurs="0" maxOccurs="1"/>
+				<xsd:element name="assignable-to" type="typedParameterType" minOccurs="0" maxOccurs="1"/>
+				<xsd:element name="exports" type="exportsType" minOccurs="0" maxOccurs="1"/>
+			</xsd:sequence>
+			<xsd:attribute name="kind" default="direct">
+				<xsd:simpleType>
+					<xsd:restriction base="xsd:string">
+						<xsd:enumeration value="ref"/>
+						<xsd:enumeration value="direct"/>
+					</xsd:restriction>
+				</xsd:simpleType>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:complexType name="typedParameterType">
+		<xsd:attribute name="type" type="xsd:string" use="required"/>
+	</xsd:complexType>
+
+	<xsd:complexType name="exportsType">
+		<xsd:annotation>
+			<xsd:documentation>
+				Indicates that an annotated type exports an application visible component.
+			</xsd:documentation>
+		</xsd:annotation>
+		<xsd:attribute name="type" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation>
+					The type of the exported component. May be null if the type is not known until runtime.
+				</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="identifier" type="xsd:string" default="@id">
+			<xsd:annotation>
+				<xsd:documentation>
+					Defines an XPath query that can be executed against the node annotated with this
+					type to determine the identifier of any exported component.
+				</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+</xsd:schema>
diff --git a/xml/tests/testData/inspections/deprecatedTag/SwitchToHtml5QuickFix.html b/xml/tests/testData/inspections/deprecatedTag/SwitchToHtml5QuickFix.html
new file mode 100644
index 000000000000..2e0b258453c3
--- /dev/null
+++ b/xml/tests/testData/inspections/deprecatedTag/SwitchToHtml5QuickFix.html
@@ -0,0 +1,8 @@
+<html>
+<head>
+  <title></title>
+</head>
+<body>
+<men<caret>u></menu>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/deprecatedTag/SwitchToHtml5QuickFix1.html b/xml/tests/testData/inspections/deprecatedTag/SwitchToHtml5QuickFix1.html
new file mode 100644
index 000000000000..53e33d7c45af
--- /dev/null
+++ b/xml/tests/testData/inspections/deprecatedTag/SwitchToHtml5QuickFix1.html
@@ -0,0 +1,10 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title></title>
+</head>
+<body>
+<me<caret>nu></menu>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/deprecatedTag/actions/after0.html b/xml/tests/testData/inspections/deprecatedTag/actions/after0.html
new file mode 100644
index 000000000000..defb3b1e92e7
--- /dev/null
+++ b/xml/tests/testData/inspections/deprecatedTag/actions/after0.html
@@ -0,0 +1,12 @@
+<!-- "Replace s tag with del tag" "true" -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>1</title>
+</head>
+<body>
+<del></del>
+</body>
+<frame/>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/deprecatedTag/actions/after1.html b/xml/tests/testData/inspections/deprecatedTag/actions/after1.html
new file mode 100644
index 000000000000..d15db0d63370
--- /dev/null
+++ b/xml/tests/testData/inspections/deprecatedTag/actions/after1.html
@@ -0,0 +1,12 @@
+<!-- "Replace strike tag with CSS" "true" -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>1</title>
+</head>
+<body>
+<span style="text-decoration: line-through;">a</span>
+<b>fdfsdfsd</b>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/deprecatedTag/actions/after2.jspx b/xml/tests/testData/inspections/deprecatedTag/actions/after2.jspx
new file mode 100644
index 000000000000..8ff510623bdf
--- /dev/null
+++ b/xml/tests/testData/inspections/deprecatedTag/actions/after2.jspx
@@ -0,0 +1,11 @@
+<!-- "Replace font tag with CSS" "true" -->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" xmlns="http://www.w3.org/1999/xhtml" version="2.0">
+  <jsp:directive.page import="java.util.Map"/>
+  <html xmlns="http://www.w3.org/1999/xhtml">
+  <body>
+    <jsp:scriptlet>
+    </jsp:scriptlet>
+  <span style="font-family: arial; font-size: 144%; color: red; ">a</span>
+  </body>
+</html>
+</jsp:root>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/deprecatedTag/actions/after3.jsp b/xml/tests/testData/inspections/deprecatedTag/actions/after3.jsp
new file mode 100644
index 000000000000..b7c96f21c199
--- /dev/null
+++ b/xml/tests/testData/inspections/deprecatedTag/actions/after3.jsp
@@ -0,0 +1,33 @@
+<%-- "Replace applet tag with object tag" "true" --%>
+<object align="baseline" width="550" height="150" classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"
+        codebase="http://java.sun.com/products/plugin/autodl/jinstall-1_4-windows-i586.cab#Version=1,4,0,0"> <param name="3dsize" value="15"> <param name="bgcolor" value="0,0,0"> <param name="bold" value="true"> <param name="delay" value="2000"> <param name="delay3d" value="15"> <param name="desc0" value="?????? 3D Message"> <param name="desc1" value="???????? ?????"> <param name="desc2" value="Move Up"> <param name="desc3" value="Move Right"> <param name="desc4" value="Move Down"> <param name="desc5" value="Move Left"> <param name="font" value="Times New Roman"> <param name="heading2" value="0"> <param name="heading3" value="1"> <param name="heading4" value="2"> <param name="heading5" value="3"> <param name="italic" value="false"> <param name="movedelay" value="0"> <param name="Notice" value="3D Message Effect, Copyright (c) 19 96 OpenCube Technologies - Freeware"> <param name="numofmessages" value="6"> <param name="size" value="40">
+    <param name="code" value="TDMessage"/>
+    <param name="id" value="3D Message"/>
+    <!--[if !IE]> -->
+    <object align="baseline" width="550" height="150" type="application/x-java-applet">
+        <param name="3dsize" value="15">
+        <param name="bgcolor" value="0,0,0">
+        <param name="bold" value="true">
+        <param name="delay" value="2000">
+        <param name="delay3d" value="15">
+        <param name="desc0" value="?????? 3D Message">
+        <param name="desc1" value="???????? ?????">
+        <param name="desc2" value="Move Up">
+        <param name="desc3" value="Move Right">
+        <param name="desc4" value="Move Down">
+        <param name="desc5" value="Move Left">
+        <param name="font" value="Times New Roman">
+        <param name="heading2" value="0">
+        <param name="heading3" value="1">
+        <param name="heading4" value="2">
+        <param name="heading5" value="3">
+        <param name="italic" value="false">
+        <param name="movedelay" value="0">
+        <param name="Notice" value="3D Message Effect, Copyright (c) 19 96 OpenCube Technologies - Freeware">
+        <param name="numofmessages" value="6">
+        <param name="size" value="40">
+        <param name="code" value="TDMessage"/>
+        <param name="id" value="3D Message"/>
+    </object>
+    <!-- <![endif]-->
+</object>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/deprecatedTag/actions/before0.html b/xml/tests/testData/inspections/deprecatedTag/actions/before0.html
new file mode 100644
index 000000000000..53b4398905de
--- /dev/null
+++ b/xml/tests/testData/inspections/deprecatedTag/actions/before0.html
@@ -0,0 +1,12 @@
+<!-- "Replace s tag with del tag" "true" -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>1</title>
+</head>
+<body>
+<<caret>s></s>
+</body>
+<frame/>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/deprecatedTag/actions/before1.html b/xml/tests/testData/inspections/deprecatedTag/actions/before1.html
new file mode 100644
index 000000000000..cf938ebc91c0
--- /dev/null
+++ b/xml/tests/testData/inspections/deprecatedTag/actions/before1.html
@@ -0,0 +1,12 @@
+<!-- "Replace strike tag with CSS" "true" -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>1</title>
+</head>
+<body>
+<strike<caret>>a</strike>
+<b>fdfsdfsd</b>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/deprecatedTag/actions/before2.jspx b/xml/tests/testData/inspections/deprecatedTag/actions/before2.jspx
new file mode 100644
index 000000000000..97d8fa3cb089
--- /dev/null
+++ b/xml/tests/testData/inspections/deprecatedTag/actions/before2.jspx
@@ -0,0 +1,11 @@
+<!-- "Replace font tag with CSS" "true" -->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" xmlns="http://www.w3.org/1999/xhtml" version="2.0">
+  <jsp:directive.page import="java.util.Map"/>
+  <html xmlns="http://www.w3.org/1999/xhtml">
+  <body>
+    <jsp:scriptlet>
+    </jsp:scriptlet>
+  <font<caret> face="arial" size="+2" color="red">a</font>
+  </body>
+</html>
+</jsp:root>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/deprecatedTag/actions/before3.jsp b/xml/tests/testData/inspections/deprecatedTag/actions/before3.jsp
new file mode 100644
index 000000000000..07025457537c
--- /dev/null
+++ b/xml/tests/testData/inspections/deprecatedTag/actions/before3.jsp
@@ -0,0 +1,2 @@
+<%-- "Replace applet tag with object tag" "true" --%>
+<applet<caret> code="TDMessage.class" align="baseline" width="550" height="150" id="3D Message"> <param name="3dsize" value="15"> <param name="bgcolor" value="0,0,0"> <param name="bold" value="true"> <param name="delay" value="2000"> <param name="delay3d" value="15"> <param name="desc0" value="?????? 3D Message"> <param name="desc1" value="???????? ?????"> <param name="desc2" value="Move Up"> <param name="desc3" value="Move Right"> <param name="desc4" value="Move Down"> <param name="desc5" value="Move Left"> <param name="font" value="Times New Roman"> <param name="heading2" value="0"> <param name="heading3" value="1"> <param name="heading4" value="2"> <param name="heading5" value="3"> <param name="italic" value="false"> <param name="movedelay" value="0"> <param name="Notice" value="3D Message Effect, Copyright (c) 19 96 OpenCube Technologies - Freeware"> <param name="numofmessages" value="6"> <param name="size" value="40"></applet>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/deprecatedTag/html_deptag5.xhtml b/xml/tests/testData/inspections/deprecatedTag/html_deptag5.xhtml
new file mode 100644
index 000000000000..cd5efad49e1d
--- /dev/null
+++ b/xml/tests/testData/inspections/deprecatedTag/html_deptag5.xhtml
@@ -0,0 +1,4 @@
+<!-- ""  "true" -->
+<html>
+<fit<caret>:menu/>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/deprecatedTag/html_deptag5.xml b/xml/tests/testData/inspections/deprecatedTag/html_deptag5.xml
new file mode 100644
index 000000000000..c70e99b6150e
--- /dev/null
+++ b/xml/tests/testData/inspections/deprecatedTag/html_deptag5.xml
@@ -0,0 +1,9 @@
+<!-- ""  "true" -->
+<xml>
+  <html>
+    <font<caret> size="+666"/>
+    <p>
+      bla-bla
+    </p>
+  </html>
+</xml>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/formInputWithoutLabel/actions/after1.html b/xml/tests/testData/inspections/formInputWithoutLabel/actions/after1.html
new file mode 100644
index 000000000000..f1724178b915
--- /dev/null
+++ b/xml/tests/testData/inspections/formInputWithoutLabel/actions/after1.html
@@ -0,0 +1,13 @@
+<!-- "Associate a new label with input element" "true" -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title></title>
+</head>
+<body>
+<label>
+    <input type="checkbox">
+</label>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/formInputWithoutLabel/actions/after2.xhtml b/xml/tests/testData/inspections/formInputWithoutLabel/actions/after2.xhtml
new file mode 100644
index 000000000000..0afb1c1d3ae0
--- /dev/null
+++ b/xml/tests/testData/inspections/formInputWithoutLabel/actions/after2.xhtml
@@ -0,0 +1,15 @@
+<!-- "Create a new label from the text before input element" "true" -->
+<html>
+<body>
+<label>
+    <label>
+        oppa
+    </label>
+    <label>
+        blabla1
+        <input type="checkbox"/>
+    </label>
+    blabla2
+</label>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/formInputWithoutLabel/actions/after3.jsp b/xml/tests/testData/inspections/formInputWithoutLabel/actions/after3.jsp
new file mode 100644
index 000000000000..7c52117e7f77
--- /dev/null
+++ b/xml/tests/testData/inspections/formInputWithoutLabel/actions/after3.jsp
@@ -0,0 +1,11 @@
+<%-- "Create a new label from the text after textarea element" "true" --%>
+<label>
+    <label>
+        oppa
+    </label>
+    blabla1
+    <label>
+        <textarea type="checkbox"/>
+        blabla2
+    </label>
+</label>
diff --git a/xml/tests/testData/inspections/formInputWithoutLabel/actions/after4.jspx b/xml/tests/testData/inspections/formInputWithoutLabel/actions/after4.jspx
new file mode 100644
index 000000000000..a6096ed8dcbb
--- /dev/null
+++ b/xml/tests/testData/inspections/formInputWithoutLabel/actions/after4.jspx
@@ -0,0 +1,15 @@
+<!-- "Create a new label from the text before select element" "true" -->
+<html>
+<body>
+<label>
+    <label>
+        oppa
+    </label>
+    <label>
+        blabla1
+        <select type="checkbox"/>
+    </label>
+    blabla2
+</label>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/formInputWithoutLabel/actions/after5.html b/xml/tests/testData/inspections/formInputWithoutLabel/actions/after5.html
new file mode 100644
index 000000000000..b3f7ec702d50
--- /dev/null
+++ b/xml/tests/testData/inspections/formInputWithoutLabel/actions/after5.html
@@ -0,0 +1,11 @@
+<!-- "Associate a new label with input element" "true" -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title></title>
+</head>
+<body>
+<label for="myInput"></label><input id="myInput" type="checkbox">
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/formInputWithoutLabel/actions/after6.xhtml b/xml/tests/testData/inspections/formInputWithoutLabel/actions/after6.xhtml
new file mode 100644
index 000000000000..e3855349296a
--- /dev/null
+++ b/xml/tests/testData/inspections/formInputWithoutLabel/actions/after6.xhtml
@@ -0,0 +1,12 @@
+<!-- "Create a new label from the text before input element" "true" -->
+<html>
+<body>
+<label>
+    <label>
+        oppa
+    </label>
+    <label for="myInput">blabla1</label><input id="myInput" type="checkbox"/>
+    blabla2
+</label>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/formInputWithoutLabel/actions/after7.jsp b/xml/tests/testData/inspections/formInputWithoutLabel/actions/after7.jsp
new file mode 100644
index 000000000000..43d7b132f708
--- /dev/null
+++ b/xml/tests/testData/inspections/formInputWithoutLabel/actions/after7.jsp
@@ -0,0 +1,8 @@
+<%-- "Create a new label from the text after textarea element" "true" --%>
+<label>
+    <label>
+        oppa
+    </label>
+    blabla1
+    <textarea Id="myText" type="checkbox"/><label for="myText">blabla2</label>
+</label>
diff --git a/xml/tests/testData/inspections/formInputWithoutLabel/actions/before1.html b/xml/tests/testData/inspections/formInputWithoutLabel/actions/before1.html
new file mode 100644
index 000000000000..d8830f66f3bb
--- /dev/null
+++ b/xml/tests/testData/inspections/formInputWithoutLabel/actions/before1.html
@@ -0,0 +1,11 @@
+<!-- "Associate a new label with input element" "true" -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title></title>
+</head>
+<body>
+  <in<caret>put type="checkbox">
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/formInputWithoutLabel/actions/before2.xhtml b/xml/tests/testData/inspections/formInputWithoutLabel/actions/before2.xhtml
new file mode 100644
index 000000000000..c92d27ebbc21
--- /dev/null
+++ b/xml/tests/testData/inspections/formInputWithoutLabel/actions/before2.xhtml
@@ -0,0 +1,13 @@
+<!-- "Create a new label from the text before input element" "true" -->
+<html>
+<body>
+<label>
+    <label>
+        oppa
+    </label>
+    blabla1
+    <in<caret>put type="checkbox"/>
+    blabla2
+</label>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/formInputWithoutLabel/actions/before3.jsp b/xml/tests/testData/inspections/formInputWithoutLabel/actions/before3.jsp
new file mode 100644
index 000000000000..2cd1904c67ac
--- /dev/null
+++ b/xml/tests/testData/inspections/formInputWithoutLabel/actions/before3.jsp
@@ -0,0 +1,9 @@
+<%-- "Create a new label from the text after textarea element" "true" --%>
+<label>
+    <label>
+        oppa
+    </label>
+    blabla1
+    <text<caret>area type="checkbox"/>
+    blabla2
+</label>
diff --git a/xml/tests/testData/inspections/formInputWithoutLabel/actions/before4.jspx b/xml/tests/testData/inspections/formInputWithoutLabel/actions/before4.jspx
new file mode 100644
index 000000000000..bbd1248ed341
--- /dev/null
+++ b/xml/tests/testData/inspections/formInputWithoutLabel/actions/before4.jspx
@@ -0,0 +1,13 @@
+<!-- "Create a new label from the text before select element" "true" -->
+<html>
+<body>
+<label>
+    <label>
+        oppa
+    </label>
+    blabla1
+    <se<caret>lect type="checkbox"/>
+    blabla2
+</label>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/formInputWithoutLabel/actions/before5.html b/xml/tests/testData/inspections/formInputWithoutLabel/actions/before5.html
new file mode 100644
index 000000000000..6e9f06ba5d24
--- /dev/null
+++ b/xml/tests/testData/inspections/formInputWithoutLabel/actions/before5.html
@@ -0,0 +1,11 @@
+<!-- "Associate a new label with input element" "true" -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title></title>
+</head>
+<body>
+<in<caret>put id="myInput" type="checkbox">
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/formInputWithoutLabel/actions/before6.xhtml b/xml/tests/testData/inspections/formInputWithoutLabel/actions/before6.xhtml
new file mode 100644
index 000000000000..1d22e119bae1
--- /dev/null
+++ b/xml/tests/testData/inspections/formInputWithoutLabel/actions/before6.xhtml
@@ -0,0 +1,13 @@
+<!-- "Create a new label from the text before input element" "true" -->
+<html>
+<body>
+<label>
+    <label>
+        oppa
+    </label>
+    blabla1
+    <in<caret>put id="myInput" type="checkbox"/>
+    blabla2
+</label>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/formInputWithoutLabel/actions/before7.jsp b/xml/tests/testData/inspections/formInputWithoutLabel/actions/before7.jsp
new file mode 100644
index 000000000000..ee69cd20793f
--- /dev/null
+++ b/xml/tests/testData/inspections/formInputWithoutLabel/actions/before7.jsp
@@ -0,0 +1,9 @@
+<%-- "Create a new label from the text after textarea element" "true" --%>
+<label>
+    <label>
+        oppa
+    </label>
+    blabla1
+    <text<caret>area Id="myText" type="checkbox"/>
+    blabla2
+</label>
diff --git a/xml/tests/testData/inspections/formInputWithoutLabel/nowarnings.html b/xml/tests/testData/inspections/formInputWithoutLabel/nowarnings.html
new file mode 100644
index 000000000000..6ff7a893c657
--- /dev/null
+++ b/xml/tests/testData/inspections/formInputWithoutLabel/nowarnings.html
@@ -0,0 +1,31 @@
+<html>
+<script>
+  "<input>"
+</script>
+<label>fd
+  <input name="fdsf 2" type="checkbox">
+  <label for="fsdf">
+    <tt>
+      blabla
+      <input name="fdsf 2" type="checkbox" id="fsdf">
+    </tt>
+  </label>
+  <b>
+    <label for="bla1">
+      aprar
+    </label>
+  </b>
+  <label for="bla2">
+    one more
+  </label>
+</label>
+<input name="x" type="checkbox" id="new">
+<label for="new">
+  <input name="y" type="checkbox">
+</label>
+<textarea cols="" rows="" id="bla1"/>
+<textarea cols="" rows="" id="bla2"/>
+<input type="SUBMIT" value="Change password">
+<input type="button" value="Change password">
+<INPUT TYPE="HIDDEN" NAME="login-form-type" VALUE="pwd">
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/formInputWithoutLabel/nowarnings.xml b/xml/tests/testData/inspections/formInputWithoutLabel/nowarnings.xml
new file mode 100644
index 000000000000..99c4f4fe015a
--- /dev/null
+++ b/xml/tests/testData/inspections/formInputWithoutLabel/nowarnings.xml
@@ -0,0 +1,10 @@
+<xml>
+    <head>
+
+    </head>
+    <body>
+        <in<caret>put type="checkbox">
+            fdsfs
+        </input>
+    </body>
+</xml>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/presentationalTag/after0.jspx b/xml/tests/testData/inspections/presentationalTag/after0.jspx
new file mode 100644
index 000000000000..e23e3b37dc50
--- /dev/null
+++ b/xml/tests/testData/inspections/presentationalTag/after0.jspx
@@ -0,0 +1,11 @@
+<!-- "Replace s tag with del tag" -->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" xmlns="http://www.w3.org/1999/xhtml" version="2.0">
+  <jsp:directive.page import="java.util.Map"/>
+  <html xmlns="http://www.w3.org/1999/xhtml">
+  <body>
+    <jsp:scriptlet>
+    </jsp:scriptlet>
+  <strong>a</strong>
+  </body>
+</html>
+</jsp:root>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/presentationalTag/before0.jspx b/xml/tests/testData/inspections/presentationalTag/before0.jspx
new file mode 100644
index 000000000000..74bfbcd1d9c0
--- /dev/null
+++ b/xml/tests/testData/inspections/presentationalTag/before0.jspx
@@ -0,0 +1,11 @@
+<!-- "Replace s tag with del tag" -->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" xmlns="http://www.w3.org/1999/xhtml" version="2.0">
+  <jsp:directive.page import="java.util.Map"/>
+  <html xmlns="http://www.w3.org/1999/xhtml">
+  <body>
+    <jsp:scriptlet>
+    </jsp:scriptlet>
+  <b<caret>>a</b>
+  </body>
+</html>
+</jsp:root>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/wrongClosingTagName/after0.xhtml b/xml/tests/testData/inspections/wrongClosingTagName/after0.xhtml
new file mode 100644
index 000000000000..c2d6c3f3a78e
--- /dev/null
+++ b/xml/tests/testData/inspections/wrongClosingTagName/after0.xhtml
@@ -0,0 +1,10 @@
+<!-- "Rename start tag 'div' to 'h3'" "true" -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <body>
+    <h3>test</<caret>h3>
+  </body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/wrongClosingTagName/after1.xhtml b/xml/tests/testData/inspections/wrongClosingTagName/after1.xhtml
new file mode 100644
index 000000000000..426510a66fba
--- /dev/null
+++ b/xml/tests/testData/inspections/wrongClosingTagName/after1.xhtml
@@ -0,0 +1,10 @@
+<!-- "Rename end tag 'h3' to 'div'" "true" -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <body>
+    <div<caret>>test</div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/wrongClosingTagName/after2.xhtml b/xml/tests/testData/inspections/wrongClosingTagName/after2.xhtml
new file mode 100644
index 000000000000..a30224b98127
--- /dev/null
+++ b/xml/tests/testData/inspections/wrongClosingTagName/after2.xhtml
@@ -0,0 +1,10 @@
+<!-- "Rename end tag 'h3' to 'div'" "true" -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <body>
+    <div>test</div<caret>>
+  </body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/wrongClosingTagName/after3.xml b/xml/tests/testData/inspections/wrongClosingTagName/after3.xml
new file mode 100644
index 000000000000..8a521d5a3907
--- /dev/null
+++ b/xml/tests/testData/inspections/wrongClosingTagName/after3.xml
@@ -0,0 +1,3 @@
+<!-- "Rename end tag 'html2' to 'html'" "true" -->
+<html<caret> lang="en">
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/wrongClosingTagName/before0.xhtml b/xml/tests/testData/inspections/wrongClosingTagName/before0.xhtml
new file mode 100644
index 000000000000..82e1f61b1524
--- /dev/null
+++ b/xml/tests/testData/inspections/wrongClosingTagName/before0.xhtml
@@ -0,0 +1,10 @@
+<!-- "Rename start tag 'div' to 'h3'" "true" -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <body>
+    <div>test</<caret>h3>
+  </body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/wrongClosingTagName/before1.xhtml b/xml/tests/testData/inspections/wrongClosingTagName/before1.xhtml
new file mode 100644
index 000000000000..45d671f116ff
--- /dev/null
+++ b/xml/tests/testData/inspections/wrongClosingTagName/before1.xhtml
@@ -0,0 +1,10 @@
+<!-- "Rename end tag 'h3' to 'div'" "true" -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <body>
+    <div<caret>>test</h3>
+  </body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/wrongClosingTagName/before2.xhtml b/xml/tests/testData/inspections/wrongClosingTagName/before2.xhtml
new file mode 100644
index 000000000000..affc7c667194
--- /dev/null
+++ b/xml/tests/testData/inspections/wrongClosingTagName/before2.xhtml
@@ -0,0 +1,10 @@
+<!-- "Rename end tag 'h3' to 'div'" "true" -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <body>
+    <div>test</h3<caret>>
+  </body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/inspections/wrongClosingTagName/before3.xml b/xml/tests/testData/inspections/wrongClosingTagName/before3.xml
new file mode 100644
index 000000000000..64c250d96420
--- /dev/null
+++ b/xml/tests/testData/inspections/wrongClosingTagName/before3.xml
@@ -0,0 +1,3 @@
+<!-- "Rename end tag 'html2' to 'html'" "true" -->
+<html<caret> lang="en">
+</html2>
\ No newline at end of file
diff --git a/xml/tests/testData/intentions/splitTag/after1.html b/xml/tests/testData/intentions/splitTag/after1.html
new file mode 100644
index 000000000000..5729be063f0f
--- /dev/null
+++ b/xml/tests/testData/intentions/splitTag/after1.html
@@ -0,0 +1,13 @@
+<!-- "Split current tag" "true" -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>a</title>
+</head>
+<body>
+<p>this is a</p>
+
+<p><caret> test</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/intentions/splitTag/after3.html b/xml/tests/testData/intentions/splitTag/after3.html
new file mode 100644
index 000000000000..63d397218c7f
--- /dev/null
+++ b/xml/tests/testData/intentions/splitTag/after3.html
@@ -0,0 +1,13 @@
+<!-- "Split current tag" "true" -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>a</title>
+</head>
+<body>
+<p class="class1 class2" id="test_id" style="color: #eee;">this is a </p>
+
+<p class="class1 class2" style="color: #eee;"><caret>test text</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/intentions/splitTag/after4.html b/xml/tests/testData/intentions/splitTag/after4.html
new file mode 100644
index 000000000000..238506ca02aa
--- /dev/null
+++ b/xml/tests/testData/intentions/splitTag/after4.html
@@ -0,0 +1,2 @@
+<!-- "Split current tag" "true" -->
+<p>Integer hac elit tortor lacus nisi odio sit?</p><p><caret> Amet lectus, <a href="/">scelerisque</a></p><p>
\ No newline at end of file
diff --git a/xml/tests/testData/intentions/splitTag/before0.html b/xml/tests/testData/intentions/splitTag/before0.html
new file mode 100644
index 000000000000..74584b1fceb3
--- /dev/null
+++ b/xml/tests/testData/intentions/splitTag/before0.html
@@ -0,0 +1,13 @@
+<!-- "Split current tag" "false" -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>a</title>
+</head>
+<body>
+this is a
+<caret>
+test
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/intentions/splitTag/before1.html b/xml/tests/testData/intentions/splitTag/before1.html
new file mode 100644
index 000000000000..d98ad1d0396a
--- /dev/null
+++ b/xml/tests/testData/intentions/splitTag/before1.html
@@ -0,0 +1,11 @@
+<!-- "Split current tag" "true" -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>a</title>
+</head>
+<body>
+<p>this is a<caret> test</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/intentions/splitTag/before2.html b/xml/tests/testData/intentions/splitTag/before2.html
new file mode 100644
index 000000000000..7901523b5327
--- /dev/null
+++ b/xml/tests/testData/intentions/splitTag/before2.html
@@ -0,0 +1,11 @@
+<!-- "Split current tag" "false" -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>this is<caret> a test</title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/intentions/splitTag/before3.html b/xml/tests/testData/intentions/splitTag/before3.html
new file mode 100644
index 000000000000..2382251be548
--- /dev/null
+++ b/xml/tests/testData/intentions/splitTag/before3.html
@@ -0,0 +1,11 @@
+<!-- "Split current tag" "true" -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>a</title>
+</head>
+<body>
+<p class="class1 class2" id="test_id" style="color: #eee;">this is a <caret>test text</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/intentions/splitTag/before4.html b/xml/tests/testData/intentions/splitTag/before4.html
new file mode 100644
index 000000000000..b35bf0a007a2
--- /dev/null
+++ b/xml/tests/testData/intentions/splitTag/before4.html
@@ -0,0 +1,2 @@
+<!-- "Split current tag" "true" -->
+<p>Integer hac elit tortor lacus nisi odio sit?<caret> Amet lectus, <a href="/">scelerisque</a><p>
\ No newline at end of file
diff --git a/xml/tests/testData/mover/1.html b/xml/tests/testData/mover/1.html
new file mode 100644
index 000000000000..c41da40fb8f9
--- /dev/null
+++ b/xml/tests/testData/mover/1.html
@@ -0,0 +1,9 @@
+<html>
+<body>
+<hr>
+<a name="a">name a</a>
+<a name="b"><caret>name b</a>
+<a name="c">name c</a>
+<hr>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/mover/1_afterDown.html b/xml/tests/testData/mover/1_afterDown.html
new file mode 100644
index 000000000000..4e3682d13ae1
--- /dev/null
+++ b/xml/tests/testData/mover/1_afterDown.html
@@ -0,0 +1,9 @@
+<html>
+<body>
+<hr>
+<a name="a">name a</a>
+<a name="c">name c</a>
+<a name="b"><caret>name b</a>
+<hr>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/mover/1_afterUp.html b/xml/tests/testData/mover/1_afterUp.html
new file mode 100644
index 000000000000..9eb9e6d66f10
--- /dev/null
+++ b/xml/tests/testData/mover/1_afterUp.html
@@ -0,0 +1,9 @@
+<html>
+<body>
+<hr>
+<a name="b"><caret>name b</a>
+<a name="a">name a</a>
+<a name="c">name c</a>
+<hr>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/mover/tag.xml b/xml/tests/testData/mover/tag.xml
new file mode 100644
index 000000000000..1eabe399dfa6
--- /dev/null
+++ b/xml/tests/testData/mover/tag.xml
@@ -0,0 +1,5 @@
+<x>
+ <caret><a/>
+<b>
+</b>
+</x>
\ No newline at end of file
diff --git a/xml/tests/testData/mover/tag10.xml b/xml/tests/testData/mover/tag10.xml
new file mode 100644
index 000000000000..146f36326b8b
--- /dev/null
+++ b/xml/tests/testData/mover/tag10.xml
@@ -0,0 +1,3 @@
+<components xmlns:pay="http://lufthansatechnik.com/mscoreengine"
+<caret>xmlns:core="http://jboss.com/products/seam/core"
+/>
\ No newline at end of file
diff --git a/xml/tests/testData/mover/tag11.xml b/xml/tests/testData/mover/tag11.xml
new file mode 100644
index 000000000000..fa8c00a5ae56
--- /dev/null
+++ b/xml/tests/testData/mover/tag11.xml
@@ -0,0 +1,6 @@
+<aaa>
+  <test />
+  <!--test comment-->
+  <test2 <caret>/>
+  <test />
+</aaa>
\ No newline at end of file
diff --git a/xml/tests/testData/mover/tag11_afterDown.xml b/xml/tests/testData/mover/tag11_afterDown.xml
new file mode 100644
index 000000000000..517df8a6ddb9
--- /dev/null
+++ b/xml/tests/testData/mover/tag11_afterDown.xml
@@ -0,0 +1,6 @@
+<aaa>
+  <test />
+  <!--test comment-->
+  <test />
+    <test2 <caret>/>
+</aaa>
\ No newline at end of file
diff --git a/xml/tests/testData/mover/tag11_afterUp.xml b/xml/tests/testData/mover/tag11_afterUp.xml
new file mode 100644
index 000000000000..3ad838c7ba20
--- /dev/null
+++ b/xml/tests/testData/mover/tag11_afterUp.xml
@@ -0,0 +1,6 @@
+<aaa>
+  <test />
+    <test2 <caret>/>
+    <!--test comment-->
+  <test />
+</aaa>
\ No newline at end of file
diff --git a/xml/tests/testData/mover/tag2.xml b/xml/tests/testData/mover/tag2.xml
new file mode 100644
index 000000000000..538018085a9e
--- /dev/null
+++ b/xml/tests/testData/mover/tag2.xml
@@ -0,0 +1,5 @@
+<x>
+    <b>
+        <caret><<selection>a/</selection>>
+    </b>
+</x>
\ No newline at end of file
diff --git a/xml/tests/testData/mover/tag2_afterDown.xml b/xml/tests/testData/mover/tag2_afterDown.xml
new file mode 100644
index 000000000000..4cc2ce7d27b0
--- /dev/null
+++ b/xml/tests/testData/mover/tag2_afterDown.xml
@@ -0,0 +1,5 @@
+<x>
+    <b>
+    </b>
+    <caret><<selection>a/</selection>>
+</x>
\ No newline at end of file
diff --git a/xml/tests/testData/mover/tag2_afterUp.xml b/xml/tests/testData/mover/tag2_afterUp.xml
new file mode 100644
index 000000000000..f5127734b3c0
--- /dev/null
+++ b/xml/tests/testData/mover/tag2_afterUp.xml
@@ -0,0 +1,5 @@
+<x>
+    <caret><<selection>a/</selection>>
+    <b>
+    </b>
+</x>
\ No newline at end of file
diff --git a/xml/tests/testData/mover/tag3.xml b/xml/tests/testData/mover/tag3.xml
new file mode 100644
index 000000000000..637405713ac9
--- /dev/null
+++ b/xml/tests/testData/mover/tag3.xml
@@ -0,0 +1,10 @@
+<x>
+    <b c="d"
+      a = "b"
+    >
+        <caret><<selection>a/</selection>>
+      <b2 c2="d2"
+      a2 = "b2">
+        </b2>
+    </b>
+</x>
\ No newline at end of file
diff --git a/xml/tests/testData/mover/tag3_afterDown.xml b/xml/tests/testData/mover/tag3_afterDown.xml
new file mode 100644
index 000000000000..4ae16ef154d1
--- /dev/null
+++ b/xml/tests/testData/mover/tag3_afterDown.xml
@@ -0,0 +1,10 @@
+<x>
+    <b c="d"
+      a = "b"
+    >
+      <b2 c2="d2"
+      a2 = "b2">
+          <caret><<selection>a/</selection>>
+      </b2>
+    </b>
+</x>
\ No newline at end of file
diff --git a/xml/tests/testData/mover/tag3_afterUp.xml b/xml/tests/testData/mover/tag3_afterUp.xml
new file mode 100644
index 000000000000..1e2a81029f0a
--- /dev/null
+++ b/xml/tests/testData/mover/tag3_afterUp.xml
@@ -0,0 +1,10 @@
+<x>
+    <caret><<selection>a/</selection>>
+    <b c="d"
+      a = "b"
+    >
+      <b2 c2="d2"
+      a2 = "b2">
+        </b2>
+    </b>
+</x>
\ No newline at end of file
diff --git a/xml/tests/testData/mover/tag4.xml b/xml/tests/testData/mover/tag4.xml
new file mode 100644
index 000000000000..7ae0ebce2519
--- /dev/null
+++ b/xml/tests/testData/mover/tag4.xml
@@ -0,0 +1,7 @@
+<x>
+    <b c="d"
+      a = "b"
+    >
+    </b>
+</x>
+<caret><<selection>a/</selection>>
\ No newline at end of file
diff --git a/xml/tests/testData/mover/tag4_afterUp.xml b/xml/tests/testData/mover/tag4_afterUp.xml
new file mode 100644
index 000000000000..0971db0b6aac
--- /dev/null
+++ b/xml/tests/testData/mover/tag4_afterUp.xml
@@ -0,0 +1,7 @@
+<x>
+    <b c="d"
+      a = "b"
+    >
+    </b>
+    <caret><<selection>a/</selection>>
+</x>
diff --git a/xml/tests/testData/mover/tag5.xml b/xml/tests/testData/mover/tag5.xml
new file mode 100644
index 000000000000..9b768c73b6fa
--- /dev/null
+++ b/xml/tests/testData/mover/tag5.xml
@@ -0,0 +1,11 @@
+<orcontainer>
+  <empty1 attr1="N0"/>
+  <empty1 attr1="N1"
+                  attr2="some">
+          <sub-empty/>
+  </empty1>
+  <empty1 attr1="N2"/>
+  <empty1 attr1="N3"
+     attr2="some"/>
+<caret><selection>  <empty1 attr1="N4"/></selection>
+</orcontainer>
\ No newline at end of file
diff --git a/xml/tests/testData/mover/tag5_afterUp.xml b/xml/tests/testData/mover/tag5_afterUp.xml
new file mode 100644
index 000000000000..174ea7a18f19
--- /dev/null
+++ b/xml/tests/testData/mover/tag5_afterUp.xml
@@ -0,0 +1,11 @@
+<orcontainer>
+  <empty1 attr1="N0"/>
+  <empty1 attr1="N1"
+                  attr2="some">
+          <sub-empty/>
+  </empty1>
+  <empty1 attr1="N2"/>
+<caret><selection>    <empty1 attr1="N4"/></selection>
+    <empty1 attr1="N3"
+     attr2="some"/>
+</orcontainer>
\ No newline at end of file
diff --git a/xml/tests/testData/mover/tag6.xml b/xml/tests/testData/mover/tag6.xml
new file mode 100644
index 000000000000..969059b14eb2
--- /dev/null
+++ b/xml/tests/testData/mover/tag6.xml
@@ -0,0 +1,11 @@
+<orcontainer>
+    <empty1 attr1="N0"/>
+    <empty1 attr1="N1"
+                    attr2="some">
+            <sub-empty/>
+    </empty1>
+    <empty1 attr1="N2"/>
+    <empty1 att<caret>r1="N3"
+                    attr2="some"/>
+    <empty1 attr1="N4"/>
+</orcontainer>
\ No newline at end of file
diff --git a/xml/tests/testData/mover/tag6_afterDown.xml b/xml/tests/testData/mover/tag6_afterDown.xml
new file mode 100644
index 000000000000..679162e5ca79
--- /dev/null
+++ b/xml/tests/testData/mover/tag6_afterDown.xml
@@ -0,0 +1,11 @@
+<orcontainer>
+    <empty1 attr1="N0"/>
+    <empty1 attr1="N1"
+                    attr2="some">
+            <sub-empty/>
+    </empty1>
+    <empty1 attr1="N2"/>
+    <empty1 attr1="N4"/>
+    <empty1 att<caret>r1="N3"
+            attr2="some"/>
+</orcontainer>
\ No newline at end of file
diff --git a/xml/tests/testData/mover/tag6_afterUp.xml b/xml/tests/testData/mover/tag6_afterUp.xml
new file mode 100644
index 000000000000..76719edd826a
--- /dev/null
+++ b/xml/tests/testData/mover/tag6_afterUp.xml
@@ -0,0 +1,11 @@
+<orcontainer>
+    <empty1 attr1="N0"/>
+    <empty1 attr1="N1"
+                    attr2="some">
+            <sub-empty/>
+    </empty1>
+    <empty1 att<caret>r1="N3"
+            attr2="some"/>
+    <empty1 attr1="N2"/>
+    <empty1 attr1="N4"/>
+</orcontainer>
\ No newline at end of file
diff --git a/xml/tests/testData/mover/tag7.xml b/xml/tests/testData/mover/tag7.xml
new file mode 100644
index 000000000000..f899c30813b8
--- /dev/null
+++ b/xml/tests/testData/mover/tag7.xml
@@ -0,0 +1,11 @@
+<orcontainer>
+    <empty1 attr1="N0"/>
+    <empty1 attr1="N1"
+                    attr2="some">
+            <sub-empty/>
+    </empty1>
+    <empty1 attr1="N2"/>
+    <empty1 attr1="N3"
+               <caret>     attr2="some"/>
+    <empty1 attr1="N4"/>
+</orcontainer>
\ No newline at end of file
diff --git a/xml/tests/testData/mover/tag7_afterDown.xml b/xml/tests/testData/mover/tag7_afterDown.xml
new file mode 100644
index 000000000000..2d68b6d0343c
--- /dev/null
+++ b/xml/tests/testData/mover/tag7_afterDown.xml
@@ -0,0 +1,11 @@
+<orcontainer>
+    <empty1 attr1="N0"/>
+    <empty1 attr1="N1"
+                    attr2="some">
+            <sub-empty/>
+    </empty1>
+    <empty1 attr1="N2"/>
+    <empty1 attr1="N4"/>
+    <empty1 attr1="N3"
+            <caret>attr2="some"/>
+</orcontainer>
\ No newline at end of file
diff --git a/xml/tests/testData/mover/tag7_afterUp.xml b/xml/tests/testData/mover/tag7_afterUp.xml
new file mode 100644
index 000000000000..a6f3cf270a00
--- /dev/null
+++ b/xml/tests/testData/mover/tag7_afterUp.xml
@@ -0,0 +1,11 @@
+<orcontainer>
+    <empty1 attr1="N0"/>
+    <empty1 attr1="N1"
+                    attr2="some">
+            <sub-empty/>
+    </empty1>
+    <empty1 attr1="N3"
+            <caret>attr2="some"/>
+    <empty1 attr1="N2"/>
+    <empty1 attr1="N4"/>
+</orcontainer>
\ No newline at end of file
diff --git a/xml/tests/testData/mover/tag8.xml b/xml/tests/testData/mover/tag8.xml
new file mode 100644
index 000000000000..c44cfb31b75d
--- /dev/null
+++ b/xml/tests/testData/mover/tag8.xml
@@ -0,0 +1,16 @@
+<components xmlns:pay="http://lufthansatechnik.com/mscoreengine"
+xmlns:core="http://jboss.com/products/seam/core"
+xmlns:persistence="http://jboss.com/products/seam/persistence"
+xmlns:framework="http://jboss.com/products/seam/framework"
+xmlns:web="http://jboss.com/products/seam/web"
+xmlns:security="http://jboss.com/products/seam/security"
+xmlns:xsi
+  ="http://www.w3.org/2001/XMLSchema-instance"
+<caret>xmlns:async="http://jboss.com/products/seam/async"
+xsi:schemaLocation=
+  "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd
+  http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.0.xsd
+  http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd
+  http://jboss.com/products/seam/async http://jboss.com/products/seam/async-2.0.xsd
+http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.0.xsd"
+/>
\ No newline at end of file
diff --git a/xml/tests/testData/mover/tag8_afterDown.xml b/xml/tests/testData/mover/tag8_afterDown.xml
new file mode 100644
index 000000000000..d5ba11297737
--- /dev/null
+++ b/xml/tests/testData/mover/tag8_afterDown.xml
@@ -0,0 +1,16 @@
+<components xmlns:pay="http://lufthansatechnik.com/mscoreengine"
+xmlns:core="http://jboss.com/products/seam/core"
+xmlns:persistence="http://jboss.com/products/seam/persistence"
+xmlns:framework="http://jboss.com/products/seam/framework"
+xmlns:web="http://jboss.com/products/seam/web"
+xmlns:security="http://jboss.com/products/seam/security"
+xmlns:xsi
+  ="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation=
+  "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd
+  http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.0.xsd
+  http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd
+  http://jboss.com/products/seam/async http://jboss.com/products/seam/async-2.0.xsd
+http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.0.xsd"
+<caret>xmlns:async="http://jboss.com/products/seam/async"
+        />
\ No newline at end of file
diff --git a/xml/tests/testData/mover/tag8_afterUp.xml b/xml/tests/testData/mover/tag8_afterUp.xml
new file mode 100644
index 000000000000..69f05250864f
--- /dev/null
+++ b/xml/tests/testData/mover/tag8_afterUp.xml
@@ -0,0 +1,16 @@
+<components xmlns:pay="http://lufthansatechnik.com/mscoreengine"
+xmlns:core="http://jboss.com/products/seam/core"
+xmlns:persistence="http://jboss.com/products/seam/persistence"
+xmlns:framework="http://jboss.com/products/seam/framework"
+xmlns:web="http://jboss.com/products/seam/web"
+xmlns:security="http://jboss.com/products/seam/security"
+<caret>xmlns:async="http://jboss.com/products/seam/async"
+xmlns:xsi
+  ="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation=
+  "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd
+  http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.0.xsd
+  http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd
+  http://jboss.com/products/seam/async http://jboss.com/products/seam/async-2.0.xsd
+http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.0.xsd"
+/>
\ No newline at end of file
diff --git a/xml/tests/testData/mover/tag9.xml b/xml/tests/testData/mover/tag9.xml
new file mode 100644
index 000000000000..00b9e54f96c5
--- /dev/null
+++ b/xml/tests/testData/mover/tag9.xml
@@ -0,0 +1,15 @@
+<components xmlns:pay="http://lufthansatechnik.com/mscoreengine"
+xmlns:core="http://jboss.com/products/seam/core"
+xmlns:persistence="http://jboss.com/products/seam/persistence"
+xmlns:framework="http://jboss.com/products/seam/framework"
+xmlns:web="http://jboss.com/products/seam/web"
+xmlns:security="http://jboss.com/products/seam/security"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<caret>xsi:schemaLocation=
+  "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd
+  http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.0.xsd
+  http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd
+  http://jboss.com/products/seam/async http://jboss.com/products/seam/async-2.0.xsd
+http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.0.xsd"
+xmlns:async="http://jboss.com/products/seam/async"
+/>
\ No newline at end of file
diff --git a/xml/tests/testData/mover/tag9_afterDown.xml b/xml/tests/testData/mover/tag9_afterDown.xml
new file mode 100644
index 000000000000..706403205e66
--- /dev/null
+++ b/xml/tests/testData/mover/tag9_afterDown.xml
@@ -0,0 +1,15 @@
+<components xmlns:pay="http://lufthansatechnik.com/mscoreengine"
+xmlns:core="http://jboss.com/products/seam/core"
+xmlns:persistence="http://jboss.com/products/seam/persistence"
+xmlns:framework="http://jboss.com/products/seam/framework"
+xmlns:web="http://jboss.com/products/seam/web"
+xmlns:security="http://jboss.com/products/seam/security"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns:async="http://jboss.com/products/seam/async"
+<caret>xsi:schemaLocation=
+        "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd
+  http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.0.xsd
+  http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd
+  http://jboss.com/products/seam/async http://jboss.com/products/seam/async-2.0.xsd
+http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.0.xsd"
+        />
\ No newline at end of file
diff --git a/xml/tests/testData/mover/tag9_afterUp.xml b/xml/tests/testData/mover/tag9_afterUp.xml
new file mode 100644
index 000000000000..0cca26139769
--- /dev/null
+++ b/xml/tests/testData/mover/tag9_afterUp.xml
@@ -0,0 +1,15 @@
+<components xmlns:pay="http://lufthansatechnik.com/mscoreengine"
+xmlns:core="http://jboss.com/products/seam/core"
+xmlns:persistence="http://jboss.com/products/seam/persistence"
+xmlns:framework="http://jboss.com/products/seam/framework"
+xmlns:web="http://jboss.com/products/seam/web"
+xmlns:security="http://jboss.com/products/seam/security"
+<caret>xsi:schemaLocation=
+        "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd
+  http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.0.xsd
+  http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd
+  http://jboss.com/products/seam/async http://jboss.com/products/seam/async-2.0.xsd
+http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.0.xsd"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns:async="http://jboss.com/products/seam/async"
+/>
\ No newline at end of file
diff --git a/xml/tests/testData/mover/tag_afterDown.xml b/xml/tests/testData/mover/tag_afterDown.xml
new file mode 100644
index 000000000000..7a947dd31472
--- /dev/null
+++ b/xml/tests/testData/mover/tag_afterDown.xml
@@ -0,0 +1,5 @@
+<x>
+<b>
+    <caret><a/>
+</b>
+</x>
\ No newline at end of file
diff --git a/xml/tests/testData/mover/tag_afterUp.xml b/xml/tests/testData/mover/tag_afterUp.xml
new file mode 100644
index 000000000000..dc240075a460
--- /dev/null
+++ b/xml/tests/testData/mover/tag_afterUp.xml
@@ -0,0 +1,5 @@
+<caret><a/>
+<x>
+<b>
+</b>
+</x>
\ No newline at end of file
diff --git a/xml/tests/testData/navigateactions/after1.html b/xml/tests/testData/navigateactions/after1.html
new file mode 100644
index 000000000000..4612f98f4949
--- /dev/null
+++ b/xml/tests/testData/navigateactions/after1.html
@@ -0,0 +1,41 @@
+<!-- "Add a new column to the table after the current one" "true" -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<link rel="stylesheet" href="a.css"/>
+<title>fdgsd</title>
+</head>
+<body>
+<div>dsfgsdgfdg</div>
+<table>
+    <tr>
+        <td>1</td>
+        <td>2</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>.</td>
+        <td>3</td>
+        <td>3</td>
+        <td><caret>3</td>
+        <td>3</td>
+        <td>4</td>
+        <td colspan="11">1</td>
+    </tr>
+    <tr>
+        <td colspan="13">1</td>
+        <td>2</td>
+        <td colspan="11">1</td>
+    </tr>
+    <tr>
+        <td colspan="11">1</td>
+        <td>2</td>
+        <td>3</td>
+        <td colspan="11">1</td>
+    </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/navigateactions/after2.xhtml b/xml/tests/testData/navigateactions/after2.xhtml
new file mode 100644
index 000000000000..6f8d2ed0937e
--- /dev/null
+++ b/xml/tests/testData/navigateactions/after2.xhtml
@@ -0,0 +1,41 @@
+<!-- "Add a new column to the table after the current one" "true" -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<link rel="stylesheet" href="a.css"/>
+<title>fdgsd</title>
+</head>
+<body>
+<div>dsfgsdgfdg</div>
+<table>
+    <tr>
+        <td>1</td>
+        <td>2</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>.</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>4</td>
+        <td colspan="11">1</td>
+    </tr>
+    <tr>
+        <td colspan="13">1</td>
+        <td>2</td>
+        <td colspan="11">1</td>
+    </tr>
+    <tr>
+        <td colspan="11">1</td>
+        <td>2</td>
+        <td>3</td>
+        <td colspan="11"><caret>1</td>
+    </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/navigateactions/after3.jsp b/xml/tests/testData/navigateactions/after3.jsp
new file mode 100644
index 000000000000..b97ee9e2eb88
--- /dev/null
+++ b/xml/tests/testData/navigateactions/after3.jsp
@@ -0,0 +1,69 @@
+<!-- "Add a new column to the table after the current one" "true" -->
+<html>
+<head>
+    <link rel="stylesheet" href="a.css"/>
+    <title>fdgsd</title>
+</head>
+<body>
+<div>dsfgsdgfdg</div>
+<table border="1">
+    <thead>
+    </thead>
+    <tbody>
+    </tbody>
+    <tr>
+        <td colspan="5">1</td>
+        <td rowspan="5">2</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td>2</td>
+        <td>5</td>
+        <td>2'</td>
+        <td>3</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td colspan="4">2</td>
+    </tr>
+    <tr>
+        <td rowspan="2" colspan="1">1</td>
+        <td>2</td>
+        <td>3</td>
+        <td rowspan="2" colspan="2">3</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td>4</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td colspan="4">2</td>
+        <td>5</td>
+    </tr>
+    <tr>
+        <td colspan="3" rowspan="3">1</td>
+        <td colspan="1" rowspan="2">2</td>
+        <td colspan="2" rowspan="4"><caret>3</td>
+    </tr>
+    <tr/>
+    <tr>
+        <td>1</td>
+    </tr>
+    <tr>
+        <td>2</td>
+        <td>3</td>
+        <td>2</td>
+        <td>4</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td>2</td>
+        <td>7</td>
+        <td>3</td>
+        <td>4</td>
+        <td>5</td>
+    </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/navigateactions/after4.jspx b/xml/tests/testData/navigateactions/after4.jspx
new file mode 100644
index 000000000000..482c81f25f2c
--- /dev/null
+++ b/xml/tests/testData/navigateactions/after4.jspx
@@ -0,0 +1,69 @@
+<!-- "Add a new column to the table after the current one" "true" -->
+<html>
+<head>
+    <link rel="stylesheet" href="a.css"/>
+    <title>fdgsd</title>
+</head>
+<body>
+<div>dsfgsdgfdg</div>
+<table border="1">
+    <thead>
+    </thead>
+    <tbody>
+    </tbody>
+    <tr>
+        <td colspan="5">1</td>
+        <td rowspan="5">2</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td>2</td>
+        <td>5</td>
+        <td>2'</td>
+        <td>3</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td colspan="4">2</td>
+    </tr>
+    <tr>
+        <td rowspan="2" colspan="1">1</td>
+        <td>2</td>
+        <td>3</td>
+        <td rowspan="2" colspan="2">3</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td>4</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td colspan="4">2</td>
+        <td>5</td>
+    </tr>
+    <tr>
+        <td colspan="3" rowspan="3">1</td>
+        <td colspan="1" rowspan="2">2</td>
+        <td colspan="2" rowspan="4">3</td>
+    </tr>
+    <tr/>
+    <tr>
+        <td>1</td>
+    </tr>
+    <tr>
+        <td>2</td>
+        <td>3</td>
+        <td>2</td>
+        <td>4</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td>2</td>
+        <td>7</td>
+        <td>3</td>
+        <td><caret>4</td>
+        <td>5</td>
+    </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/navigateactions/before1.html b/xml/tests/testData/navigateactions/before1.html
new file mode 100644
index 000000000000..1b4b1a7d970c
--- /dev/null
+++ b/xml/tests/testData/navigateactions/before1.html
@@ -0,0 +1,41 @@
+<!-- "Add a new column to the table after the current one" "true" -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<link rel="stylesheet" href="a.css"/>
+<title>fdgsd</title>
+</head>
+<body>
+<div>dsfgsdgfdg</div>
+<table>
+    <tr>
+        <td>1</td>
+        <td>2</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>.</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <t<caret>d>3</td>
+        <td>4</td>
+        <td colspan="11">1</td>
+    </tr>
+    <tr>
+        <td colspan="13">1</td>
+        <td>2</td>
+        <td colspan="11">1</td>
+    </tr>
+    <tr>
+        <td colspan="11">1</td>
+        <td>2</td>
+        <td>3</td>
+        <td colspan="11">1</td>
+    </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/navigateactions/before2.xhtml b/xml/tests/testData/navigateactions/before2.xhtml
new file mode 100644
index 000000000000..898bdf600227
--- /dev/null
+++ b/xml/tests/testData/navigateactions/before2.xhtml
@@ -0,0 +1,41 @@
+<!-- "Add a new column to the table after the current one" "true" -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<link rel="stylesheet" href="a.css"/>
+<title>fdgsd</title>
+</head>
+<body>
+<div>dsfgsdgfdg</div>
+<table>
+    <tr>
+        <td>1</td>
+        <td>2</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>.</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>4</td>
+        <td colspan="11">1</td>
+    </tr>
+    <tr>
+        <td colspan="13">1</td>
+        <td>2</td>
+        <td colspan="11">1</td>
+    </tr>
+    <tr>
+        <td colspan="11">1</td>
+        <td>2</td>
+        <t<caret>d>3</td>
+        <td colspan="11">1</td>
+    </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/navigateactions/before3.jsp b/xml/tests/testData/navigateactions/before3.jsp
new file mode 100644
index 000000000000..3a6da5b9d3ec
--- /dev/null
+++ b/xml/tests/testData/navigateactions/before3.jsp
@@ -0,0 +1,69 @@
+<!-- "Add a new column to the table after the current one" "true" -->
+<html>
+<head>
+    <link rel="stylesheet" href="a.css"/>
+    <title>fdgsd</title>
+</head>
+<body>
+<div>dsfgsdgfdg</div>
+<table border="1">
+    <thead>
+    </thead>
+    <tbody>
+    </tbody>
+    <tr>
+        <td colspan="5">1</td>
+        <td rowspan="5">2</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td>2</td>
+        <td>5</td>
+        <td>2'</td>
+        <td>3</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td colspan="4">2</td>
+    </tr>
+    <tr>
+        <td rowspan="2" colspan="1">1</td>
+        <td>2</td>
+        <td>3</td>
+        <td rowspan="2" colspan="2">3</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td>4</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td colspan="4">2</td>
+        <td>5</td>
+    </tr>
+    <tr>
+        <td colspan="3" rowspan="3">1</td>
+        <td colspan="1" rowspan="2">2</td>
+        <td colspan="2" rowspan="4">3</td>
+    </tr>
+    <tr/>
+    <tr>
+        <td>1</td>
+    </tr>
+    <tr>
+        <td>2</td>
+        <td>3</td>
+        <td>2</td>
+        <td>4</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td>2</td>
+        <td>7</td>
+        <td>3</td>
+        <td>4</td>
+        <td><caret>5</td>
+    </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/navigateactions/before4.jspx b/xml/tests/testData/navigateactions/before4.jspx
new file mode 100644
index 000000000000..b97ee9e2eb88
--- /dev/null
+++ b/xml/tests/testData/navigateactions/before4.jspx
@@ -0,0 +1,69 @@
+<!-- "Add a new column to the table after the current one" "true" -->
+<html>
+<head>
+    <link rel="stylesheet" href="a.css"/>
+    <title>fdgsd</title>
+</head>
+<body>
+<div>dsfgsdgfdg</div>
+<table border="1">
+    <thead>
+    </thead>
+    <tbody>
+    </tbody>
+    <tr>
+        <td colspan="5">1</td>
+        <td rowspan="5">2</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td>2</td>
+        <td>5</td>
+        <td>2'</td>
+        <td>3</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td colspan="4">2</td>
+    </tr>
+    <tr>
+        <td rowspan="2" colspan="1">1</td>
+        <td>2</td>
+        <td>3</td>
+        <td rowspan="2" colspan="2">3</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td>4</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td colspan="4">2</td>
+        <td>5</td>
+    </tr>
+    <tr>
+        <td colspan="3" rowspan="3">1</td>
+        <td colspan="1" rowspan="2">2</td>
+        <td colspan="2" rowspan="4"><caret>3</td>
+    </tr>
+    <tr/>
+    <tr>
+        <td>1</td>
+    </tr>
+    <tr>
+        <td>2</td>
+        <td>3</td>
+        <td>2</td>
+        <td>4</td>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td>2</td>
+        <td>7</td>
+        <td>3</td>
+        <td>4</td>
+        <td>5</td>
+    </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/navigateactions/before8.xml b/xml/tests/testData/navigateactions/before8.xml
new file mode 100644
index 000000000000..1b4b1a7d970c
--- /dev/null
+++ b/xml/tests/testData/navigateactions/before8.xml
@@ -0,0 +1,41 @@
+<!-- "Add a new column to the table after the current one" "true" -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<link rel="stylesheet" href="a.css"/>
+<title>fdgsd</title>
+</head>
+<body>
+<div>dsfgsdgfdg</div>
+<table>
+    <tr>
+        <td>1</td>
+        <td>2</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <td>.</td>
+        <td>3</td>
+        <td>3</td>
+        <td>3</td>
+        <t<caret>d>3</td>
+        <td>4</td>
+        <td colspan="11">1</td>
+    </tr>
+    <tr>
+        <td colspan="13">1</td>
+        <td>2</td>
+        <td colspan="11">1</td>
+    </tr>
+    <tr>
+        <td colspan="11">1</td>
+        <td>2</td>
+        <td>3</td>
+        <td colspan="11">1</td>
+    </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/performance/IndentUnindent.xml b/xml/tests/testData/performance/IndentUnindent.xml
new file mode 100644
index 000000000000..43d183aa3e65
--- /dev/null
+++ b/xml/tests/testData/performance/IndentUnindent.xml
@@ -0,0 +1,3361 @@
+                <?xml version="1.0" encoding="UTF-8"?>
+
+                <stopWord language="de">
+                        <word>a.st.stein@gmx.net</word>
+                        <word>aaalso</word>
+                        <word>abbaust</word>
+                        <word>abbekommst</word>
+                        <word>abbekommt</word>
+                        <word>abbr?_ch</word>
+                        <word>abbuchung</word>
+                        <word>abdeckungen</word>
+                        <word>abdriften</word>
+                        <word>abe^hitzl</word>
+                        <word>abenteu</word>
+                        <word>abenteuerlichen</word>
+                        <word>abholari</word>
+                        <word>abholpaket</word>
+                        <word>abholt</word>
+                        <word>abh?�ngt</word>
+                        <word>abh?ren</word>
+                        <word>abkleben</word>
+                        <word>abk?_rzungen</word>
+                        <word>ablassen</word>
+                        <word>abner</word>
+                        <word>abraham</word>
+                        <word>abrechnungstakt</word>
+                        <word>abrechnungszeitraum</word>
+                        <word>abred</word>
+                        <word>abrei?_endem</word>
+                        <word>abroad</word>
+                        <word>abruf</word>
+                        <word>abschl?�gig</word>
+                        <word>abschrecken</word>
+                        <word>absendet</word>
+                        <word>absichtlich</word>
+                        <word>absoluten</word>
+                        <word>abspecken</word>
+                        <word>abspielf?�hig</word>
+                        <word>absterben</word>
+                        <word>abstrahlen</word>
+                        <word>abstrus</word>
+                        <word>abstuerzt</word>
+                        <word>absturzsicherheit</word>
+                        <word>abtun</word>
+                        <word>abundzu</word>
+                        <word>abwechselnd</word>
+                        <word>abwinken</word>
+                        <word>abw?�g</word>
+                        <word>abzahlst</word>
+                        <word>abzeichnen</word>
+                        <word>abzock</word>
+                        <word>abzutun</word>
+                        <word>accessoir</word>
+                        <word>accessori</word>
+                        <word>achim</word>
+                        <word>achtet</word>
+                        <word>acknowledg</word>
+                        <word>acm</word>
+                        <word>actionspielen</word>
+                        <word>actual</word>
+                        <word>adac</word>
+                        <word>adam</word>
+                        <word>addin</word>
+                        <word>adult</word>
+                        <word>advanx</word>
+                        <word>advic</word>
+                        <word>aehm</word>
+                        <word>aein</word>
+                        <word>aem</word>
+                        <word>aesch</word>
+                        <word>afairc</word>
+                        <word>agilemobil</word>
+                        <word>aknowledge</word>
+                        <word>albernheit</word>
+                        <word>albrecht</word>
+                        <word>aldo</word>
+                        <word>alfr</word>
+                        <word>alleinstehenden</word>
+                        <word>allenfals</word>
+                        <word>aloha</word>
+                        <word>altbekannten</word>
+                        <word>altersbedingt</word>
+                        <word>alterung</word>
+                        <word>amper</word>
+                        <word>andersen</word>
+                        <word>anderw?�rtig</word>
+                        <word>andre</word>
+                        <word>andr?c</word>
+                        <word>anerkannten</word>
+                        <word>anerkennen</word>
+                        <word>anfeinden</word>
+                        <word>anfeindung</word>
+                        <word>angeberhandi</word>
+                        <word>angedeutet</word>
+                        <word>angela</word>
+                        <word>angeleiert</word>
+                        <word>angemacht</word>
+                        <word>angemailt</word>
+                        <word>angrinst</word>
+                        <word>ankam</word>
+                        <word>anklingl</word>
+                        <word>ankopiert</word>
+                        <word>ankopplung</word>
+                        <word>anmeldest</word>
+                        <word>anmerken</word>
+                        <word>ansosnsten</word>
+                        <word>ansonsten</word>
+                        <word>ansteuerbar</word>
+                        <word>anst?pseln</word>
+                        <word>anybodi</word>
+                        <word>anzapfen</word>
+                        <word>anzustinken</word>
+                        <word>armselig</word>
+                        <word>assemblierung</word>
+                        <word>astrein</word>
+                        <word>augenkrebs</word>
+                        <word>augenweide</word>
+                        <word>autsch</word>
+                        <word>auweia</word>
+                        <word>awk</word>
+                        <word>babi</word>
+                        <word>bartsch</word>
+                        <word>beidem</word>
+                        <word>beider</word>
+                        <word>beiderseitig</word>
+                        <word>beizeiten</word>
+                        <word>beizubehalten</word>
+                        <word>bejaen</word>
+                        <word>benelux</word>
+                        <word>bern</word>
+                        <word>ber?_hmt</word>
+                        <word>beschaltet</word>
+                        <word>bescheuert</word>
+                        <word>beschleicht</word>
+                        <word>bewaldet</word>
+                        <word>bewandert</word>
+                        <word>beweglich</word>
+                        <word>bezueglich</word>
+                        <word>bezugm?glichkeiten</word>
+                        <word>be?tigt</word>
+                        <word>binder</word>
+                        <word>bird</word>
+                        <word>bischl</word>
+                        <word>bisserl</word>
+                        <word>bissig</word>
+                        <word>bon</word>
+                        <word>bonk</word>
+                        <word>bordel</word>
+                        <word>borg</word>
+                        <word>bormann</word>
+                        <word>branch</word>
+                        <word>braunarsch</word>
+                        <word>braun?�rschen</word>
+                        <word>brit</word>
+                        <word>brite</word>
+                        <word>bum</word>
+                        <word>californian</word>
+                        <word>cannstadt</word>
+                        <word>cannst?�dter</word>
+                        <word>castro</word>
+                        <word>cheap</word>
+                        <word>cheaper</word>
+                        <word>checkt</word>
+                        <word>chrisi</word>
+                        <word>dachtest</word>
+                        <word>dahingehend</word>
+                        <word>dahinrafft</word>
+                        <word>dankend</word>
+                        <word>dankt</word>
+                        <word>daruaf</word>
+                        <word>darauf</word>
+                        <word>dazugeh?renden</word>
+                        <word>dazugeh?rig</word>
+                        <word>dazugeh?rigen</word>
+                        <word>dazustellen</word>
+                        <word>dazwischenfunkt</word>
+                        <word>dazwischenliegen</word>
+                        <word>deaktivierbar</word>
+                        <word>des?fteren</word>
+                        <word>detlef</word>
+                        <word>deutet</word>
+                        <word>deutschalnd</word>
+                        <word>dildo</word>
+                        <word>draufgespielt</word>
+                        <word>draufgestossen</word>
+                        <word>draufkopiert</word>
+                        <word>drauflosschreibst</word>
+                        <word>draufmachen</word>
+                        <word>draufpacken</word>
+                        <word>drauftun</word>
+                        <word>draufzulegen</word>
+                        <word>draufzuspielen</word>
+                        <word>dreist</word>
+                        <word>dreister</word>
+                        <word>drinhatt</word>
+                        <word>drinsteckt</word>
+                        <word>dr?_ben</word>
+                        <word>dunkelheit</word>
+                        <word>dunkelt</word>
+                        <word>durchforstet</word>
+                        <word>durchgehalten</word>
+                        <word>duschen</word>
+                        <word>d?_mmer</word>
+                        <word>d?_mmlich</word>
+                        <word>d?_mmsten</word>
+                        <word>d?_nnste</word>
+                        <word>d?_rft</word>
+                        <word>d?_rftest</word>
+                        <word>eckert</word>
+                        <word>ehem</word>
+                        <word>ehhh</word>
+                        <word>einsenden</word>
+                        <word>einstein</word>
+                        <word>elektrischen</word>
+                        <word>elektromagnetisch</word>
+                        <word>elmar</word>
+                        <word>ensprechend</word>
+                        <word>ergonomischst</word>
+                        <word>erhaeltlich</word>
+                        <word>erhardt</word>
+                        <word>eventuellen</word>
+                        <word>fahrend</word>
+                        <word>fahrerei</word>
+                        <word>faltbar</word>
+                        <word>fanden</word>
+                        <word>fangen</word>
+                        <word>feinen</word>
+                        <word>feinheit</word>
+                        <word>feinheiten</word>
+                        <word>festgehalten</word>
+                        <word>festgelegten</word>
+                        <word>festgezurrt</word>
+                        <word>fidel</word>
+                        <word>firebird</word>
+                        <word>firefox</word>
+                        <word>frahlmann</word>
+                        <word>freebsd</word>
+                        <word>fritsch</word>
+                        <word>frodo</word>
+                        <word>frueh</word>
+                        <word>fuck</word>
+                        <word>fuji</word>
+                        <word>fuktion</word>
+                        <word>fummelig</word>
+                        <word>fummlig</word>
+                        <word>funkend</word>
+                        <word>f?rmlich</word>
+                        <word>f?_hle</word>
+                        <word>f?_nfer</word>
+                        <word>f?_nffach</word>
+                        <word>f?_nfte</word>
+                        <word>f?_nfthandi</word>
+                        <word>gedr?_ckhalten</word>
+                        <word>gehansel</word>
+                        <word>gehauen</word>
+                        <word>geisler</word>
+                        <word>genua</word>
+                        <word>gequirlt</word>
+                        <word>gequirlten</word>
+                        <word>gesaugten</word>
+                        <word>geschaut</word>
+                        <word>gew?hnlichen</word>
+                        <word>glatt</word>
+                        <word>gleichartig</word>
+                        <word>glock</word>
+                        <word>grell</word>
+                        <word>grellen</word>
+                        <word>grottenschlecht</word>
+                        <word>gr?_n</word>
+                        <word>guckt</word>
+                        <word>hanisch</word>
+                        <word>happahappa</word>
+                        <word>hartmann</word>
+                        <word>hauaha</word>
+                        <word>hee</word>
+                        <word>heidenreich</word>
+                        <word>heinrich</word>
+                        <word>herbert</word>
+                        <word>herrmann</word>
+                        <word>hilbert</word>
+                        <word>hinauszuschauen</word>
+                        <word>hinauszuschreiben</word>
+                        <word>hineinbekommen</word>
+                        <word>hineininterpretiert</word>
+                        <word>hineinschreiben</word>
+                        <word>hin?_ber</word>
+                        <word>hipp</word>
+                        <word>hire</word>
+                        <word>hk</word>
+                        <word>hoden</word>
+                        <word>hodensack</word>
+                        <word>hoerensagen</word>
+                        <word>homo</word>
+                        <word>h?�ndisch</word>
+                        <word>h?flicherweise</word>
+                        <word>igitt</word>
+                        <word>internem</word>
+                        <word>irendwo</word>
+                        <word>irgendwann</word>
+                        <word>irgendein</word>
+                        <word>italian</word>
+                        <word>jack</word>
+                        <word>jaensch</word>
+                        <word>jakob</word>
+                        <word>jan</word>
+                        <word>jefferson</word>
+                        <word>jens</word>
+                        <word>jetzt</word>
+                        <word>jetzigen</word>
+                        <word>joachim</word>
+                        <word>jochen</word>
+                        <word>joerg</word>
+                        <word>joga</word>
+                        <word>john</word>
+                        <word>judith</word>
+                        <word>juni</word>
+                        <word>karlheinz</word>
+                        <word>karpowitz</word>
+                        <word>karsten</word>
+                        <word>kg</word>
+                        <word>knackt</word>
+                        <word>knips</word>
+                        <word>kn?_ller</word>
+                        <word>kontra</word>
+                        <word>kurzum</word>
+                        <word>kyrillischen</word>
+                        <word>k?nnte</word>
+                        <word>k?rpereigen</word>
+                        <word>k?rperseiten</word>
+                        <word>k?_ndigt</word>
+                        <word>k?_nftig</word>
+                        <word>k?_rze</word>
+                        <word>laenger</word>
+                        <word>la?_t</word>
+                        <word>leergezogen</word>
+                        <word>lehel</word>
+                        <word>leiern</word>
+                        <word>leisem</word>
+                        <word>leo</word>
+                        <word>letzlich</word>
+                        <word>lincoln</word>
+                        <word>lisa</word>
+                        <word>macaroni</word>
+                        <word>martin</word>
+                        <word>mark</word>
+                        <word>max</word>
+                        <word>mcdonald</word>
+                        <word>merkel</word>
+                        <word>mirco</word>
+                        <word>mobi</word>
+                        <word>mobile2dai</word>
+                        <word>mobilemast</word>
+                        <word>mobilewindoof</word>
+                        <word>mobilfunkanbiet</word>
+                        <word>mobilfunkbetreib</word>
+                        <word>mobilfunkspezialisten</word>
+                        <word>mobilfunktelefon</word>
+                        <word>mobilfunkunternehmen</word>
+                        <word>mobilfunkvertrag</word>
+                        <word>mobilnetz</word>
+                        <word>mobiltel</word>
+                        <word>mobtec</word>
+                        <word>modellierung</word>
+                        <word>modemsymbol</word>
+                        <word>modemtreibern</word>
+                        <word>modemtyp</word>
+                        <word>modemverbindung</word>
+                        <word>moderiert</word>
+                        <word>modern</word>
+                        <word>modernst</word>
+                        <word>modicapagov</word>
+                        <word>modifik</word>
+                        <word>modu</word>
+                        <word>modulen</word>
+                        <word>moechten</word>
+                        <word>moechtest</word>
+                        <word>moeglichst</word>
+                        <word>mohbeil</word>
+                        <word>moher</word>
+
+                        <word>mord</word>
+                        <word>moremsg</word>
+                        <word>motorla</word>
+                        <word>motto</word>
+                        <word>mount</word>
+                        <word>movabl</word>
+                        <word>mqt23ft3mnguifqzjyaqzworj7uqqkkmlgszjn2puelfs8ms2aue2t2oluyqtzxspi4pwkhj</word>
+                        <word>msg</word>
+                        <word>msiexec</word>
+                        <word>mtc</word>
+                        <word>mtv</word>
+                        <word>muenster</word>
+                        <word>mulder</word>
+                        <word>mulitmediacard</word>
+                        <word>multibankf?�hig</word>
+                        <word>multimediaanwendungen</word>
+                        <word>multimediaplay</word>
+                        <word>musikdateien</word>
+                        <word>musikh?ren</word>
+                        <word>musktitel</word>
+                        <word>muster</word>
+                        <word>mute</word>
+                        <word>mu?_e</word>
+                        <word>mv@pdv-systeme.d</word>
+                        <word>mvp0ihtyyr6uk2jaotjuxgt70r7rozmfkqk3ycbnj1ohqjma14vtnp2whvkktoaqdupsb61x</word>
+                        <word>mysteri?s</word>
+                        <word>m?_uesst</word>
+                        <word>m?_?glichst</word>
+                        <word>m?_???_?_test</word>
+                        <word>m?�nnerstimm</word>
+                        <word>m?�rkte</word>
+                        <word>m?�rz</word>
+                        <word>m?�use</word>
+                        <word>m?cht</word>
+                        <word>m?chtetst</word>
+                        <word>m?glichkeinen</word>
+                        <word>m?hre</word>
+                        <word>m?_helo</word>
+                        <word>m?_sst</word>
+                        <word>m?_?_test</word>
+                        <word>n'abend</word>
+                        <word>n3330</word>
+                        <word>n6210</word>
+                        <word>n910</word>
+                        <word>n917</word>
+                        <word>n9cia1lvd1vd9ntqjulo29rf8fmn2c06rq@4ax.com</word>
+                        <word>nachbauprodukt</word>
+                        <word>nacheinand</word>
+                        <word>nacherf?_llungsschuldn</word>
+                        <word>nachgebessert</word>
+                        <word>nachgeholt</word>
+                        <word>nachgekauft</word>
+                        <word>nachgekauften</word>
+                        <word>nachgelesen</word>
+                        <word>nachgeliefert</word>
+                        <word>nachgeruestet</word>
+                        <word>nachgetragen</word>
+                        <word>nachinstallieren</word>
+                        <word>nachkonfigurieren</word>
+                        <word>nachnahm</word>
+                        <word>nachpr?_fen</word>
+                        <word>nachregeln</word>
+                        <word>nachrichteneingang</word>
+                        <word>nachrichtenmagazin</word>
+                        <word>nachrichtent?n</word>
+                        <word>nachr?_startikel</word>
+                        <word>nachschlagewerk</word>
+                        <word>nachst?bern</word>
+                        <word>nachtdienst</word>
+                        <word>nachtisch</word>
+                        <word>nachtmodu</word>
+                        <word>nachtrsigmglich</word>
+                        <word>nachudenken</word>
+                        <word>nachwei</word>
+                        <word>nachwievor</word>
+                        <word>nachwuchsprodukt</word>
+                        <word>nachzahlen</word>
+                        <word>nachzulesen</word>
+                        <word>nachzumachen</word>
+                        <word>nachzur?_sten</word>
+                        <word>nachzuschauen</word>
+                        <word>nachzusehen</word>
+                        <word>nachzuvollziehen</word>
+                        <word>nachzuw?�hlen</word>
+                        <word>nackt</word>
+                        <word>nafol</word>
+                        <word>nafop</word>
+                        <word>nagel</word>
+                        <word>nahaufnahmen</word>
+                        <word>nahegelegt</word>
+                        <word>naheliegendst</word>
+                        <word>nahem</word>
+                        <word>naher</word>
+                        <word>nahtlo</word>
+                        <word>nahu</word>
+                        <word>naiv</word>
+                        <word>name=patches_</word>
+                        <word>namenslist</word>
+                        <word>namespac</word>
+                        <word>nanana</word>
+                        <word>nanu</word>
+                        <word>nasen</word>
+                        <word>nass</word>
+                        <word>natasigan</word>
+                        <word>natimeripi</word>
+                        <word>navdvf8a1p5x8dmabzfmkp8amazzhu3noo5u57d2rwzpiazizcfkaicjskwtq86yqelpj71l</word>
+                        <word>navigationsger?�t</word>
+                        <word>navigationsprogamm</word>
+                        <word>navigationssystemen</word>
+                        <word>na?_</word>
+                        <word>nbertragen</word>
+                        <word>nde</word>
+                        <word>ndwann</word>
+                        <word>nearli</word>
+                        <word>nebel</word>
+                        <word>nebelbomben</word>
+                        <word>nebenan</word>
+                        <word>nebenbemerkungen</word>
+                        <word>nebenwirkungen</word>
+                        <word>nef</word>
+                        <word>neidisch</word>
+                        <word>nemerix</word>
+                        <word>nenen</word>
+                        <word>nenenswert</word>
+                        <word>nennspannung</word>
+                        <word>nero</word>
+                        <word>nervenfutt</word>
+                        <word>nervton</word>
+                        <word>nervt?tenden</word>
+                        <word>nerv?</word>
+                        <word>netcom</word>
+                        <word>netikett</word>
+                        <word>netiquett</word>
+                        <word>netphon</word>
+                        <word>nettigkeiten</word>
+                        <word>netzbetreibern</word>
+                        <word>netzeinstellungen</word>
+                        <word>netzfunkt</word>
+                        <word>netzintern</word>
+                        <word>netzlock</word>
+                        <word>netzseitigen</word>
+                        <word>netzstandard</word>
+                        <word>netztbetreib</word>
+                        <word>netzzugang</word>
+                        <word>neuauflag</word>
+                        <word>neubauer</word>
+                        <word>neubaustreck</word>
+                        <word>neubooten</word>
+                        <word>neueinbuchungen</word>
+                        <word>neuentwicklung</word>
+                        <word>neuesm</word>
+                        <word>neuester</word>
+                        <word>neugestarteten</word>
+                        <word>neugierig</word>
+                        <word>neustartoptionen</word>
+                        <word>neusten</word>
+                        <word>neuteil</word>
+                        <word>neuwagen</word>
+                        <word>neuwertig</word>
+                        <word>neuwertigen</word>
+                        <word>news06-05@herr-der-mails.de</word>
+                        <word>news@tofu.us</word>
+                        <word>newsgroup@rlaue.de</word>
+                        <word>newsgruppen</word>
+                        <word>newsreader@unterderbruecke.de</word>
+                        <word>newstick</word>
+                        <word>ng_umleitung@spamfence.net</word>
+                        <word>ngig</word>
+                        <word>nhar</word>
+                        <word>nicht_</word>
+                        <word>nichtanzeig</word>
+                        <word>nichtfl?_chtigen</word>
+                        <word>nichtfunktionierendem</word>
+                        <word>nichtfunktionierenden</word>
+                        <word>nichtoriginalen</word>
+                        <word>nichtsaussagenden</word>
+                        <word>nichtssagend</word>
+                        <word>nicht?_bereinstimmung</word>
+                        <word>nid</word>
+                        <word>niedergelegt</word>
+                        <word>niederl?_??ndisch</word>
+                        <word>niederl?�ndisch</word>
+                        <word>niederl?�ndischen</word>
+                        <word>niedrigen</word>
+                        <word>nietzsch</word>
+                        <word>nil</word>
+                        <word>nintendo</word>
+                        <word>nn</word>
+                        <word>nnqrkxuvsg7tobrdt0dzpvutrorgp7lyonkjkh8ipgnc5hfav0ehhdaldtixvimc12lwnp71</word>
+                        <word>no_email_@gmx.net</word>
+                        <word>nocturne@doomnet.d</word>
+                        <word>nodec</word>
+                        <word>nofal</word>
+                        <word>nofop</word>
+                        <word>nokiaartig</word>
+                        <word>nokiaerfahrenen</word>
+                        <word>nokiah?�ndl</word>
+                        <word>nokiastor</word>
+                        <word>noll</word>
+                        <word>nomorespam@onlinehome.de</word>
+                        <word>none@home</word>
+                        <word>nonplusultra</word>
+                        <word>norb</word>
+                        <word>nordenham</word>
+                        <word>normalewrweis</word>
+                        <word>normalfal</word>
+                        <word>normalprofil</word>
+                        <word>normalus</word>
+                        <word>nosaxilom</word>
+                        <word>nospam@christian-althoff.de</word>
+                        <word>nospam@nospam.com</word>
+                        <word>nospam_at_news@kaffeeschluerfer.com</word>
+                        <word>nossil</word>
+                        <word>notapothek</word>
+                        <word>notarzt</word>
+                        <word>notaufnahmepatienten</word>
+                        <word>notbehelf</word>
+                        <word>notieren</word>
+                        <word>notiz</word>
+                        <word>notizzettel</word>
+                        <word>novemb</word>
+                        <word>ns</word>
+                        <word>nsfs6z47vpjf9lis8gt8u9pdimutrjxy3r6r2ijukpbjlbt23v4dqpqkzbyc8j0rc31w5azo</word>
+                        <word>nste</word>
+                        <word>nt</word>
+                        <word>nu0oir6u7ecippeaehjznvswpqg80d70pwibh50kirezwyegstxsx5bincbhvssf25bnzmnc</word>
+                        <word>nuhec</word>
+                        <word>nullen</word>
+                        <word>num=20&amp;hl=de&amp;q=remote+p900+download&amp;btng=suche&amp;meta=lr%3dlang_d</word>
+                        <word>numerischen</word>
+                        <word>nummerierung</word>
+                        <word>nummernwechsel</word>
+                        <word>nummmer</word>
+                        <word>nunmehr</word>
+                        <word>nurmehr</word>
+                        <word>nutcrack</word>
+                        <word>nutzanwendern</word>
+                        <word>nutzern</word>
+                        <word>nutzerprofil</word>
+                        <word>nutzerwechsel</word>
+                        <word>nutzungen</word>
+                        <word>nutzungsabh?�ngigen</word>
+                        <word>nutzungsgewohnheiten</word>
+                        <word>nutzungsverhalten</word>
+                        <word>nutzwert</word>
+                        <word>nvkrvi83i6vl8yyjecm5kkyce1tnxp20l5rnwjesblgds9j7xuv0mmdugqei0xyy9zjtmhta</word>
+                        <word>nvsym9xe0siaceipdakacfwmtajlnyxeczswikdcd3nkbmyagmb7e9ayogece5aoovjzgqbo</word>
+                        <word>nx7000</word>
+                        <word>nyxclock</word>
+                        <word>n|b|r|f</word>
+                        <word>n?_?tig</word>
+                        <word>n?_??chste</word>
+                        <word>n?�chstem</word>
+                        <word>n?�chstgelegen</word>
+                        <word>n?�hmlich</word>
+                        <word>n?ig</word>
+                        <word>n?_rnberger</word>
+                        <word>n?_tzlichem</word>
+                        <word>n?_x</word>
+                        <word>o'keeff</word>
+                        <word>o2?-estim</word>
+                        <word>o5oipac0s96l6yrexg1jitihsqfejr5nfarrc0bzxedicnihnjnnamiffgd9qikaurmgay1d</word>
+                        <word>obendrein</word>
+                        <word>oberwellen</word>
+                        <word>obgleich</word>
+                        <word>objekten</word>
+                        <word>obligatorischen</word>
+                        <word>obskur</word>
+                        <word>oeffentlich</word>
+                        <word>oefter</word>
+                        <word>oem</word>
+                        <word>offenhat</word>
+                        <word>offtop</word>
+                        <word>og</word>
+                        <word>oginalen</word>
+                        <word>ohnedi</word>
+                        <word>okt</word>
+                        <word>oktob</word>
+                        <word>olaf@criseis.ruhr.de</word>
+                        <word>oled-au?_?_endisplai</word>
+                        <word>olt</word>
+                        <word>olympu</word>
+                        <word>omi</word>
+                        <word>omin?s</word>
+                        <word>onetoucheasi</word>
+                        <word>ongo</word>
+                        <word>onkel</word>
+                        <word>ontop</word>
+                        <word>ooop</word>
+                        <word>openoffic</word>
+                        <word>openvm</word>
+                        <word>opera</word>
+                        <word>operieren</word>
+                        <word>opma</word>
+                        <word>optimistisch</word>
+                        <word>optimum</word>
+                        <word>option=com_content&task=view&id=485</word>
+                        <word>option=com_content&task=view&id=511</word>
+                        <word>optional</word>
+                        <word>optoinen</word>
+                        <word>oral</word>
+                        <word>ordentliceh</word>
+                        <word>ordin?�r</word>
+                        <word>ordnern</word>
+                        <word>ordnerpositionen</word>
+                        <word>ordnerstruktur</word>
+                        <word>ordnungsgem?�?_</word>
+                        <word>organismu</word>
+                        <word>orginalkabel</word>
+                        <word>orientierung</word>
+                        <word>orientierungshilf</word>
+                        <word>original</word>
+                        <word>originalakkublock</word>
+                        <word>originaldatei</word>
+                        <word>originalgr??_</word>
+                        <word>originaltasch</word>
+                        <word>originalvers</word>
+                        <word>orten</word>
+                        <word>orth</word>
+                        <word>ortmann</word>
+                        <word>ortsbezeichnung</word>
+                        <word>osteurop?�ischen</word>
+                        <word>osthoff</word>
+                        <word>ott</word>
+                        <word>ottxvi2fi5soby7ufrtbuziqsuiu0yfk2joohkpyguymcrg7pm06uhsqmuguourm95p0nubu</word>
+                        <word>oudtoor</word>
+                        <word>oukxgukfcsyfchqrgbqoukxgukfcsyfchqrgbqoukxgukfcsyfchqrgbqoukxgukfcsyfchq</word>
+                        <word>outback</word>
+                        <word>outbank</word>
+                        <word>outdoor</word>
+                        <word>outllok</word>
+                        <word>overlap</word>
+                        <word>overs</word>
+                        <word>ovipesmuahhpiplane80sidqixec1gncvuciersjxx7uygimtxrcqkvsahm8rmoigfsopvim</word>
+                        <word>oxygenephonemanag</word>
+                        <word>oxygensoftwar</word>
+                        <word>o|</word>
+                        <word>o|o|</word>
+                        <word>o?_-brand</word>
+                        <word>o?�</word>
+                        <word>p.wiemann@t-online.de</word>
+                        <word>p7389</word>
+                        <word>paaren</word>
+                        <word>packet</word>
+                        <word>packung?ffnen</word>
+                        <word>paduck</word>
+                        <word>paferi</word>
+                        <word>pagal</word>
+                        <word>pai</word>
+                        <word>paint</word>
+                        <word>palmdesktop</word>
+                        <word>palmon</word>
+                        <word>pampig</word>
+                        <word>pan.2005.07.14.14.30.14.794496@arcor.d</word>
+                        <word>panel</word>
+                        <word>panikmach</word>
+                        <word>pap</word>
+                        <word>papiertaschentuch</word>
+                        <word>pappen</word>
+                        <word>parachut</word>
+                        <word>paradox</word>
+                        <word>paranoia</word>
+                        <word>parkuhr</word>
+                        <word>partout</word>
+                        <word>passendend</word>
+                        <word>passiern</word>
+                        <word>passworteingab</word>
+                        <word>pasta</word>
+                        <word>pattern</word>
+                        <word>paul.dorn@bnv-bamberg.de</word>
+                        <word>pausen</word>
+                        <word>payment</word>
+                        <word>pcsync</word>
+                        <word>pda??</word>
+                        <word>pdid=hz514&catid=4013&rate=5&vid=913</word>
+                        <word>pdp</word>
+                        <word>pdu</word>
+                        <word>pedahepanu</word>
+                        <word>pedda@balthaus.net</word>
+                        <word>peiffer</word>
+                        <word>penefor</word>
+                        <word>penetrant</word>
+                        <word>peon</word>
+                        <word>percal</word>
+                        <word>perfect</word>
+                        <word>performanceproblem</word>
+                        <word>perl</word>
+                        <word>perplex</word>
+                        <word>persoenlich</word>
+                        <word>perspekt</word>
+                        <word>perversl</word>
+                        <word>peter.koerberno_spam@freesurf.ch</word>
+                        <word>peter.loos@web.de</word>
+                        <word>petir</word>
+                        <word>peuss</word>
+                        <word>pev</word>
+                        <word>pevapagol</word>
+                        <word>pfabigan</word>
+                        <word>pferd</word>
+                        <word>pfingsten@netcologne.de</word>
+                        <word>pflege</word>
+                        <word>pflegen</word>
+                        <word>pflegeresourcen</word>
+                        <word>pflichten</word>
+                        <word>pflock</word>
+                        <word>pforzheim</word>
+                        <word>pfuschig</word>
+                        <word>pf?rtner</word>
+                        <word>pgp-schl???_ssel</word>
+                        <word>ph</word>
+                        <word>philosoph</word>
+                        <word>philosophi</word>
+                        <word>phne</word>
+                        <word>phoneid=328&countryid=13&bearerid=5&contractid=191&sitelanguageid=124&captchaenabled=true&step=netwo</word>
+                        <word>photo</word>
+                        <word>phun</word>
+                        <word>physic</word>
+                        <word>physiologisch</word>
+                        <word>pickel</word>
+                        <word>pictbridg</word>
+                        <word>piepser</word>
+                        <word>piepton</word>
+                        <word>pik@amigo.ping.d</word>
+                        <word>pillen</word>
+                        <word>pinior</word>
+                        <word>pintan</word>
+                        <word>pipelin</word>
+                        <word>pitumateho</word>
+                        <word>pivep</word>
+                        <word>pjsacvli3feypkiklqzzxukpiiofm55puqojfztmuqthseakm3e0wwd6kkdirisyhnmapha</word>
+                        <word>plackerei</word>
+                        <word>plan</word>
+                        <word>planki</word>
+                        <word>plantron</word>
+                        <word>planungen</word>
+                        <word>plastikbeutel</word>
+                        <word>plastikk?�fig</word>
+                        <word>platinfish@gmx.ch</word>
+                        <word>platzgr?_nden</word>
+                        <word>platzmangel</word>
+                        <word>plauzi</word>
+                        <word>plauzi@gmx.d</word>
+                        <word>playlisten</word>
+                        <word>pleitewel</word>
+                        <word>plenkt</word>
+                        <word>pluspunkt</word>
+                        <word>pluto1025@gmx.de</word>
+                        <word>pl?tzlichen</word>
+                        <word>po</word>
+                        <word>pocekesot</word>
+                        <word>pocketword</word>
+                        <word>pogorzelski</word>
+                        <word>pointer</word>
+                        <word>pointiert</word>
+                        <word>polchi</word>
+                        <word>polemik</word>
+                        <word>pool</word>
+                        <word>poppen</word>
+                        <word>popper</word>
+                        <word>poppt</word>
+                        <word>popup</word>
+                        <word>por</word>
+                        <word>portabl</word>
+                        <word>porti</word>
+                        <word>portugisisch</word>
+                        <word>post@michael-dahmen.d</word>
+                        <word>postadressen</word>
+                        <word>poster</word>
+                        <word>postid=149729#post149729</word>
+                        <word>postit</word>
+                        <word>potenti</word>
+                        <word>potentiel</word>
+                        <word>potenz</word>
+                        <word>potenziel</word>
+                        <word>potxdmniezrke9z86v8ar13iqrzwb1jlnjdyebgsamu97kkpbjrm1fdruodu5yn86vatmccu</word>
+                        <word>powerbook</word>
+                        <word>powerleucht</word>
+                        <word>poxenuhod</word>
+                        <word>pp</word>
+                        <word>ppc2002</word>
+                        <word>praechtig</word>
+                        <word>praep@freenet.de</word>
+                        <word>praesentieren</word>
+                        <word>praktikabel</word>
+                        <word>praktischerweis</word>
+                        <word>praxisfremd</word>
+                        <word>praxistauglich</word>
+                        <word>praxistest</word>
+                        <word>preced</word>
+                        <word>preinstal</word>
+                        <word>preisgef?_g</word>
+                        <word>preisg?_nstiger</word>
+                        <word>preisobergrenz</word>
+                        <word>preisskala</word>
+                        <word>preisverd?�chtig</word>
+                        <word>preiszugeben</word>
+                        <word>preller</word>
+                        <word>prepaidkarten</word>
+                        <word>prepaidpacks_</word>
+                        <word>presst</word>
+                        <word>pretoria</word>
+                        <word>prevent</word>
+                        <word>previous</word>
+                        <word>prg</word>
+                        <word>prgcxc125873_eu_1_a</word>
+                        <word>price</word>
+                        <word>prickelnd</word>
+                        <word>primatenabteilung</word>
+                        <word>prinzp</word>
+                        <word>prite</word>
+                        <word>privatbereich</word>
+                        <word>privatdaten</word>
+                        <word>privatisierung</word>
+                        <word>privilegien</word>
+                        <word>probem</word>
+                        <word>products_id=1854</word>
+                        <word>produktgenerationen</word>
+                        <word>produktionsdatum</word>
+                        <word>produktionsfehl</word>
+                        <word>produktionsseri</word>
+                        <word>produktmanag</word>
+                        <word>produktseit</word>
+                        <word>produktsuch</word>
+                        <word>professionellen</word>
+                        <word>proffesionel</word>
+                        <word>profilanweisung</word>
+                        <word>profilverwaltung</word>
+                        <word>profil?�nderungen</word>
+                        <word>profitabel</word>
+                        <word>profitorientiert</word>
+                        <word>programmanbiet</word>
+                        <word>programmdownload</word>
+                        <word>programmierkenntniss</word>
+                        <word>programmiersprach</word>
+                        <word>programmmen?_punkt</word>
+                        <word>prominent</word>
+                        <word>promis</word>
+                        <word>prommer</word>
+                        <word>proper</word>
+                        <word>properit?_??r</word>
+                        <word>properti</word>
+                        <word>proport</word>
+                        <word>propos</word>
+                        <word>proprietaer</word>
+                        <word>propriet?�r</word>
+                        <word>propriet?�rem</word>
+                        <word>protect</word>
+                        <word>protocolstack</word>
+                        <word>protokolldatei</word>
+                        <word>protokollieren</word>
+                        <word>protokolllierungsoptionen</word>
+                        <word>providerabh?�ngig</word>
+                        <word>provisioniert</word>
+                        <word>provoziert</word>
+                        <word>prozesskostenrechnung</word>
+                        <word>prozessoren</word>
+                        <word>prozessorlast</word>
+                        <word>prozessorleistung</word>
+                        <word>pr?�sent</word>
+                        <word>pr?�sentiert</word>
+                        <word>pr?�zise</word>
+                        <word>pr?_fling</word>
+                        <word>pr?_fsumm</word>
+                        <word>psy</word>
+                        <word>ptt</word>
+                        <word>puffer</word>
+                        <word>puh</word>
+                        <word>pull</word>
+                        <word>pulsung</word>
+                        <word>punkten</word>
+                        <word>punktet</word>
+                        <word>pure</word>
+                        <word>purer</word>
+                        <word>putzen</word>
+                        <word>pw</word>
+                        <word>pxa</word>
+                        <word>python</word>
+                        <word>p|e|c|m|s|o|d|a|u|v</word>
+                        <word>q=29+euro+group%3ade.comm.geraete.mobil.siemens&qt_s=such</word>
+                        <word>qd</word>
+                        <word>qdgt9kupbxbqrqucpideepnmlhgfemu0ui6di1iiokpwgfksrqznkehhpnilyyp1flbxtsf</word>
+                        <word>qkjk3lyb0pfezf2hoqejdztuglz9485ofau0fsm6uepeeksownywxxnsciuqfts072pfwqv8</word>
+                        <word>qrifcn0ovrihirdrcij7cciaiwcgtzwthfqyaile5egixmszjon24on7clokyzrho5prkxaw</word>
+                        <word>qrwz2yaahemacacdcpq0wdne0on27vnqzotjaemujqpqadnvnpwspuyyplxkeadnfbay0n9j</word>
+                        <word>qtech</word>
+                        <word>quadantenn</word>
+                        <word>qualiti</word>
+                        <word>qualit?_??t</word>
+                        <word>qualit?�tsstufen</word>
+                        <word>qualit?�tsverlust</word>
+                        <word>quarter</word>
+                        <word>quengeln</word>
+                        <word>quergelesen</word>
+                        <word>quickbutton</word>
+                        <word>quickoffic</word>
+                        <word>quicksync</word>
+                        <word>quittiet</word>
+                        <word>quittung</word>
+                        <word>quittungst?n</word>
+                        <word>quizfrag</word>
+                        <word>quoten</word>
+                        <word>qu?�kig</word>
+                        <word>qyrsypbnjm8xokdmakqvaskugnspnrxuabpsicak2yq6gnip7t3dzuiwoqaqtij0odikz2qi</word>
+                        <word>r.tietje@gmx.net</word>
+                        <word>r1j002</word>
+                        <word>r2ai</word>
+                        <word>r2ay004</word>
+                        <word>r310</word>
+                        <word>r520</word>
+                        <word>ra</word>
+                        <word>ra0iakyimlidjnadkgzohftshvbfsodnaaje0yyekuvbheh1rx8goakgkpjikmlwfzpqxix</word>
+                        <word>racoons@gmx.net</word>
+                        <word>rad</word>
+                        <word>radik</word>
+                        <word>radiofrequenzen</word>
+                        <word>radion</word>
+                        <word>radiostream</word>
+                        <word>radiu</word>
+                        <word>raimon</word>
+                        <word>rainerklingenberg@hotmail.com</word>
+                        <word>rais</word>
+                        <word>rajah</word>
+                        <word>ral</word>
+                        <word>ralav</word>
+                        <word>ralli</word>
+                        <word>ralo</word>
+                        <word>rambo</word>
+                        <word>randbemerkung</word>
+                        <word>randomli</word>
+                        <word>rane</word>
+                        <word>rang</word>
+                        <word>rapememet</word>
+                        <word>rapid</word>
+                        <word>rare</word>
+                        <word>rasend</word>
+                        <word>raskin</word>
+                        <word>rassistischen</word>
+                        <word>rateb</word>
+                        <word>ratschlaeg</word>
+                        <word>ratten</word>
+                        <word>raufbringen</word>
+                        <word>rausbekommt</word>
+                        <word>rausbringt</word>
+                        <word>rauscht</word>
+                        <word>rausgeholt</word>
+                        <word>rausgekomen</word>
+                        <word>rausgesucht</word>
+                        <word>rauslesen</word>
+                        <word>rausreissen</word>
+                        <word>rauszufinden</word>
+                        <word>rautetast</word>
+                        <word>rd</word>
+                        <word>rde</word>
+                        <word>rden</word>
+                        <word>reaktivierung</word>
+                        <word>realem</word>
+                        <word>realisierbar</word>
+                        <word>realit?�ten</word>
+                        <word>realplay</word>
+                        <word>rebootfunkt</word>
+                        <word>recheckschwingungungen</word>
+                        <word>rechenzentren</word>
+                        <word>recherch</word>
+                        <word>rechnenexempel</word>
+                        <word>rechnern</word>
+                        <word>rechtm?�?_igen</word>
+                        <word>rechtsanwalt</word>
+                        <word>rechtschreibfehl</word>
+                        <word>rechtswidrigen</word>
+                        <word>rechtzeititg</word>
+                        <word>recipi</word>
+                        <word>recognit</word>
+                        <word>redirect</word>
+                        <word>redmond</word>
+                        <word>redund</word>
+                        <word>referenz</word>
+                        <word>reflect</word>
+                        <word>reflexartig</word>
+                        <word>refus</word>
+                        <word>regalen</word>
+                        <word>regardless</word>
+                        <word>regelmaessig</word>
+                        <word>regelrecht</word>
+                        <word>regelst</word>
+                        <word>regelt</word>
+                        <word>regelungen</word>
+                        <word>regen</word>
+                        <word>region</word>
+                        <word>registr</word>
+                        <word>registriercod</word>
+                        <word>regulierung</word>
+                        <word>regul?�ren</word>
+                        <word>reiehenfolg</word>
+                        <word>reifen</word>
+                        <word>reindeer</word>
+                        <word>reinfal</word>
+                        <word>reingefallen</word>
+                        <word>reingesteckt</word>
+                        <word>reingetaucht</word>
+                        <word>reinigung</word>
+                        <word>reinimplementiert</word>
+                        <word>reinkam</word>
+                        <word>reinkommen</word>
+                        <word>reinkommt</word>
+                        <word>reinkriegen</word>
+                        <word>reinlauf</word>
+                        <word>reinmachen</word>
+                        <word>reinmachst</word>
+                        <word>reinrufen</word>
+                        <word>reinstecken</word>
+                        <word>reinst?pseln</word>
+                        <word>reintun</word>
+                        <word>reinzuf?�llig</word>
+                        <word>reis</word>
+                        <word>reiser</word>
+                        <word>reissen</word>
+                        <word>reiter</word>
+                        <word>reizt</word>
+                        <word>reject</word>
+                        <word>reklamationen</word>
+                        <word>rel</word>
+                        <word>relat</word>
+                        <word>relevant</word>
+                        <word>reliabl</word>
+                        <word>reluct</word>
+                        <word>rememb</word>
+                        <word>removeaempir</word>
+                        <word>removethi</word>
+                        <word>renesa</word>
+                        <word>rennt</word>
+                        <word>renommierten</word>
+                        <word>reparaturdienst</word>
+                        <word>reparaturkennung</word>
+                        <word>reparaturoptionen</word>
+                        <word>reparaturvertrag</word>
+                        <word>reparier</word>
+                        <word>repertoir</word>
+                        <word>replizieren</word>
+                        <word>replyto</word>
+                        <word>reppenhagen</word>
+                        <word>request</word>
+                        <word>reserveger?�t</word>
+                        <word>reservierung</word>
+                        <word>respond</word>
+                        <word>respons</word>
+                        <word>ressourcen</word>
+                        <word>restlaufzeit</word>
+                        <word>restriktiv</word>
+                        <word>result</word>
+                        <word>resultat</word>
+                        <word>resum</word>
+                        <word>retten</word>
+                        <word>reuss</word>
+                        <word>reveal</word>
+                        <word>revolution?�r</word>
+                        <word>rewind</word>
+                        <word>rfs@mail.org</word>
+                        <word>rg7qdwnttslvvpjqd1bgv6xrcnaqkfhycoainu7f3dkhrhebuy12yk1hzottkxsppteq7wgu</word>
+                        <word>rgbt9ghocrhippcfyeiam275kccafslk2imnw7efzainowx5eaqccpslju30d0a7radnaksz</word>
+                        <word>rhode</word>
+                        <word>ric</word>
+                        <word>richt</word>
+                        <word>richtigem</word>
+                        <word>richtigzustellen</word>
+                        <word>riesenaufwand</word>
+                        <word>riexing</word>
+                        <word>rigaweg</word>
+                        <word>rio</word>
+                        <word>riskieren</word>
+                        <word>rkb@directbox.com</word>
+                        <word>rn</word>
+                        <word>rnfeind</word>
+                        <word>ro</word>
+                        <word>roamingbedingungen</word>
+                        <word>robin</word>
+                        <word>rofidacima</word>
+                        <word>rogramm</word>
+                        <word>rohotanimir</word>
+                        <word>rollbar</word>
+                        <word>rollt</word>
+                        <word>rolo</word>
+                        <word>roof</word>
+                        <word>ropamumetol</word>
+                        <word>rose</word>
+                        <word>rosig</word>
+                        <word>rosina</word>
+                        <word>rotflbtc</word>
+                        <word>rotflol</word>
+                        <word>roth</word>
+                        <word>rotwein</word>
+                        <word>routenberechnung</word>
+                        <word>routenplan</word>
+                        <word>routinem?�?_ig</word>
+                        <word>routiniert</word>
+                        <word>rovehifa</word>
+                        <word>rpfqrmgoiq41wnqs28a9kgznukq9rayxdaj0rpi7r4nqftiwisbx704i5jtokbkkh3iliymt</word>
+                        <word>rs232</word>
+                        <word>rsap</word>
+                        <word>ru1</word>
+                        <word>ruckizucki</word>
+                        <word>ruebergekommen</word>
+                        <word>rueckfrag</word>
+                        <word>rueckmeldungen</word>
+                        <word>rueckrufen</word>
+                        <word>rufannahmeverz?gerung</word>
+                        <word>ruflist</word>
+                        <word>rufnummernuebermittlung</word>
+                        <word>rufnummernunterdr?_ckung</word>
+                        <word>rufst</word>
+                        <word>ruftonlautst?�rk</word>
+                        <word>ruft?_?n</word>
+                        <word>ruh</word>
+                        <word>ruhigen</word>
+                        <word>ruhotinemar</word>
+                        <word>ruinieren</word>
+                        <word>ruin?s</word>
+                        <word>rule</word>
+                        <word>rumdr?_cken</word>
+                        <word>rumfliegen</word>
+                        <word>rumfliegt</word>
+                        <word>rumforschen</word>
+                        <word>rumgefummelt</word>
+                        <word>rumgelaufen</word>
+                        <word>rumlaufen</word>
+                        <word>rumprobieren</word>
+                        <word>rumq?�ken</word>
+                        <word>rumspazieren</word>
+                        <word>rumspielst</word>
+                        <word>rumstehen</word>
+                        <word>rumzuspinnen</word>
+                        <word>rumzu?�rgern</word>
+                        <word>runderneurten</word>
+                        <word>rundfunkbereich</word>
+                        <word>runterf?�llt</word>
+                        <word>runtergerittenen</word>
+                        <word>runtergesicherten</word>
+                        <word>runterlad</word>
+                        <word>runterspuelen</word>
+                        <word>russichen</word>
+                        <word>rut</word>
+                        <word>rv</word>
+                        <word>rxwkmegdupeqwwpdoi2jiijnhpqt7vhnaj0pgwpisvlaiqdfkxmanvmgbe0regpbfjbwflsm</word>
+                        <word>r?_??tsel</word>
+                        <word>r?�nder</word>
+                        <word>r?�uberpistolen</word>
+                        <word>r?�umt</word>
+                        <word>r?delt</word>
+                        <word>r?ntgenstrahlung</word>
+                        <word>r?_ckdeckel</word>
+                        <word>r?_cken</word>
+                        <word>r?_ckgelieferten</word>
+                        <word>r?_ckg?�nfig</word>
+                        <word>r?_ckg?�ngig</word>
+                        <word>r?_ckl?�ufer</word>
+                        <word>r?_ckruf</word>
+                        <word>r?_cksendung</word>
+                        <word>r?_ckspielen</word>
+                        <word>r?_cktritt</word>
+                        <word>r?_sten</word>
+                        <word>s&e-pack</word>
+                        <word>s.hz.tg@arcor.de</word>
+                        <word>s.mitch@gmx.d</word>
+                        <word>s200</word>
+                        <word>s25@nce</word>
+                        <word>s288</word>
+                        <word>s65er</word>
+                        <word>s65v</word>
+                        <word>s80</word>
+                        <word>s9z06dhu5iew.dlg@newsfqdn.net.dhis.org</word>
+                        <word>s=&amp;threadid=134246&amp;pagenumber=4</word>
+                        <word>s=&amp;threadid=166047&amp;highlight=pushtotalk</word>
+                        <word>s=&amp;threadid=167413</word>
+                        <word>sa</word>
+                        <word>sabin</word>
+                        <word>sachdienlich</word>
+                        <word>sachlichen</word>
+                        <word>sachm?_??ngelhaftung</word>
+                        <word>sachm?�ngelhaftung</word>
+                        <word>sadasacowot</word>
+                        <word>sadismu</word>
+                        <word>saemtlich</word>
+                        <word>saetzen</word>
+                        <word>safarigr?_n</word>
+                        <word>safe</word>
+                        <word>sahen</word>
+                        <word>sahra</word>
+                        <word>sakura</word>
+                        <word>sal</word>
+                        <word>saldenabfrag</word>
+                        <word>saldo</word>
+                        <word>salopp</word>
+                        <word>salv</word>
+                        <word>samenzellen</word>
+                        <word>samimogemun</word>
+                        <word>sampl</word>
+                        <word>samt</word>
+                        <word>sanddisk</word>
+                        <word>sandisc</word>
+                        <word>sanduhr</word>
+                        <word>sanfter</word>
+                        <word>sank</word>
+                        <word>sarati</word>
+                        <word>sarek</word>
+                        <word>sash</word>
+                        <word>sasirolavo</word>
+                        <word>satelliten</word>
+                        <word>sattler2000@gmx.de</word>
+                        <word>sattsam</word>
+                        <word>sauberen</word>
+                        <word>sauerei</word>
+                        <word>sauerkraut</word>
+                        <word>saufen</word>
+                        <word>saugnapf</word>
+                        <word>savvi</word>
+                        <word>scene</word>
+                        <word>schablon</word>
+                        <word>schaefer@bioinf.uni-sb.d</word>
+                        <word>schaltelektronik</word>
+                        <word>schand</word>
+                        <word>scharfstellen</word>
+                        <word>schatten</word>
+                        <word>schatz</word>
+                        <word>schatzamt</word>
+                        <word>scheib</word>
+                        <word>scheif</word>
+                        <word>scheitern</word>
+                        <word>schema</word>
+                        <word>scheme</word>
+                        <word>schichten</word>
+                        <word>schichtplan</word>
+                        <word>schieben</word>
+                        <word>schiebeschalt</word>
+                        <word>schien</word>
+                        <word>schiessen</word>
+                        <word>schiesst</word>
+                        <word>schie?_en</word>
+                        <word>schildert</word>
+                        <word>schili</word>
+                        <word>schimpft</word>
+                        <word>schlaf</word>
+                        <word>schlage</word>
+                        <word>schlagen</word>
+                        <word>schlagwaff</word>
+                        <word>schleifen</word>
+                        <word>schleifpapi</word>
+                        <word>schlichtus</word>
+                        <word>schltet</word>
+                        <word>schlug</word>
+                        <word>schlu?_</word>
+                        <word>schl?�ge</word>
+                        <word>schl?_sse</word>
+                        <word>schmalbr?_stig</word>
+                        <word>schmalhof</word>
+                        <word>schmecken</word>
+                        <word>schmetterling</word>
+                        <word>schmunzeln</word>
+                        <word>schmutzig</word>
+                        <word>schnap</word>
+                        <word>schnappsch?_ss</word>
+                        <word>schneckenhaft</word>
+                        <word>schneiden</word>
+                        <word>schnellen</word>
+                        <word>schnellst</word>
+                        <word>schnickschnackspielzeug</word>
+                        <word>schnipp</word>
+                        <word>schnittstellenbeschaffenheit</word>
+                        <word>schnitzer</word>
+                        <word>schnupp</word>
+                        <word>schnurlosen</word>
+                        <word>schnurlostelefon</word>
+                        <word>schn?selig</word>
+                        <word>schn?selniveau</word>
+                        <word>schob</word>
+                        <word>schoben</word>
+                        <word>schomal</word>
+                        <word>schonbez?_g</word>
+                        <word>schonn</word>
+                        <word>schooeeeen</word>
+                        <word>schraubenzieh</word>
+                        <word>schraubst</word>
+                        <word>schreckt</word>
+                        <word>schrei</word>
+                        <word>schreibend</word>
+                        <word>schreibrecht</word>
+                        <word>schreibtisch</word>
+                        <word>schreibtischlad</word>
+                        <word>schreibvorgang</word>
+                        <word>schrein</word>
+                        <word>schreitet</word>
+                        <word>schriftarten</word>
+                        <word>schriftbild</word>
+                        <word>schriftlich</word>
+                        <word>schriftstueck</word>
+                        <word>schriftverkehr</word>
+                        <word>schriftz?_gen</word>
+                        <word>schrill</word>
+                        <word>schrottig</word>
+                        <word>schr?_?der</word>
+                        <word>schr?�nkt</word>
+                        <word>schuenemann</word>
+                        <word>schuf</word>
+                        <word>schultern</word>
+                        <word>schultz</word>
+                        <word>schutzklausel</word>
+                        <word>schutzsoftwar</word>
+                        <word>schwachpunkt</word>
+                        <word>schwachsinnigen</word>
+                        <word>schwaecher</word>
+                        <word>schwandtner@uni-mainz.de</word>
+                        <word>schwankend</word>
+                        <word>schwarzem</word>
+                        <word>schwarzfunken</word>
+                        <word>schwarzkamp</word>
+                        <word>schwedisch</word>
+                        <word>schweif</word>
+                        <word>schweigend</word>
+                        <word>schwerwiegend</word>
+                        <word>schwerwiegendem</word>
+                        <word>schwiegervat</word>
+                        <word>schwierigeren</word>
+                        <word>schw?�cher</word>
+                        <word>schw?�rmen</word>
+                        <word>schw?ren</word>
+                        <word>sch?_?n</word>
+                        <word>sch?_?ne</word>
+                        <word>sch?�digt</word>
+                        <word>sch?�digung</word>
+                        <word>sch?�dlich</word>
+                        <word>sch?�rfe</word>
+                        <word>sch?neren</word>
+                        <word>sch?nreden</word>
+                        <word>sch?_tze</word>
+                        <word>sch?_tzt</word>
+                        <word>scientif</word>
+                        <word>scnr???_</word>
+                        <word>scotland</word>
+                        <word>screw</word>
+                        <word>scripten</word>
+                        <word>scriptfehl</word>
+                        <word>sculli</word>
+                        <word>sdc_p=po1026937fcl0s5mnu&</word>
+                        <word>sdp</word>
+                        <word>sechst</word>
+                        <word>sed</word>
+                        <word>segeln</word>
+                        <word>segen</word>
+                        <word>sehnend</word>
+                        <word>sehnsucht</word>
+                        <word>seinerzeit</word>
+                        <word>seither</word>
+                        <word>seitlch</word>
+                        <word>seitlich</word>
+                        <word>sekundengenau</word>
+                        <word>sekund?�r</word>
+                        <word>selbigen</word>
+                        <word>selbsternannten</word>
+                        <word>selbstklebend</word>
+                        <word>selbstleuchtend</word>
+                        <word>selbstst?�ndig</word>
+                        <word>selbsttest</word>
+                        <word>selbstverst?�ndlichkeiten</word>
+                        <word>selektieren</word>
+                        <word>selfdestruct</word>
+                        <word>seltenen</word>
+                        <word>seltsamsten</word>
+                        <word>semaf</word>
+                        <word>semamago</word>
+                        <word>semiotik</word>
+                        <word>semk</word>
+                        <word>sendeeinheit</word>
+                        <word>sendefrequenz</word>
+                        <word>sendend</word>
+                        <word>sendenden</word>
+                        <word>sendest</word>
+                        <word>sendest?�rk</word>
+                        <word>sendeversuch</word>
+                        <word>senior</word>
+                        <word>sensor</word>
+                        <word>sent</word>
+                        <word>sequenc</word>
+                        <word>serienger?�t</word>
+                        <word>serienm?�?_ig</word>
+                        <word>serva</word>
+                        <word>serversynchronis</word>
+                        <word>service@khelm.de</word>
+                        <word>setemoi</word>
+                        <word>sexualit?�t</word>
+                        <word>sgxujhrs2ytyaqcggekyywyuqiiauehskbajixtgia5owzwgsoojhlgc96ikhvijmeudirj6</word>
+                        <word>shield</word>
+                        <word>ship</word>
+                        <word>shoppen</word>
+                        <word>showtopic=9263&amp;hl=</word>
+                        <word>shutdown</word>
+                        <word>si</word>
+                        <word>sic</word>
+                        <word>sicherer</word>
+                        <word>sicherheitseinstellungen</word>
+                        <word>sicherheitskopien</word>
+                        <word>sicherheitskritisch</word>
+                        <word>sicherheitsvorkehrungen</word>
+                        <word>sicherungsadatei</word>
+                        <word>sicherungsdatei</word>
+                        <word>sicherungsdefinitionen</word>
+                        <word>sicherungsfunkt</word>
+                        <word>sicherungskopien</word>
+                        <word>sicherungsvorgang</word>
+                        <word>sichtbaren</word>
+                        <word>sichtverbindung</word>
+                        <word>sichtweis</word>
+                        <word>sid</word>
+                        <word>sidimecer</word>
+                        <word>sidiseba</word>
+                        <word>siedl</word>
+                        <word>siegel</word>
+                        <word>siem</word>
+                        <word>siemensger?_??t</word>
+                        <word>siemensmodel</word>
+                        <word>siemensseit</word>
+                        <word>siemensusb</word>
+                        <word>siemesn</word>
+                        <word>signalisierungsprofil</word>
+                        <word>sihc</word>
+                        <word>silli</word>
+                        <word>silosoc</word>
+                        <word>simbian</word>
+                        <word>simple_</word>
+                        <word>simplifi</word>
+                        <word>simplyfi</word>
+                        <word>simulieren</word>
+                        <word>simuliert</word>
+                        <word>simultan</word>
+                        <word>sinnentleerung</word>
+                        <word>sinnfrei</word>
+                        <word>sinnfreiheit</word>
+                        <word>sinnlosen</word>
+                        <word>sinuswellen</word>
+                        <word>sinvol</word>
+                        <word>sip</word>
+                        <word>sir</word>
+                        <word>sirabimecix</word>
+                        <word>sirenent?nen</word>
+                        <word>siteribego</word>
+                        <word>sitten</word>
+                        <word>sitzung</word>
+                        <word>sitzungen</word>
+                        <word>sk</word>
+                        <word>skepsi</word>
+                        <word>skeptisch</word>
+                        <word>skin</word>
+                        <word>skopas@tiscali.de</word>
+                        <word>skript</word>
+                        <word>skurril</word>
+                        <word>sl150</word>
+                        <word>sl1color</word>
+                        <word>sl42</word>
+                        <word>sl44</word>
+                        <word>sl740</word>
+                        <word>slavischen</word>
+                        <word>sleep</word>
+                        <word>slide</word>
+                        <word>slrndbl0qp.iq9.slim.post@gibsmir.csn.tu-chemnitz.d</word>
+                        <word>slrndc2fp5.e0g.slim.post@gibsmir.csn.tu-chemnitz.de</word>
+                        <word>slrndek25r.d94.slim.post@gibsmir.csn.tu-chemnitz.d</word>
+                        <word>slx</word>
+                        <word>smarphon</word>
+                        <word>smartkei</word>
+                        <word>smash</word>
+                        <word>smd</word>
+                        <word>sms</word>
+                        <word>snack</word>
+                        <word>snap</word>
+                        <word>snappermail</word>
+                        <word>snipe</word>
+                        <word>snipl</word>
+                        <word>snipp</word>
+                        <word>so'n</word>
+                        <word>soalng</word>
+                        <word>socamoxelag</word>
+                        <word>socket</word>
+                        <word>soda</word>
+                        <word>sodisibib</word>
+                        <word>sofortaustausch</word>
+                        <word>softwareabsturz</word>
+                        <word>softwarebasi</word>
+                        <word>softwaredownload</word>
+                        <word>softwaremaessig</word>
+                        <word>softwarest?�nden</word>
+                        <word>softwarevorschl?�gen</word>
+                        <word>software?�nderung</word>
+                        <word>sonderausstattung</word>
+                        <word>sonderedit</word>
+                        <word>sondermuel</word>
+                        <word>sonderprofil</word>
+                        <word>sonderz?_gen</word>
+                        <word>sonnig</word>
+                        <word>sonstigen</word>
+                        <word>sonstwo</word>
+                        <word>soost</word>
+                        <word>sore</word>
+                        <word>sorg</word>
+                        <word>soundwiedergab</word>
+                        <word>souvenir</word>
+                        <word>sowet</word>
+                        <word>soxiven</word>
+                        <word>soziologisch</word>
+                        <word>sozusagen</word>
+                        <word>so????n</word>
+                        <word>sp$</word>
+                        <word>space</word>
+                        <word>spaet</word>
+                        <word>spafford</word>
+                        <word>spalten</word>
+                        <word>spam-friedhof@onlinehome.de</word>
+                        <word>spam_juli2005@willms.info</word>
+                        <word>spanish</word>
+                        <word>spannend</word>
+                        <word>spannungsmess</word>
+                        <word>spannungsteil</word>
+                        <word>sparst</word>
+                        <word>spassvol</word>
+                        <word>spazieren</word>
+                        <word>spa?_?_</word>
+                        <word>specht@freesurf.ch</word>
+                        <word>specifi</word>
+                        <word>speicherbereich</word>
+                        <word>speicherfress</word>
+                        <word>speicherkapazit?�t</word>
+                        <word>speichermanag</word>
+                        <word>speicherort</word>
+                        <word>speichkart</word>
+                        <word>spelter</word>
+                        <word>spermien</word>
+                        <word>sperren</word>
+                        <word>spezialfal</word>
+                        <word>spezialforen</word>
+                        <word>spezialhalterung</word>
+                        <word>spezialvorschrift</word>
+                        <word>speziellem</word>
+                        <word>spezifikationen</word>
+                        <word>spezifisch</word>
+                        <word>spezifischen</word>
+                        <word>spiegel</word>
+                        <word>spiegelt</word>
+                        <word>spielregeln</word>
+                        <word>spigt</word>
+                        <word>spionag</word>
+                        <word>spitzenprodukt</word>
+                        <word>split</word>
+                        <word>splitter</word>
+                        <word>spontanen</word>
+                        <word>sport</word>
+                        <word>spottprei</word>
+                        <word>sprachfluss</word>
+                        <word>sprachkan</word>
+                        <word>sprachraum</word>
+                        <word>sprachvers</word>
+                        <word>sprachverst?�ndigung</word>
+                        <word>spread</word>
+                        <word>sprechanlag</word>
+                        <word>sprechzeit</word>
+                        <word>spritzwasserdichtung</word>
+                        <word>spritzwasserfest</word>
+                        <word>spr?_chen</word>
+                        <word>spr?_nge</word>
+                        <word>spuk</word>
+                        <word>spuren</word>
+                        <word>spyra</word>
+                        <word>spywar</word>
+                        <word>spzifisch</word>
+                        <word>sp?_??tsommer</word>
+                        <word>sp?�tsommer</word>
+                        <word>sp?_rbar</word>
+                        <word>sseatuabuhtict2half5l4op7zegmdqycsgwjyu4mkdyqghztktin1q3tfbzsersguqpntcz</word>
+                        <word>staedten</word>
+                        <word>staedter</word>
+                        <word>stahlbeton</word>
+                        <word>stahlplatt</word>
+                        <word>stammen</word>
+                        <word>stammkund</word>
+                        <word>stammten</word>
+                        <word>standardakku</word>
+                        <word>standardbauformen</word>
+                        <word>standardbildschirm</word>
+                        <word>standardisierungsgremium</word>
+                        <word>standardm?�ssig</word>
+                        <word>standardnumm</word>
+                        <word>standardpiepst?n</word>
+                        <word>standardspiel</word>
+                        <word>standardtext</word>
+                        <word>standardton</word>
+                        <word>standardumleitungsnumm</word>
+                        <word>standardverhalten</word>
+                        <word>standardvorgab</word>
+                        <word>standbild</word>
+                        <word>standbyverbrauch</word>
+                        <word>standort</word>
+                        <word>standpunkt</word>
+                        <word>stang</word>
+                        <word>starken</word>
+                        <word>starker</word>
+                        <word>starr</word>
+                        <word>startguthaben</word>
+                        <word>startup</word>
+                        <word>stati</word>
+                        <word>station?�r</word>
+                        <word>statisch</word>
+                        <word>statistisch</word>
+                        <word>stattdessen</word>
+                        <word>stattfindend</word>
+                        <word>stattgefunden</word>
+                        <word>statusberichten</word>
+                        <word>statusleist</word>
+                        <word>statusmeldung</word>
+                        <word>staubk?rnern</word>
+                        <word>std</word>
+                        <word>steel</word>
+                        <word>stefanmario@gmx.at</word>
+                        <word>stehr</word>
+                        <word>steig</word>
+                        <word>steigen</word>
+                        <word>steigst</word>
+                        <word>steinalt</word>
+                        <word>steinschlag</word>
+                        <word>stelo</word>
+                        <word>stereoheadset</word>
+                        <word>stern</word>
+                        <word>sternchen</word>
+                        <word>sternen</word>
+                        <word>sternenbild</word>
+                        <word>stesa</word>
+                        <word>steuererklaerung</word>
+                        <word>steuert</word>
+                        <word>steuerzeichen</word>
+                        <word>stichworten</word>
+                        <word>stichwortverzeichni</word>
+                        <word>sticker</word>
+                        <word>stieber</word>
+                        <word>stiefm?_tterlich</word>
+                        <word>stieg</word>
+                        <word>stielt</word>
+                        <word>stiften</word>
+                        <word>stiftung</word>
+                        <word>stifung</word>
+                        <word>stirbt</word>
+                        <word>stoeren</word>
+                        <word>stoert</word>
+                        <word>stoesst</word>
+                        <word>stoffteil</word>
+                        <word>stoiber</word>
+                        <word>stolen</word>
+                        <word>stomverbrauch</word>
+                        <word>sto?_d?�mpfung</word>
+                        <word>sto?_gesch?_tzt</word>
+                        <word>sto?_sich</word>
+                        <word>str</word>
+                        <word>strafanzeigen</word>
+                        <word>strafbar</word>
+                        <word>strafgeb?_hr</word>
+                        <word>straftat</word>
+                        <word>straftatbest?�nd</word>
+                        <word>straftaten</word>
+                        <word>strahlenbelastungen</word>
+                        <word>strassen</word>
+                        <word>strato</word>
+                        <word>stra?_e</word>
+                        <word>stra?_enbahn</word>
+                        <word>stra?_?_</word>
+                        <word>stra?_?_enbahn</word>
+                        <word>streck</word>
+                        <word>strehl</word>
+                        <word>streikt</word>
+                        <word>streit</word>
+                        <word>streng</word>
+                        <word>strengt</word>
+                        <word>streuung</word>
+                        <word>stripp</word>
+                        <word>strolchen</word>
+                        <word>stromaufnahm</word>
+                        <word>strombegrenzung</word>
+                        <word>stromm?�?_ig</word>
+                        <word>stromnetz</word>
+                        <word>stromsparen</word>
+                        <word>stromverbrauch</word>
+                        <word>stromversorgung</word>
+                        <word>strunck</word>
+                        <word>studieren</word>
+                        <word>studiert</word>
+                        <word>stueck</word>
+                        <word>stufenlo</word>
+                        <word>stuhl</word>
+                        <word>stummen</word>
+                        <word>stummprofil</word>
+                        <word>stummschalt</word>
+                        <word>stummschalterei</word>
+                        <word>stummtast</word>
+                        <word>stupid</word>
+                        <word>stur</word>
+                        <word>style</word>
+                        <word>stymmt</word>
+                        <word>st?_?ckchen</word>
+                        <word>st?_?rt</word>
+                        <word>st?_?rung</word>
+                        <word>st?_??rzt</word>
+                        <word>st?�dten</word>
+                        <word>st?�dtisch</word>
+                        <word>st?�rken</word>
+                        <word>st?�rksten</word>
+                        <word>st?ber</word>
+                        <word>st?hrend</word>
+                        <word>st?renden</word>
+                        <word>st?rger?�uschen</word>
+                        <word>st?_ckzahl</word>
+                        <word>st?_nde</word>
+                        <word>st?_tzt</word>
+                        <word>su</word>
+                        <word>suah</word>
+                        <word>subject=3dsend_me_your_public_kei</word>
+                        <word>subjectlin</word>
+                        <word>subjekt</word>
+                        <word>subvent</word>
+                        <word>subventionieren</word>
+                        <word>suchmaschin</word>
+                        <word>suchtipp</word>
+                        <word>suchwoertern</word>
+                        <word>sudomain</word>
+                        <word>sum</word>
+                        <word>sumerlechn</word>
+                        <word>summer</word>
+                        <word>summieren</word>
+                        <word>sung</word>
+                        <word>superbillich</word>
+                        <word>surf&email-pack</word>
+                        <word>suse</word>
+                        <word>suuuuuper</word>
+                        <word>sv42</word>
+                        <word>svbcqfiurj3q3xvpbva7uu6rclbx5kyf5vqlvdmc8sd1elkf00xbfinzhmkjcxmfwg4jbp60</word>
+                        <word>sven-schneider@gmx.de</word>
+                        <word>svenwantsnospam@yahoo.de</word>
+                        <word>svenwantsnospoam@yahoo.d</word>
+                        <word>svf7w96gzbng1jt3c6jcssmsawal4jvkhyimjqraaiqichfpica1no7is2xwgbcwzzstf970</word>
+                        <word>sw91</word>
+                        <word>sweetmorn</word>
+                        <word>swyl0f4qgj7zahe9uanl5radtojaryj7nxzwxk1q9b4u6107shsafvgwcasmiswamwcayt1p</word>
+                        <word>sx</word>
+                        <word>sx440</word>
+                        <word>sx445</word>
+                        <word>sychronisieren</word>
+                        <word>sympathischer</word>
+                        <word>synchen</word>
+                        <word>synchronisationspaket</word>
+                        <word>synchronisationsversuch</word>
+                        <word>synchronisierungsvorgang</word>
+                        <word>syncm?glichkeit</word>
+                        <word>syncstat</word>
+                        <word>synct</word>
+                        <word>synonym</word>
+                        <word>syntax</word>
+                        <word>synvhronisieren</word>
+                        <word>systemleist</word>
+                        <word>systemnachricht</word>
+                        <word>systemprogramm</word>
+                        <word>systemverhalten</word>
+                        <word>systemverzeichni</word>
+                        <word>szeneboard</word>
+                        <word>s?_??mtlicher</word>
+                        <word>s?_nde</word>
+                        <word>s?_ndenbock</word>
+                        <word>s?_?_er</word>
+                        <word>t.dursthoff@web.de</word>
+                        <word>t0yqezfyynvzdfyzmsszjmi2teeypo09vwpkkxrdyb8gztpmcmkqzgntby8jnl2lrevkcxco</word>
+                        <word>t191</word>
+                        <word>t230</word>
+                        <word>t28</word>
+                        <word>t68</word>
+                        <word>t86i</word>
+                        <word>t86ytkvyqeqyrveldubeuflszntst7zxwuotrjfkekl0cgoamikhbpnmjqrmccuprsirezpi</word>
+                        <word>tabastero@spamoff.de</word>
+                        <word>tabellarischen</word>
+                        <word>tabl</word>
+                        <word>tacacano</word>
+                        <word>tackl</word>
+                        <word>taetgksta9r8qq1jiirmm5aogg3jikfcegp5sk9ukqbut2rkqkibtgdjninrhantms5nia3b</word>
+                        <word>tagebuch</word>
+                        <word>tagelang</word>
+                        <word>tagesangab</word>
+                        <word>tagesgebrauch</word>
+                        <word>tagesordnung</word>
+                        <word>tageszeiten</word>
+                        <word>tageszulassung</word>
+                        <word>tagung</word>
+                        <word>tai</word>
+                        <word>taken</word>
+                        <word>talfahrt</word>
+                        <word>tamet</word>
+                        <word>tariffal</word>
+                        <word>tariflich</word>
+                        <word>tariftabel</word>
+                        <word>tarifumstellung</word>
+                        <word>taschenlampenfunkt</word>
+                        <word>taschenrechnern</word>
+                        <word>taskmanag</word>
+                        <word>tastaturbelegung</word>
+                        <word>tastaturverriegelung</word>
+                        <word>tastatusmatt</word>
+                        <word>tastenfolg</word>
+                        <word>tastenfunktionen</word>
+                        <word>tatsachen</word>
+                        <word>tauglichkeit</word>
+                        <word>tausenden</word>
+                        <word>taxi</word>
+                        <word>tcp</word>
+                        <word>tdc</word>
+                        <word>technicu</word>
+                        <word>techniqu</word>
+                        <word>technolog</word>
+                        <word>teilabgeschriebenem</word>
+                        <word>teilnehmerzahl</word>
+                        <word>teilthread</word>
+                        <word>telbuch</word>
+                        <word>telefion</word>
+                        <word>telefonanlagen</word>
+                        <word>telefonaten</word>
+                        <word>telefonbuchbearbeitung</word>
+                        <word>telefonbuchdaten</word>
+                        <word>telefonbucheintr?_??g</word>
+                        <word>telefonbuchtast</word>
+                        <word>telefoneintrag</word>
+                        <word>telefongespr?�chen</word>
+                        <word>telefonhardwar</word>
+                        <word>telefonierverhalten</word>
+                        <word>telefonieseit</word>
+                        <word>telefonino</word>
+                        <word>telefoninstallateur</word>
+                        <word>telefonkosten</word>
+                        <word>telefonladen</word>
+                        <word>telefonl?�den</word>
+                        <word>telefonmodellen</word>
+                        <word>telefonmonitor</word>
+                        <word>telefonnetz</word>
+                        <word>telefonnr</word>
+                        <word>telefonqualit?�ten</word>
+                        <word>telefonregist</word>
+                        <word>telefonsoftwar</word>
+                        <word>telefonsperr</word>
+                        <word>telefonzellen</word>
+                        <word>telekommunikationseinrichtungen</word>
+                        <word>telephonen</word>
+                        <word>tellerrand</word>
+                        <word>telli</word>
+                        <word>tem</word>
+                        <word>temperatur</word>
+                        <word>temperatursensoren</word>
+                        <word>tempo</word>
+                        <word>temporari</word>
+                        <word>tempratur</word>
+                        <word>tenor</word>
+                        <word>terminaleigenschaften</word>
+                        <word>terminalemul</word>
+                        <word>terminalprogramm</word>
+                        <word>terminkonflikthervorhebung</word>
+                        <word>terriern</word>
+                        <word>tesa</word>
+                        <word>testbild</word>
+                        <word>testet</word>
+                        <word>testkontakt</word>
+                        <word>testmust</word>
+                        <word>testverbindungen</word>
+                        <word>testwild@gmx.de</word>
+                        <word>testzeit</word>
+                        <word>teuerer</word>
+                        <word>teuerest</word>
+                        <word>teuersten</word>
+                        <word>teufel</word>
+                        <word>teunabh</word>
+                        <word>teureren</word>
+                        <word>textbereich</word>
+                        <word>texteditor</word>
+                        <word>texteingabemodi</word>
+                        <word>texten</word>
+                        <word>texterkennung</word>
+                        <word>textfeld</word>
+                        <word>textform</word>
+                        <word>textkonvertierung</word>
+                        <word>textmail</word>
+                        <word>theft</word>
+                        <word>themenblock</word>
+                        <word>theo</word>
+                        <word>they'r</word>
+                        <word>thilo</word>
+                        <word>threadid=10649&amp;sid=99992f2117f9a777dde1ed8a0c98931f</word>
+                        <word>threadid=143264&amp;page=1</word>
+                        <word>thronen</word>
+                        <word>thurrott</word>
+                        <word>tibonof</word>
+                        <word>ticicina</word>
+                        <word>tiefentladung</word>
+                        <word>tiefgarag</word>
+                        <word>tiefschl?�g</word>
+                        <word>tieh</word>
+                        <word>tierisch</word>
+                        <word>tiger</word>
+                        <word>tigern</word>
+                        <word>tight</word>
+                        <word>timuvumif</word>
+                        <word>tino</word>
+                        <word>tippfehl</word>
+                        <word>tippselt</word>
+                        <word>tippt</word>
+                        <word>tipptast</word>
+                        <word>tiradaya</word>
+                        <word>tirelep</word>
+                        <word>tischlad</word>
+                        <word>titelseit</word>
+                        <word>tjbakg5hbojjagpu04yxmqfyoivbgfwktjsbppfiaqrmk04sctmzfnyjm5imbssdguaxkci9</word>
+                        <word>tl</word>
+                        <word>tobi</word>
+                        <word>tobias.weller@nurfuerspam.de</word>
+                        <word>tobisatora</word>
+                        <word>tocobadec</word>
+                        <word>toedlich</word>
+                        <word>toi</word>
+                        <word>tolerierbar</word>
+                        <word>tolkien</word>
+                        <word>toller</word>
+                        <word>tom2000@web.de</word>
+                        <word>tomblin</word>
+                        <word>tomtom@nospam.de</word>
+                        <word>tonn</word>
+                        <word>topf</word>
+                        <word>topf?_hler</word>
+                        <word>topp</word>
+                        <word>totalabsturz</word>
+                        <word>totalausfal</word>
+                        <word>totalaustausch</word>
+                        <word>totgehofften</word>
+                        <word>tour</word>
+                        <word>toyesixi</word>
+                        <word>track</word>
+                        <word>tracktiert</word>
+                        <word>trade</word>
+                        <word>trainieren</word>
+                        <word>transformlist</word>
+                        <word>translat</word>
+                        <word>transmiss</word>
+                        <word>transp</word>
+                        <word>transportier</word>
+                        <word>transvosg</word>
+                        <word>trappeln</word>
+                        <word>trauben</word>
+                        <word>traue</word>
+                        <word>trauer</word>
+                        <word>trauf</word>
+                        <word>traumhaft</word>
+                        <word>trayappl</word>
+                        <word>treat</word>
+                        <word>treffend</word>
+                        <word>treibersoftwar</word>
+                        <word>treibervers</word>
+                        <word>treibt</word>
+                        <word>trial</word>
+                        <word>trio</word>
+                        <word>trixi</word>
+                        <word>trocken</word>
+                        <word>trockenen</word>
+                        <word>trockengewischt</word>
+                        <word>trocker</word>
+                        <word>trolli</word>
+                        <word>trotzki</word>
+                        <word>trs_en_de_bg-bg_et-ee_lv-lv_lt-lt_ro_ru-ru_uk-ua_.jar</word>
+                        <word>truetsch</word>
+                        <word>trycktil</word>
+                        <word>tr?�ge</word>
+                        <word>tr?�gheit</word>
+                        <word>tr?�nkenwagen</word>
+                        <word>tr?�ume</word>
+                        <word>tr?dler</word>
+                        <word>tr?_ben</word>
+                        <word>tr?_gerischen</word>
+                        <word>tschechisch</word>
+                        <word>tschudlig</word>
+                        <word>tsch?</word>
+                        <word>tstrehl@germanynet.de</word>
+                        <word>tt</word>
+                        <word>tt3</word>
+                        <word>ttn</word>
+                        <word>tuch</word>
+                        <word>tuen</word>
+                        <word>tune</word>
+                        <word>tunlichst</word>
+                        <word>turn</word>
+                        <word>tussi</word>
+                        <word>tust</word>
+                        <word>tv</word>
+                        <word>twc6exfswiosors2fnt9qmhxxllwi5qu1dshjpjhfwxxy4mvxawsueritvdgtm7eaffoz70n</word>
+                        <word>twdggdomofdm0ymktsczaobjoawjruh1gimuv9dygxiigim06sgsix6uony7vxogdn0zwr8i</word>
+                        <word>twzciyqesydhjsdwt6mptqn9dghznahwlckoqcdfyoe1cj8o7yvsor6k5uxadg2metwiijfu</word>
+                        <word>typischen</word>
+                        <word>tze</word>
+                        <word>t?_?ne</word>
+                        <word>t?_cke</word>
+                        <word>t?_rglocken</word>
+                        <word>t?_rsprechstellen</word>
+                        <word>uah</word>
+                        <word>udat</word>
+                        <word>udp</word>
+                        <word>ue</word>
+                        <word>ueberfordert</word>
+                        <word>ueberlegt</word>
+                        <word>ueberlegung</word>
+                        <word>uebersehen</word>
+                        <word>ugspvscqrgmad1ds6fxrmgpjnxegullydabh2isnxdkfujkjw5rdojrva1cf1rgay7ehsfu</word>
+                        <word>uhren</word>
+                        <word>uhrenabgleich</word>
+                        <word>uhrenhintergrund</word>
+                        <word>uhs</word>
+                        <word>uhu</word>
+                        <word>ui</word>
+                        <word>uii</word>
+                        <word>uiuiui</word>
+                        <word>ulk</word>
+                        <word>umbelgt</word>
+                        <word>umbringen</word>
+                        <word>umbr?_ch</word>
+                        <word>umeleitung</word>
+                        <word>umelitung</word>
+                        <word>umgebaut</word>
+                        <word>umgebend</word>
+                        <word>umgebogen</word>
+                        <word>umgedeutet</word>
+                        <word>umgeh</word>
+                        <word>umgehend</word>
+                        <word>umgehung</word>
+                        <word>umgelenkt</word>
+                        <word>umgeschaut</word>
+                        <word>umgew?hnung</word>
+                        <word>umgezogen</word>
+                        <word>umlauf</word>
+                        <word>umleit</word>
+                        <word>umleitet</word>
+                        <word>umleitungseinstellungen</word>
+                        <word>umleitungslotteri</word>
+                        <word>umleitungsquatsch</word>
+                        <word>umm</word>
+                        <word>umrechnen</word>
+                        <word>umruestung</word>
+                        <word>umr?_stung</word>
+                        <word>umsatzabfrag</word>
+                        <word>umschaltung</word>
+                        <word>umschreiben</word>
+                        <word>umso</word>
+                        <word>umstaendlich</word>
+                        <word>umsteck</word>
+                        <word>umsteigern</word>
+                        <word>umstellt</word>
+                        <word>umst?�nd</word>
+                        <word>umtausch</word>
+                        <word>umtauschaktionen</word>
+                        <word>umtauschen</word>
+                        <word>umtauschgrund</word>
+                        <word>umwelteinfl?_ssen</word>
+                        <word>umzingelt</word>
+                        <word>umzubelegen</word>
+                        <word>umzubenennen</word>
+                        <word>umzug</word>
+                        <word>umzupolen</word>
+                        <word>umzusetzen</word>
+                        <word>umzustricken</word>
+                        <word>unabh?_??ngig</word>
+                        <word>unansehnlich</word>
+                        <word>unbeaufsichtigt</word>
+                        <word>unbedeutend</word>
+                        <word>unbedienbar</word>
+                        <word>unbegreiflich</word>
+                        <word>unbekanntem</word>
+                        <word>unbelegt</word>
+                        <word>unbenutzbarkeit</word>
+                        <word>unbequem</word>
+                        <word>unberechtigterweis</word>
+                        <word>unber?_hrt</word>
+                        <word>unbeschadet</word>
+                        <word>unbestimmt</word>
+                        <word>unbestritten</word>
+                        <word>unbest?�tigt</word>
+                        <word>unbeweglich</word>
+                        <word>unbrand</word>
+                        <word>unbrauchbarem</word>
+                        <word>unc</word>
+                        <word>unclesam@gmx.com</word>
+                        <word>unclesam@gmx.com</word>
+                        <word>uncool</word>
+                        <word>underlin</word>
+                        <word>undicht</word>
+                        <word>unertr?�glich</word>
+                        <word>unerw?_nschten</word>
+                        <word>unfalldetail</word>
+                        <word>unfreiwillig</word>
+                        <word>unfreundlich</word>
+                        <word>unfreundlichen</word>
+                        <word>unfruchtbarkeit</word>
+                        <word>unf?�ll</word>
+                        <word>ung</word>
+                        <word>ungarn</word>
+                        <word>ungebremst</word>
+                        <word>ungeduld</word>
+                        <word>ungef?�hren</word>
+                        <word>ungef?�hrlich</word>
+                        <word>ungef?�hrlichkeit</word>
+                        <word>ungeheu</word>
+                        <word>ungehindert</word>
+                        <word>ungelesenen</word>
+                        <word>ungen?_genden</word>
+                        <word>ungeschickt</word>
+                        <word>ungesch?_tzt</word>
+                        <word>ungewiss</word>
+                        <word>ungewohnten</word>
+                        <word>unglaubw?_rdig</word>
+                        <word>ungleichm?�?_ig</word>
+                        <word>unhip</word>
+                        <word>uni</word>
+                        <word>unicod</word>
+                        <word>uninformiert</word>
+                        <word>uninstal</word>
+                        <word>universum</word>
+                        <word>unix</word>
+                        <word>unkaputtbar</word>
+                        <word>unkenntlich</word>
+                        <word>unklar</word>
+                        <word>unknown</word>
+                        <word>unkoordiniert</word>
+                        <word>unleserlich</word>
+                        <word>unlockt</word>
+                        <word>unlogik</word>
+                        <word>unmisverst?�ndlich</word>
+                        <word>unmut</word>
+                        <word>unm?glichen</word>
+                        <word>unnorm</word>
+                        <word>unnutzbar</word>
+                        <word>unn?_tzer</word>
+                        <word>unoriginel</word>
+                        <word>unrechtm?�?_ig</word>
+                        <word>unrechtm?�?_igen</word>
+                        <word>unregelmaessigen</word>
+                        <word>unrichtig</word>
+                        <word>unschuldig</word>
+                        <word>unschwer</word>
+                        <word>unsch?�rfer</word>
+                        <word>unserem</word>
+                        <word>unseren</word>
+                        <word>unsich</word>
+                        <word>unsicherer</word>
+                        <word>unsinnigerweis</word>
+                        <word>unst</word>
+                        <word>unstrukturiert</word>
+                        <word>unstrukturierten</word>
+                        <word>untaugichen</word>
+                        <word>unterbindung</word>
+                        <word>unterbrochen</word>
+                        <word>unterdr?_cken</word>
+                        <word>untereinand</word>
+                        <word>untereintrag</word>
+                        <word>unterfangen</word>
+                        <word>unterfordert</word>
+                        <word>unterhalb</word>
+                        <word>unterlassung</word>
+                        <word>unterlassungen</word>
+                        <word>unternimmt</word>
+                        <word>unterrichtet</word>
+                        <word>unterschl?�gt</word>
+                        <word>unterschl?_ssel</word>
+                        <word>unterstrichen</word>
+                        <word>unterst?_??tzt</word>
+                        <word>unterst?_tztem</word>
+                        <word>unterwerfen</word>
+                        <word>unterworfen</word>
+                        <word>unterzogen</word>
+                        <word>untrust</word>
+                        <word>unverf?�nglich</word>
+                        <word>unverh?�ltnism?�?_ig</word>
+                        <word>unversch?�mtheit</word>
+                        <word>unversch?�mtheiten</word>
+                        <word>unverst?�ndni</word>
+                        <word>unver?�nderbar</word>
+                        <word>unver?�ndert</word>
+                        <word>unvis</word>
+                        <word>unwahrscheinlichen</word>
+                        <word>unweigerlich</word>
+                        <word>unwirksam</word>
+                        <word>unwork</word>
+                        <word>unzweifelsfrei</word>
+                        <word>unz?_??hligen</word>
+                        <word>un?tig</word>
+                        <word>updatebar</word>
+                        <word>upged</word>
+                        <word>upgegradet</word>
+                        <word>upload</word>
+                        <word>upp</word>
+                        <word>uptod</word>
+                        <word>ur</word>
+                        <word>uralten</word>
+                        <word>uranisch</word>
+                        <word>uriv9imafkmkmeru3ulkgmoqabqsxalytmson3et6lbl04usbmtv11u4g8n6a8lpfs7dcbl</word>
+                        <word>urlaubsbildern</word>
+                        <word>urn</word>
+                        <word>ursprungsmail</word>
+                        <word>ursprungspost</word>
+                        <word>urspr?_??nglich</word>
+                        <word>urspr?_nglichen</word>
+                        <word>urs?�chlich</word>
+                        <word>urteilst</word>
+                        <word>usb\vid_0815&pid_0100&mi_00</word>
+                        <word>usenet8951</word>
+                        <word>usenet@datenhamster.org</word>
+                        <word>usenet@tobiasnissen.de</word>
+                        <word>usenetbox@jet2web.cc</word>
+                        <word>usenetbox@jet2web.cc</word>
+                        <word>usern</word>
+                        <word>usim</word>
+                        <word>usp</word>
+                        <word>usual</word>
+                        <word>uswi</word>
+                        <word>ut</word>
+                        <word>uti</word>
+                        <word>utmfrjueijpahnvxjaeqbuvvxjung4ek8ioflrvyr6ty8sm5tgfaq7idopc9h61eidkrp5bq</word>
+                        <word>uwedoern</word>
+                        <word>uwg</word>
+                        <word>v1050</word>
+                        <word>v19</word>
+                        <word>v23</word>
+                        <word>v3688</word>
+                        <word>v52</word>
+                        <word>v560</word>
+                        <word>v5pgb1p73l8p66bh7013cjn69fn9f2dba2@4ax.com</word>
+                        <word>v600</word>
+                        <word>v620</word>
+                        <word>v66i</word>
+                        <word>v800</word>
+                        <word>vamefi</word>
+                        <word>variabl</word>
+                        <word>variieren</word>
+                        <word>vawotor</word>
+                        <word>vdo</word>
+                        <word>vdr</word>
+                        <word>vegetari</word>
+                        <word>venosa</word>
+                        <word>verabreicht</word>
+                        <word>verallgemeinerungen</word>
+                        <word>veranlasst</word>
+                        <word>veranschlagt</word>
+                        <word>veranstalt</word>
+                        <word>verantwortlichen</word>
+                        <word>verantwortlichkeit</word>
+                        <word>verarbeiten</word>
+                        <word>verarbeitet</word>
+                        <word>verarbeitungsqualit?�t</word>
+                        <word>verbal</word>
+                        <word>verbesserten</word>
+                        <word>verbindest</word>
+                        <word>verbleiben</word>
+                        <word>verbracht</word>
+                        <word>verbreitet</word>
+                        <word>verbring</word>
+                        <word>verbugt</word>
+                        <word>verdachtsmo</word>
+                        <word>verdeutlichung</word>
+                        <word>verdienst</word>
+                        <word>verdonner</word>
+                        <word>verdrahtung</word>
+                        <word>verdruss</word>
+                        <word>verdunkeln</word>
+                        <word>verdunkelt</word>
+                        <word>verd?�chtig</word>
+                        <word>verd?�chtigungen</word>
+                        <word>vereinbarung</word>
+                        <word>vereinfacht</word>
+                        <word>vereinfachung</word>
+                        <word>vereinigten</word>
+                        <word>verfassen</word>
+                        <word>verfasst</word>
+                        <word>verfassung</word>
+                        <word>verfolgung</word>
+                        <word>verfuegbarkeit</word>
+                        <word>verfusselt</word>
+                        <word>verf?_??gbaren</word>
+                        <word>verf?_??gbarkeit</word>
+                        <word>verf?�lschten</word>
+                        <word>vergangen</word>
+                        <word>vergangenheit</word>
+                        <word>vergewissert</word>
+                        <word>vergiessen</word>
+                        <word>vergiss</word>
+                        <word>vergi?_</word>
+                        <word>vergleichszeitraum</word>
+                        <word>vergn?_gen</word>
+                        <word>vergr?ssert</word>
+                        <word>verhandlungen</word>
+                        <word>verharmlosen</word>
+                        <word>verheddert</word>
+                        <word>verheiratet</word>
+                        <word>verh?�ltniss</word>
+                        <word>verifi</word>
+                        <word>verin</word>
+                        <word>verison</word>
+                        <word>verkaufsofferten</word>
+                        <word>verkaufsshop</word>
+                        <word>verkaufssumm</word>
+                        <word>verkaufszahlen</word>
+                        <word>verkehrsfunknachrichten</word>
+                        <word>verkehrt</word>
+                        <word>verkloppt</word>
+                        <word>verkn?_pft</word>
+                        <word>verkn?_pfungen</word>
+                        <word>verkrampfen</word>
+                        <word>verkrueppelt</word>
+                        <word>verk?_??uf</word>
+                        <word>verk?_ndend</word>
+                        <word>verk?_rzten</word>
+                        <word>verlang</word>
+                        <word>verlangst</word>
+                        <word>verlauten</word>
+                        <word>verleiten</word>
+                        <word>verliebt</word>
+                        <word>verlief</word>
+                        <word>verlie?_</word>
+                        <word>verlinkt</word>
+                        <word>verlinkten</word>
+                        <word>verlor</word>
+                        <word>verlorenen</word>
+                        <word>verlorenst</word>
+                        <word>verl?�ngerung</word>
+                        <word>verl?�ngerungskabel</word>
+                        <word>verl?�sst</word>
+                        <word>vermarktet</word>
+                        <word>vermeidet</word>
+                        <word>vermeintlichen</word>
+                        <word>vermieten</word>
+                        <word>verm?gen</word>
+                        <word>verm?gensvorteil</word>
+                        <word>vernachlaessigen</word>
+                        <word>verneinen</word>
+                        <word>vernunft</word>
+                        <word>verordnungen</word>
+                        <word>verpackungen</word>
+                        <word>verpassten</word>
+                        <word>verpflichtungen</word>
+                        <word>verquer</word>
+                        <word>verquickung</word>
+                        <word>verrechnet</word>
+                        <word>verrechnung</word>
+                        <word>verringern</word>
+                        <word>verrissen</word>
+                        <word>verrutschen</word>
+                        <word>versandgeb?_hren</word>
+                        <word>versandkostenzuschlag</word>
+                        <word>versandt</word>
+                        <word>verschaffen</word>
+                        <word>verschieb</word>
+                        <word>verschiedensten</word>
+                        <word>verschienden</word>
+                        <word>verschimmeln</word>
+                        <word>verschlafen</word>
+                        <word>verschlusshebel</word>
+                        <word>verschl?_sselung</word>
+                        <word>verschmerzen</word>
+                        <word>verschob</word>
+                        <word>verschobenen</word>
+                        <word>verschrauben</word>
+                        <word>verschwand</word>
+                        <word>verschwei?_ten</word>
+                        <word>verschw?rungstheorien</word>
+                        <word>versieht</word>
+                        <word>versionsangaben</word>
+                        <word>versorgung</word>
+                        <word>verspielten</word>
+                        <word>verspricht</word>
+                        <word>verstaendlich</word>
+                        <word>verstauen</word>
+                        <word>verstellbar</word>
+                        <word>versto?_</word>
+                        <word>verstrichen</word>
+                        <word>verstummen</word>
+                        <word>verst??_t</word>
+                        <word>verst?_mmelt</word>
+                        <word>verteilerkasten</word>
+                        <word>verteilerlist</word>
+                        <word>verteilt</word>
+                        <word>vertik</word>
+                        <word>vertragsablauf</word>
+                        <word>vertragsabschluss</word>
+                        <word>vertragsabschlu?_</word>
+                        <word>vertragsverh?�ltni</word>
+                        <word>vertragsverl?�ngerungsangebot</word>
+                        <word>vertrau</word>
+                        <word>vertreiben</word>
+                        <word>vertreibt</word>
+                        <word>vertret</word>
+                        <word>vertr?�gt</word>
+                        <word>verusacht</word>
+                        <word>verwaltungszeichen</word>
+                        <word>verwandt</word>
+                        <word>verwechest</word>
+                        <word>verwechsleret</word>
+                        <word>verwechslung</word>
+                        <word>verweigerung</word>
+                        <word>verweilt</word>
+                        <word>verwerfen</word>
+                        <word>verwertbaren</word>
+                        <word>verwiesen</word>
+                        <word>verwirkt</word>
+                        <word>verwirrend</word>
+                        <word>verzehrt</word>
+                        <word>verzieren</word>
+                        <word>verzoegert</word>
+                        <word>verzoegerung</word>
+                        <word>verzweifel</word>
+                        <word>verzweiflung</word>
+                        <word>verzweigung</word>
+                        <word>verzwickt</word>
+                        <word>verz?gert</word>
+                        <word>verz?_ckt</word>
+                        <word>ver?�nderbar</word>
+                        <word>ver?�nderbarkeit</word>
+                        <word>ver?�nderungen</word>
+                        <word>ver?�u?_ern</word>
+                        <word>vetr?�gt</word>
+                        <word>vewutiruvuh</word>
+                        <word>vga</word>
+                        <word>viamichelin</word>
+                        <word>viausb</word>
+                        <word>vibramotor</word>
+                        <word>vibrationsmotor</word>
+                        <word>videoaufnahmen</word>
+                        <word>videoqualit?�t</word>
+                        <word>viedeo</word>
+                        <word>vieler</word>
+                        <word>vielerlei</word>
+                        <word>vielmal</word>
+                        <word>vielmehr</word>
+                        <word>vieltelefonier</word>
+                        <word>viert</word>
+                        <word>vietelefonier</word>
+                        <word>viewitem&category=24010&item=6409732511</word>
+                        <word>viewitem&item=6401819203</word>
+                        <word>viewitem&item=7540266050</word>
+                        <word>vihifix</word>
+                        <word>viiiiel</word>
+                        <word>viiiiiiiiiielen</word>
+                        <word>vim</word>
+                        <word>vin</word>
+                        <word>viorgeschlagen</word>
+                        <word>virenfrei</word>
+                        <word>virengefahr</word>
+                        <word>visa</word>
+                        <word>visibl</word>
+                        <word>visitenkart</word>
+                        <word>visitkarten</word>
+                        <word>visualisierung</word>
+                        <word>viva</word>
+                        <word>vk</word>
+                        <word>vodafol</word>
+                        <word>vodafoneleut</word>
+                        <word>vodkamann</word>
+                        <word>vodoofon</word>
+                        <word>voicedial</word>
+                        <word>voil?�</word>
+                        <word>voiw1pxnrbrlw1gh3ozbr5ibzyqkkafwh1zvwbl21olit37umktftqzxbybdfusczammage0</word>
+                        <word>vokabel</word>
+                        <word>volksmund</word>
+                        <word>vollast</word>
+                        <word>vollidioten</word>
+                        <word>vollmond</word>
+                        <word>vollmundig</word>
+                        <word>vollst</word>
+                        <word>vollzitat</word>
+                        <word>vollzitiererei</word>
+                        <word>voltag</word>
+                        <word>voltair</word>
+                        <word>vorangetrieben</word>
+                        <word>vorank?_ndigungen</word>
+                        <word>voraussetzt</word>
+                        <word>vorauszusagen</word>
+                        <word>vorbehalt</word>
+                        <word>vorbeibekommen</word>
+                        <word>vorbeigeht</word>
+                        <word>vorbeigeschaut</word>
+                        <word>vorbeikommen</word>
+                        <word>vorbeikommt</word>
+                        <word>vorbereitung</word>
+                        <word>vorbestellen</word>
+                        <word>vorbeugend</word>
+                        <word>voreingegeben</word>
+                        <word>voreingestellten</word>
+                        <word>vorenth?�lt</word>
+                        <word>vorfahrtstrass</word>
+                        <word>vorfeld</word>
+                        <word>vorgaukelt</word>
+                        <word>vorgedudelt</word>
+                        <word>vorgef?_hrt</word>
+                        <word>vorgegangen</word>
+                        <word>vorgehendweis</word>
+                        <word>vorgeschlagenen</word>
+                        <word>vorgestellt</word>
+                        <word>vorgewagt</word>
+                        <word>vorhandensein</word>
+                        <word>vorinstal</word>
+                        <word>vorjahr</word>
+                        <word>vorkommend</word>
+                        <word>vorletzt</word>
+                        <word>vorlieben</word>
+                        <word>vorl?�ufermodel</word>
+                        <word>vornedran</word>
+                        <word>vornehm</word>
+                        <word>vorprodukt</word>
+                        <word>vorschlaeg</word>
+                        <word>vorschlagen</word>
+                        <word>vorschriftsm?�ssigen</word>
+                        <word>vorsehen</word>
+                        <word>vorsichtigem</word>
+                        <word>vorsichtsma?_?_nahmen</word>
+                        <word>vorspiegelung</word>
+                        <word>vorstellbar</word>
+                        <word>vors?�tzlich</word>
+                        <word>vorteol</word>
+                        <word>vortragen</word>
+                        <word>vortritt</word>
+                        <word>vort?�uschen</word>
+                        <word>vorwerfen</word>
+                        <word>vorzeigen</word>
+                        <word>vorzeit</word>
+                        <word>vorzugeben</word>
+                        <word>vorz?_glich</word>
+                        <word>vor?_ber</word>
+                        <word>vsqnxz074aswrgm524jj0fjftm7ciu4v5ococlwc5q38nmtvxd01naif4cjvbj86qro2xcet</word>
+                        <word>vstich@sofort-mail.de</word>
+                        <word>vt</word>
+                        <word>vtbxw7yirdr2otk4x2oq7zg7sds06lycoxaqkdemfdvmccjtsdb1lracoi4otqvl9jeu40hb</word>
+                        <word>vtdvhsr5vnzuc9qgfdlgpc1gn8ysdj966itjapnzslovssvjhi3y55pjvqwg1wdgzquw</word>
+                        <word>vulkanschwarz</word>
+                        <word>vv</word>
+                        <word>v?_?lligen</word>
+                        <word>v?llst?�ndig</word>
+                        <word>v?lp</word>
+                        <word>w2ksp3</word>
+                        <word>w95</word>
+                        <word>w=fcrd</word>
+                        <word>waagie1981@arcor.de</word>
+                        <word>wab</word>
+                        <word>wackelig</word>
+                        <word>wackelkontakt</word>
+                        <word>wackelnd</word>
+                        <word>waehlerei</word>
+                        <word>waeren</word>
+                        <word>waffen</word>
+                        <word>wagt</word>
+                        <word>wahlsieg</word>
+                        <word>wahrer</word>
+                        <word>wahrgenommen</word>
+                        <word>wahrlo</word>
+                        <word>wahrsch</word>
+                        <word>wait</word>
+                        <word>waldspaziergang</word>
+                        <word>wandeln</word>
+                        <word>want</word>
+                        <word>wapovergpr</word>
+                        <word>wapverbindungen</word>
+                        <word>war`</word>
+                        <word>warnungen</word>
+                        <word>wasch^w</word>
+                        <word>wasserschaden</word>
+                        <word>wassertropfen</word>
+                        <word>wasserversorgung</word>
+                        <word>water</word>
+                        <word>watscheneinfach</word>
+                        <word>watson</word>
+                        <word>wdcma</word>
+                        <word>weak</word>
+                        <word>webadress</word>
+                        <word>weboberfl?�ch</word>
+                        <word>webpag</word>
+                        <word>webster</word>
+                        <word>websuch</word>
+                        <word>wechner</word>
+                        <word>wechseldatentr?�g</word>
+                        <word>wechselsprechen</word>
+                        <word>wechseltag</word>
+                        <word>wedbrwxjjnbh7ilsncjyadt0a1wttukeimknajdzqrojpsxygktmgqpvekdtt2jswmusadpa</word>
+                        <word>wegbekam</word>
+                        <word>wegdr?_ckst</word>
+                        <word>weggebracht</word>
+                        <word>weggedr?_ckt</word>
+                        <word>weggeht</word>
+                        <word>weggelassen</word>
+                        <word>weghaengt</word>
+                        <word>wegschwimmen</word>
+                        <word>wegspeichern</word>
+                        <word>wegwerfen</word>
+                        <word>wegwerfkart</word>
+                        <word>wegzubekommen</word>
+                        <word>wehe</word>
+                        <word>wehren</word>
+                        <word>wehret</word>
+                        <word>weia</word>
+                        <word>weich</word>
+                        <word>weichen</word>
+                        <word>weidlich</word>
+                        <word>weilchen</word>
+                        <word>weisen</word>
+                        <word>weiterbearbeiten</word>
+                        <word>weiterbenutzen</word>
+                        <word>weiterbesteht</word>
+                        <word>weiterbilden</word>
+                        <word>weiterentwickelt</word>
+                        <word>weiterf?_hrenden</word>
+                        <word>weitergebracht</word>
+                        <word>weitergehend</word>
+                        <word>weitergeholfen</word>
+                        <word>weitergeleitet</word>
+                        <word>weitern</word>
+                        <word>weiterversenden</word>
+                        <word>weiterverwenden</word>
+                        <word>wellenform</word>
+                        <word>weltkonzern</word>
+                        <word>weltweiten</word>
+                        <word>wenigisten</word>
+                        <word>wenngleich</word>
+                        <word>wennich</word>
+                        <word>werbespruch</word>
+                        <word>werbetext</word>
+                        <word>werbung@</word>
+                        <word>werdden</word>
+                        <word>werdend</word>
+                        <word>werksgaranti</word>
+                        <word>werksseitigen</word>
+                        <word>werkszustand</word>
+                        <word>werkzeugmaschinen</word>
+                        <word>wernerkick@t-online.de</word>
+                        <word>wertigkeit</word>
+                        <word>wertvol</word>
+                        <word>wettbewerbsverzerrung</word>
+                        <word>wetterst</word>
+                        <word>whiskyfan</word>
+                        <word>wich</word>
+                        <word>widcommtreib</word>
+                        <word>wide</word>
+                        <word>wideangl</word>
+                        <word>wider</word>
+                        <word>widerrufen</word>
+                        <word>widersprechen</word>
+                        <word>widerwilleg</word>
+                        <word>widerwillig</word>
+                        <word>wiederfinden</word>
+                        <word>wiederherstellt</word>
+                        <word>wiederholbar</word>
+                        <word>wiederholend</word>
+                        <word>wiederholung</word>
+                        <word>wiederholungsfunktionen</word>
+                        <word>wiederzufinden</word>
+                        <word>wiemann</word>
+                        <word>wife</word>
+                        <word>wildbahn</word>
+                        <word>wilk</word>
+                        <word>wimmelt</word>
+                        <word>win2000</word>
+                        <word>win98</word>
+                        <word>winamp</word>
+                        <word>windoof</word>
+                        <word>windowseigenen</word>
+                        <word>winfoni</word>
+                        <word>winppc2003</word>
+                        <word>wintermute_101_nospam@yahoo.de</word>
+                        <word>winterschlaf</word>
+                        <word>winxp_sp2</word>
+                        <word>wirklicj</word>
+                        <word>wirkungslo</word>
+                        <word>wirs</word>
+                        <word>wiss</word>
+                        <word>wissenschaft</word>
+                        <word>wissenswert</word>
+                        <word>wissenwert</word>
+                        <word>witt</word>
+                        <word>witulla@t-online.d</word>
+                        <word>witulla@t-online.de</word>
+                        <word>witzigerweis</word>
+                        <word>wks7tnsab92hn26owhapcbgwkkatugsx7gu9azwy3nhpnblu96jjq2wxjbvjtufmmkgazp97</word>
+                        <word>wm</word>
+                        <word>wnn</word>
+                        <word>wochentermin</word>
+                        <word>woellten</word>
+                        <word>woerterbuch</word>
+                        <word>wogegen</word>
+                        <word>wohingegen</word>
+                        <word>wohler</word>
+                        <word>wohlt?�tigkeit</word>
+                        <word>wohnen</word>
+                        <word>wolken</word>
+                        <word>woll</word>
+                        <word>wolt</word>
+                        <word>wonder</word>
+                        <word>wonn</word>
+                        <word>worch</word>
+                        <word>worin</word>
+                        <word>workflow</word>
+                        <word>workstat</word>
+                        <word>wortlist</word>
+                        <word>wortwahl</word>
+                        <word>wpsdjzdnqbl57anduw7cbmcjlma4hzqx0fuzc0exltimlaxoumz3ny2pmckcn50ykkwqda0u</word>
+                        <word>wpxtun77iqzn9a6d17wj1hp9ooglw3xccvisbxjpvwi1wg1vh2f63kez6ztknsgslq47x4k8</word>
+                        <word>wrist</word>
+                        <word>ws2ltsjwoyk5gn2rnrq6klgaavvxbfdlgpo7ujzrupkjogabr2qq575zuwgbyfm2dwaagcak</word>
+                        <word>wu76c6zs9zoe.dlg@grisu.my-fqdn.d</word>
+                        <word>wucher</word>
+                        <word>wunderbaren</word>
+                        <word>wundersam</word>
+                        <word>wundersch?n</word>
+                        <word>wunschdenken</word>
+                        <word>wunschgem?�?_</word>
+                        <word>wunschzeitraum</word>
+                        <word>wunschzettel</word>
+                        <word>wuppert</word>
+                        <word>wurm</word>
+                        <word>wurmverseucht</word>
+                        <word>wurstfing</word>
+                        <word>wurzel</word>
+                        <word>wusstest</word>
+                        <word>wu?_?_t</word>
+                        <word>www.mobileunlocked.com/unlock_codes.php</word>
+                        <word>www.trycktill.com/eng/unlock_swe.asp</word>
+                        <word>w?_??nschend</word>
+                        <word>w?�hlton</word>
+                        <word>w?�hlverbindung</word>
+                        <word>w?�hrung</word>
+                        <word>w?�rmsten</word>
+                        <word>w?�rst</word>
+                        <word>w?�rtst</word>
+                        <word>w?chentlich</word>
+                        <word>w?_nschst</word>
+                        <word>w?_r</word>
+                        <word>w?_rg</word>
+                        <word>w?_rmer</word>
+                        <word>x%</word>
+                        <word>x'p</word>
+                        <word>x'post</word>
+                        <word>x160</word>
+                        <word>x2</word>
+                        <word>x45</word>
+                        <word>x86</word>
+                        <word>x86ern</word>
+                        <word>xagor</word>
+                        <word>xd</word>
+                        <word>xe</word>
+                        <word>xe7ga8rz0trdwjthdtaj5me1c66ve2tlmcua7hbkcctwg6z1w58npvaue2pxrn3vdedcmmji</word>
+                        <word>xecalefap</word>
+                        <word>xelibri</word>
+                        <word>xenahadotec</word>
+                        <word>xhtml</word>
+                        <word>xmit@gmx.de</word>
+                        <word>xns96678433c6a9af1ck3n@outerlimit.d</word>
+                        <word>xns968ad3e9bc7deeldosampleman@130.133.1.18</word>
+                        <word>xns968fa2acdbaedeldosampleman@130.133.1.18</word>
+                        <word>xns9697dbee0f439bschubertgmxnet@151.189.20.10</word>
+                        <word>xplore</word>
+                        <word>xpsp2</word>
+                        <word>xrvcsrjqswzej8aem7miqpsoiumapwllcckqdtposisvz6hktsoiuesttdl7hpmrmehipyb2</word>
+                        <word>xscale</word>
+                        <word>xtnc</word>
+                        <word>xtndconnectpc</word>
+                        <word>xtndconnetct</word>
+                        <word>xtrapack</word>
+                        <word>xwbml4er5ukdliqbjn3pe3aookthy1kzvyu3budooyjeub5ypxukrvyygtsg9ioah31l8tzv</word>
+                        <word>xxx@example.net</word>
+                        <word>xxx@example.net</word>
+                        <word>xy76a3cy69@yahoo.com</word>
+                        <word>yahooseit</word>
+                        <word>yap</word>
+                        <word>yarjilzbhehlvpmgkmwljbqs0kdjimah3fkume54hf2rofhj9mlzqnlnt1rvpytt5l0unj</word>
+                        <word>yase</word>
+                        <word>yheeki</word>
+                        <word>yheeky@x-mail.net</word>
+                        <word>ym4c0k4mapko1npokec91u9omhgflslyypvtsgmzuzjmegqxoti18wezj2crm1ktqaqeftsw</word>
+                        <word>york</word>
+                        <word>yorkshir</word>
+                        <word>yotiyasuxav</word>
+                        <word>z500</word>
+                        <word>zach228@fortunecity.d</word>
+                        <word>zach228@fortunecity.de</word>
+                        <word>zahlendreh</word>
+                        <word>zaphod</word>
+                        <word>zaubern</word>
+                        <word>zaunpfahl</word>
+                        <word>zbetwaoazt6vrknema52qyfsdlorz87hc5hp9kf2eyawaoipkrfkhu0mxqtu2aozixuhuuct</word>
+                        <word>zehnstellig</word>
+                        <word>zeichnet</word>
+                        <word>zeilenend</word>
+                        <word>zeitabstaenden</word>
+                        <word>zeitgem?�?_</word>
+                        <word>zeitgesteuert</word>
+                        <word>zeitgleich</word>
+                        <word>zeitlich</word>
+                        <word>zeitraum</word>
+                        <word>zeitr?�um</word>
+                        <word>zeitschaltuhr</word>
+                        <word>zeitverz?gerung</word>
+                        <word>zeitwesen@gmxnospam.net</word>
+                        <word>zelebrieren</word>
+                        <word>zellmembranen</word>
+                        <word>zellverlust</word>
+                        <word>zellwechseln</word>
+                        <word>zerkratzten</word>
+                        <word>zerrissen</word>
+                        <word>zerschneiden</word>
+                        <word>zerschossenen</word>
+                        <word>zersetzungseffekten</word>
+                        <word>zerst</word>
+                        <word>zerst?rst</word>
+                        <word>zerst?rung</word>
+                        <word>zerst?rungsfrei</word>
+                        <word>zertifizierungen</word>
+                        <word>zeugni?_</word>
+                        <word>zewa</word>
+                        <word>zickt</word>
+                        <word>ziehst</word>
+                        <word>zielort</word>
+                        <word>zieser</word>
+                        <word>ziffern</word>
+                        <word>zifferntastatur</word>
+                        <word>zigarett</word>
+                        <word>zigarettenanz?_??nd</word>
+                        <word>zilxes3ynmmzamt5ppkbicannj9aiwgwt6wc0bbsimd6rsgbgzyaybqjhtbimjvsgatm59d6</word>
+                        <word>zire</word>
+                        <word>zitier</word>
+                        <word>zitiert</word>
+                        <word>zittrig</word>
+                        <word>zivil</word>
+                        <word>zmcuryyprgeaijujoimt3zrgkh2ormgabhriizaxtzw1kktmaj14m4oodascvpxfxtqhe09m</word>
+                        <word>zoellner</word>
+                        <word>zone</word>
+                        <word>zonen</word>
+                        <word>zoohandlung</word>
+                        <word>zoomplay</word>
+                        <word>zordn</word>
+                        <word>zr2owzsr9rpkqb2hc1gtast4mmymmrdxal9rqmueaa4udsbxutxwpsqwyv144cy77ebxlxr</word>
+                        <word>zs1@gmx.de</word>
+                        <word>zsammenabreit</word>
+                        <word>zubehoerherstellern</word>
+                        <word>zubeh?ranbiet</word>
+                        <word>zubeh?rverf?_gbarkeit</word>
+                        <word>zueinand</word>
+                        <word>zufolg</word>
+                        <word>zufriedengestellt</word>
+                        <word>zufriedenheit</word>
+                        <word>zufriedenstellend</word>
+                        <word>zuf?_??llig</word>
+                        <word>zuf?_hren</word>
+                        <word>zugangsm?glichkeit</word>
+                        <word>zugeflogen</word>
+                        <word>zugegeben</word>
+                        <word>zugegebenerma?_en</word>
+                        <word>zugegriffen</word>
+                        <word>zugeh?rend</word>
+                        <word>zugeklapptem</word>
+                        <word>zugelassen</word>
+                        <word>zugeordnetem</word>
+                        <word>zugeordneten</word>
+                        <word>zugeschlagen</word>
+                        <word>zugeschnitten</word>
+                        <word>zugesichert</word>
+                        <word>zugetragen</word>
+                        <word>zugreift</word>
+                        <word>zug?�ng</word>
+                        <word>zug?�nglichen</word>
+                        <word>zukangspunkt</word>
+                        <word>zukaufger?�ten</word>
+                        <word>zuklappen</word>
+                        <word>zukleben</word>
+                        <word>zulassungen</word>
+                        <word>zulassungsfrag</word>
+                        <word>zuleitung</word>
+                        <word>zulieferanten</word>
+                        <word>zumailen</word>
+                        <word>zumut</word>
+                        <word>zumutet</word>
+                        <word>zunahm</word>
+                        <word>zunehmend</word>
+                        <word>zunehmenden</word>
+                        <word>zunummt</word>
+                        <word>zurechtgeflickt</word>
+                        <word>zurechtkommen</word>
+                        <word>zurechtkommst</word>
+                        <word>zureden</word>
+                        <word>zurerst</word>
+                        <word>zurgiff</word>
+                        <word>zurp?_cksichern</word>
+                        <word>zurueckgebliebenen</word>
+                        <word>zurueckliegenden</word>
+                        <word>zur?_??ckgegriffen</word>
+                        <word>zur?_??ckschicken</word>
+                        <word>zur?_ckgeb</word>
+                        <word>zur?_ckgegeben</word>
+                        <word>zur?_ckgekehrt</word>
+                        <word>zur?_ckgeschickt</word>
+                        <word>zur?_ckgestellt</word>
+                        <word>zur?_ckgewechselt</word>
+                        <word>zur?_ckhaltend</word>
+                        <word>zur?_ckhangelst</word>
+                        <word>zur?_ckkommt</word>
+                        <word>zur?_ckschalten</word>
+                        <word>zur?_cksetzt</word>
+                        <word>zur?_ckstecken</word>
+                        <word>zur?_cktauschen</word>
+                        <word>zur?_cktritt</word>
+                        <word>zur?_ckwechseln</word>
+                        <word>zur?_ckzubl?�ttern</word>
+                        <word>zur?_ckzukommen</word>
+                        <word>zur?_ckzuschauen</word>
+                        <word>zusammenarbeitet</word>
+                        <word>zusammendr?_cken</word>
+                        <word>zusammengebaut</word>
+                        <word>zusammengefasst</word>
+                        <word>zusammengekasperten</word>
+                        <word>zusammenh?�ngend</word>
+                        <word>zusammenloeten</word>
+                        <word>zusammensammeln</word>
+                        <word>zusammenstellung</word>
+                        <word>zusammenzuf?_gen</word>
+                        <word>zusammenzuf?_hren</word>
+                        <word>zusammenzustellen</word>
+                        <word>zusatzangebot</word>
+                        <word>zusatzfeatur</word>
+                        <word>zusatzgeb?_hr</word>
+                        <word>zusatzinform</word>
+                        <word>zusatzkontakt</word>
+                        <word>zusatzrent</word>
+                        <word>zuschl?�gt</word>
+                        <word>zusetzen</word>
+                        <word>zuspachteln</word>
+                        <word>zustellbest?�tigung</word>
+                        <word>zustellmeldungen</word>
+                        <word>zustellzeit</word>
+                        <word>zustimm</word>
+                        <word>zustimmen</word>
+                        <word>zust?_??ndig</word>
+                        <word>zus?_??tzlich</word>
+                        <word>zuteilen</word>
+                        <word>zutrau</word>
+                        <word>zutrauen</word>
+                        <word>zuvorgekommen</word>
+                        <word>zuzuordnen</word>
+                        <word>zuzuschlagen</word>
+                        <word>zuzuweisen</word>
+                        <word>zwangsl?�ufig</word>
+                        <word>zweckm?�?_ig</word>
+                        <word>zweifelhaften</word>
+                        <word>zweifelsohn</word>
+                        <word>zweitger?�t</word>
+                        <word>zweitverwertung</word>
+                        <word>zwiener</word>
+                        <word>zwirner</word>
+                        <word>zwischenk?�stchen</word>
+                        <word>zwischenziel</word>
+                        <word>zwitschern</word>
+                        <word>zxbiy1owojfcib9safqstryaiarioyi45prgirraycgjq6onmilabzhnk2j3pwrtfikmrbpz</word>
+                        <word>zxnlbsbiyw5kesbuawnodcbtzwhylibnzwluies3ntbpighhyibpy2ggc2nob24gymvzdgvsbhqg</word>
+                        <word>zyklen</word>
+                        <word>zzgl</word>
+                        <word>zztqrujbkdiikg3nhftwt5nninvkguyklxijwpwql6iha7tlelzfaq2hocvt9s07c4rgexnj</word>
+                        <word>z?gern</word>
+                        <word>z?_gige</word>
+                        <word>z?_ndung</word>
+                        <word>z?_ndungserkennung</word>
+                        <word>|*</word>
+                        <word>|/o</word>
+                        <word>|__|_|</word>
+                        <word>|||</word>
+                        <word>~$</word>
+                        <word>~100</word>
+                        <word>~3</word>
+                        <word>~30=a4</word>
+                        <word>~~~~~~~~~~~</word>
+                        <word>?145</word>
+                        <word>??thoma</word>
+                        <word>???_?"</word>
+                        <word>?_?_ber</word>
+                        <word>?_?_berlegen</word>
+                        <word>?_?_bertragung</word>
+                        <word>?_??berhaubt</word>
+                        <word>?_??bertragbar</word>
+                        <word>?_??bertragen</word>
+                        <word>?_??hnelt</word>
+                        <word>?_??ndern</word>
+                        <word>?�hnelt</word>
+                        <word>?�hnlicher</word>
+                        <word>?�lterer</word>
+                        <word>?�nden</word>
+                        <word>?�nder</word>
+                        <word>?�pfel</word>
+                        <word>?�quivalenten</word>
+                        <word>?�ussern</word>
+                        <word>?ffnungen</word>
+                        <word>?ieber</word>
+                        <word>?kostr?_mpf</word>
+                        <word>?rtlichen</word>
+                        <word>?sterreichisch</word>
+                        <word>?_berbr?_ckt</word>
+                        <word>?_bereinstimmt</word>
+                        <word>?_berflogen</word>
+                        <word>?_berfl?_ssigen</word>
+                        <word>?_bergab</word>
+                        <word>?_berhatt</word>
+                        <word>?_berheblich</word>
+                        <word>?_berholt</word>
+                        <word>?_berlang</word>
+                        <word>?_berlastung</word>
+                        <word>?_berlebt</word>
+                        <word>?_berlegungen</word>
+                        <word>?_bermitteln</word>
+                        <word>?_bern</word>
+                        <word>?_bernahm</word>
+                        <word>?_bernahmewert</word>
+                        <word>?_bernehm</word>
+                        <word>?_berorganisieren</word>
+                        <word>?_berpr?_ft</word>
+                        <word>?_berpr?_fungen</word>
+                        <word>?_berragend</word>
+                        <word>?_berraschen</word>
+                        <word>?_berredungsk?_nst</word>
+                        <word>?_berschaubarem</word>
+                        <word>?_berschreiten</word>
+                        <word>?_berschrift</word>
+                        <word>?_bersch?�tzt</word>
+                        <word>?_berseh</word>
+                        <word>?_bersetzt</word>
+                        <word>?_bersetzungen</word>
+                        <word>?_bersichtlichkeit</word>
+                        <word>?_bersiehst</word>
+                        <word>?_berspielen</word>
+                        <word>?_berspielt</word>
+                        <word>?_bersprechen</word>
+                        <word>?_bers?�t</word>
+                        <word>?_berteagen</word>
+                        <word>?_bertragunen</word>
+                        <word>?_bertragungsgeschwindigkeiten</word>
+                        <word>?_bertreffen</word>
+                        <word>?_bertreten</word>
+                        <word>?_bertrifft</word>
+                        <word>?_berweisungsbeleg</word>
+                        <word>?_berzeugung</word>
+                        <word>?_betragen</word>
+                        <word>?_betragungsmodu</word>
+                        <word>?_birgen</word>
+                        <word>?_brigend</word>
+                        <word>?_briggebliebenen</word>
+                        <word>?_bung</word>
+                        <word>?_r</word>
+
+                        <word>kurz</word>
+                        <word>aber</word>
+                        <word>alle</word>
+                        <word>allem</word>
+                        <word>allen</word>
+                        <word>aller</word>
+                        <word>alles</word>
+                        <word>als</word>
+                        <word>also</word>
+                        <word>am</word>
+                        <word>anander</word>
+                        <word>andere</word>
+                        <word>anderem</word>
+                        <word>anderen</word>
+                        <word>anderer</word>
+                        <word>anderes</word>
+                        <word>anderm</word>
+                        <word>andern</word>
+                        <word>anderr</word>
+                        <word>andersauch</word>
+                        <word>auf</word>
+                        <word>aus</word>
+                        <word>bei</word>
+                        <word>bin</word>
+                        <word>bis</word>
+                        <word>bist</word>
+                        <word>da</word>
+                        <word>damit</word>
+                        <word>dann</word>
+                        <word>der</word>
+                        <word>den</word>
+                        <word>des</word>
+                        <word>dem</word>
+                        <word>die</word>
+                        <word>das</word>
+                        <word>da?_derselbe</word>
+                        <word>derselben</word>
+                        <word>denselben</word>
+                        <word>desselben</word>
+                        <word>demselben</word>
+                        <word>dieselbe</word>
+                        <word>dieselben</word>
+                        <word>dasselbe</word>
+                        <word>dazu</word>
+                        <word>dein</word>
+                        <word>deine</word>
+                        <word>deinem</word>
+                        <word>deinen</word>
+                        <word>deiner</word>
+                        <word>deines</word>
+                        <word>denn</word>
+                        <word>derer</word>
+                        <word>dessen</word>
+                        <word>dich</word>
+                        <word>dir</word>
+                        <word>du</word>
+                        <word>dies</word>
+                        <word>diese</word>
+                        <word>diesem</word>
+                        <word>diesen</word>
+                        <word>dieser</word>
+                        <word>dieses</word>
+                        <word>doch</word>
+                        <word>dort</word>
+                        <word>durch</word>
+                        <word>ein</word>
+                        <word>eine</word>
+                        <word>einem</word>
+                        <word>einen</word>
+                        <word>einer</word>
+                        <word>eines</word>
+                        <word>einig</word>
+                        <word>einige</word>
+                        <word>einigem</word>
+                        <word>einigen</word>
+                        <word>einiger</word>
+                        <word>einiges</word>
+                        <word>einmal</word>
+                        <word>er</word>
+                        <word>ihn</word>
+                        <word>ihm</word>
+                        <word>es</word>
+                        <word>etwas</word>
+                        <word>euer</word>
+                        <word>eure</word>
+                        <word>eurem</word>
+                        <word>euren</word>
+                        <word>eurer</word>
+                        <word>eures</word>
+                        <word>f?_r</word>
+                        <word>gegen</word>
+                        <word>gewesen</word>
+                        <word>hab</word>
+                        <word>habe</word>
+                        <word>haben</word>
+                        <word>hat</word>
+                        <word>hatte</word>
+                        <word>hatten</word>
+                        <word>hier</word>
+                        <word>hin</word>
+                        <word>hinter</word>
+                        <word>ich</word>
+                        <word>mich</word>
+                        <word>mir</word>
+                        <word>ihr</word>
+                        <word>ihre</word>
+                        <word>ihrem</word>
+                        <word>ihren</word>
+                        <word>ihrer</word>
+                        <word>ihres</word>
+                        <word>euch</word>
+                        <word>im</word>
+                        <word>in</word>
+                        <word>indem</word>
+                        <word>ins</word>
+                        <word>ist</word>
+                        <word>jede</word>
+                        <word>jedem</word>
+                        <word>jeden</word>
+                        <word>jeder</word>
+                        <word>jedes</word>
+                        <word>jene</word>
+                        <word>jenem</word>
+                        <word>jenen</word>
+                        <word>jener</word>
+                        <word>jenes</word>
+                        <word>jetzt</word>
+                        <word>kann</word>
+                        <word>kein</word>
+                        <word>keine</word>
+                        <word>keinem</word>
+                        <word>keinen</word>
+                        <word>keiner</word>
+                        <word>keines</word>
+                        <word>k?nnen</word>
+                        <word>k?nnte</word>
+                        <word>machen</word>
+                        <word>man</word>
+                        <word>manche</word>
+                        <word>manchem</word>
+                        <word>manchen</word>
+                        <word>mancher</word>
+                        <word>manches</word>
+                        <word>mein</word>
+                        <word>meine</word>
+                        <word>meinem</word>
+                        <word>meinen</word>
+                        <word>meiner</word>
+                        <word>meines</word>
+                        <word>mit</word>
+                        <word>muss</word>
+                        <word>musste</word>
+                        <word>nach</word>
+                        <word>nicht</word>
+                        <word>nichts</word>
+                        <word>noch</word>
+                        <word>nun</word>
+                        <word>nur</word>
+                        <word>ob</word>
+                        <word>oder</word>
+                        <word>ohne</word>
+                        <word>sehr</word>
+                        <word>sein</word>
+                        <word>seine</word>
+                        <word>seinem</word>
+                        <word>seinen</word>
+                        <word>seiner</word>
+                        <word>seines</word>
+                        <word>selbst</word>
+                        <word>sich</word>
+                        <word>sie</word>
+                        <word>ihnen</word>
+                        <word>sind</word>
+                        <word>so</word>
+                        <word>solche</word>
+                        <word>solchem</word>
+                        <word>solchen</word>
+                        <word>solcher</word>
+                        <word>solches</word>
+                        <word>soll</word>
+                        <word>sollte</word>
+                        <word>sondern</word>
+                        <word>sonst</word>
+                        <word>?_ber</word>
+                        <word>um</word>
+                        <word>und</word>
+                        <word>uns</word>
+                        <word>unse</word>
+                        <word>unsem</word>
+                        <word>unsen</word>
+                        <word>unser</word>
+                        <word>unses</word>
+                        <word>unter</word>
+                        <word>viel</word>
+                        <word>vom</word>
+                        <word>von</word>
+                        <word>vor</word>
+                        <word>w?�hrend</word>
+                        <word>war</word>
+                        <word>waren</word>
+                        <word>warst</word>
+                        <word>was</word>
+                        <word>weg</word>
+                        <word>weil</word>
+                        <word>weiter</word>
+                        <word>welche</word>
+                        <word>welchem</word>
+                        <word>welchen</word>
+                        <word>welcher</word>
+                        <word>welches</word>
+                        <word>wenn</word>
+                        <word>werde</word>
+                        <word>werden</word>
+                        <word>wie</word>
+                        <word>wieder</word>
+                        <word>will</word>
+                        <word>wir</word>
+                        <word>wird</word>
+                        <word>wirst</word>
+                        <word>wo</word>
+                        <word>wollen</word>
+                        <word>wollte</word>
+                        <word>w?_rde</word>
+                        <word>w?_rden</word>
+                        <word>zu</word>
+                        <word>zum</word>
+
+                </stopWord>
\ No newline at end of file
diff --git a/xml/tests/testData/performance/IndentUnindent2.xml b/xml/tests/testData/performance/IndentUnindent2.xml
new file mode 100644
index 000000000000..e7eeddff12e5
--- /dev/null
+++ b/xml/tests/testData/performance/IndentUnindent2.xml
@@ -0,0 +1,2870 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE schema
+PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"
+[
+<!ATTLIST schema
+xmlns:ds CDATA #FIXED "http://www.w3.org/2000/09/xmldsig#">
+<!ENTITY dsig 'http://www.w3.org/2000/09/xmldsig#'>
+<!ENTITY % p ''>
+<!ENTITY % s ''>
+]>
+
+<!-- Schema for XML Signatures
+http://www.w3.org/2000/09/xmldsig#
+$Revision: 1.1 $ on $Date: 2002/02/08 20:32:26 $ by $Author: reagle $
+
+Copyright 2001 The Internet Society and W3C (Massachusetts Institute
+of Technology, Institut National de Recherche en Informatique et en
+Automatique, Keio University). All Rights Reserved.
+http://www.w3.org/Consortium/Legal/
+
+This document is governed by the W3C Software License [1] as described
+in the FAQ [2].
+
+[1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+[2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
+-->
+
+
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+targetNamespace="http://www.w3.org/2000/09/xmldsig#"
+version="0.1" elementFormDefault="qualified">
+
+<!-- Basic Types Defined for Signatures -->
+
+<simpleType name="CryptoBinary">
+<restriction base="base64Binary">
+</restriction>
+</simpleType>
+
+<!-- Start Signature -->
+
+<element name="Signature" type="ds:SignatureType"/>
+<complexType name="SignatureType">
+<sequence>
+<element ref="ds:SignedInfo"/>
+<element ref="ds:SignatureValue"/>
+<element ref="ds:KeyInfo" minOccurs="0"/>
+<element ref="ds:Object" minOccurs="0" maxOccurs="unbounded"/>
+</sequence>
+<attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+<element name="SignatureValue" type="ds:SignatureValueType"/>
+<complexType name="SignatureValueType">
+<simpleContent>
+<extension base="base64Binary">
+<attribute name="Id" type="ID" use="optional"/>
+</extension>
+</simpleContent>
+</complexType>
+
+<!-- Start SignedInfo -->
+
+<element name="SignedInfo" type="ds:SignedInfoType"/>
+<complexType name="SignedInfoType">
+<sequence>
+<element ref="ds:CanonicalizationMethod"/>
+<element ref="ds:SignatureMethod"/>
+<element ref="ds:Reference" maxOccurs="unbounded"/>
+</sequence>
+<attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+<element name="CanonicalizationMethod" type="ds:CanonicalizationMethodType"/>
+<complexType name="CanonicalizationMethodType" mixed="true">
+<sequence>
+<any namespace="##any" minOccurs="0" maxOccurs="unbounded"/>
+<!-- (0,unbounded) elements from (1,1) namespace -->
+</sequence>
+<attribute name="Algorithm" type="anyURI" use="required"/>
+</complexType>
+
+<element name="SignatureMethod" type="ds:SignatureMethodType"/>
+<complexType name="SignatureMethodType" mixed="true">
+<sequence>
+<element name="HMACOutputLength" minOccurs="0" type="ds:HMACOutputLengthType"/>
+<any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+<!-- (0,unbounded) elements from (1,1) external namespace -->
+</sequence>
+<attribute name="Algorithm" type="anyURI" use="required"/>
+</complexType>
+
+<!-- Start Reference -->
+
+<element name="Reference" type="ds:ReferenceType"/>
+<complexType name="ReferenceType">
+<sequence>
+<element ref="ds:Transforms" minOccurs="0"/>
+<element ref="ds:DigestMethod"/>
+<element ref="ds:DigestValue"/>
+</sequence>
+<attribute name="Id" type="ID" use="optional"/>
+<attribute name="URI" type="anyURI" use="optional"/>
+<attribute name="Type" type="anyURI" use="optional"/>
+</complexType>
+
+<element name="Transforms" type="ds:TransformsType"/>
+<complexType name="TransformsType">
+<sequence>
+<element ref="ds:Transform" maxOccurs="unbounded"/>
+</sequence>
+</complexType>
+
+<element name="Transform" type="ds:TransformType"/>
+<complexType name="TransformType" mixed="true">
+<choice minOccurs="0" maxOccurs="unbounded">
+<any namespace="##other" processContents="lax"/>
+<!-- (1,1) elements from (0,unbounded) namespaces -->
+<element name="XPath" type="string"/>
+</choice>
+<attribute name="Algorithm" type="anyURI" use="required"/>
+</complexType>
+
+<!-- End Reference -->
+
+<element name="DigestMethod" type="ds:DigestMethodType"/>
+<complexType name="DigestMethodType" mixed="true">
+<sequence>
+<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+</sequence>
+<attribute name="Algorithm" type="anyURI" use="required"/>
+</complexType>
+
+<element name="DigestValue" type="ds:DigestValueType"/>
+<simpleType name="DigestValueType">
+<restriction base="base64Binary"/>
+</simpleType>
+
+<!-- End SignedInfo -->
+
+<!-- Start KeyInfo -->
+
+<element name="KeyInfo" type="ds:KeyInfoType"/>
+<complexType name="KeyInfoType" mixed="true">
+<choice maxOccurs="unbounded">
+<element ref="ds:KeyName"/>
+<element ref="ds:KeyValue"/>
+<element ref="ds:RetrievalMethod"/>
+<element ref="ds:X509Data"/>
+<element ref="ds:PGPData"/>
+<element ref="ds:SPKIData"/>
+<element ref="ds:MgmtData"/>
+<any processContents="lax" namespace="##other"/>
+<!-- (1,1) elements from (0,unbounded) namespaces -->
+</choice>
+<attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+<element name="KeyName" type="string"/>
+<element name="MgmtData" type="string"/>
+
+<element name="KeyValue" type="ds:KeyValueType"/>
+<complexType name="KeyValueType" mixed="true">
+<choice>
+<element ref="ds:DSAKeyValue"/>
+<element ref="ds:RSAKeyValue"/>
+<any namespace="##other" processContents="lax"/>
+</choice>
+</complexType>
+
+<element name="RetrievalMethod" type="ds:RetrievalMethodType"/>
+<complexType name="RetrievalMethodType">
+<sequence>
+<element ref="ds:Transforms" minOccurs="0"/>
+</sequence>
+<attribute name="URI" type="anyURI"/>
+<attribute name="Type" type="anyURI" use="optional"/>
+</complexType>
+
+<!-- Start X509Data -->
+
+<element name="X509Data" type="ds:X509DataType"/>
+<complexType name="X509DataType">
+<sequence maxOccurs="unbounded">
+<choice>
+<element name="X509IssuerSerial" type="ds:X509IssuerSerialType"/>
+<element name="X509SKI" type="base64Binary"/>
+<element name="X509SubjectName" type="string"/>
+<element name="X509Certificate" type="base64Binary"/>
+<element name="X509CRL" type="base64Binary"/>
+<any namespace="##other" processContents="lax"/>
+</choice>
+</sequence>
+</complexType>
+
+<complexType name="X509IssuerSerialType">
+<sequence>
+<element name="X509IssuerName" type="string"/>
+<element name="X509SerialNumber" type="integer"/>
+</sequence>
+</complexType>
+
+<!-- End X509Data -->
+
+<!-- Begin PGPData -->
+
+<element name="PGPData" type="ds:PGPDataType"/>
+<complexType name="PGPDataType">
+<choice>
+<sequence>
+<element name="PGPKeyID" type="base64Binary"/>
+<element name="PGPKeyPacket" type="base64Binary" minOccurs="0"/>
+<any namespace="##other" processContents="lax" minOccurs="0"
+maxOccurs="unbounded"/>
+</sequence>
+<sequence>
+<element name="PGPKeyPacket" type="base64Binary"/>
+<any namespace="##other" processContents="lax" minOccurs="0"
+maxOccurs="unbounded"/>
+</sequence>
+</choice>
+</complexType>
+
+<!-- End PGPData -->
+
+<!-- Begin SPKIData -->
+
+<element name="SPKIData" type="ds:SPKIDataType"/>
+<complexType name="SPKIDataType">
+<sequence maxOccurs="unbounded">
+<element name="SPKISexp" type="base64Binary"/>
+<any namespace="##other" processContents="lax" minOccurs="0"/>
+</sequence>
+</complexType>
+
+<!-- End SPKIData -->
+
+<!-- End KeyInfo -->
+
+<!-- Start Object (Manifest, SignatureProperty) -->
+
+<element name="Object" type="ds:ObjectType"/>
+<complexType name="ObjectType" mixed="true">
+<sequence minOccurs="0" maxOccurs="unbounded">
+<any namespace="##any" processContents="lax"/>
+</sequence>
+<attribute name="Id" type="ID" use="optional"/>
+<attribute name="MimeType" type="string" use="optional"/> <!-- add a grep facet -->
+<attribute name="Encoding" type="anyURI" use="optional"/>
+</complexType>
+
+<element name="Manifest" type="ds:ManifestType"/>
+<complexType name="ManifestType">
+<sequence>
+<element ref="ds:Reference" maxOccurs="unbounded"/>
+</sequence>
+<attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+<element name="SignatureProperties" type="ds:SignaturePropertiesType"/>
+<complexType name="SignaturePropertiesType">
+<sequence>
+<element ref="ds:SignatureProperty" maxOccurs="unbounded"/>
+</sequence>
+<attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+<element name="SignatureProperty" type="ds:SignaturePropertyType"/>
+<complexType name="SignaturePropertyType" mixed="true">
+<choice maxOccurs="unbounded">
+<any namespace="##other" processContents="lax"/>
+<!-- (1,1) elements from (1,unbounded) namespaces -->
+</choice>
+<attribute name="Target" type="anyURI" use="required"/>
+<attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+<!-- End Object (Manifest, SignatureProperty) -->
+
+<!-- Start Algorithm Parameters -->
+
+<simpleType name="HMACOutputLengthType">
+<restriction base="integer"/>
+</simpleType>
+
+<!-- Start KeyValue Element-types -->
+
+<element name="DSAKeyValue" type="ds:DSAKeyValueType"/>
+<complexType name="DSAKeyValueType">
+<sequence>
+<sequence minOccurs="0">
+<element name="P" type="ds:CryptoBinary"/>
+<element name="Q" type="ds:CryptoBinary"/>
+</sequence>
+<element name="G" type="ds:CryptoBinary" minOccurs="0"/>
+<element name="Y" type="ds:CryptoBinary"/>
+<element name="J" type="ds:CryptoBinary" minOccurs="0"/>
+<sequence minOccurs="0">
+<element name="Seed" type="ds:CryptoBinary"/>
+<element name="PgenCounter" type="ds:CryptoBinary"/>
+</sequence>
+</sequence>
+</complexType>
+
+<element name="RSAKeyValue" type="ds:RSAKeyValueType"/>
+<complexType name="RSAKeyValueType">
+<sequence>
+<element name="Modulus" type="ds:CryptoBinary"/>
+<element name="Exponent" type="ds:CryptoBinary"/>
+</sequence>
+</complexType>
+
+<!-- End KeyValue Element-types -->
+
+<!-- End Signature -->
+
+</schema>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE schema
+  PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"
+ [
+   <!ATTLIST schema
+     xmlns:ds CDATA #FIXED "http://www.w3.org/2000/09/xmldsig#">
+   <!ENTITY dsig 'http://www.w3.org/2000/09/xmldsig#'>
+   <!ENTITY % p ''>
+   <!ENTITY % s ''>
+  ]>
+
+<!-- Schema for XML Signatures
+    http://www.w3.org/2000/09/xmldsig#
+    $Revision: 1.1 $ on $Date: 2002/02/08 20:32:26 $ by $Author: reagle $
+
+    Copyright 2001 The Internet Society and W3C (Massachusetts Institute
+    of Technology, Institut National de Recherche en Informatique et en
+    Automatique, Keio University). All Rights Reserved.
+    http://www.w3.org/Consortium/Legal/
+
+    This document is governed by the W3C Software License [1] as described
+    in the FAQ [2].
+
+    [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+    [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
+-->
+
+
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+        targetNamespace="http://www.w3.org/2000/09/xmldsig#"
+        version="0.1" elementFormDefault="qualified">
+
+<!-- Basic Types Defined for Signatures -->
+
+<simpleType name="CryptoBinary">
+  <restriction base="base64Binary">
+  </restriction>
+</simpleType>
+
+<!-- Start Signature -->
+
+<element name="Signature" type="ds:SignatureType"/>
+<complexType name="SignatureType">
+  <sequence>
+    <element ref="ds:SignedInfo"/>
+    <element ref="ds:SignatureValue"/>
+    <element ref="ds:KeyInfo" minOccurs="0"/>
+    <element ref="ds:Object" minOccurs="0" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+  <element name="SignatureValue" type="ds:SignatureValueType"/>
+  <complexType name="SignatureValueType">
+    <simpleContent>
+      <extension base="base64Binary">
+        <attribute name="Id" type="ID" use="optional"/>
+      </extension>
+    </simpleContent>
+  </complexType>
+
+<!-- Start SignedInfo -->
+
+<element name="SignedInfo" type="ds:SignedInfoType"/>
+<complexType name="SignedInfoType">
+  <sequence>
+    <element ref="ds:CanonicalizationMethod"/>
+    <element ref="ds:SignatureMethod"/>
+    <element ref="ds:Reference" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+  <element name="CanonicalizationMethod" type="ds:CanonicalizationMethodType"/>
+  <complexType name="CanonicalizationMethodType" mixed="true">
+    <sequence>
+      <any namespace="##any" minOccurs="0" maxOccurs="unbounded"/>
+      <!-- (0,unbounded) elements from (1,1) namespace -->
+    </sequence>
+    <attribute name="Algorithm" type="anyURI" use="required"/>
+  </complexType>
+
+  <element name="SignatureMethod" type="ds:SignatureMethodType"/>
+  <complexType name="SignatureMethodType" mixed="true">
+    <sequence>
+      <element name="HMACOutputLength" minOccurs="0" type="ds:HMACOutputLengthType"/>
+      <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+      <!-- (0,unbounded) elements from (1,1) external namespace -->
+    </sequence>
+    <attribute name="Algorithm" type="anyURI" use="required"/>
+  </complexType>
+
+<!-- Start Reference -->
+
+<element name="Reference" type="ds:ReferenceType"/>
+<complexType name="ReferenceType">
+  <sequence>
+    <element ref="ds:Transforms" minOccurs="0"/>
+    <element ref="ds:DigestMethod"/>
+    <element ref="ds:DigestValue"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+  <attribute name="URI" type="anyURI" use="optional"/>
+  <attribute name="Type" type="anyURI" use="optional"/>
+</complexType>
+
+  <element name="Transforms" type="ds:TransformsType"/>
+  <complexType name="TransformsType">
+    <sequence>
+      <element ref="ds:Transform" maxOccurs="unbounded"/>
+    </sequence>
+  </complexType>
+
+  <element name="Transform" type="ds:TransformType"/>
+  <complexType name="TransformType" mixed="true">
+    <choice minOccurs="0" maxOccurs="unbounded">
+      <any namespace="##other" processContents="lax"/>
+      <!-- (1,1) elements from (0,unbounded) namespaces -->
+      <element name="XPath" type="string"/>
+    </choice>
+    <attribute name="Algorithm" type="anyURI" use="required"/>
+  </complexType>
+
+<!-- End Reference -->
+
+<element name="DigestMethod" type="ds:DigestMethodType"/>
+<complexType name="DigestMethodType" mixed="true">
+  <sequence>
+    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Algorithm" type="anyURI" use="required"/>
+</complexType>
+
+<element name="DigestValue" type="ds:DigestValueType"/>
+<simpleType name="DigestValueType">
+  <restriction base="base64Binary"/>
+</simpleType>
+
+<!-- End SignedInfo -->
+
+<!-- Start KeyInfo -->
+
+<element name="KeyInfo" type="ds:KeyInfoType"/>
+<complexType name="KeyInfoType" mixed="true">
+  <choice maxOccurs="unbounded">
+    <element ref="ds:KeyName"/>
+    <element ref="ds:KeyValue"/>
+    <element ref="ds:RetrievalMethod"/>
+    <element ref="ds:X509Data"/>
+    <element ref="ds:PGPData"/>
+    <element ref="ds:SPKIData"/>
+    <element ref="ds:MgmtData"/>
+    <any processContents="lax" namespace="##other"/>
+    <!-- (1,1) elements from (0,unbounded) namespaces -->
+  </choice>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+  <element name="KeyName" type="string"/>
+  <element name="MgmtData" type="string"/>
+
+  <element name="KeyValue" type="ds:KeyValueType"/>
+  <complexType name="KeyValueType" mixed="true">
+   <choice>
+     <element ref="ds:DSAKeyValue"/>
+     <element ref="ds:RSAKeyValue"/>
+     <any namespace="##other" processContents="lax"/>
+   </choice>
+  </complexType>
+
+  <element name="RetrievalMethod" type="ds:RetrievalMethodType"/>
+  <complexType name="RetrievalMethodType">
+    <sequence>
+      <element ref="ds:Transforms" minOccurs="0"/>
+    </sequence>
+    <attribute name="URI" type="anyURI"/>
+    <attribute name="Type" type="anyURI" use="optional"/>
+  </complexType>
+
+<!-- Start X509Data -->
+
+<element name="X509Data" type="ds:X509DataType"/>
+<complexType name="X509DataType">
+  <sequence maxOccurs="unbounded">
+    <choice>
+      <element name="X509IssuerSerial" type="ds:X509IssuerSerialType"/>
+      <element name="X509SKI" type="base64Binary"/>
+      <element name="X509SubjectName" type="string"/>
+      <element name="X509Certificate" type="base64Binary"/>
+      <element name="X509CRL" type="base64Binary"/>
+      <any namespace="##other" processContents="lax"/>
+    </choice>
+  </sequence>
+</complexType>
+
+<complexType name="X509IssuerSerialType">
+  <sequence>
+    <element name="X509IssuerName" type="string"/>
+    <element name="X509SerialNumber" type="integer"/>
+  </sequence>
+</complexType>
+
+<!-- End X509Data -->
+
+<!-- Begin PGPData -->
+
+<element name="PGPData" type="ds:PGPDataType"/>
+<complexType name="PGPDataType">
+  <choice>
+    <sequence>
+      <element name="PGPKeyID" type="base64Binary"/>
+      <element name="PGPKeyPacket" type="base64Binary" minOccurs="0"/>
+      <any namespace="##other" processContents="lax" minOccurs="0"
+       maxOccurs="unbounded"/>
+    </sequence>
+    <sequence>
+      <element name="PGPKeyPacket" type="base64Binary"/>
+      <any namespace="##other" processContents="lax" minOccurs="0"
+       maxOccurs="unbounded"/>
+    </sequence>
+  </choice>
+</complexType>
+
+<!-- End PGPData -->
+
+<!-- Begin SPKIData -->
+
+<element name="SPKIData" type="ds:SPKIDataType"/>
+<complexType name="SPKIDataType">
+  <sequence maxOccurs="unbounded">
+    <element name="SPKISexp" type="base64Binary"/>
+    <any namespace="##other" processContents="lax" minOccurs="0"/>
+  </sequence>
+</complexType>
+
+<!-- End SPKIData -->
+
+<!-- End KeyInfo -->
+
+<!-- Start Object (Manifest, SignatureProperty) -->
+
+<element name="Object" type="ds:ObjectType"/>
+<complexType name="ObjectType" mixed="true">
+  <sequence minOccurs="0" maxOccurs="unbounded">
+    <any namespace="##any" processContents="lax"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+  <attribute name="MimeType" type="string" use="optional"/> <!-- add a grep facet -->
+  <attribute name="Encoding" type="anyURI" use="optional"/>
+</complexType>
+
+<element name="Manifest" type="ds:ManifestType"/>
+<complexType name="ManifestType">
+  <sequence>
+    <element ref="ds:Reference" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+<element name="SignatureProperties" type="ds:SignaturePropertiesType"/>
+<complexType name="SignaturePropertiesType">
+  <sequence>
+    <element ref="ds:SignatureProperty" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+   <element name="SignatureProperty" type="ds:SignaturePropertyType"/>
+   <complexType name="SignaturePropertyType" mixed="true">
+     <choice maxOccurs="unbounded">
+       <any namespace="##other" processContents="lax"/>
+       <!-- (1,1) elements from (1,unbounded) namespaces -->
+     </choice>
+     <attribute name="Target" type="anyURI" use="required"/>
+     <attribute name="Id" type="ID" use="optional"/>
+   </complexType>
+
+<!-- End Object (Manifest, SignatureProperty) -->
+
+<!-- Start Algorithm Parameters -->
+
+<simpleType name="HMACOutputLengthType">
+  <restriction base="integer"/>
+</simpleType>
+
+<!-- Start KeyValue Element-types -->
+
+<element name="DSAKeyValue" type="ds:DSAKeyValueType"/>
+<complexType name="DSAKeyValueType">
+  <sequence>
+    <sequence minOccurs="0">
+      <element name="P" type="ds:CryptoBinary"/>
+      <element name="Q" type="ds:CryptoBinary"/>
+    </sequence>
+    <element name="G" type="ds:CryptoBinary" minOccurs="0"/>
+    <element name="Y" type="ds:CryptoBinary"/>
+    <element name="J" type="ds:CryptoBinary" minOccurs="0"/>
+    <sequence minOccurs="0">
+      <element name="Seed" type="ds:CryptoBinary"/>
+      <element name="PgenCounter" type="ds:CryptoBinary"/>
+    </sequence>
+  </sequence>
+</complexType>
+
+<element name="RSAKeyValue" type="ds:RSAKeyValueType"/>
+<complexType name="RSAKeyValueType">
+  <sequence>
+    <element name="Modulus" type="ds:CryptoBinary"/>
+    <element name="Exponent" type="ds:CryptoBinary"/>
+  </sequence>
+</complexType>
+
+<!-- End KeyValue Element-types -->
+
+<!-- End Signature -->
+
+</schema>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE schema
+  PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"
+ [
+   <!ATTLIST schema
+     xmlns:ds CDATA #FIXED "http://www.w3.org/2000/09/xmldsig#">
+   <!ENTITY dsig 'http://www.w3.org/2000/09/xmldsig#'>
+   <!ENTITY % p ''>
+   <!ENTITY % s ''>
+  ]>
+
+<!-- Schema for XML Signatures
+    http://www.w3.org/2000/09/xmldsig#
+    $Revision: 1.1 $ on $Date: 2002/02/08 20:32:26 $ by $Author: reagle $
+
+    Copyright 2001 The Internet Society and W3C (Massachusetts Institute
+    of Technology, Institut National de Recherche en Informatique et en
+    Automatique, Keio University). All Rights Reserved.
+    http://www.w3.org/Consortium/Legal/
+
+    This document is governed by the W3C Software License [1] as described
+    in the FAQ [2].
+
+    [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+    [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
+-->
+
+
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+        targetNamespace="http://www.w3.org/2000/09/xmldsig#"
+        version="0.1" elementFormDefault="qualified">
+
+<!-- Basic Types Defined for Signatures -->
+
+<simpleType name="CryptoBinary">
+  <restriction base="base64Binary">
+  </restriction>
+</simpleType>
+
+<!-- Start Signature -->
+
+<element name="Signature" type="ds:SignatureType"/>
+<complexType name="SignatureType">
+  <sequence>
+    <element ref="ds:SignedInfo"/>
+    <element ref="ds:SignatureValue"/>
+    <element ref="ds:KeyInfo" minOccurs="0"/>
+    <element ref="ds:Object" minOccurs="0" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+  <element name="SignatureValue" type="ds:SignatureValueType"/>
+  <complexType name="SignatureValueType">
+    <simpleContent>
+      <extension base="base64Binary">
+        <attribute name="Id" type="ID" use="optional"/>
+      </extension>
+    </simpleContent>
+  </complexType>
+
+<!-- Start SignedInfo -->
+
+<element name="SignedInfo" type="ds:SignedInfoType"/>
+<complexType name="SignedInfoType">
+  <sequence>
+    <element ref="ds:CanonicalizationMethod"/>
+    <element ref="ds:SignatureMethod"/>
+    <element ref="ds:Reference" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+  <element name="CanonicalizationMethod" type="ds:CanonicalizationMethodType"/>
+  <complexType name="CanonicalizationMethodType" mixed="true">
+    <sequence>
+      <any namespace="##any" minOccurs="0" maxOccurs="unbounded"/>
+      <!-- (0,unbounded) elements from (1,1) namespace -->
+    </sequence>
+    <attribute name="Algorithm" type="anyURI" use="required"/>
+  </complexType>
+
+  <element name="SignatureMethod" type="ds:SignatureMethodType"/>
+  <complexType name="SignatureMethodType" mixed="true">
+    <sequence>
+      <element name="HMACOutputLength" minOccurs="0" type="ds:HMACOutputLengthType"/>
+      <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+      <!-- (0,unbounded) elements from (1,1) external namespace -->
+    </sequence>
+    <attribute name="Algorithm" type="anyURI" use="required"/>
+  </complexType>
+
+<!-- Start Reference -->
+
+<element name="Reference" type="ds:ReferenceType"/>
+<complexType name="ReferenceType">
+  <sequence>
+    <element ref="ds:Transforms" minOccurs="0"/>
+    <element ref="ds:DigestMethod"/>
+    <element ref="ds:DigestValue"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+  <attribute name="URI" type="anyURI" use="optional"/>
+  <attribute name="Type" type="anyURI" use="optional"/>
+</complexType>
+
+  <element name="Transforms" type="ds:TransformsType"/>
+  <complexType name="TransformsType">
+    <sequence>
+      <element ref="ds:Transform" maxOccurs="unbounded"/>
+    </sequence>
+  </complexType>
+
+  <element name="Transform" type="ds:TransformType"/>
+  <complexType name="TransformType" mixed="true">
+    <choice minOccurs="0" maxOccurs="unbounded">
+      <any namespace="##other" processContents="lax"/>
+      <!-- (1,1) elements from (0,unbounded) namespaces -->
+      <element name="XPath" type="string"/>
+    </choice>
+    <attribute name="Algorithm" type="anyURI" use="required"/>
+  </complexType>
+
+<!-- End Reference -->
+
+<element name="DigestMethod" type="ds:DigestMethodType"/>
+<complexType name="DigestMethodType" mixed="true">
+  <sequence>
+    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Algorithm" type="anyURI" use="required"/>
+</complexType>
+
+<element name="DigestValue" type="ds:DigestValueType"/>
+<simpleType name="DigestValueType">
+  <restriction base="base64Binary"/>
+</simpleType>
+
+<!-- End SignedInfo -->
+
+<!-- Start KeyInfo -->
+
+<element name="KeyInfo" type="ds:KeyInfoType"/>
+<complexType name="KeyInfoType" mixed="true">
+  <choice maxOccurs="unbounded">
+    <element ref="ds:KeyName"/>
+    <element ref="ds:KeyValue"/>
+    <element ref="ds:RetrievalMethod"/>
+    <element ref="ds:X509Data"/>
+    <element ref="ds:PGPData"/>
+    <element ref="ds:SPKIData"/>
+    <element ref="ds:MgmtData"/>
+    <any processContents="lax" namespace="##other"/>
+    <!-- (1,1) elements from (0,unbounded) namespaces -->
+  </choice>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+  <element name="KeyName" type="string"/>
+  <element name="MgmtData" type="string"/>
+
+  <element name="KeyValue" type="ds:KeyValueType"/>
+  <complexType name="KeyValueType" mixed="true">
+   <choice>
+     <element ref="ds:DSAKeyValue"/>
+     <element ref="ds:RSAKeyValue"/>
+     <any namespace="##other" processContents="lax"/>
+   </choice>
+  </complexType>
+
+  <element name="RetrievalMethod" type="ds:RetrievalMethodType"/>
+  <complexType name="RetrievalMethodType">
+    <sequence>
+      <element ref="ds:Transforms" minOccurs="0"/>
+    </sequence>
+    <attribute name="URI" type="anyURI"/>
+    <attribute name="Type" type="anyURI" use="optional"/>
+  </complexType>
+
+<!-- Start X509Data -->
+
+<element name="X509Data" type="ds:X509DataType"/>
+<complexType name="X509DataType">
+  <sequence maxOccurs="unbounded">
+    <choice>
+      <element name="X509IssuerSerial" type="ds:X509IssuerSerialType"/>
+      <element name="X509SKI" type="base64Binary"/>
+      <element name="X509SubjectName" type="string"/>
+      <element name="X509Certificate" type="base64Binary"/>
+      <element name="X509CRL" type="base64Binary"/>
+      <any namespace="##other" processContents="lax"/>
+    </choice>
+  </sequence>
+</complexType>
+
+<complexType name="X509IssuerSerialType">
+  <sequence>
+    <element name="X509IssuerName" type="string"/>
+    <element name="X509SerialNumber" type="integer"/>
+  </sequence>
+</complexType>
+
+<!-- End X509Data -->
+
+<!-- Begin PGPData -->
+
+<element name="PGPData" type="ds:PGPDataType"/>
+<complexType name="PGPDataType">
+  <choice>
+    <sequence>
+      <element name="PGPKeyID" type="base64Binary"/>
+      <element name="PGPKeyPacket" type="base64Binary" minOccurs="0"/>
+      <any namespace="##other" processContents="lax" minOccurs="0"
+       maxOccurs="unbounded"/>
+    </sequence>
+    <sequence>
+      <element name="PGPKeyPacket" type="base64Binary"/>
+      <any namespace="##other" processContents="lax" minOccurs="0"
+       maxOccurs="unbounded"/>
+    </sequence>
+  </choice>
+</complexType>
+
+<!-- End PGPData -->
+
+<!-- Begin SPKIData -->
+
+<element name="SPKIData" type="ds:SPKIDataType"/>
+<complexType name="SPKIDataType">
+  <sequence maxOccurs="unbounded">
+    <element name="SPKISexp" type="base64Binary"/>
+    <any namespace="##other" processContents="lax" minOccurs="0"/>
+  </sequence>
+</complexType>
+
+<!-- End SPKIData -->
+
+<!-- End KeyInfo -->
+
+<!-- Start Object (Manifest, SignatureProperty) -->
+
+<element name="Object" type="ds:ObjectType"/>
+<complexType name="ObjectType" mixed="true">
+  <sequence minOccurs="0" maxOccurs="unbounded">
+    <any namespace="##any" processContents="lax"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+  <attribute name="MimeType" type="string" use="optional"/> <!-- add a grep facet -->
+  <attribute name="Encoding" type="anyURI" use="optional"/>
+</complexType>
+
+<element name="Manifest" type="ds:ManifestType"/>
+<complexType name="ManifestType">
+  <sequence>
+    <element ref="ds:Reference" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+<element name="SignatureProperties" type="ds:SignaturePropertiesType"/>
+<complexType name="SignaturePropertiesType">
+  <sequence>
+    <element ref="ds:SignatureProperty" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+   <element name="SignatureProperty" type="ds:SignaturePropertyType"/>
+   <complexType name="SignaturePropertyType" mixed="true">
+     <choice maxOccurs="unbounded">
+       <any namespace="##other" processContents="lax"/>
+       <!-- (1,1) elements from (1,unbounded) namespaces -->
+     </choice>
+     <attribute name="Target" type="anyURI" use="required"/>
+     <attribute name="Id" type="ID" use="optional"/>
+   </complexType>
+
+<!-- End Object (Manifest, SignatureProperty) -->
+
+<!-- Start Algorithm Parameters -->
+
+<simpleType name="HMACOutputLengthType">
+  <restriction base="integer"/>
+</simpleType>
+
+<!-- Start KeyValue Element-types -->
+
+<element name="DSAKeyValue" type="ds:DSAKeyValueType"/>
+<complexType name="DSAKeyValueType">
+  <sequence>
+    <sequence minOccurs="0">
+      <element name="P" type="ds:CryptoBinary"/>
+      <element name="Q" type="ds:CryptoBinary"/>
+    </sequence>
+    <element name="G" type="ds:CryptoBinary" minOccurs="0"/>
+    <element name="Y" type="ds:CryptoBinary"/>
+    <element name="J" type="ds:CryptoBinary" minOccurs="0"/>
+    <sequence minOccurs="0">
+      <element name="Seed" type="ds:CryptoBinary"/>
+      <element name="PgenCounter" type="ds:CryptoBinary"/>
+    </sequence>
+  </sequence>
+</complexType>
+
+<element name="RSAKeyValue" type="ds:RSAKeyValueType"/>
+<complexType name="RSAKeyValueType">
+  <sequence>
+    <element name="Modulus" type="ds:CryptoBinary"/>
+    <element name="Exponent" type="ds:CryptoBinary"/>
+  </sequence>
+</complexType>
+
+<!-- End KeyValue Element-types -->
+
+<!-- End Signature -->
+
+</schema>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE schema
+  PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"
+ [
+   <!ATTLIST schema
+     xmlns:ds CDATA #FIXED "http://www.w3.org/2000/09/xmldsig#">
+   <!ENTITY dsig 'http://www.w3.org/2000/09/xmldsig#'>
+   <!ENTITY % p ''>
+   <!ENTITY % s ''>
+  ]>
+
+<!-- Schema for XML Signatures
+    http://www.w3.org/2000/09/xmldsig#
+    $Revision: 1.1 $ on $Date: 2002/02/08 20:32:26 $ by $Author: reagle $
+
+    Copyright 2001 The Internet Society and W3C (Massachusetts Institute
+    of Technology, Institut National de Recherche en Informatique et en
+    Automatique, Keio University). All Rights Reserved.
+    http://www.w3.org/Consortium/Legal/
+
+    This document is governed by the W3C Software License [1] as described
+    in the FAQ [2].
+
+    [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+    [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
+-->
+
+
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+        targetNamespace="http://www.w3.org/2000/09/xmldsig#"
+        version="0.1" elementFormDefault="qualified">
+
+<!-- Basic Types Defined for Signatures -->
+
+<simpleType name="CryptoBinary">
+  <restriction base="base64Binary">
+  </restriction>
+</simpleType>
+
+<!-- Start Signature -->
+
+<element name="Signature" type="ds:SignatureType"/>
+<complexType name="SignatureType">
+  <sequence>
+    <element ref="ds:SignedInfo"/>
+    <element ref="ds:SignatureValue"/>
+    <element ref="ds:KeyInfo" minOccurs="0"/>
+    <element ref="ds:Object" minOccurs="0" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+  <element name="SignatureValue" type="ds:SignatureValueType"/>
+  <complexType name="SignatureValueType">
+    <simpleContent>
+      <extension base="base64Binary">
+        <attribute name="Id" type="ID" use="optional"/>
+      </extension>
+    </simpleContent>
+  </complexType>
+
+<!-- Start SignedInfo -->
+
+<element name="SignedInfo" type="ds:SignedInfoType"/>
+<complexType name="SignedInfoType">
+  <sequence>
+    <element ref="ds:CanonicalizationMethod"/>
+    <element ref="ds:SignatureMethod"/>
+    <element ref="ds:Reference" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+  <element name="CanonicalizationMethod" type="ds:CanonicalizationMethodType"/>
+  <complexType name="CanonicalizationMethodType" mixed="true">
+    <sequence>
+      <any namespace="##any" minOccurs="0" maxOccurs="unbounded"/>
+      <!-- (0,unbounded) elements from (1,1) namespace -->
+    </sequence>
+    <attribute name="Algorithm" type="anyURI" use="required"/>
+  </complexType>
+
+  <element name="SignatureMethod" type="ds:SignatureMethodType"/>
+  <complexType name="SignatureMethodType" mixed="true">
+    <sequence>
+      <element name="HMACOutputLength" minOccurs="0" type="ds:HMACOutputLengthType"/>
+      <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+      <!-- (0,unbounded) elements from (1,1) external namespace -->
+    </sequence>
+    <attribute name="Algorithm" type="anyURI" use="required"/>
+  </complexType>
+
+<!-- Start Reference -->
+
+<element name="Reference" type="ds:ReferenceType"/>
+<complexType name="ReferenceType">
+  <sequence>
+    <element ref="ds:Transforms" minOccurs="0"/>
+    <element ref="ds:DigestMethod"/>
+    <element ref="ds:DigestValue"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+  <attribute name="URI" type="anyURI" use="optional"/>
+  <attribute name="Type" type="anyURI" use="optional"/>
+</complexType>
+
+  <element name="Transforms" type="ds:TransformsType"/>
+  <complexType name="TransformsType">
+    <sequence>
+      <element ref="ds:Transform" maxOccurs="unbounded"/>
+    </sequence>
+  </complexType>
+
+  <element name="Transform" type="ds:TransformType"/>
+  <complexType name="TransformType" mixed="true">
+    <choice minOccurs="0" maxOccurs="unbounded">
+      <any namespace="##other" processContents="lax"/>
+      <!-- (1,1) elements from (0,unbounded) namespaces -->
+      <element name="XPath" type="string"/>
+    </choice>
+    <attribute name="Algorithm" type="anyURI" use="required"/>
+  </complexType>
+
+<!-- End Reference -->
+
+<element name="DigestMethod" type="ds:DigestMethodType"/>
+<complexType name="DigestMethodType" mixed="true">
+  <sequence>
+    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Algorithm" type="anyURI" use="required"/>
+</complexType>
+
+<element name="DigestValue" type="ds:DigestValueType"/>
+<simpleType name="DigestValueType">
+  <restriction base="base64Binary"/>
+</simpleType>
+
+<!-- End SignedInfo -->
+
+<!-- Start KeyInfo -->
+
+<element name="KeyInfo" type="ds:KeyInfoType"/>
+<complexType name="KeyInfoType" mixed="true">
+  <choice maxOccurs="unbounded">
+    <element ref="ds:KeyName"/>
+    <element ref="ds:KeyValue"/>
+    <element ref="ds:RetrievalMethod"/>
+    <element ref="ds:X509Data"/>
+    <element ref="ds:PGPData"/>
+    <element ref="ds:SPKIData"/>
+    <element ref="ds:MgmtData"/>
+    <any processContents="lax" namespace="##other"/>
+    <!-- (1,1) elements from (0,unbounded) namespaces -->
+  </choice>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+  <element name="KeyName" type="string"/>
+  <element name="MgmtData" type="string"/>
+
+  <element name="KeyValue" type="ds:KeyValueType"/>
+  <complexType name="KeyValueType" mixed="true">
+   <choice>
+     <element ref="ds:DSAKeyValue"/>
+     <element ref="ds:RSAKeyValue"/>
+     <any namespace="##other" processContents="lax"/>
+   </choice>
+  </complexType>
+
+  <element name="RetrievalMethod" type="ds:RetrievalMethodType"/>
+  <complexType name="RetrievalMethodType">
+    <sequence>
+      <element ref="ds:Transforms" minOccurs="0"/>
+    </sequence>
+    <attribute name="URI" type="anyURI"/>
+    <attribute name="Type" type="anyURI" use="optional"/>
+  </complexType>
+
+<!-- Start X509Data -->
+
+<element name="X509Data" type="ds:X509DataType"/>
+<complexType name="X509DataType">
+  <sequence maxOccurs="unbounded">
+    <choice>
+      <element name="X509IssuerSerial" type="ds:X509IssuerSerialType"/>
+      <element name="X509SKI" type="base64Binary"/>
+      <element name="X509SubjectName" type="string"/>
+      <element name="X509Certificate" type="base64Binary"/>
+      <element name="X509CRL" type="base64Binary"/>
+      <any namespace="##other" processContents="lax"/>
+    </choice>
+  </sequence>
+</complexType>
+
+<complexType name="X509IssuerSerialType">
+  <sequence>
+    <element name="X509IssuerName" type="string"/>
+    <element name="X509SerialNumber" type="integer"/>
+  </sequence>
+</complexType>
+
+<!-- End X509Data -->
+
+<!-- Begin PGPData -->
+
+<element name="PGPData" type="ds:PGPDataType"/>
+<complexType name="PGPDataType">
+  <choice>
+    <sequence>
+      <element name="PGPKeyID" type="base64Binary"/>
+      <element name="PGPKeyPacket" type="base64Binary" minOccurs="0"/>
+      <any namespace="##other" processContents="lax" minOccurs="0"
+       maxOccurs="unbounded"/>
+    </sequence>
+    <sequence>
+      <element name="PGPKeyPacket" type="base64Binary"/>
+      <any namespace="##other" processContents="lax" minOccurs="0"
+       maxOccurs="unbounded"/>
+    </sequence>
+  </choice>
+</complexType>
+
+<!-- End PGPData -->
+
+<!-- Begin SPKIData -->
+
+<element name="SPKIData" type="ds:SPKIDataType"/>
+<complexType name="SPKIDataType">
+  <sequence maxOccurs="unbounded">
+    <element name="SPKISexp" type="base64Binary"/>
+    <any namespace="##other" processContents="lax" minOccurs="0"/>
+  </sequence>
+</complexType>
+
+<!-- End SPKIData -->
+
+<!-- End KeyInfo -->
+
+<!-- Start Object (Manifest, SignatureProperty) -->
+
+<element name="Object" type="ds:ObjectType"/>
+<complexType name="ObjectType" mixed="true">
+  <sequence minOccurs="0" maxOccurs="unbounded">
+    <any namespace="##any" processContents="lax"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+  <attribute name="MimeType" type="string" use="optional"/> <!-- add a grep facet -->
+  <attribute name="Encoding" type="anyURI" use="optional"/>
+</complexType>
+
+<element name="Manifest" type="ds:ManifestType"/>
+<complexType name="ManifestType">
+  <sequence>
+    <element ref="ds:Reference" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+<element name="SignatureProperties" type="ds:SignaturePropertiesType"/>
+<complexType name="SignaturePropertiesType">
+  <sequence>
+    <element ref="ds:SignatureProperty" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+   <element name="SignatureProperty" type="ds:SignaturePropertyType"/>
+   <complexType name="SignaturePropertyType" mixed="true">
+     <choice maxOccurs="unbounded">
+       <any namespace="##other" processContents="lax"/>
+       <!-- (1,1) elements from (1,unbounded) namespaces -->
+     </choice>
+     <attribute name="Target" type="anyURI" use="required"/>
+     <attribute name="Id" type="ID" use="optional"/>
+   </complexType>
+
+<!-- End Object (Manifest, SignatureProperty) -->
+
+<!-- Start Algorithm Parameters -->
+
+<simpleType name="HMACOutputLengthType">
+  <restriction base="integer"/>
+</simpleType>
+
+<!-- Start KeyValue Element-types -->
+
+<element name="DSAKeyValue" type="ds:DSAKeyValueType"/>
+<complexType name="DSAKeyValueType">
+  <sequence>
+    <sequence minOccurs="0">
+      <element name="P" type="ds:CryptoBinary"/>
+      <element name="Q" type="ds:CryptoBinary"/>
+    </sequence>
+    <element name="G" type="ds:CryptoBinary" minOccurs="0"/>
+    <element name="Y" type="ds:CryptoBinary"/>
+    <element name="J" type="ds:CryptoBinary" minOccurs="0"/>
+    <sequence minOccurs="0">
+      <element name="Seed" type="ds:CryptoBinary"/>
+      <element name="PgenCounter" type="ds:CryptoBinary"/>
+    </sequence>
+  </sequence>
+</complexType>
+
+<element name="RSAKeyValue" type="ds:RSAKeyValueType"/>
+<complexType name="RSAKeyValueType">
+  <sequence>
+    <element name="Modulus" type="ds:CryptoBinary"/>
+    <element name="Exponent" type="ds:CryptoBinary"/>
+  </sequence>
+</complexType>
+
+<!-- End KeyValue Element-types -->
+
+<!-- End Signature -->
+
+</schema>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE schema
+  PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"
+ [
+   <!ATTLIST schema
+     xmlns:ds CDATA #FIXED "http://www.w3.org/2000/09/xmldsig#">
+   <!ENTITY dsig 'http://www.w3.org/2000/09/xmldsig#'>
+   <!ENTITY % p ''>
+   <!ENTITY % s ''>
+  ]>
+
+<!-- Schema for XML Signatures
+    http://www.w3.org/2000/09/xmldsig#
+    $Revision: 1.1 $ on $Date: 2002/02/08 20:32:26 $ by $Author: reagle $
+
+    Copyright 2001 The Internet Society and W3C (Massachusetts Institute
+    of Technology, Institut National de Recherche en Informatique et en
+    Automatique, Keio University). All Rights Reserved.
+    http://www.w3.org/Consortium/Legal/
+
+    This document is governed by the W3C Software License [1] as described
+    in the FAQ [2].
+
+    [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+    [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
+-->
+
+
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+        targetNamespace="http://www.w3.org/2000/09/xmldsig#"
+        version="0.1" elementFormDefault="qualified">
+
+<!-- Basic Types Defined for Signatures -->
+
+<simpleType name="CryptoBinary">
+  <restriction base="base64Binary">
+  </restriction>
+</simpleType>
+
+<!-- Start Signature -->
+
+<element name="Signature" type="ds:SignatureType"/>
+<complexType name="SignatureType">
+  <sequence>
+    <element ref="ds:SignedInfo"/>
+    <element ref="ds:SignatureValue"/>
+    <element ref="ds:KeyInfo" minOccurs="0"/>
+    <element ref="ds:Object" minOccurs="0" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+  <element name="SignatureValue" type="ds:SignatureValueType"/>
+  <complexType name="SignatureValueType">
+    <simpleContent>
+      <extension base="base64Binary">
+        <attribute name="Id" type="ID" use="optional"/>
+      </extension>
+    </simpleContent>
+  </complexType>
+
+<!-- Start SignedInfo -->
+
+<element name="SignedInfo" type="ds:SignedInfoType"/>
+<complexType name="SignedInfoType">
+  <sequence>
+    <element ref="ds:CanonicalizationMethod"/>
+    <element ref="ds:SignatureMethod"/>
+    <element ref="ds:Reference" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+  <element name="CanonicalizationMethod" type="ds:CanonicalizationMethodType"/>
+  <complexType name="CanonicalizationMethodType" mixed="true">
+    <sequence>
+      <any namespace="##any" minOccurs="0" maxOccurs="unbounded"/>
+      <!-- (0,unbounded) elements from (1,1) namespace -->
+    </sequence>
+    <attribute name="Algorithm" type="anyURI" use="required"/>
+  </complexType>
+
+  <element name="SignatureMethod" type="ds:SignatureMethodType"/>
+  <complexType name="SignatureMethodType" mixed="true">
+    <sequence>
+      <element name="HMACOutputLength" minOccurs="0" type="ds:HMACOutputLengthType"/>
+      <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+      <!-- (0,unbounded) elements from (1,1) external namespace -->
+    </sequence>
+    <attribute name="Algorithm" type="anyURI" use="required"/>
+  </complexType>
+
+<!-- Start Reference -->
+
+<element name="Reference" type="ds:ReferenceType"/>
+<complexType name="ReferenceType">
+  <sequence>
+    <element ref="ds:Transforms" minOccurs="0"/>
+    <element ref="ds:DigestMethod"/>
+    <element ref="ds:DigestValue"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+  <attribute name="URI" type="anyURI" use="optional"/>
+  <attribute name="Type" type="anyURI" use="optional"/>
+</complexType>
+
+  <element name="Transforms" type="ds:TransformsType"/>
+  <complexType name="TransformsType">
+    <sequence>
+      <element ref="ds:Transform" maxOccurs="unbounded"/>
+    </sequence>
+  </complexType>
+
+  <element name="Transform" type="ds:TransformType"/>
+  <complexType name="TransformType" mixed="true">
+    <choice minOccurs="0" maxOccurs="unbounded">
+      <any namespace="##other" processContents="lax"/>
+      <!-- (1,1) elements from (0,unbounded) namespaces -->
+      <element name="XPath" type="string"/>
+    </choice>
+    <attribute name="Algorithm" type="anyURI" use="required"/>
+  </complexType>
+
+<!-- End Reference -->
+
+<element name="DigestMethod" type="ds:DigestMethodType"/>
+<complexType name="DigestMethodType" mixed="true">
+  <sequence>
+    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Algorithm" type="anyURI" use="required"/>
+</complexType>
+
+<element name="DigestValue" type="ds:DigestValueType"/>
+<simpleType name="DigestValueType">
+  <restriction base="base64Binary"/>
+</simpleType>
+
+<!-- End SignedInfo -->
+
+<!-- Start KeyInfo -->
+
+<element name="KeyInfo" type="ds:KeyInfoType"/>
+<complexType name="KeyInfoType" mixed="true">
+  <choice maxOccurs="unbounded">
+    <element ref="ds:KeyName"/>
+    <element ref="ds:KeyValue"/>
+    <element ref="ds:RetrievalMethod"/>
+    <element ref="ds:X509Data"/>
+    <element ref="ds:PGPData"/>
+    <element ref="ds:SPKIData"/>
+    <element ref="ds:MgmtData"/>
+    <any processContents="lax" namespace="##other"/>
+    <!-- (1,1) elements from (0,unbounded) namespaces -->
+  </choice>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+  <element name="KeyName" type="string"/>
+  <element name="MgmtData" type="string"/>
+
+  <element name="KeyValue" type="ds:KeyValueType"/>
+  <complexType name="KeyValueType" mixed="true">
+   <choice>
+     <element ref="ds:DSAKeyValue"/>
+     <element ref="ds:RSAKeyValue"/>
+     <any namespace="##other" processContents="lax"/>
+   </choice>
+  </complexType>
+
+  <element name="RetrievalMethod" type="ds:RetrievalMethodType"/>
+  <complexType name="RetrievalMethodType">
+    <sequence>
+      <element ref="ds:Transforms" minOccurs="0"/>
+    </sequence>
+    <attribute name="URI" type="anyURI"/>
+    <attribute name="Type" type="anyURI" use="optional"/>
+  </complexType>
+
+<!-- Start X509Data -->
+
+<element name="X509Data" type="ds:X509DataType"/>
+<complexType name="X509DataType">
+  <sequence maxOccurs="unbounded">
+    <choice>
+      <element name="X509IssuerSerial" type="ds:X509IssuerSerialType"/>
+      <element name="X509SKI" type="base64Binary"/>
+      <element name="X509SubjectName" type="string"/>
+      <element name="X509Certificate" type="base64Binary"/>
+      <element name="X509CRL" type="base64Binary"/>
+      <any namespace="##other" processContents="lax"/>
+    </choice>
+  </sequence>
+</complexType>
+
+<complexType name="X509IssuerSerialType">
+  <sequence>
+    <element name="X509IssuerName" type="string"/>
+    <element name="X509SerialNumber" type="integer"/>
+  </sequence>
+</complexType>
+
+<!-- End X509Data -->
+
+<!-- Begin PGPData -->
+
+<element name="PGPData" type="ds:PGPDataType"/>
+<complexType name="PGPDataType">
+  <choice>
+    <sequence>
+      <element name="PGPKeyID" type="base64Binary"/>
+      <element name="PGPKeyPacket" type="base64Binary" minOccurs="0"/>
+      <any namespace="##other" processContents="lax" minOccurs="0"
+       maxOccurs="unbounded"/>
+    </sequence>
+    <sequence>
+      <element name="PGPKeyPacket" type="base64Binary"/>
+      <any namespace="##other" processContents="lax" minOccurs="0"
+       maxOccurs="unbounded"/>
+    </sequence>
+  </choice>
+</complexType>
+
+<!-- End PGPData -->
+
+<!-- Begin SPKIData -->
+
+<element name="SPKIData" type="ds:SPKIDataType"/>
+<complexType name="SPKIDataType">
+  <sequence maxOccurs="unbounded">
+    <element name="SPKISexp" type="base64Binary"/>
+    <any namespace="##other" processContents="lax" minOccurs="0"/>
+  </sequence>
+</complexType>
+
+<!-- End SPKIData -->
+
+<!-- End KeyInfo -->
+
+<!-- Start Object (Manifest, SignatureProperty) -->
+
+<element name="Object" type="ds:ObjectType"/>
+<complexType name="ObjectType" mixed="true">
+  <sequence minOccurs="0" maxOccurs="unbounded">
+    <any namespace="##any" processContents="lax"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+  <attribute name="MimeType" type="string" use="optional"/> <!-- add a grep facet -->
+  <attribute name="Encoding" type="anyURI" use="optional"/>
+</complexType>
+
+<element name="Manifest" type="ds:ManifestType"/>
+<complexType name="ManifestType">
+  <sequence>
+    <element ref="ds:Reference" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+<element name="SignatureProperties" type="ds:SignaturePropertiesType"/>
+<complexType name="SignaturePropertiesType">
+  <sequence>
+    <element ref="ds:SignatureProperty" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+   <element name="SignatureProperty" type="ds:SignaturePropertyType"/>
+   <complexType name="SignaturePropertyType" mixed="true">
+     <choice maxOccurs="unbounded">
+       <any namespace="##other" processContents="lax"/>
+       <!-- (1,1) elements from (1,unbounded) namespaces -->
+     </choice>
+     <attribute name="Target" type="anyURI" use="required"/>
+     <attribute name="Id" type="ID" use="optional"/>
+   </complexType>
+
+<!-- End Object (Manifest, SignatureProperty) -->
+
+<!-- Start Algorithm Parameters -->
+
+<simpleType name="HMACOutputLengthType">
+  <restriction base="integer"/>
+</simpleType>
+
+<!-- Start KeyValue Element-types -->
+
+<element name="DSAKeyValue" type="ds:DSAKeyValueType"/>
+<complexType name="DSAKeyValueType">
+  <sequence>
+    <sequence minOccurs="0">
+      <element name="P" type="ds:CryptoBinary"/>
+      <element name="Q" type="ds:CryptoBinary"/>
+    </sequence>
+    <element name="G" type="ds:CryptoBinary" minOccurs="0"/>
+    <element name="Y" type="ds:CryptoBinary"/>
+    <element name="J" type="ds:CryptoBinary" minOccurs="0"/>
+    <sequence minOccurs="0">
+      <element name="Seed" type="ds:CryptoBinary"/>
+      <element name="PgenCounter" type="ds:CryptoBinary"/>
+    </sequence>
+  </sequence>
+</complexType>
+
+<element name="RSAKeyValue" type="ds:RSAKeyValueType"/>
+<complexType name="RSAKeyValueType">
+  <sequence>
+    <element name="Modulus" type="ds:CryptoBinary"/>
+    <element name="Exponent" type="ds:CryptoBinary"/>
+  </sequence>
+</complexType>
+
+<!-- End KeyValue Element-types -->
+
+<!-- End Signature -->
+
+</schema>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE schema
+  PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"
+ [
+   <!ATTLIST schema
+     xmlns:ds CDATA #FIXED "http://www.w3.org/2000/09/xmldsig#">
+   <!ENTITY dsig 'http://www.w3.org/2000/09/xmldsig#'>
+   <!ENTITY % p ''>
+   <!ENTITY % s ''>
+  ]>
+
+<!-- Schema for XML Signatures
+    http://www.w3.org/2000/09/xmldsig#
+    $Revision: 1.1 $ on $Date: 2002/02/08 20:32:26 $ by $Author: reagle $
+
+    Copyright 2001 The Internet Society and W3C (Massachusetts Institute
+    of Technology, Institut National de Recherche en Informatique et en
+    Automatique, Keio University). All Rights Reserved.
+    http://www.w3.org/Consortium/Legal/
+
+    This document is governed by the W3C Software License [1] as described
+    in the FAQ [2].
+
+    [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+    [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
+-->
+
+
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+        targetNamespace="http://www.w3.org/2000/09/xmldsig#"
+        version="0.1" elementFormDefault="qualified">
+
+<!-- Basic Types Defined for Signatures -->
+
+<simpleType name="CryptoBinary">
+  <restriction base="base64Binary">
+  </restriction>
+</simpleType>
+
+<!-- Start Signature -->
+
+<element name="Signature" type="ds:SignatureType"/>
+<complexType name="SignatureType">
+  <sequence>
+    <element ref="ds:SignedInfo"/>
+    <element ref="ds:SignatureValue"/>
+    <element ref="ds:KeyInfo" minOccurs="0"/>
+    <element ref="ds:Object" minOccurs="0" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+  <element name="SignatureValue" type="ds:SignatureValueType"/>
+  <complexType name="SignatureValueType">
+    <simpleContent>
+      <extension base="base64Binary">
+        <attribute name="Id" type="ID" use="optional"/>
+      </extension>
+    </simpleContent>
+  </complexType>
+
+<!-- Start SignedInfo -->
+
+<element name="SignedInfo" type="ds:SignedInfoType"/>
+<complexType name="SignedInfoType">
+  <sequence>
+    <element ref="ds:CanonicalizationMethod"/>
+    <element ref="ds:SignatureMethod"/>
+    <element ref="ds:Reference" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+  <element name="CanonicalizationMethod" type="ds:CanonicalizationMethodType"/>
+  <complexType name="CanonicalizationMethodType" mixed="true">
+    <sequence>
+      <any namespace="##any" minOccurs="0" maxOccurs="unbounded"/>
+      <!-- (0,unbounded) elements from (1,1) namespace -->
+    </sequence>
+    <attribute name="Algorithm" type="anyURI" use="required"/>
+  </complexType>
+
+  <element name="SignatureMethod" type="ds:SignatureMethodType"/>
+  <complexType name="SignatureMethodType" mixed="true">
+    <sequence>
+      <element name="HMACOutputLength" minOccurs="0" type="ds:HMACOutputLengthType"/>
+      <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+      <!-- (0,unbounded) elements from (1,1) external namespace -->
+    </sequence>
+    <attribute name="Algorithm" type="anyURI" use="required"/>
+  </complexType>
+
+<!-- Start Reference -->
+
+<element name="Reference" type="ds:ReferenceType"/>
+<complexType name="ReferenceType">
+  <sequence>
+    <element ref="ds:Transforms" minOccurs="0"/>
+    <element ref="ds:DigestMethod"/>
+    <element ref="ds:DigestValue"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+  <attribute name="URI" type="anyURI" use="optional"/>
+  <attribute name="Type" type="anyURI" use="optional"/>
+</complexType>
+
+  <element name="Transforms" type="ds:TransformsType"/>
+  <complexType name="TransformsType">
+    <sequence>
+      <element ref="ds:Transform" maxOccurs="unbounded"/>
+    </sequence>
+  </complexType>
+
+  <element name="Transform" type="ds:TransformType"/>
+  <complexType name="TransformType" mixed="true">
+    <choice minOccurs="0" maxOccurs="unbounded">
+      <any namespace="##other" processContents="lax"/>
+      <!-- (1,1) elements from (0,unbounded) namespaces -->
+      <element name="XPath" type="string"/>
+    </choice>
+    <attribute name="Algorithm" type="anyURI" use="required"/>
+  </complexType>
+
+<!-- End Reference -->
+
+<element name="DigestMethod" type="ds:DigestMethodType"/>
+<complexType name="DigestMethodType" mixed="true">
+  <sequence>
+    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Algorithm" type="anyURI" use="required"/>
+</complexType>
+
+<element name="DigestValue" type="ds:DigestValueType"/>
+<simpleType name="DigestValueType">
+  <restriction base="base64Binary"/>
+</simpleType>
+
+<!-- End SignedInfo -->
+
+<!-- Start KeyInfo -->
+
+<element name="KeyInfo" type="ds:KeyInfoType"/>
+<complexType name="KeyInfoType" mixed="true">
+  <choice maxOccurs="unbounded">
+    <element ref="ds:KeyName"/>
+    <element ref="ds:KeyValue"/>
+    <element ref="ds:RetrievalMethod"/>
+    <element ref="ds:X509Data"/>
+    <element ref="ds:PGPData"/>
+    <element ref="ds:SPKIData"/>
+    <element ref="ds:MgmtData"/>
+    <any processContents="lax" namespace="##other"/>
+    <!-- (1,1) elements from (0,unbounded) namespaces -->
+  </choice>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+  <element name="KeyName" type="string"/>
+  <element name="MgmtData" type="string"/>
+
+  <element name="KeyValue" type="ds:KeyValueType"/>
+  <complexType name="KeyValueType" mixed="true">
+   <choice>
+     <element ref="ds:DSAKeyValue"/>
+     <element ref="ds:RSAKeyValue"/>
+     <any namespace="##other" processContents="lax"/>
+   </choice>
+  </complexType>
+
+  <element name="RetrievalMethod" type="ds:RetrievalMethodType"/>
+  <complexType name="RetrievalMethodType">
+    <sequence>
+      <element ref="ds:Transforms" minOccurs="0"/>
+    </sequence>
+    <attribute name="URI" type="anyURI"/>
+    <attribute name="Type" type="anyURI" use="optional"/>
+  </complexType>
+
+<!-- Start X509Data -->
+
+<element name="X509Data" type="ds:X509DataType"/>
+<complexType name="X509DataType">
+  <sequence maxOccurs="unbounded">
+    <choice>
+      <element name="X509IssuerSerial" type="ds:X509IssuerSerialType"/>
+      <element name="X509SKI" type="base64Binary"/>
+      <element name="X509SubjectName" type="string"/>
+      <element name="X509Certificate" type="base64Binary"/>
+      <element name="X509CRL" type="base64Binary"/>
+      <any namespace="##other" processContents="lax"/>
+    </choice>
+  </sequence>
+</complexType>
+
+<complexType name="X509IssuerSerialType">
+  <sequence>
+    <element name="X509IssuerName" type="string"/>
+    <element name="X509SerialNumber" type="integer"/>
+  </sequence>
+</complexType>
+
+<!-- End X509Data -->
+
+<!-- Begin PGPData -->
+
+<element name="PGPData" type="ds:PGPDataType"/>
+<complexType name="PGPDataType">
+  <choice>
+    <sequence>
+      <element name="PGPKeyID" type="base64Binary"/>
+      <element name="PGPKeyPacket" type="base64Binary" minOccurs="0"/>
+      <any namespace="##other" processContents="lax" minOccurs="0"
+       maxOccurs="unbounded"/>
+    </sequence>
+    <sequence>
+      <element name="PGPKeyPacket" type="base64Binary"/>
+      <any namespace="##other" processContents="lax" minOccurs="0"
+       maxOccurs="unbounded"/>
+    </sequence>
+  </choice>
+</complexType>
+
+<!-- End PGPData -->
+
+<!-- Begin SPKIData -->
+
+<element name="SPKIData" type="ds:SPKIDataType"/>
+<complexType name="SPKIDataType">
+  <sequence maxOccurs="unbounded">
+    <element name="SPKISexp" type="base64Binary"/>
+    <any namespace="##other" processContents="lax" minOccurs="0"/>
+  </sequence>
+</complexType>
+
+<!-- End SPKIData -->
+
+<!-- End KeyInfo -->
+
+<!-- Start Object (Manifest, SignatureProperty) -->
+
+<element name="Object" type="ds:ObjectType"/>
+<complexType name="ObjectType" mixed="true">
+  <sequence minOccurs="0" maxOccurs="unbounded">
+    <any namespace="##any" processContents="lax"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+  <attribute name="MimeType" type="string" use="optional"/> <!-- add a grep facet -->
+  <attribute name="Encoding" type="anyURI" use="optional"/>
+</complexType>
+
+<element name="Manifest" type="ds:ManifestType"/>
+<complexType name="ManifestType">
+  <sequence>
+    <element ref="ds:Reference" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+<element name="SignatureProperties" type="ds:SignaturePropertiesType"/>
+<complexType name="SignaturePropertiesType">
+  <sequence>
+    <element ref="ds:SignatureProperty" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+   <element name="SignatureProperty" type="ds:SignaturePropertyType"/>
+   <complexType name="SignaturePropertyType" mixed="true">
+     <choice maxOccurs="unbounded">
+       <any namespace="##other" processContents="lax"/>
+       <!-- (1,1) elements from (1,unbounded) namespaces -->
+     </choice>
+     <attribute name="Target" type="anyURI" use="required"/>
+     <attribute name="Id" type="ID" use="optional"/>
+   </complexType>
+
+<!-- End Object (Manifest, SignatureProperty) -->
+
+<!-- Start Algorithm Parameters -->
+
+<simpleType name="HMACOutputLengthType">
+  <restriction base="integer"/>
+</simpleType>
+
+<!-- Start KeyValue Element-types -->
+
+<element name="DSAKeyValue" type="ds:DSAKeyValueType"/>
+<complexType name="DSAKeyValueType">
+  <sequence>
+    <sequence minOccurs="0">
+      <element name="P" type="ds:CryptoBinary"/>
+      <element name="Q" type="ds:CryptoBinary"/>
+    </sequence>
+    <element name="G" type="ds:CryptoBinary" minOccurs="0"/>
+    <element name="Y" type="ds:CryptoBinary"/>
+    <element name="J" type="ds:CryptoBinary" minOccurs="0"/>
+    <sequence minOccurs="0">
+      <element name="Seed" type="ds:CryptoBinary"/>
+      <element name="PgenCounter" type="ds:CryptoBinary"/>
+    </sequence>
+  </sequence>
+</complexType>
+
+<element name="RSAKeyValue" type="ds:RSAKeyValueType"/>
+<complexType name="RSAKeyValueType">
+  <sequence>
+    <element name="Modulus" type="ds:CryptoBinary"/>
+    <element name="Exponent" type="ds:CryptoBinary"/>
+  </sequence>
+</complexType>
+
+<!-- End KeyValue Element-types -->
+
+<!-- End Signature -->
+
+</schema>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE schema
+  PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"
+ [
+   <!ATTLIST schema
+     xmlns:ds CDATA #FIXED "http://www.w3.org/2000/09/xmldsig#">
+   <!ENTITY dsig 'http://www.w3.org/2000/09/xmldsig#'>
+   <!ENTITY % p ''>
+   <!ENTITY % s ''>
+  ]>
+
+<!-- Schema for XML Signatures
+    http://www.w3.org/2000/09/xmldsig#
+    $Revision: 1.1 $ on $Date: 2002/02/08 20:32:26 $ by $Author: reagle $
+
+    Copyright 2001 The Internet Society and W3C (Massachusetts Institute
+    of Technology, Institut National de Recherche en Informatique et en
+    Automatique, Keio University). All Rights Reserved.
+    http://www.w3.org/Consortium/Legal/
+
+    This document is governed by the W3C Software License [1] as described
+    in the FAQ [2].
+
+    [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+    [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
+-->
+
+
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+        targetNamespace="http://www.w3.org/2000/09/xmldsig#"
+        version="0.1" elementFormDefault="qualified">
+
+<!-- Basic Types Defined for Signatures -->
+
+<simpleType name="CryptoBinary">
+  <restriction base="base64Binary">
+  </restriction>
+</simpleType>
+
+<!-- Start Signature -->
+
+<element name="Signature" type="ds:SignatureType"/>
+<complexType name="SignatureType">
+  <sequence>
+    <element ref="ds:SignedInfo"/>
+    <element ref="ds:SignatureValue"/>
+    <element ref="ds:KeyInfo" minOccurs="0"/>
+    <element ref="ds:Object" minOccurs="0" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+  <element name="SignatureValue" type="ds:SignatureValueType"/>
+  <complexType name="SignatureValueType">
+    <simpleContent>
+      <extension base="base64Binary">
+        <attribute name="Id" type="ID" use="optional"/>
+      </extension>
+    </simpleContent>
+  </complexType>
+
+<!-- Start SignedInfo -->
+
+<element name="SignedInfo" type="ds:SignedInfoType"/>
+<complexType name="SignedInfoType">
+  <sequence>
+    <element ref="ds:CanonicalizationMethod"/>
+    <element ref="ds:SignatureMethod"/>
+    <element ref="ds:Reference" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+  <element name="CanonicalizationMethod" type="ds:CanonicalizationMethodType"/>
+  <complexType name="CanonicalizationMethodType" mixed="true">
+    <sequence>
+      <any namespace="##any" minOccurs="0" maxOccurs="unbounded"/>
+      <!-- (0,unbounded) elements from (1,1) namespace -->
+    </sequence>
+    <attribute name="Algorithm" type="anyURI" use="required"/>
+  </complexType>
+
+  <element name="SignatureMethod" type="ds:SignatureMethodType"/>
+  <complexType name="SignatureMethodType" mixed="true">
+    <sequence>
+      <element name="HMACOutputLength" minOccurs="0" type="ds:HMACOutputLengthType"/>
+      <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+      <!-- (0,unbounded) elements from (1,1) external namespace -->
+    </sequence>
+    <attribute name="Algorithm" type="anyURI" use="required"/>
+  </complexType>
+
+<!-- Start Reference -->
+
+<element name="Reference" type="ds:ReferenceType"/>
+<complexType name="ReferenceType">
+  <sequence>
+    <element ref="ds:Transforms" minOccurs="0"/>
+    <element ref="ds:DigestMethod"/>
+    <element ref="ds:DigestValue"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+  <attribute name="URI" type="anyURI" use="optional"/>
+  <attribute name="Type" type="anyURI" use="optional"/>
+</complexType>
+
+  <element name="Transforms" type="ds:TransformsType"/>
+  <complexType name="TransformsType">
+    <sequence>
+      <element ref="ds:Transform" maxOccurs="unbounded"/>
+    </sequence>
+  </complexType>
+
+  <element name="Transform" type="ds:TransformType"/>
+  <complexType name="TransformType" mixed="true">
+    <choice minOccurs="0" maxOccurs="unbounded">
+      <any namespace="##other" processContents="lax"/>
+      <!-- (1,1) elements from (0,unbounded) namespaces -->
+      <element name="XPath" type="string"/>
+    </choice>
+    <attribute name="Algorithm" type="anyURI" use="required"/>
+  </complexType>
+
+<!-- End Reference -->
+
+<element name="DigestMethod" type="ds:DigestMethodType"/>
+<complexType name="DigestMethodType" mixed="true">
+  <sequence>
+    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Algorithm" type="anyURI" use="required"/>
+</complexType>
+
+<element name="DigestValue" type="ds:DigestValueType"/>
+<simpleType name="DigestValueType">
+  <restriction base="base64Binary"/>
+</simpleType>
+
+<!-- End SignedInfo -->
+
+<!-- Start KeyInfo -->
+
+<element name="KeyInfo" type="ds:KeyInfoType"/>
+<complexType name="KeyInfoType" mixed="true">
+  <choice maxOccurs="unbounded">
+    <element ref="ds:KeyName"/>
+    <element ref="ds:KeyValue"/>
+    <element ref="ds:RetrievalMethod"/>
+    <element ref="ds:X509Data"/>
+    <element ref="ds:PGPData"/>
+    <element ref="ds:SPKIData"/>
+    <element ref="ds:MgmtData"/>
+    <any processContents="lax" namespace="##other"/>
+    <!-- (1,1) elements from (0,unbounded) namespaces -->
+  </choice>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+  <element name="KeyName" type="string"/>
+  <element name="MgmtData" type="string"/>
+
+  <element name="KeyValue" type="ds:KeyValueType"/>
+  <complexType name="KeyValueType" mixed="true">
+   <choice>
+     <element ref="ds:DSAKeyValue"/>
+     <element ref="ds:RSAKeyValue"/>
+     <any namespace="##other" processContents="lax"/>
+   </choice>
+  </complexType>
+
+  <element name="RetrievalMethod" type="ds:RetrievalMethodType"/>
+  <complexType name="RetrievalMethodType">
+    <sequence>
+      <element ref="ds:Transforms" minOccurs="0"/>
+    </sequence>
+    <attribute name="URI" type="anyURI"/>
+    <attribute name="Type" type="anyURI" use="optional"/>
+  </complexType>
+
+<!-- Start X509Data -->
+
+<element name="X509Data" type="ds:X509DataType"/>
+<complexType name="X509DataType">
+  <sequence maxOccurs="unbounded">
+    <choice>
+      <element name="X509IssuerSerial" type="ds:X509IssuerSerialType"/>
+      <element name="X509SKI" type="base64Binary"/>
+      <element name="X509SubjectName" type="string"/>
+      <element name="X509Certificate" type="base64Binary"/>
+      <element name="X509CRL" type="base64Binary"/>
+      <any namespace="##other" processContents="lax"/>
+    </choice>
+  </sequence>
+</complexType>
+
+<complexType name="X509IssuerSerialType">
+  <sequence>
+    <element name="X509IssuerName" type="string"/>
+    <element name="X509SerialNumber" type="integer"/>
+  </sequence>
+</complexType>
+
+<!-- End X509Data -->
+
+<!-- Begin PGPData -->
+
+<element name="PGPData" type="ds:PGPDataType"/>
+<complexType name="PGPDataType">
+  <choice>
+    <sequence>
+      <element name="PGPKeyID" type="base64Binary"/>
+      <element name="PGPKeyPacket" type="base64Binary" minOccurs="0"/>
+      <any namespace="##other" processContents="lax" minOccurs="0"
+       maxOccurs="unbounded"/>
+    </sequence>
+    <sequence>
+      <element name="PGPKeyPacket" type="base64Binary"/>
+      <any namespace="##other" processContents="lax" minOccurs="0"
+       maxOccurs="unbounded"/>
+    </sequence>
+  </choice>
+</complexType>
+
+<!-- End PGPData -->
+
+<!-- Begin SPKIData -->
+
+<element name="SPKIData" type="ds:SPKIDataType"/>
+<complexType name="SPKIDataType">
+  <sequence maxOccurs="unbounded">
+    <element name="SPKISexp" type="base64Binary"/>
+    <any namespace="##other" processContents="lax" minOccurs="0"/>
+  </sequence>
+</complexType>
+
+<!-- End SPKIData -->
+
+<!-- End KeyInfo -->
+
+<!-- Start Object (Manifest, SignatureProperty) -->
+
+<element name="Object" type="ds:ObjectType"/>
+<complexType name="ObjectType" mixed="true">
+  <sequence minOccurs="0" maxOccurs="unbounded">
+    <any namespace="##any" processContents="lax"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+  <attribute name="MimeType" type="string" use="optional"/> <!-- add a grep facet -->
+  <attribute name="Encoding" type="anyURI" use="optional"/>
+</complexType>
+
+<element name="Manifest" type="ds:ManifestType"/>
+<complexType name="ManifestType">
+  <sequence>
+    <element ref="ds:Reference" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+<element name="SignatureProperties" type="ds:SignaturePropertiesType"/>
+<complexType name="SignaturePropertiesType">
+  <sequence>
+    <element ref="ds:SignatureProperty" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+   <element name="SignatureProperty" type="ds:SignaturePropertyType"/>
+   <complexType name="SignaturePropertyType" mixed="true">
+     <choice maxOccurs="unbounded">
+       <any namespace="##other" processContents="lax"/>
+       <!-- (1,1) elements from (1,unbounded) namespaces -->
+     </choice>
+     <attribute name="Target" type="anyURI" use="required"/>
+     <attribute name="Id" type="ID" use="optional"/>
+   </complexType>
+
+<!-- End Object (Manifest, SignatureProperty) -->
+
+<!-- Start Algorithm Parameters -->
+
+<simpleType name="HMACOutputLengthType">
+  <restriction base="integer"/>
+</simpleType>
+
+<!-- Start KeyValue Element-types -->
+
+<element name="DSAKeyValue" type="ds:DSAKeyValueType"/>
+<complexType name="DSAKeyValueType">
+  <sequence>
+    <sequence minOccurs="0">
+      <element name="P" type="ds:CryptoBinary"/>
+      <element name="Q" type="ds:CryptoBinary"/>
+    </sequence>
+    <element name="G" type="ds:CryptoBinary" minOccurs="0"/>
+    <element name="Y" type="ds:CryptoBinary"/>
+    <element name="J" type="ds:CryptoBinary" minOccurs="0"/>
+    <sequence minOccurs="0">
+      <element name="Seed" type="ds:CryptoBinary"/>
+      <element name="PgenCounter" type="ds:CryptoBinary"/>
+    </sequence>
+  </sequence>
+</complexType>
+
+<element name="RSAKeyValue" type="ds:RSAKeyValueType"/>
+<complexType name="RSAKeyValueType">
+  <sequence>
+    <element name="Modulus" type="ds:CryptoBinary"/>
+    <element name="Exponent" type="ds:CryptoBinary"/>
+  </sequence>
+</complexType>
+
+<!-- End KeyValue Element-types -->
+
+<!-- End Signature -->
+
+</schema>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE schema
+  PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"
+ [
+   <!ATTLIST schema
+     xmlns:ds CDATA #FIXED "http://www.w3.org/2000/09/xmldsig#">
+   <!ENTITY dsig 'http://www.w3.org/2000/09/xmldsig#'>
+   <!ENTITY % p ''>
+   <!ENTITY % s ''>
+  ]>
+
+<!-- Schema for XML Signatures
+    http://www.w3.org/2000/09/xmldsig#
+    $Revision: 1.1 $ on $Date: 2002/02/08 20:32:26 $ by $Author: reagle $
+
+    Copyright 2001 The Internet Society and W3C (Massachusetts Institute
+    of Technology, Institut National de Recherche en Informatique et en
+    Automatique, Keio University). All Rights Reserved.
+    http://www.w3.org/Consortium/Legal/
+
+    This document is governed by the W3C Software License [1] as described
+    in the FAQ [2].
+
+    [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+    [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
+-->
+
+
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+        targetNamespace="http://www.w3.org/2000/09/xmldsig#"
+        version="0.1" elementFormDefault="qualified">
+
+<!-- Basic Types Defined for Signatures -->
+
+<simpleType name="CryptoBinary">
+  <restriction base="base64Binary">
+  </restriction>
+</simpleType>
+
+<!-- Start Signature -->
+
+<element name="Signature" type="ds:SignatureType"/>
+<complexType name="SignatureType">
+  <sequence>
+    <element ref="ds:SignedInfo"/>
+    <element ref="ds:SignatureValue"/>
+    <element ref="ds:KeyInfo" minOccurs="0"/>
+    <element ref="ds:Object" minOccurs="0" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+  <element name="SignatureValue" type="ds:SignatureValueType"/>
+  <complexType name="SignatureValueType">
+    <simpleContent>
+      <extension base="base64Binary">
+        <attribute name="Id" type="ID" use="optional"/>
+      </extension>
+    </simpleContent>
+  </complexType>
+
+<!-- Start SignedInfo -->
+
+<element name="SignedInfo" type="ds:SignedInfoType"/>
+<complexType name="SignedInfoType">
+  <sequence>
+    <element ref="ds:CanonicalizationMethod"/>
+    <element ref="ds:SignatureMethod"/>
+    <element ref="ds:Reference" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+  <element name="CanonicalizationMethod" type="ds:CanonicalizationMethodType"/>
+  <complexType name="CanonicalizationMethodType" mixed="true">
+    <sequence>
+      <any namespace="##any" minOccurs="0" maxOccurs="unbounded"/>
+      <!-- (0,unbounded) elements from (1,1) namespace -->
+    </sequence>
+    <attribute name="Algorithm" type="anyURI" use="required"/>
+  </complexType>
+
+  <element name="SignatureMethod" type="ds:SignatureMethodType"/>
+  <complexType name="SignatureMethodType" mixed="true">
+    <sequence>
+      <element name="HMACOutputLength" minOccurs="0" type="ds:HMACOutputLengthType"/>
+      <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+      <!-- (0,unbounded) elements from (1,1) external namespace -->
+    </sequence>
+    <attribute name="Algorithm" type="anyURI" use="required"/>
+  </complexType>
+
+<!-- Start Reference -->
+
+<element name="Reference" type="ds:ReferenceType"/>
+<complexType name="ReferenceType">
+  <sequence>
+    <element ref="ds:Transforms" minOccurs="0"/>
+    <element ref="ds:DigestMethod"/>
+    <element ref="ds:DigestValue"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+  <attribute name="URI" type="anyURI" use="optional"/>
+  <attribute name="Type" type="anyURI" use="optional"/>
+</complexType>
+
+  <element name="Transforms" type="ds:TransformsType"/>
+  <complexType name="TransformsType">
+    <sequence>
+      <element ref="ds:Transform" maxOccurs="unbounded"/>
+    </sequence>
+  </complexType>
+
+  <element name="Transform" type="ds:TransformType"/>
+  <complexType name="TransformType" mixed="true">
+    <choice minOccurs="0" maxOccurs="unbounded">
+      <any namespace="##other" processContents="lax"/>
+      <!-- (1,1) elements from (0,unbounded) namespaces -->
+      <element name="XPath" type="string"/>
+    </choice>
+    <attribute name="Algorithm" type="anyURI" use="required"/>
+  </complexType>
+
+<!-- End Reference -->
+
+<element name="DigestMethod" type="ds:DigestMethodType"/>
+<complexType name="DigestMethodType" mixed="true">
+  <sequence>
+    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Algorithm" type="anyURI" use="required"/>
+</complexType>
+
+<element name="DigestValue" type="ds:DigestValueType"/>
+<simpleType name="DigestValueType">
+  <restriction base="base64Binary"/>
+</simpleType>
+
+<!-- End SignedInfo -->
+
+<!-- Start KeyInfo -->
+
+<element name="KeyInfo" type="ds:KeyInfoType"/>
+<complexType name="KeyInfoType" mixed="true">
+  <choice maxOccurs="unbounded">
+    <element ref="ds:KeyName"/>
+    <element ref="ds:KeyValue"/>
+    <element ref="ds:RetrievalMethod"/>
+    <element ref="ds:X509Data"/>
+    <element ref="ds:PGPData"/>
+    <element ref="ds:SPKIData"/>
+    <element ref="ds:MgmtData"/>
+    <any processContents="lax" namespace="##other"/>
+    <!-- (1,1) elements from (0,unbounded) namespaces -->
+  </choice>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+  <element name="KeyName" type="string"/>
+  <element name="MgmtData" type="string"/>
+
+  <element name="KeyValue" type="ds:KeyValueType"/>
+  <complexType name="KeyValueType" mixed="true">
+   <choice>
+     <element ref="ds:DSAKeyValue"/>
+     <element ref="ds:RSAKeyValue"/>
+     <any namespace="##other" processContents="lax"/>
+   </choice>
+  </complexType>
+
+  <element name="RetrievalMethod" type="ds:RetrievalMethodType"/>
+  <complexType name="RetrievalMethodType">
+    <sequence>
+      <element ref="ds:Transforms" minOccurs="0"/>
+    </sequence>
+    <attribute name="URI" type="anyURI"/>
+    <attribute name="Type" type="anyURI" use="optional"/>
+  </complexType>
+
+<!-- Start X509Data -->
+
+<element name="X509Data" type="ds:X509DataType"/>
+<complexType name="X509DataType">
+  <sequence maxOccurs="unbounded">
+    <choice>
+      <element name="X509IssuerSerial" type="ds:X509IssuerSerialType"/>
+      <element name="X509SKI" type="base64Binary"/>
+      <element name="X509SubjectName" type="string"/>
+      <element name="X509Certificate" type="base64Binary"/>
+      <element name="X509CRL" type="base64Binary"/>
+      <any namespace="##other" processContents="lax"/>
+    </choice>
+  </sequence>
+</complexType>
+
+<complexType name="X509IssuerSerialType">
+  <sequence>
+    <element name="X509IssuerName" type="string"/>
+    <element name="X509SerialNumber" type="integer"/>
+  </sequence>
+</complexType>
+
+<!-- End X509Data -->
+
+<!-- Begin PGPData -->
+
+<element name="PGPData" type="ds:PGPDataType"/>
+<complexType name="PGPDataType">
+  <choice>
+    <sequence>
+      <element name="PGPKeyID" type="base64Binary"/>
+      <element name="PGPKeyPacket" type="base64Binary" minOccurs="0"/>
+      <any namespace="##other" processContents="lax" minOccurs="0"
+       maxOccurs="unbounded"/>
+    </sequence>
+    <sequence>
+      <element name="PGPKeyPacket" type="base64Binary"/>
+      <any namespace="##other" processContents="lax" minOccurs="0"
+       maxOccurs="unbounded"/>
+    </sequence>
+  </choice>
+</complexType>
+
+<!-- End PGPData -->
+
+<!-- Begin SPKIData -->
+
+<element name="SPKIData" type="ds:SPKIDataType"/>
+<complexType name="SPKIDataType">
+  <sequence maxOccurs="unbounded">
+    <element name="SPKISexp" type="base64Binary"/>
+    <any namespace="##other" processContents="lax" minOccurs="0"/>
+  </sequence>
+</complexType>
+
+<!-- End SPKIData -->
+
+<!-- End KeyInfo -->
+
+<!-- Start Object (Manifest, SignatureProperty) -->
+
+<element name="Object" type="ds:ObjectType"/>
+<complexType name="ObjectType" mixed="true">
+  <sequence minOccurs="0" maxOccurs="unbounded">
+    <any namespace="##any" processContents="lax"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+  <attribute name="MimeType" type="string" use="optional"/> <!-- add a grep facet -->
+  <attribute name="Encoding" type="anyURI" use="optional"/>
+</complexType>
+
+<element name="Manifest" type="ds:ManifestType"/>
+<complexType name="ManifestType">
+  <sequence>
+    <element ref="ds:Reference" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+<element name="SignatureProperties" type="ds:SignaturePropertiesType"/>
+<complexType name="SignaturePropertiesType">
+  <sequence>
+    <element ref="ds:SignatureProperty" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+   <element name="SignatureProperty" type="ds:SignaturePropertyType"/>
+   <complexType name="SignaturePropertyType" mixed="true">
+     <choice maxOccurs="unbounded">
+       <any namespace="##other" processContents="lax"/>
+       <!-- (1,1) elements from (1,unbounded) namespaces -->
+     </choice>
+     <attribute name="Target" type="anyURI" use="required"/>
+     <attribute name="Id" type="ID" use="optional"/>
+   </complexType>
+
+<!-- End Object (Manifest, SignatureProperty) -->
+
+<!-- Start Algorithm Parameters -->
+
+<simpleType name="HMACOutputLengthType">
+  <restriction base="integer"/>
+</simpleType>
+
+<!-- Start KeyValue Element-types -->
+
+<element name="DSAKeyValue" type="ds:DSAKeyValueType"/>
+<complexType name="DSAKeyValueType">
+  <sequence>
+    <sequence minOccurs="0">
+      <element name="P" type="ds:CryptoBinary"/>
+      <element name="Q" type="ds:CryptoBinary"/>
+    </sequence>
+    <element name="G" type="ds:CryptoBinary" minOccurs="0"/>
+    <element name="Y" type="ds:CryptoBinary"/>
+    <element name="J" type="ds:CryptoBinary" minOccurs="0"/>
+    <sequence minOccurs="0">
+      <element name="Seed" type="ds:CryptoBinary"/>
+      <element name="PgenCounter" type="ds:CryptoBinary"/>
+    </sequence>
+  </sequence>
+</complexType>
+
+<element name="RSAKeyValue" type="ds:RSAKeyValueType"/>
+<complexType name="RSAKeyValueType">
+  <sequence>
+    <element name="Modulus" type="ds:CryptoBinary"/>
+    <element name="Exponent" type="ds:CryptoBinary"/>
+  </sequence>
+</complexType>
+
+<!-- End KeyValue Element-types -->
+
+<!-- End Signature -->
+
+</schema>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE schema
+  PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"
+ [
+   <!ATTLIST schema
+     xmlns:ds CDATA #FIXED "http://www.w3.org/2000/09/xmldsig#">
+   <!ENTITY dsig 'http://www.w3.org/2000/09/xmldsig#'>
+   <!ENTITY % p ''>
+   <!ENTITY % s ''>
+  ]>
+
+<!-- Schema for XML Signatures
+    http://www.w3.org/2000/09/xmldsig#
+    $Revision: 1.1 $ on $Date: 2002/02/08 20:32:26 $ by $Author: reagle $
+
+    Copyright 2001 The Internet Society and W3C (Massachusetts Institute
+    of Technology, Institut National de Recherche en Informatique et en
+    Automatique, Keio University). All Rights Reserved.
+    http://www.w3.org/Consortium/Legal/
+
+    This document is governed by the W3C Software License [1] as described
+    in the FAQ [2].
+
+    [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+    [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
+-->
+
+
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+        targetNamespace="http://www.w3.org/2000/09/xmldsig#"
+        version="0.1" elementFormDefault="qualified">
+
+<!-- Basic Types Defined for Signatures -->
+
+<simpleType name="CryptoBinary">
+  <restriction base="base64Binary">
+  </restriction>
+</simpleType>
+
+<!-- Start Signature -->
+
+<element name="Signature" type="ds:SignatureType"/>
+<complexType name="SignatureType">
+  <sequence>
+    <element ref="ds:SignedInfo"/>
+    <element ref="ds:SignatureValue"/>
+    <element ref="ds:KeyInfo" minOccurs="0"/>
+    <element ref="ds:Object" minOccurs="0" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+  <element name="SignatureValue" type="ds:SignatureValueType"/>
+  <complexType name="SignatureValueType">
+    <simpleContent>
+      <extension base="base64Binary">
+        <attribute name="Id" type="ID" use="optional"/>
+      </extension>
+    </simpleContent>
+  </complexType>
+
+<!-- Start SignedInfo -->
+
+<element name="SignedInfo" type="ds:SignedInfoType"/>
+<complexType name="SignedInfoType">
+  <sequence>
+    <element ref="ds:CanonicalizationMethod"/>
+    <element ref="ds:SignatureMethod"/>
+    <element ref="ds:Reference" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+  <element name="CanonicalizationMethod" type="ds:CanonicalizationMethodType"/>
+  <complexType name="CanonicalizationMethodType" mixed="true">
+    <sequence>
+      <any namespace="##any" minOccurs="0" maxOccurs="unbounded"/>
+      <!-- (0,unbounded) elements from (1,1) namespace -->
+    </sequence>
+    <attribute name="Algorithm" type="anyURI" use="required"/>
+  </complexType>
+
+  <element name="SignatureMethod" type="ds:SignatureMethodType"/>
+  <complexType name="SignatureMethodType" mixed="true">
+    <sequence>
+      <element name="HMACOutputLength" minOccurs="0" type="ds:HMACOutputLengthType"/>
+      <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+      <!-- (0,unbounded) elements from (1,1) external namespace -->
+    </sequence>
+    <attribute name="Algorithm" type="anyURI" use="required"/>
+  </complexType>
+
+<!-- Start Reference -->
+
+<element name="Reference" type="ds:ReferenceType"/>
+<complexType name="ReferenceType">
+  <sequence>
+    <element ref="ds:Transforms" minOccurs="0"/>
+    <element ref="ds:DigestMethod"/>
+    <element ref="ds:DigestValue"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+  <attribute name="URI" type="anyURI" use="optional"/>
+  <attribute name="Type" type="anyURI" use="optional"/>
+</complexType>
+
+  <element name="Transforms" type="ds:TransformsType"/>
+  <complexType name="TransformsType">
+    <sequence>
+      <element ref="ds:Transform" maxOccurs="unbounded"/>
+    </sequence>
+  </complexType>
+
+  <element name="Transform" type="ds:TransformType"/>
+  <complexType name="TransformType" mixed="true">
+    <choice minOccurs="0" maxOccurs="unbounded">
+      <any namespace="##other" processContents="lax"/>
+      <!-- (1,1) elements from (0,unbounded) namespaces -->
+      <element name="XPath" type="string"/>
+    </choice>
+    <attribute name="Algorithm" type="anyURI" use="required"/>
+  </complexType>
+
+<!-- End Reference -->
+
+<element name="DigestMethod" type="ds:DigestMethodType"/>
+<complexType name="DigestMethodType" mixed="true">
+  <sequence>
+    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Algorithm" type="anyURI" use="required"/>
+</complexType>
+
+<element name="DigestValue" type="ds:DigestValueType"/>
+<simpleType name="DigestValueType">
+  <restriction base="base64Binary"/>
+</simpleType>
+
+<!-- End SignedInfo -->
+
+<!-- Start KeyInfo -->
+
+<element name="KeyInfo" type="ds:KeyInfoType"/>
+<complexType name="KeyInfoType" mixed="true">
+  <choice maxOccurs="unbounded">
+    <element ref="ds:KeyName"/>
+    <element ref="ds:KeyValue"/>
+    <element ref="ds:RetrievalMethod"/>
+    <element ref="ds:X509Data"/>
+    <element ref="ds:PGPData"/>
+    <element ref="ds:SPKIData"/>
+    <element ref="ds:MgmtData"/>
+    <any processContents="lax" namespace="##other"/>
+    <!-- (1,1) elements from (0,unbounded) namespaces -->
+  </choice>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+  <element name="KeyName" type="string"/>
+  <element name="MgmtData" type="string"/>
+
+  <element name="KeyValue" type="ds:KeyValueType"/>
+  <complexType name="KeyValueType" mixed="true">
+   <choice>
+     <element ref="ds:DSAKeyValue"/>
+     <element ref="ds:RSAKeyValue"/>
+     <any namespace="##other" processContents="lax"/>
+   </choice>
+  </complexType>
+
+  <element name="RetrievalMethod" type="ds:RetrievalMethodType"/>
+  <complexType name="RetrievalMethodType">
+    <sequence>
+      <element ref="ds:Transforms" minOccurs="0"/>
+    </sequence>
+    <attribute name="URI" type="anyURI"/>
+    <attribute name="Type" type="anyURI" use="optional"/>
+  </complexType>
+
+<!-- Start X509Data -->
+
+<element name="X509Data" type="ds:X509DataType"/>
+<complexType name="X509DataType">
+  <sequence maxOccurs="unbounded">
+    <choice>
+      <element name="X509IssuerSerial" type="ds:X509IssuerSerialType"/>
+      <element name="X509SKI" type="base64Binary"/>
+      <element name="X509SubjectName" type="string"/>
+      <element name="X509Certificate" type="base64Binary"/>
+      <element name="X509CRL" type="base64Binary"/>
+      <any namespace="##other" processContents="lax"/>
+    </choice>
+  </sequence>
+</complexType>
+
+<complexType name="X509IssuerSerialType">
+  <sequence>
+    <element name="X509IssuerName" type="string"/>
+    <element name="X509SerialNumber" type="integer"/>
+  </sequence>
+</complexType>
+
+<!-- End X509Data -->
+
+<!-- Begin PGPData -->
+
+<element name="PGPData" type="ds:PGPDataType"/>
+<complexType name="PGPDataType">
+  <choice>
+    <sequence>
+      <element name="PGPKeyID" type="base64Binary"/>
+      <element name="PGPKeyPacket" type="base64Binary" minOccurs="0"/>
+      <any namespace="##other" processContents="lax" minOccurs="0"
+       maxOccurs="unbounded"/>
+    </sequence>
+    <sequence>
+      <element name="PGPKeyPacket" type="base64Binary"/>
+      <any namespace="##other" processContents="lax" minOccurs="0"
+       maxOccurs="unbounded"/>
+    </sequence>
+  </choice>
+</complexType>
+
+<!-- End PGPData -->
+
+<!-- Begin SPKIData -->
+
+<element name="SPKIData" type="ds:SPKIDataType"/>
+<complexType name="SPKIDataType">
+  <sequence maxOccurs="unbounded">
+    <element name="SPKISexp" type="base64Binary"/>
+    <any namespace="##other" processContents="lax" minOccurs="0"/>
+  </sequence>
+</complexType>
+
+<!-- End SPKIData -->
+
+<!-- End KeyInfo -->
+
+<!-- Start Object (Manifest, SignatureProperty) -->
+
+<element name="Object" type="ds:ObjectType"/>
+<complexType name="ObjectType" mixed="true">
+  <sequence minOccurs="0" maxOccurs="unbounded">
+    <any namespace="##any" processContents="lax"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+  <attribute name="MimeType" type="string" use="optional"/> <!-- add a grep facet -->
+  <attribute name="Encoding" type="anyURI" use="optional"/>
+</complexType>
+
+<element name="Manifest" type="ds:ManifestType"/>
+<complexType name="ManifestType">
+  <sequence>
+    <element ref="ds:Reference" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+<element name="SignatureProperties" type="ds:SignaturePropertiesType"/>
+<complexType name="SignaturePropertiesType">
+  <sequence>
+    <element ref="ds:SignatureProperty" maxOccurs="unbounded"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+   <element name="SignatureProperty" type="ds:SignaturePropertyType"/>
+   <complexType name="SignaturePropertyType" mixed="true">
+     <choice maxOccurs="unbounded">
+       <any namespace="##other" processContents="lax"/>
+       <!-- (1,1) elements from (1,unbounded) namespaces -->
+     </choice>
+     <attribute name="Target" type="anyURI" use="required"/>
+     <attribute name="Id" type="ID" use="optional"/>
+   </complexType>
+
+<!-- End Object (Manifest, SignatureProperty) -->
+
+<!-- Start Algorithm Parameters -->
+
+<simpleType name="HMACOutputLengthType">
+  <restriction base="integer"/>
+</simpleType>
+
+<!-- Start KeyValue Element-types -->
+
+<element name="DSAKeyValue" type="ds:DSAKeyValueType"/>
+<complexType name="DSAKeyValueType">
+  <sequence>
+    <sequence minOccurs="0">
+      <element name="P" type="ds:CryptoBinary"/>
+      <element name="Q" type="ds:CryptoBinary"/>
+    </sequence>
+    <element name="G" type="ds:CryptoBinary" minOccurs="0"/>
+    <element name="Y" type="ds:CryptoBinary"/>
+    <element name="J" type="ds:CryptoBinary" minOccurs="0"/>
+    <sequence minOccurs="0">
+      <element name="Seed" type="ds:CryptoBinary"/>
+      <element name="PgenCounter" type="ds:CryptoBinary"/>
+    </sequence>
+  </sequence>
+</complexType>
+
+<element name="RSAKeyValue" type="ds:RSAKeyValueType"/>
+<complexType name="RSAKeyValueType">
+  <sequence>
+    <element name="Modulus" type="ds:CryptoBinary"/>
+    <element name="Exponent" type="ds:CryptoBinary"/>
+  </sequence>
+</complexType>
+
+<!-- End KeyValue Element-types -->
+
+
+
+
+
+
+
+
+<!-- End Signature -->
+
+</schema>
+
diff --git a/xml/tests/testData/psi/events/1.txt b/xml/tests/testData/psi/events/1.txt
new file mode 100644
index 000000000000..b02964d479b1
--- /dev/null
+++ b/xml/tests/testData/psi/events/1.txt
@@ -0,0 +1 @@
+(Attribute "a" for tag "a" set to "b")
diff --git a/xml/tests/testData/psi/events/2.txt b/xml/tests/testData/psi/events/2.txt
new file mode 100644
index 000000000000..82453a841ec0
--- /dev/null
+++ b/xml/tests/testData/psi/events/2.txt
@@ -0,0 +1 @@
+(text changed to 'aa' was: 'aaa'), (child added to a child: XmlText), (child added to a child: XmlTag:a)
\ No newline at end of file
diff --git a/xml/tests/testData/psi/events/3.txt b/xml/tests/testData/psi/events/3.txt
new file mode 100644
index 000000000000..954dbafd7fae
--- /dev/null
+++ b/xml/tests/testData/psi/events/3.txt
@@ -0,0 +1 @@
+(text changed to 'aabba' was: 'aaa')
diff --git a/xml/tests/testData/psi/events/4.txt b/xml/tests/testData/psi/events/4.txt
new file mode 100644
index 000000000000..d0470d3dec94
--- /dev/null
+++ b/xml/tests/testData/psi/events/4.txt
@@ -0,0 +1 @@
+(text changed to 'a a ' was: 'a ')
diff --git a/xml/tests/testData/psi/events/5.txt b/xml/tests/testData/psi/events/5.txt
new file mode 100644
index 000000000000..ad835b557ef4
--- /dev/null
+++ b/xml/tests/testData/psi/events/5.txt
@@ -0,0 +1 @@
+(Xml document changed)
diff --git a/xml/tests/testData/psi/events/BulkUpdate.txt b/xml/tests/testData/psi/events/BulkUpdate.txt
new file mode 100644
index 000000000000..ad835b557ef4
--- /dev/null
+++ b/xml/tests/testData/psi/events/BulkUpdate.txt
@@ -0,0 +1 @@
+(Xml document changed)
diff --git a/xml/tests/testData/psi/events/DocumentChange1.txt b/xml/tests/testData/psi/events/DocumentChange1.txt
new file mode 100644
index 000000000000..ad835b557ef4
--- /dev/null
+++ b/xml/tests/testData/psi/events/DocumentChange1.txt
@@ -0,0 +1 @@
+(Xml document changed)
diff --git a/xml/tests/testData/psi/events/DocumentChange2.txt b/xml/tests/testData/psi/events/DocumentChange2.txt
new file mode 100644
index 000000000000..ad835b557ef4
--- /dev/null
+++ b/xml/tests/testData/psi/events/DocumentChange2.txt
@@ -0,0 +1 @@
+(Xml document changed)
diff --git a/xml/tests/testData/psi/events/DocumentChange3.txt b/xml/tests/testData/psi/events/DocumentChange3.txt
new file mode 100644
index 000000000000..f572e6333826
--- /dev/null
+++ b/xml/tests/testData/psi/events/DocumentChange3.txt
@@ -0,0 +1 @@
+(child changed in b child: XmlTag:a)
diff --git a/xml/tests/testData/psi/events/TagRemove.txt b/xml/tests/testData/psi/events/TagRemove.txt
new file mode 100644
index 000000000000..9c546956e886
--- /dev/null
+++ b/xml/tests/testData/psi/events/TagRemove.txt
@@ -0,0 +1 @@
+(child changed in html child: XmlText), (child removed from html child: XmlTag:b), (child removed from html child: XmlText)
diff --git a/xml/tests/testData/psi/incrementalReparse41_after.xml b/xml/tests/testData/psi/incrementalReparse41_after.xml
new file mode 100644
index 000000000000..d80e6eaa7ec5
--- /dev/null
+++ b/xml/tests/testData/psi/incrementalReparse41_after.xml
@@ -0,0 +1,1594 @@
+
+<!-- ===================================================================
+
+   Build file for PRM - for use with the Jakarta Ant java build tool
+   Requires Ant 1.5 or greater
+
+Build Instructions:
+   To build, run
+     build.bat - optionally with a target arg as indicated below -
+                 in the directory where this file is located.
+
+   The batch/shell file sets up your classpath and calls java org.apache.tools.ant.Main
+
+Authors:
+  Tim Morrow <tim@project.net>
+
+   $Id: build.xml,v 1.80.2.14 2004/01/17 00:43:54 tim Exp $
+
+==================================================================== -->
+
+<project name="prm" default="build">
+
+  <!-- Print Usage of this build file -->
+  <target name="usage">
+    <echo>
+build [target]
+
+Where target is one of the following:
+-------------------
+Compilation Targets
+-------------------
+  build               (default) compiles, builds and copies all files
+  compile             compiles java sources, jsp sources and pnet patch to
+                        output directories
+  compile-java        compiles java classes in the following packages:
+                        com, pnet, net.project
+  compile-jsp         compiles jsp sources only
+  compile-java-com    compiles java com.* classes only (including rmi classes)
+  compile-java-pnet   compiles java pnet.* classes only
+  compile-java-net    compiles java net.* classes only
+  compile-pnetpatch   compiles pnet patch and builds jar file
+  compile-version     compiles Version.java
+
+  javadoc             generates javadoc; for internal use only
+  resource            builds resources (images etc.) and copies to web root
+  xsl                 copies XSL files to output directories
+  etc                 copies application files (e.g. crypto/key.txt) to output
+                        directories
+  bin                 copies bin files (e.g. start_listeners.bat) to output
+                        directories
+
+  clean               purges the output tree
+
+------------------
+Deployment Targets
+------------------
+  deploy              Deploys application; executes build target then executes
+                        all of the following deploy targets:
+                        (Note: All targets perform incremental builds)
+  deploy-prm
+  deploy-xsl
+  deploy-etc
+  deploy-jars
+  deploy-bin
+  deploy-resource
+  deploy-database
+  deploy-docs
+
+  deploy-src          Deploys application; executes "deploy" target then
+                        executes these:
+  deploy-src-jsp
+  deploy-src-javadoc
+
+  deploy-clean        Purges the output and deployment tree; suitable for use
+                        before either "deploy" or "deploy-src"
+
+-----------------
+Packaging Targets
+-----------------
+  installer           Generates an installer; executes the "deploy" target and
+                        the "zip" target (incremental)
+  installer-clean     Purges the output and deployment tree then generates an
+                        installer (from clean)
+  installer-src       Generates an installer; executes the "deploy-src" target
+                        and the "zip-src" target
+  installer-src-clean Purges the output and deployment tree then generates an
+                        installer with source (from clean)
+  zip                 Creates a zip file in releases directory based on the
+                        current deployment (incremental)
+  zip-src             Creates a zip file in deployment directory, including
+                        the source (incremental)
+  create-escrow-source Creates a zip file containing escrow software
+
+-----------------
+Unit Test Targets
+-----------------
+   compile-unit-test    Compiles unit test stubs and all unit test classes
+   unit-test            Compiles and executes all unit tests
+   run-single-unit-test Runs a single unit test.  The unit test class to run
+                          is passed on the command line as follows:
+
+                          build run-single-unit-test
+                              -Dunittest.to.run=fullyqualifiedclassname
+
+                          where fullyqualifiedclassname is a unit test class
+
+-----------------
+Other Targets
+-----------------
+   run                Run an application server instance
+
+    </echo>
+  </target>
+
+
+  <!--
+       This target constructs the properties required for building the product.
+    -->
+  <target name="-init" depends="-init-base-directories, -init-directories, -init-classpath, -debug-on">
+
+      <!-- Set compilation properties -->
+      <property name="build.compiler" value="jikes"/>
+      <property name="build.rmic" value="sun"/>
+      <property name="deprecation" value="off"/>
+
+      <!-- Version Properties contains properties:
+               product.version
+	           product.version.codename
+	           autogenerate.warning
+      -->
+      <property file="${config.src.dir}/version.properties" />
+
+      <echo message="Compilation debug setting is ${debug}" />
+  </target>
+
+  <!-- Allows compilation debug info to be turned off via a dependency -->
+  <target name="-debug-off">
+      <property name="debug" value="off"/>
+  </target>
+
+  <!--
+        Allows compilation debug info to be turned on via a dependency.
+        This should be set ahead of the "init" target
+    -->
+  <target name="-debug-on">
+      <property name="debug" value="on"/>
+  </target>
+
+  <!-- Checks for presence of build.properties; sets build-properties-present -->
+  <target name="-check-build-properties">
+     <condition property="build-properties-present">
+          <available file="build.properties" />
+     </condition>
+  </target>
+
+  <!-- Copies build.properties.example to build.properties if build.properties
+       is not present -->
+  <target name="-ensure-build-properties" depends="-check-build-properties" unless="build-properties-present" >
+    <echo>No build.properties file found; creating default properties file</echo>
+    <copy file="build.properties.example" tofile="build.properties" />
+    <fail>Created build.properties.  Please review its contents before restarting build.</fail>
+  </target>
+
+  <!--
+       Setup base directories from properties file.
+       These include:
+           bluestone.dir - bluestone installation
+           website.dir - website root
+           output.dir  - prm directory in output
+           deploy.dir  - prm directory in deploy
+
+           source.dir  - prm directory in source
+           devroot.dir - parent of all module directories in source
+    -->
+  <target name="-init-base-directories" depends="-ensure-build-properties">
+
+      <!-- Set properties from build.properties file -->
+      <property file="build.properties"/>
+
+      <!-- Set a flag if required directories do not exist -->
+      <condition property="error.cannot-find-default-directories">
+        <not>
+          <and>
+            <available file="${bluestone.dir}"/>
+          </and>
+        </not>
+      </condition>
+
+      <!-- Fail if above condiition is true -->
+      <fail if="error.cannot-find-default-directories">
+One or more required properties was not set in build.properties.  Current
+values are:
+    bluestone.dir: ${bluestone.dir}
+    website.dir:   ${website.dir}
+      </fail>
+
+      <!-- Set the source directory which is really the base directory -->
+      <property name="source.dir" value="${basedir}" />
+
+      <!-- Set a development root property to the parent directory of the
+           base directory -->
+      <property name="devroot.dir" location="${basedir}/.." />
+
+  </target>
+
+  <!--
+       Set all properties that specify directories.
+    -->
+  <target name="-init-directories" depends="-init-base-directories">
+
+      <!-- Source directories -->
+      <property name="tools.dir" location="${devroot.dir}/tools" />
+      <property name="optional.dir" location="${devroot.dir}/optional" />
+      <property name="database.src.dir" location="${optional.dir}/database" />
+      <property name="config.src.dir" location="${source.dir}/Config" />
+      <property name="jdiff.src.dir" location="${config.src.dir}/JDiff" />
+      <property name="bin.src.dir" location="${source.dir}/bin" />
+      <property name="java.src.dir" location="${source.dir}/Java" />
+      <property name="jsp.packagename" value="pnet" />
+      <property name="jsp.src.dir" location="${source.dir}/Jsp" />
+      <property name="jsp.src.package.dir" location="${jsp.src.dir}/${jsp.packagename}" />
+      <property name="resource.src.dir" location="${source.dir}/Resources" />
+      <property name="docs.src.dir" location="${source.dir}/Docs/product" />
+      <property name="test.dir" location="${tools.dir}/test"/>
+
+      <!-- Output directories -->
+      <property name="resource.dest" location="${website.dir}" />
+      <property name="etc.dest" location="${output.dir}/etc"/>
+      <property name="bin.dest" location="${output.dir}/bin"/>
+      <property name="compile.dest" location="${output.dir}/java"/>
+      <property name="jars.dest" location="${output.dir}/jars"/>
+      <property name="javadoc.dest" location="${output.dir}/docs/api"/>
+      <property name="pnetpatch.dest" location="${output.dir}/pnetpatch"/>
+      <property name="rmic.dest" location="${output.dir}/rmic"/>
+
+      <!-- Deploy directories -->
+      <property name="etc.deploy.dest" location="${deploy.dir}/etc" />
+      <property name="lib.deploy.dest" location="${deploy.dir}/lib" />
+      <property name="bin.deploy.dest" location="${deploy.dir}/bin" />
+      <property name="classes.deploy.dest" location="${deploy.dir}/classes" />
+      <property name="xsl.deploy.dest" location="${deploy.dir}/app" />
+      <property name="resource.deploy.dest" location="${deploy.dir}/resource" />
+      <property name="database.deploy.dest" location="${deploy.dir}/database"/>
+      <property name="docs.deploy.dest" location="${deploy.dir}/docs" />
+      <property name="src.deploy.dest" location="${deploy.dir}/src" />
+      <property name="jdiff.deploy.dest" location="${src.deploy.dest}/apidiff"/>
+      <property name="javadoc.deploy.dest" location="${src.deploy.dest}/apiDocs" />
+
+  </target>
+
+  <!--
+       Sets all properties that specify classpaths
+    -->
+  <target name="-init-classpath" depends="-init-directories">
+
+      <!-- Grab the environment to get JAVA_HOME -->
+      <property environment="env" />
+
+      <condition property="error.missing-java-home">
+        <not>
+            <available file="${env.JAVA_HOME}" type="dir" />
+        </not>
+      </condition>
+
+      <!-- Fail if above condiition is true -->
+      <fail if="error.missing-java-home">
+The environment variable JAVA_HOME is not set or does not represent a valid
+directory.  JAVA_HOME is required to locate additional JAR files required
+for compilation with Jikes.
+Current value: ${env.JAVA_HOME}
+      </fail>
+
+      <!-- Constructs the base classpath -->
+      <path id="prm.classpath">
+          <pathelement location="${jars.dest}\pnetpatch.jar"/>
+          <pathelement location="${jars.dest}\activation.jar"/>
+          <pathelement location="${jars.dest}\mail.jar"/>
+          <pathelement location="${jars.dest}\jdom.jar"/>
+          <pathelement location="${jars.dest}\cos.jar"/>
+          <pathelement location="${jars.dest}\chart.jar"/>
+          <pathelement location="${jars.dest}\iTextXML.jar"/>
+          <pathelement location="${jars.dest}\itext.jar"/>
+          <pathelement location="${jars.dest}\commons-validator.jar"/>
+          <pathelement location="${jars.dest}\commons-collections.jar"/>
+          <pathelement location="${jars.dest}\jakarta-oro-2.0.6.jar"/>
+          <pathelement location="${jars.dest}\ojdbc14.jar"/>
+          <pathelement location="${jars.dest}\xerces.jar"/>
+          <pathelement location="${jars.dest}\Verisign.jar"/>
+          <pathelement location="${jars.dest}\log4j-1.2.8.jar"/>
+          <pathelement location="${bluestone.dir}\jars\ubs.jar"/>
+          <pathelement location="${bluestone.dir}\jars\jta-spec1_0_1.jar"/>
+          <pathelement location="${bluestone.dir}\jars\bullejb.jar"/>
+          <pathelement location="${compile.dest}"/>
+          <pathelement location="${env.JAVA_HOME}\jre\lib\jce.jar" />
+          <pathelement location="${env.JAVA_HOME}\jre\lib\jsse.jar" />
+      </path>
+
+      <!-- Constructs the runtime classpath -->
+      <path id="run.classpath">
+          <path refid="prm.classpath"/>
+      </path>
+
+      <!-- Constructs the compilation classpath -->
+      <path id="src.compile.classpath">
+          <pathelement location="c:\java"/>
+          <path refid="prm.classpath"/>
+          <pathelement location="${test.dir}\lib\junit.jar"/>
+      </path>
+
+      <path id="jdiff.classpath">
+          <path refid="src.compile.classpath"/>
+          <pathelement location="${java.src.dir}/jdiff/jdiff.jar"/>
+          <pathelement location="${java.src.dir}/jdiff/xerces.jar"/>
+      </path>
+
+      <path id="unittest.compile.classpath">
+          <pathelement location="c:\java"/>
+          <pathelement location="${test.dir}\mockobjects\output"/>
+          <path refid="prm.classpath"/>
+          <pathelement location="${test.dir}\lib\junit.jar"/>
+          <pathelement location="${test.dir}\lib\junit-addons-1.4.jar"/>
+      </path>
+
+      <!-- Constructs the JSP compilation classpath -->
+      <path id="jsp.src.compile.classpath">
+          <pathelement location="${tools.dir}\bluestone"/>
+          <path refid="src.compile.classpath"/>
+      </path>
+
+  </target>
+
+
+  <!-- =========================================================================
+
+		TARGET PREPARES
+
+		These targets simply prepare output directories for builds
+
+       ===================================================================== -->
+
+  <!-- ===================================================================
+       Prepares the output build directory
+       =================================================================== -->
+  <target name="-prepare" depends="-init">
+    <mkdir dir="${output.dir}"/>
+  </target>
+
+  <!-- ===================================================================
+       Prepares the output directories for compile targets
+       =================================================================== -->
+  <target name="prepare-compile" depends="-prepare">
+    <mkdir dir="${compile.dest}"/>
+  </target>
+
+  <!-- ===================================================================
+       Prepares the output directories for application files
+       =================================================================== -->
+  <target name="prepare-etc" depends="-prepare">
+    <mkdir dir="${etc.dest}"/>
+  </target>
+
+  <!-- ===================================================================
+       Prepares the output directories bin fules
+       =================================================================== -->
+  <target name="prepare-bin" depends="-prepare">
+    <mkdir dir="${bin.dest}"/>
+  </target>
+
+  <!-- ===================================================================
+       Prepares the output directories for jars
+       =================================================================== -->
+  <target name="prepare-jars" depends="-prepare">
+    <mkdir dir="${jars.dest}"/>
+  </target>
+
+  <!-- ===================================================================
+       Prepares the output directories for pnet patch
+       =================================================================== -->
+  <target name="prepare-pnetpatch" depends="-prepare">
+    <mkdir dir="${pnetpatch.dest}"/>
+  </target>
+
+  <!-- ===================================================================
+       Prepares the output directories for com classes
+       =================================================================== -->
+  <target name="prepare-com" depends="prepare-compile">
+    <mkdir dir="${rmic.dest}"/>
+  </target>
+
+  <!-- ===================================================================
+       Prepares the output directories for javadoc targets
+       =================================================================== -->
+  <target name="prepare-javadoc" depends="-prepare">
+    <mkdir dir="${javadoc.dest}"/>
+  </target>
+
+  <!-- ===================================================================
+       Prepares the resource directory
+       =================================================================== -->
+  <target name="prepare-resource" depends="-init">
+    <mkdir dir="${resource.dest}/styles"/>
+    <mkdir dir="${resource.dest}/src"/>
+  </target>
+
+  <!-- ===================================================================
+       Prepares for version stuff.
+       =================================================================== -->
+  <target name="prepare-update-version" depends="prepare-compile">
+	<property name="version.java.pre" value="net/project/util/Version.java.pre" />
+	<property name="version.java" value="net/project/util/Version.java" />
+
+        <!-- Set property if Version.java.pre exists -->
+	<available file="${java.src.dir}/${version.java.pre}" property="version.java.pre.present"/>
+
+	<!-- Determine whether translated java source is up to date: Source needs
+	     regenerated if version.properties of Version.java.pre file changes -->
+	<uptodate targetfile="${java.src.dir}/${version.java}" property="version.java.uptodate" >
+            <srcfiles dir="${config.src.dir}" includes="version.properties"/>
+            <srcfiles dir="${java.src.dir}" includes="${version.java.pre}"/>
+        </uptodate>
+  </target>
+
+
+  <!-- =========================================================================
+
+		TARGET BUILDS
+
+		These targets build, compile or copy files
+
+       ===================================================================== -->
+
+  <!-- ===================================================================
+       Compile any unit test stubs
+       =================================================================== -->
+  <target name="compile-unit-test-stubs" depends="-init">
+      <mkdir dir="${test.dir}/mockobjects/output"/>
+      <javac destdir="${test.dir}/mockobjects/output" debug="true" source="1.4">
+          <classpath refid="src.compile.classpath"/>
+          <src location="${test.dir}/mockobjects/src"/>
+      </javac>
+  </target>
+
+  <!-- ===================================================================
+       Compiles the PRM java source tree
+       =================================================================== -->
+  <target name="compile-java" depends="compile-java-com,compile-java-pnet,compile-java-net" description="Compile all non-JSP Java files."/>
+
+  <!-- ===================================================================
+       Compiles com classes
+	   =================================================================== -->
+  <target name="compile-java-com" depends="prepare-compile,jars">
+
+	<!-- Compile com sources -->
+	<javac srcdir="${java.src.dir}"
+	       destdir="${compile.dest}"
+		   debug="${debug}"
+           deprecation="${deprecation}"
+           nowarn="on"
+           source="1.4">
+      <classpath refid="src.compile.classpath"/>
+	  <include name="com/**" />
+	</javac>
+
+	<!-- RMI compile certain files -->
+	<rmic base="${compile.dest}">
+	  <include name="com/**/PublisherImpl.class" />
+	  <include name="com/**/MonitorConnectionImpl.class" />
+	  <include name="com/**/Logger.class" />
+      <classpath refid="src.compile.classpath"/>
+    </rmic>
+
+  </target>
+
+  <!-- ===================================================================
+       Compiles the pnet class
+       =================================================================== -->
+  <target name="compile-java-pnet" depends="prepare-compile,jars">
+    <javac srcdir="${java.src.dir}"
+           destdir="${compile.dest}"
+           debug="${debug}"
+           deprecation="${deprecation}"
+           nowarn="on"
+           source="1.4">
+      <classpath refid="src.compile.classpath"/>
+	  <include name="pnet/**" />
+	</javac>
+  </target>
+
+  <!-- ===================================================================
+       Compiles the net.project classes
+       =================================================================== -->
+  <target name="compile-java-net" depends="prepare-compile,jars">
+    <javac srcdir="${java.src.dir}"
+           destdir="${compile.dest}"
+           debug="${debug}"
+           deprecation="${deprecation}"
+           nowarn="on"
+           source="1.4">
+      <classpath refid="src.compile.classpath"/>
+	  <include name="net/project/**" />
+
+      <!-- Don't compile unit tests -->
+      <exclude name="**/*Test.java" />
+
+      <!-- Don't compile J2EE 1.3 sources (they are for Weblogic build only) -->
+      <exclude name="net/project/security/SessionAccessFilter.java" />
+      <exclude name="net/project/security/SecurityFilter.java" />
+	</javac>
+  </target>
+
+  <!-- ===================================================================
+       Compiles the jsp source tree
+       Process JSPs to Java level - note runs in separate fork to allow for
+       switching of directory and to avoid dying on System.exit() in processor.
+       Also, inserts tools/bluestone in front of Classpath to pick up
+       tweaked JSP compiler (which actually avoids compiling unchanged files)
+
+       IMPORTANT:
+         1)  The directory that is passed here is very specific.  It MUST be
+             the JSP package directory to make the modification checking work.
+             This is a quirk of the Bentley timestamp-compare hack.
+             If none of your JSPs are compiling, this is why.
+             E.g. c:/pnet/src/pnet-main/prm/jsp/prm  or
+                  c:/pnet/src/pnet-main/prm/jsp/pnet  would work
+       =================================================================== -->
+  <target name="compile-jsp-only" depends="prepare-compile" description="Compiles JSP files with no dependency checks">
+
+    <java classname="SaApi.servlet.jsp.SaJspProcessor"
+          dir="${jsp.src.package.dir}"
+          fork="yes"
+          failonerror="yes">
+      <classpath refid="jsp.src.compile.classpath"/>
+      <arg line="-app ${jsp.packagename}.class -level java -recurse -quiet -packageName ${jsp.packagename} -compilePath ${compile.dest} ${jsp.src.package.dir}" />
+    </java>
+
+    <!-- Now compile java versions of jsps (only those in JSP package directory and below -->
+    <javac srcdir="${compile.dest}"
+           destdir="${compile.dest}"
+           debug="${debug}"
+           deprecation="${deprecation}"
+           includes="${jsp.packagename}/**"
+           nowarn="on"
+           source="1.4">
+      <classpath refid="src.compile.classpath"/>
+    </javac>
+
+  </target>
+
+  <target name="compile-jsp" depends="compile-java-net,compile-pnetpatch,compile-jsp-only" description="Compiles JSP files" />
+
+  <target name="-check-jsp-specified" unless="jsp.to.compile">
+      <fail>
+          Please set the jsp.to.compile property before calling this target.
+      </fail>
+  </target>
+
+  <target name="compile-single-jsp" depends="-check-jsp-specified, prepare-compile" description="Compile a single JSP file without compiling everything else">
+      <echo message="Compiling file ${jsp.to.compile}"/>
+
+      <java classname="SaApi.servlet.jsp.SaJspProcessor"
+            dir="${jsp.src.package.dir}"
+            fork="yes"
+            failonerror="yes">
+        <classpath refid="jsp.src.compile.classpath"/>
+        <arg line="-app ${jsp.packagename}.class -level java -recurse -quiet -packageName ${jsp.packagename} -compilePath ${compile.dest} ${jsp.to.compile}" />
+      </java>
+
+      <!-- Now compile java versions of jsps (only those in JSP package directory and below -->
+      <javac srcdir="${compile.dest}"
+             destdir="${compile.dest}"
+             debug="${debug}"
+             deprecation="${deprecation}"
+             includes="${jsp.packagename}/**"
+             nowarn="on"
+             source="1.4">
+        <classpath refid="src.compile.classpath"/>
+      </javac>
+  </target>
+
+  <!-- ===================================================================
+       Unit Test Targets
+       =================================================================== -->
+
+    <target name="-test-format-plain">
+        <property name="test.format" value="plain" />
+    </target>
+
+    <target name="-test-format-xml">
+        <property name="test.format" value="xml" />
+    </target>
+
+    <!-- Compile unit test classes -->
+    <target name="compile-unit-test" depends="compile-unit-test-stubs, compile-java">
+        <javac srcdir="${java.src.dir}"
+               destdir="${compile.dest}"
+               debug="${debug}"
+               deprecation="${deprecation}"
+               nowarn="on"
+               source="1.4">
+          <classpath refid="unittest.compile.classpath"/>
+          <include name="net/project/**/*Test.java" />
+        </javac>
+    </target>
+
+    <!-- Run unit tests only; PLAIN format -->
+    <target name="run-unit-test" depends="-init, -test-format-plain, run-single-unit-test, run-all-unit-tests" description="Run unit tests without compiling first"/>
+
+    <target name="run-single-unit-test" if="unittest.to.run">
+        <junit printsummary="yes">
+            <classpath refid="unittest.compile.classpath"/>
+            <formatter type="${test.format}"/>
+            <sysproperty key="mockobject.properties.location" value="${test.dir}\mockobjects.properties"/>
+            <jvmarg value="-ea"/>
+            <!-- Even though the next line shows up as an error, it isn't.  The
+                 property is intended to be supplied on the command line in the
+                 form "make unit-test -Dunittest.to.run=net.project.schedule.TaskEndpointCalculationTest" -->
+            <test name="${unittest.to.run}" haltonfailure="false"/>
+        </junit>
+    </target>
+
+    <target name="run-all-unit-tests" unless="unittest.to.run">
+        <junit printsummary="yes">
+            <classpath refid="unittest.compile.classpath"/>
+            <formatter type="${test.format}"/>
+            <sysproperty key="mockobject.properties.location" value="${test.dir}\mockobjects.properties"/>
+            <!-- 05/06/2003 - Tim
+                 Enabling assertions when using batchtest appears to cause
+                 all assertions to fail.  Commenting it out for now. -->
+            <!--<jvmarg value="-ea"/>-->
+            <batchtest fork="yes">
+              <fileset dir="${java.src.dir}">
+                <include name="**/*Test.java"/>
+              </fileset>
+            </batchtest>
+        </junit>
+    </target>
+
+    <!-- Run unit test after compile; PLAIN format -->
+    <target name="unit-test" depends="compile-unit-test, -test-format-plain, run-unit-test" description="Run all unit tests" />
+
+    <!-- Run unit test after compile; XML format -->
+    <target name="unit-test-xml" depends="-test-format-xml, unit-test" />
+
+    <!-- Run unit test only; XML format -->
+    <target name="run-unit-test-xml" depends="-test-format-xml, run-unit-test" />
+
+
+  <!-- ===================================================================
+       Copies the xml files to output
+       =================================================================== -->
+  <target name="xsl" depends="prepare-compile">
+    <!-- Copy all XSL files from JSP src to output -->
+    <copy todir="${compile.dest}">
+        <fileset dir="${jsp.src.dir}" >
+			<exclude name="**/.#*" />
+            <include name="**/*.xsl" />
+        </fileset>
+    </copy>
+  </target>
+
+  <!-- ===================================================================
+       Version update
+       =================================================================== -->
+  <!-- Fail unless required files are present -->
+  <target name="-update-version-check" depends="prepare-update-version" unless="version.java.pre.present">
+	<fail message="Version check failed.  File: '${java.src.dir}/${version.java.pre}' not present." />
+  </target>
+
+  <!-- Regenerate Version.java unless up-to-date -->
+  <target name="update-version-regenerate" unless="version.java.uptodate" depends="-update-version-check">
+    <filter filtersfile="${config.src.dir}/version.properties" />
+	<copy file="${java.src.dir}/${version.java.pre}" tofile="${java.src.dir}/${version.java}"
+	      filtering="true" overwrite="true" />
+  </target>
+
+  <!-- Compile Version.java -->
+  <target name="compile-version" depends="-update-version-check, update-version-regenerate">
+    <javac srcdir="${java.src.dir}"
+           destdir="${compile.dest}"
+           debug="${debug}"
+           deprecation="${deprecation}"
+           nowarn="on"
+           source="1.4">
+      <classpath refid="src.compile.classpath"/>
+	  <include name="${version.java}" />
+	</javac>
+  </target>
+
+
+  <!-- ===================================================================
+       Makes the pnet patch
+       =================================================================== -->
+  <target name="compile-pnetpatch" depends="prepare-pnetpatch,jars,compile-java-com">
+
+    <!--
+
+		UBS_7 patch
+
+		Aplication server patches
+
+	-->
+
+    <!-- Copy class files which have no source to pnetpatch output dir -->
+	<copy todir="${pnetpatch.dest}">
+		<fileset dir="${config.src.dir}/Bluestone/patches/UBS_7">
+			<exclude name="**/.#*" />
+			<include name="**/*.class" />
+		</fileset>
+	</copy>
+
+	<!-- Compile java sources to pnetpatch output dir -->
+	<javac srcdir="${config.src.dir}/Bluestone/patches/UBS_7"
+	       destdir="${pnetpatch.dest}"
+		   debug="${debug}"
+           deprecation="${deprecation}"
+           nowarn="on"
+           source="1.4">
+      <classpath refid="src.compile.classpath"/>
+    </javac>
+
+    <!--
+
+		UBS_72GA patch
+
+		Character encoding patches
+
+	-->
+
+	<!-- Compile java sources to pnetpatch output dir -->
+	<javac srcdir="${config.src.dir}/Bluestone/patches/UBS_72GA"
+	       destdir="${pnetpatch.dest}"
+		   debug="${debug}"
+           deprecation="${deprecation}"
+           nowarn="on"
+           source="1.4">
+      <classpath refid="src.compile.classpath"/>
+    </javac>
+
+	<!-- Jar it up -->
+	<jar jarfile="${jars.dest}/pnetpatch.jar"
+	     basedir="${pnetpatch.dest}" />
+
+  </target>
+
+  <!-- ===================================================================
+       Copies jars to output
+       =================================================================== -->
+  <target name="jars" depends="prepare-jars">
+    <copy todir="${jars.dest}">
+        <fileset dir="${java.src.dir}/javax">
+			<exclude name="**/.#*" />
+			<include name="*.jar" />
+			<include name="*.zip" />
+		</fileset>
+        <fileset dir="${java.src.dir}/jars">
+			<exclude name="**/.#*" />
+			<include name="*.jar" />
+			<include name="*.zip" />
+		</fileset>
+        <fileset dir="${java.src.dir}/jars/jdbc">
+			<exclude name="**/.#*" />
+			<include name="*.jar" />
+			<include name="*.zip" />
+		</fileset>
+
+
+
+
+        <fileset dir="${java.src.dir}/jars/jdbc">
+			<exclude name="**/.#*" />
+			<include name="*.jar" />
+			<include name="*.zip" />
+		</fileset>
+        <fileset dir="${java.src.dir}/jars/jdbc">
+			<exclude name="**/.#*" />
+			<include name="*.jar" />
+			<include name="*.zip" />
+		</fileset>
+        <fileset dir="${java.src.dir}/jars/jdbc">
+			<exclude name="**/.#*" />
+			<include name="*.jar" />
+			<include name="*.zip" />
+		</fileset>
+        <fileset dir="${java.src.dir}/jars/jdbc">
+			<exclude name="**/.#*" />
+			<include name="*.jar" />
+			<include name="*.zip" />
+		</fileset>
+    </copy>
+  </target>
+
+  <!-- ===================================================================
+       Build javadoc
+       =================================================================== -->
+  <target name="javadoc" depends="prepare-javadoc" description="Generates JavaDoc for internal use">
+    <javadoc sourcepath="${java.src.dir}"
+              destdir="${javadoc.dest}"
+              packagenames="net.*"
+              windowtitle="Project.net PRMServer v${product.version} (${product.version.codename})"
+              maxmemory="256M"
+              verbose="false"
+              additionalparam="-source 1.4"
+              private="true">
+        <bottom>&lt;div align=&quot;center&quot;> &lt;a href=&quot;http://www.project.net/&quot; target=&quot;_top&quot;>&#169;2000-2003 Project.net, Inc.&lt;/a> All Rights Reserved.&lt;div></bottom>
+        <link href="http://java.sun.com/j2se/1.4.1/docs/api/"/>
+        <link href="http://java.sun.com/j2ee/sdk_1.2.1/techdocs/api/"/>
+        <link href="http://www.jdom.org/docs/apidocs/"/>
+        <link href="http://itext.sourceforge.net/docs/"/>
+    </javadoc>
+
+  </target>
+
+  <!-- ===================================================================
+       Build the resources
+       =================================================================== -->
+  <target name="resource" depends="prepare-resource">
+
+	<!-- Images -->
+    <copy todir="${resource.dest}/images">
+      <fileset dir="${resource.src.dir}/Images">
+		<exclude name="**/.#*" />
+		<exclude name="tabs/src/*" />
+		<exclude name="toolbar/src/*" />
+	  </fileset>
+    </copy>
+
+	<!-- Javascript Source -->
+    <copy todir="${resource.dest}/src">
+        <javadoc sourcepath="${java.src.dir}"
+                  destdir="${javadoc.dest}"
+                  packagenames="net.*"
+                  windowtitle="Project.net PRMServer v${product.version} (${product.version.codename})"
+                  maxmemory="256M"
+                  verbose="false"
+                  additionalparam="-source 1.4"
+                  private="true">
+            <bottom>&lt;div align=&quot;center&quot;> &lt;a href=&quot;http://www.project.net/&quot; target=&quot;_top&quot;>&#169;2000-2003 Project.net, Inc.&lt;/a> All Rights Reserved.&lt;div></bottom>
+            <link href="http://java.sun.com/j2se/1.4.1/docs/api/"/>
+            <link href="http://java.sun.com/j2ee/sdk_1.2.1/techdocs/api/"/>
+            <link href="http://www.jdom.org/docs/apidocs/"/>
+            <link href="http://itext.sourceforge.net/docs/"/>
+        </javadoc>
+
+      <fileset dir="${resource.src.dir}/src" excludes="**/.#*" />
+    </copy>
+
+	<!-- CSS -->
+    <copy todir="${resource.dest}/styles">
+
+      <fileset dir="${resource.src.dir}/styles" excludes="**/.#*" />
+    </copy>
+
+	<!-- HTML files and other resources -->
+    <copy todir="${resource.dest}">
+      <fileset dir="${resource.src.dir}">
+		<exclude name="**/.#*" />
+		<include name="**/*.html" />
+		<include name="**/*.htm" />
+		<include name="**/*.ico" />
+		<include name="hosted" />
+	  </fileset>
+    </copy>
+
+  </target>
+
+  <!-- ===================================================================
+       Builds etc files
+       =================================================================== -->
+  <target name="etc" depends="prepare-etc">
+
+	<copy todir="${etc.dest}">
+        <fileset dir="${config.src.dir}/crypto" excludes="**/.#*" />
+    </copy>
+
+    <!-- Project.net Scheduler files -->
+	<copy todir="${etc.dest}">
+        <fileset dir="${config.src.dir}/scheduler">
+			<exclude name="**/.#*" />
+			<include name="*.properties" />
+		</fileset>
+    </copy>
+
+	<!-- Bluestone config files -->
+	<copy todir="${etc.dest}/ubs/config">
+		<fileset dir="${config.src.dir}/Bluestone/ubs">
+			<exclude name="**/.#*" />
+		</fileset>
+	</copy>
+
+  	<!-- Bluestone lbb files -->
+	<copy todir="${etc.dest}/ubs/lbb">
+		<fileset dir="${config.src.dir}/Bluestone/lbb">
+			<exclude name="**/.#*" />
+		</fileset>
+	</copy>
+
+    <!-- Log4j configuration files -->
+	<copy todir="${etc.dest}">
+        <fileset dir="${config.src.dir}/log4j">
+			<exclude name="**/.#*" />
+			<include name="*.xml" />
+		</fileset>
+    </copy>
+
+  </target>
+
+  <!-- ===================================================================
+       Copies bin files to output
+       =================================================================== -->
+  <target name="bin" depends="prepare-bin">
+    <!-- Copy and fix Unix scripts -->
+    <fixcrlf srcdir="${bin.src.dir}"
+             destdir="${bin.dest}"
+             eol="lf"
+             eof="remove">
+        <exclude name="**/.#*" />
+    	<include name="*.sh" />
+    	<include name="pnet-init" />
+    </fixcrlf>
+
+    <!-- Copy and fix DOS scripts -->
+    <fixcrlf srcdir="${bin.src.dir}"
+             destdir="${bin.dest}"
+             eol="crlf"
+             eof="add">
+        <exclude name="**/.#*" />
+			<include name="*.bat" />
+    </fixcrlf>
+
+    <!-- Copy remaining bin items -->
+    <copy todir="${bin.dest}">
+        <fileset dir="${bin.src.dir}">
+			<exclude name="**/.#*" />
+			<include name="*.exe" />
+  		</fileset>
+    </copy>
+
+  </target>
+
+  <!-- ===================================================================
+       Compiles the ALL source
+       =================================================================== -->
+  <target name="compile" depends="compile-java,compile-pnetpatch,compile-jsp,xsl,compile-version,compile-unit-test" />
+
+  <!-- ===================================================================
+       Builds output
+       =================================================================== -->
+  <target name="build" depends="jars,compile,etc,bin,resource" description="Builds all of the files in the output directory"/>
+
+  <!-- Builds after updating from cvs -->
+  <target name="cvs-build" depends="cvs-update-source, build" />
+  <target name="cvs-build-clean" depends="cvs-update-source, clean, build" />
+  <target name="cvs-build-test" depends="cvs-build, unit-test-xml" />
+  <target name="cvs-build-clean-test" depends="cvs-build-clean, unit-test-xml" />
+
+
+  <!-- =========================================================================
+
+	   Deploys the application
+
+       ===================================================================== -->
+
+    <target name="prepare-deploy" depends="-prepare">
+	   <echo message="Preparing to deploy product: ${product.version.codename} (${product.version})" />
+       <mkdir dir="${deploy.dir}" />
+    </target>
+
+    <!-- Deletes deployment directory -->
+    <target name="prepare-deploy-clean" depends="-init">
+        <delete dir="${deploy.dir}" />
+    </target>
+
+	<target name="prepare-deploy-src" depends="prepare-deploy">
+        <mkdir dir="${src.deploy.dest}" />
+    </target>
+
+    <target name="prepare-deploy-prm" depends="prepare-deploy">
+        <mkdir dir="${lib.deploy.dest}" />
+        <mkdir dir="${classes.deploy.dest}" />
+    </target>
+
+    <target name="prepare-deploy-xsl" depends="prepare-deploy">
+        <mkdir dir="${xsl.deploy.dest}" />
+    </target>
+
+    <target name="prepare-deploy-etc" depends="prepare-deploy">
+        <mkdir dir="${etc.deploy.dest}" />
+    </target>
+
+    <target name="prepare-deploy-bin" depends="prepare-deploy">
+        <mkdir dir="${bin.deploy.dest}" />
+    </target>
+
+    <target name="prepare-deploy-resource" depends="prepare-deploy">
+        <mkdir dir="${resource.deploy.dest}" />
+    </target>
+
+    <target name="prepare-deploy-database" depends="prepare-deploy">
+        <mkdir dir="${database.deploy.dest}" />
+    </target>
+
+    <target name="prepare-deploy-docs" depends="prepare-deploy">
+        <mkdir dir="${docs.deploy.dest}" />
+    </target>
+
+	<target name="prepare-deploy-src-javadoc" depends="prepare-deploy-src">
+        <mkdir dir="${javadoc.deploy.dest}" />
+    </target>
+
+    <target name="prepare-deploy-api-diff" depends="prepare-deploy">
+        <mkdir dir="${jdiff.deploy.dest}"/>
+    </target>
+
+	<!--
+		Deploy targets
+	-->
+
+    <target name="deploy-prm" depends="build, prepare-deploy-prm">
+
+            <jar jarfile="${lib.deploy.dest}/prm.jar"
+                basedir="${compile.dest}">
+
+				<exclude name="**/.#*" />
+				<exclude name="**/*.java" />
+				<exclude name="**/*.xsl" />
+				<exclude name="**/xsl/**" />
+				<exclude name="**/*.jsp" />
+            </jar>
+    </target>
+
+	<!-- Deploy XSL files -->
+    <target name="deploy-xsl" depends="xsl, prepare-deploy-xsl">
+        <copy todir="${xsl.deploy.dest}">
+            <fileset dir="${compile.dest}" >
+			    <exclude name="**/.#*" />
+                <include name="**/*.xsl" />
+				<!-- Must specify possible empty directories here -->
+                <include name="**/include" />
+            </fileset>
+        </copy>
+    </target>
+
+
+  <!-- Deploy JAR files -->
+  <target name="deploy-jars" depends="jars, prepare-deploy-prm">
+    <copy todir="asdgjagsd" asdh="${lib.deploy.dest}" asgd="">
+        <fileset>
+            <and>
+                ajshdkjhaskjdh
+    <type description="sdad"/>
+            </and>
+        </fileset>
+        <fileset dir="${jars.dest}">
+			<exclude name="**/.#*" />
+			<include name="*.jar" />
+			<include name="*.zip" />
+   	</fileset>
+    </copy>
+  </target>
+
+    <!-- Deploy license.txt file -->
+    <target name="deploy-jars-license" depends="prepare-deploy-prm,prepare-deploy-docs,-init">
+        <copy todir="${lib.deploy.dest}">
+            <fileset dir="${java.src.dir}/jars">
+                <include name="License.txt"/>
+            </fileset>
+        </copy>
+
+        <copy todir="${docs.deploy.dest}">
+            <fileset dir="${java.src.dir}/jars">
+                <include name="License.txt"/>
+            </fileset>
+        </copy>
+    </target>
+
+
+    <!-- Updates source from cvs -->
+	<target name="cvs-update-source" depends="-init">
+        <exec dir="${devroot.dir}" executable="cvs">
+			<arg line="-q update -dP prm tools" />
+		</exec>
+	</target>
+
+	<!-- Deploy etc files
+         Note - These are deployed form the source directory, as the files
+         in the output directory have already had tokens replaced, etc.
+      -->
+    <target name="deploy-etc" depends="prepare-deploy-etc">
+
+		<copy todir="${etc.deploy.dest}">
+			<fileset dir="${config.src.dir}/crypto" excludes="**/.#*" />
+        </copy>
+
+        <!-- Project.net Scheduler files -->
+        <copy todir="${etc.deploy.dest}">
+            <fileset dir="${config.src.dir}/scheduler">
+			    <exclude name="**/.#*" />
+			    <include name="*.properties" />
+		    </fileset>
+        </copy>
+
+        <!-- UBS config files -->
+		<copy todir="${etc.deploy.dest}/ubs/config">
+			<fileset dir="${etc.dest}/ubs/config">
+			    <exclude name="**/.#*" />
+			</fileset>
+        </copy>
+
+        <!-- LBB Plugins -->
+		<copy todir="${etc.deploy.dest}/ubs/lbb">
+			<fileset dir="${etc.dest}/ubs/lbb">
+			    <exclude name="**/.#*" />
+			</fileset>
+        </copy>
+
+		<copy todir="${etc.deploy.dest}">
+			<fileset dir="${config.src.dir}/log4j" excludes="**/.#*" />
+        </copy>
+
+    </target>
+
+	<!-- Deploy bin files -->
+    <target name="deploy-bin" depends="prepare-deploy-bin, bin">
+        <copy todir="${bin.deploy.dest}">
+			<fileset dir="${bin.dest}" excludes="**/.#*" />
+        </copy>
+    </target>
+
+  <!-- Deploy web server resources -->
+  <target name="deploy-resource" depends="resource, prepare-deploy-resource">
+
+	<!-- Images -->
+    <copy todir="${resource.deploy.dest}/images">
+      <fileset dir="${resource.src.dir}/images">
+		<exclude name="**/.#*" />
+		<exclude name="tabs/src/*" />
+		<exclude name="toolbar/src/*" />
+	  </fileset>
+    </copy>
+
+	<!-- Javascript Source -->
+    <copy todir="${resource.deploy.dest}/src">
+      <fileset dir="${resource.src.dir}/src" excludes="**/.#*" />
+    </copy>
+
+	<!-- CSS -->
+    <copy todir="${resource.deploy.dest}/styles">
+      <fileset dir="${resource.src.dir}/styles" excludes="**/.#*" />
+    </copy>
+
+	<!-- HTML files and other resources -->
+    <copy todir="${resource.deploy.dest}">
+      <fileset dir="${resource.src.dir}">
+		<exclude name="**/.#*" />
+		<include name="**/*.html" />
+		<include name="**/*.htm" />
+		<include name="**/*.ico" />
+		<include name="hosted" />
+	  </fileset>
+        <fileset></fileset>
+    </copy>
+
+  </target>
+
+	<!-- Deploy database files -->
+    <target name="deploy-database" depends="prepare-deploy-database">
+        <copy todir="${database.deploy.dest}">
+			<fileset dir="${database.src.dir}">
+			  <exclude name="**/.#*" />
+			  <include name="CreateScripts/**" />
+			</fileset>
+        </copy>
+
+
+      <!-- Images -->
+      <copy todir="${resource.deploy.dest}/images">
+        <fileset dir="${resource.src.dir}/images">
+          <exclude name="**/.#*" />
+          <exclude name="tabs/src/*" />
+          <exclude name="toolbar/src/*" />
+        </fileset>
+      </copy>
+
+      <!-- Javascript Source -->
+      <copy todir="${resource.deploy.dest}/src">
+        <fileset dir="${resource.src.dir}/src" excludes="**/.#*" />
+      </copy>
+
+      <!-- CSS -->
+      <copy todir="${resource.deploy.dest}/styles">
+        <fileset dir="${resource.src.dir}/styles" excludes="**/.#*" />
+      </copy>
+
+      <!-- HTML files and other resources -->
+      <copy todir="${resource.deploy.dest}">
+        <fileset dir="${resource.src.dir}">
+          <exclude name="**/.#*" />
+          <include name="**/*.html" />
+          <include name="**/*.htm" />
+          <include name="**/*.ico" />
+          <include name="hosted" />
+        </fileset>
+          <fileset></fileset>
+      </copy>
+
+
+
+      <!-- Images -->
+      <copy todir="${resource.deploy.dest}/images">
+        <fileset dir="${resource.src.dir}/images">
+          <exclude name="**/.#*" />
+          <exclude name="tabs/src/*" />
+          <exclude name="toolbar/src/*" />
+        </fileset>
+      </copy>
+
+      <!-- Javascript Source -->
+      <copy todir="${resource.deploy.dest}/src">
+        <fileset dir="${resource.src.dir}/src" excludes="**/.#*" />
+      </copy>
+
+      <!-- CSS -->
+      <copy todir="${resource.deploy.dest}/styles">
+        <fileset dir="${resource.src.dir}/styles" excludes="**/.#*" />
+      </copy>
+
+      <!-- HTML files and other resources -->
+      <copy todir="${resource.deploy.dest}">
+        <fileset dir="${resource.src.dir}">
+          <exclude name="**/.#*" />
+          <include name="**/*.html" />
+          <include name="**/*.htm" />
+          <include name="**/*.ico" />
+          <include name="hosted" />
+        </fileset>
+          <fileset></fileset>
+      </copy>
+
+
+    </target>
+
+	<!-- Deploy docs -->
+    <target name="deploy-docs" depends="prepare-deploy-docs">
+
+		<!-- Copy all docs except for Word Documents to deployment area
+		     Assumes Word documents are created as PDF files -->
+		<copy todir="${docs.deploy.dest}">
+			<fileset dir="${docs.src.dir}">
+			    <exclude name="**/.#*" />
+				<exclude name="**/*.doc" />
+			</fileset>
+        </copy>
+
+    </target>
+
+  <!-- ===================================================================
+       Deployments for Source releases
+       =================================================================== -->
+
+	<!-- Deploy JSP files -->
+    <target name="deploy-src-jsp" depends="compile-jsp, prepare-deploy-src">
+        <copy todir="${src.deploy.dest}/jsp">
+            <fileset dir="${jsp.src.dir}" >
+			    <exclude name="**/.#*" />
+            </fileset>
+        </copy>
+    </target>
+
+	<!-- Deploy api docs -->
+	<!--packagenames="net.project.*"-->
+	<target name="deploy-src-javadoc" depends="prepare-deploy-src-javadoc">
+		<javadoc packagenames="net.*"
+                 sourcepath="${java.src.dir}"
+			     destdir="${src.deploy.dest}/apiDocs"
+			     author="false"
+			     public="true"
+                 maxmemory="256M"
+                 additionalparam="-source 1.4"
+                 defaultexcludes="yes"
+			     windowtitle="Project.net PRMServer v${product.version} (${product.version.codename})">
+            <bottom>&lt;div align=&quot;center&quot;> &lt;a href=&quot;http://www.project.net/&quot; target=&quot;_top&quot;>&#169;2000-2003 Project.net, Inc.&lt;/a> All Rights Reserved.&lt;div></bottom>
+            <link href="http://java.sun.com/j2se/1.4.1/docs/api/"/>
+            <link href="http://java.sun.com/j2ee/sdk_1.2.1/techdocs/api/"/>
+            <link href="http://www.jdom.org/docs/apidocs/"/>
+            <link href="http://itext.sourceforge.net/docs/"/>
+        </javadoc>
+	</target>
+
+    <target name="generate-new-api-diff" depends="-init">
+
+        <!-- The name of apis, used for naming files -->
+        <property name="newapiname" value="${product.version.codename}" />
+
+        <!-- Produce XML for this version's Javadoc -->
+		<javadoc packagenames="net.project.*"
+                 sourcepath="${java.src.dir}"
+			     destdir=""
+			     author="false"
+			     public="true"
+                 maxmemory="256M"
+                 defaultexcludes="yes"
+			     windowtitle="Project.net PRMServer v${product.version} (${product.version.codename})"
+                 additionalparam="-source 1.4">
+            <classpath refid="jdiff.classpath"/>
+            <doclet name="jdiff.JDiff" path="${java.src.dir}/jdiff/jdiff.jar:${java.src.dir}/diff/xerces.jar">
+                <param name="-apidir" value="${jdiff.src.dir}"/>
+                <param name="-apiname" value="${newapiname}"/>
+            </doclet>
+        </javadoc>
+    </target>
+
+    <!-- Produce a report which will outline the API differences between this
+         version and the previous one. -->
+	<target name="deploy-api-diff" depends="prepare-deploy-api-diff,generate-new-api-diff" description="Produce an API difference report between this version and the previous one." >
+
+        <!-- The name of apis, used for naming files -->
+        <property name="oldapiname" value="7_5_1_release" />
+        <property name="newapiname" value="${product.version.codename}" />
+
+        <!-- Produce the diff between this and last version's Javadoc -->
+		<javadoc packagenames="net.project.*"
+                 sourcepath="${java.src.dir}"
+			     destdir=""
+			     author="false"
+			     public="true"
+                 maxmemory="256m"
+                 additionalparam="-source 1.4"
+                 defaultexcludes="yes"
+			     windowtitle="Project.net PRMServer v${product.version} (${product.version.codename})">
+            <doclet name="jdiff.JDiff" path="${java.src.dir}/jdiff/jdiff.jar:${java.src.dir}/jdiff/xerces.jar">
+                <param name="-d" value="${jdiff.deploy.dest}"/>
+                <param name="-oldapi" value="${oldapiname}"/>
+                <param name="-oldapidir" value="${jdiff.src.dir}"/>
+                <param name="-newapi" value="${newapiname}"/>
+                <param name="-newapidir" value="${jdiff.src.dir}"/>
+                <param name="-javadocold" value="../../oldapiDocs/"/>
+                <param name="-javadocnew" value="../../apiDocs/"/>
+            </doclet>
+        </javadoc>
+
+        <!-- Delete some files that shouldn't be shipped to the user. -->
+        <delete file="${jdiff.deploy.dest}/missingSinces.txt"/>
+        <delete file="${jdiff.deploy.dest}/user_comments_for_${oldapiname}_to_${newapiname}.xml"/>
+    </target>
+
+    <!-- Makes a deployment; incrementally (does not clean first) -->
+    <target name="deploy" depends="-debug-off, prepare-deploy, deploy-prm, deploy-jars, deploy-jars-license, deploy-xsl, deploy-resource, deploy-etc, deploy-bin, deploy-docs, deploy-database" />
+
+    <!-- Makes a source deployment; incrementally (does not clean first) -->
+    <target name="deploy-src" depends="-debug-off, deploy, deploy-src-jsp, deploy-src-javadoc, deploy-api-diff" />
+
+    <!-- Makes a source deployment; incrementally (does not clean first) -->
+    <target name="deploy-src-no-javadoc" depends="-debug-off, deploy, deploy-src-jsp" />
+
+    <!-- Cleans pending a deployment -->
+    <target name="deploy-clean" depends="-debug-off, prepare-deploy-clean, clean" description="Deletes all of the files from the deploy directory" />
+
+  <!-- ===================================================================
+       Run the application
+       =================================================================== -->
+    <target name="copy-runtime-config-file" depends="-init" description="Customizes the sajava.ini file in the bluestone configuration directory based on your local runtime configuration.">
+        <filter filtersfile="./runtime.properties"/>
+        <copy todir="${bluestone.dir}/config" filtering="true" overwrite="true" >
+            <fileset dir="${config.src.dir}/Bluestone/ubs" includes="sajava.ini SaLBB.ini"/>
+        </copy>
+        <copy file="${config.src.dir}/Bluestone/ubs/apserver.txt.noproxy.example" tofile="${bluestone.dir}/config/apserver.txt" filtering="true" overwrite="true" />
+    </target>
+
+    <target name="run" depends="-init">
+        <java classname="SaApi.SaAppServController" fork="yes" classpathref="run.classpath">
+            <arg value="-port"/>
+            <arg value="20000"/>
+            <arg value="-debug"/>
+            <arg value="true"/>
+        </java>
+
+    </target>
+
+  <!-- ===================================================================
+       Escrow creation target
+       =================================================================== -->
+  <target name="create-escrow-source" depends="-init" description="Create full source zip for escrow account">
+      <zip zipfile="../prm_${product.version.codename}_full_src.zip">
+          <zipfileset dir="../prm" prefix="prm">
+              <exclude name="**/CVS"/>
+              <exclude name="**/CVS/*"/>
+          </zipfileset>
+          <zipfileset dir="../optional" prefix="optional">
+              <exclude name="**/CVS"/>
+              <exclude name="**/CVS/*"/>
+          </zipfileset>
+          <zipfileset dir="../tools" prefix="tools">
+              <exclude name="**/CVS"/>
+              <exclude name="**/CVS/*"/>
+          </zipfileset>
+      </zip>
+      <echo>
+          Now, manually add the contents of the \\lion\\Development\Development Documentation\
+          directory to the zip file.  The zip file creation will be complete then.
+      </echo>
+  </target>
+
+  <!-- ===================================================================
+       Installer
+       =================================================================== -->
+
+  <!-- Build Zip file -->
+  <target name="zip" depends="prepare-deploy">
+	<!-- Zip file placed in root of deployment directory -->
+	<zip zipfile="${deploy.dir}/../prm_${product.version.codename}.zip">
+      <zipfileset dir="${deploy.dir}" prefix="prm"
+	      excludes="src/**" />
+	</zip>
+  </target>
+
+  <!-- Build Zip file including source -->
+  <target name="zip-src" depends="prepare-deploy-src">
+	<!-- Zip file placed in deploy directory with product version -->
+	<zip zipfile="${deploy.dir}/../prm_${product.version.codename}-src.zip">
+      <zipfileset dir="${deploy.dir}" prefix="prm" />
+	</zip>
+  </target>
+
+  <!-- Builds the Installer (which is currently a Zip) -->
+  <target name="installer" depends="deploy, zip" />
+
+  <!-- Builds the Installer from clean (which is currently a Zip) -->
+  <target name="installer-clean" depends="deploy-clean, installer" description="Builds the entire product from scratch into an installer"/>
+
+  <!-- Builds the Installer from source (which is currently a Zip) -->
+  <target name="installer-src" depends="deploy-src, zip-src" />
+
+  <!-- Builds the Installer from clean (which is currently a Zip) -->
+  <target name="installer-src-clean" depends="deploy-clean, installer-src" description="Builds the entire product with sources from scratch into an installer"/>
+
+    <target name="-prepare-patch" depends="-init">
+        <property name="patch.output.dir" value="${output.dir}/../patch" />
+        <mkdir dir="${patch.output.dir}"/>
+    </target>
+
+    <!-- This patch has been delivered to: ST -->
+    <target name="create-7.6.3-patch-1" depends="-prepare-patch" description="Create Patch 1 for 7.6.3">
+        <property name="currentpatch.output.dir" value="${patch.output.dir}/patch1" />
+        <mkdir dir="${currentpatch.output.dir}"/>
+
+        <delete file="${currentpatch.output.dir}/763Patch1-classes.zip"/>
+        <zip zipfile="${currentpatch.output.dir}/763Patch1-classes.zip">
+            <zipfileset dir="${output.dir}/java/" prefix="classes">
+                <include name="pnet/schedule/fixoverallocations_sjsp.class"/>
+                <include name="net/project/schedule/ScheduleEntry.class"/>
+                <include name="net/project/schedule/ScheduleEntry$*.class"/>
+                <include name="net/project/schedule/TaskEndpointCalculation.class"/>
+                <include name="net/project/schedule/TaskEndpointCalculation$*.class"/>
+                <include name="net/project/schedule/Schedule.class"/>
+                <include name="net/project/schedule/Schedule$*.class"/>
+                <include name="net/project/space/SpaceFactory.class"/>
+                <include name="net/project/space/SpaceFactory$*.class"/>
+                <include name="net/project/base/finder/Finder.class"/>
+                <include name="net/project/base/finder/Finder$*.class"/>
+                <include name="net/project/schedule/TaskFinder.class"/>
+                <include name="net/project/schedule/TaskFinder$*.class"/>
+                <include name="net/project/persistence/PersistenceException.class"/>
+                <include name="net/project/persistence/PersistenceException$*.class"/>
+                <!--<include name=""/>-->
+            </zipfileset>
+        </zip>
+
+        <delete file="${currentpatch.output.dir}/763Patch1-database.zip"/>
+        <zip zipfile="${currentpatch.output.dir}/763Patch1-database.zip">
+            <zipfileset dir="${source.dir}/patch/">
+                <include name="patch1.sql"/>
+            </zipfileset>
+        </zip>
+
+        <copy file="${source.dir}/patch/7.6.3-Patch1-ReleaseNotes.txt"
+              todir="${currentpatch.output.dir}"/>
+    </target>
+
+    <!-- ENW Bugs -->
+    <target name="create-7.6.3-patch-2" depends="-prepare-patch" description="Create Patch 2 for 7.6.3">
+        <property name="currentpatch.output.dir" value="${patch.output.dir}/patch2" />
+        <mkdir dir="${currentpatch.output.dir}"/>
+
+        <delete file="${currentpatch.output.dir}/763Patch2-classes.zip"/>
+        <zip zipfile="${currentpatch.output.dir}/763Patch2-classes.zip">
+            <zipfileset dir="${output.dir}/java/" prefix="classes">
+                <include name="pnet/channel/customizechannels_sjsp.class"/>
+                <include name="pnet/document/documentaddlink_sjsp.class"/>
+                <include name="pnet/discussion/postnewprocessing_sjsp.class"/>
+                <include name="pnet/schedule/main_sjsp.class"/>
+                <include name="pnet/schedule/workingtime/edit_sjsp.class"/>
+                <include name="pnet/schedule/workingtime/list_sjsp.class"/>
+                <include name="net/project/discussion/DiscussionGroup.class"/>
+                <include name="net/project/discussion/DiscussionGroup$*.class"/>
+                <include name="net/project/discussion/Post.class"/>
+                <include name="net/project/discussion/Post$*.class"/>
+                <include name="net/project/notification/EventCodes.class"/>
+                <include name="net/project/notification/EventCodes$*.class"/>
+                <include name="net/project/resource/ResourceAllocationCalendar.class"/>
+                <include name="net/project/resource/ResourceAllocationCalendar$*.class"/>
+                <include name="net/project/schedule/mvc/ScheduleHandlerMapping.class"/>
+                <include name="net/project/schedule/mvc/ScheduleHandlerMapping$*.class"/>
+            </zipfileset>
+
+            <!-- BFD-1900
+                Java/net/project/news/News.java
+                Java/net/project/news/NewsManager.java
+                Java/net/project/util/XSLFormat.java
+                Java/net/project/util/XSLFormatTest.java
+                Jsp/pnet/news/include/NewsChannel.jsp
+                Jsp/pnet/news/xsl/news-channel.xsl
+            -->
+            <zipfileset dir="${output.dir}/java/" prefix="classes">
+                <include name="net/project/news/News.class"/>
+                <include name="net/project/news/News$*.class"/>
+                <include name="net/project/news/NewsManager.class"/>
+                <include name="net/project/news/NewsManager$*.class"/>
+                <include name="net/project/util/XSLFormat.class"/>
+                <include name="net/project/util/XSLFormat$*.class"/>
+                <include name="pnet/news/include/newschannel_sjsp.class"/>
+
+            </zipfileset>
+            <zipfileset dir="${output.dir}/java/" prefix="app">
+                <include name="pnet/news/xsl/news-channel.xsl"/>
+
+            </zipfileset>
+
+            <!-- BFD-1906
+                Jsp/pnet/schedule/MPXImportResult.jsp
+                Jsp/pnet/workflow/envelope/EnvelopeWizardPage2.jsp
+            -->
+            <zipfileset dir="${output.dir}/java/" prefix="classes">
+                <include name="pnet/schedule/mpximportresult_sjsp.class"/>
+                <include name="pnet/workflow/envelope/envelopewizardpage2_sjsp.class"/>
+            </zipfileset>
+            <!-- BFD-1907
+                Jsp/pnet/business/Setup.jsp
+                Jsp/pnet/methodology/Actions.jsp
+                Jsp/pnet/methodology/TemplifySpace.jsp
+            -->
+            <zipfileset dir="${output.dir}/java/" prefix="classes">
+                <include name="pnet/business/setup_sjsp.class"/>
+                <include name="pnet/methodology/actions_sjsp.class"/>
+                <include name="pnet/methodology/templifyspace_sjsp.class"/>
+            </zipfileset>
+        </zip>
+
+        <delete file="${currentpatch.output.dir}/763Patch2-database.zip"/>
+        <zip zipfile="${currentpatch.output.dir}/763Patch2-database.zip">
+            <zipfileset dir="${source.dir}/patch/">
+                <include name="Patch2.sql"/>
+            </zipfileset>
+        </zip>
+
+        <copy file="${source.dir}/patch/7.6.3-Patch2-ReleaseNotes.txt"
+              todir="${currentpatch.output.dir}"/>
+    </target>
+
+    <target name="create-7.6.3-patch-3" depends="-prepare-patch" description="Create Patch 3 for 7.6.3">
+        <property name="currentpatch.output.dir" value="${patch.output.dir}/patch3" />
+        <mkdir dir="${currentpatch.output.dir}"/>
+
+        <delete file="${currentpatch.output.dir}/763Patch3-classes.zip"/>
+        <zip zipfile="${currentpatch.output.dir}/763Patch3-classes.zip">
+            <zipfileset dir="${output.dir}/java/" prefix="classes">
+                <include name="pnet/document/documentaddlink_sjsp.class"/>
+                <include name="net/project/schedule/ScheduleEntry.class"/>
+                <include name="net/project/schedule/ScheduleEntry$*.class"/>
+                <!--<include name=""/>-->
+            </zipfileset>
+        </zip>
+
+        <delete file="${currentpatch.output.dir}/763Patch1-database.zip"/>
+        <zip zipfile="${currentpatch.output.dir}/763Patch1-database.zip">
+            <zipfileset dir="${source.dir}/patch/">
+                <include name="patch1.sql"/>
+            </zipfileset>
+        </zip>
+
+        <copy file="${source.dir}/patch/7.6.3-Patch3-ReleaseNotes.txt"
+              todir="${currentpatch.output.dir}"/>
+    </target>
+
+  <!-- ===================================================================
+       Cleans everything: build tree
+               - build tree
+       =================================================================== -->
+  <target name="clean" depends="-init" description="Delete all of the files from the resource and output directories">
+    <delete dir="${output.dir}" />
+	<delete dir="${resource.dest}" />
+  </target>
+
+
+</project>
diff --git a/xml/tests/testData/psi/incrementalReparse41_before.xml b/xml/tests/testData/psi/incrementalReparse41_before.xml
new file mode 100644
index 000000000000..f4f3323ad5b2
--- /dev/null
+++ b/xml/tests/testData/psi/incrementalReparse41_before.xml
@@ -0,0 +1,1594 @@
+
+<!-- ===================================================================
+
+   Build file for PRM - for use with the Jakarta Ant java build tool
+   Requires Ant 1.5 or greater
+
+Build Instructions:
+   To build, run
+     build.bat - optionally with a target arg as indicated below -
+                 in the directory where this file is located.
+
+   The batch/shell file sets up your classpath and calls java org.apache.tools.ant.Main
+
+Authors:
+  Tim Morrow <tim@project.net>
+
+   $Id: build.xml,v 1.80.2.14 2004/01/17 00:43:54 tim Exp $
+
+==================================================================== -->
+
+<project name="prm" default="build">
+
+  <!-- Print Usage of this build file -->
+  <target name="usage">
+    <echo>
+build [target]
+
+Where target is one of the following:
+-------------------
+Compilation Targets
+-------------------
+  build               (default) compiles, builds and copies all files
+  compile             compiles java sources, jsp sources and pnet patch to
+                        output directories
+  compile-java        compiles java classes in the following packages:
+                        com, pnet, net.project
+  compile-jsp         compiles jsp sources only
+  compile-java-com    compiles java com.* classes only (including rmi classes)
+  compile-java-pnet   compiles java pnet.* classes only
+  compile-java-net    compiles java net.* classes only
+  compile-pnetpatch   compiles pnet patch and builds jar file
+  compile-version     compiles Version.java
+
+  javadoc             generates javadoc; for internal use only
+  resource            builds resources (images etc.) and copies to web root
+  xsl                 copies XSL files to output directories
+  etc                 copies application files (e.g. crypto/key.txt) to output
+                        directories
+  bin                 copies bin files (e.g. start_listeners.bat) to output
+                        directories
+
+  clean               purges the output tree
+
+------------------
+Deployment Targets
+------------------
+  deploy              Deploys application; executes build target then executes
+                        all of the following deploy targets:
+                        (Note: All targets perform incremental builds)
+  deploy-prm
+  deploy-xsl
+  deploy-etc
+  deploy-jars
+  deploy-bin
+  deploy-resource
+  deploy-database
+  deploy-docs
+
+  deploy-src          Deploys application; executes "deploy" target then
+                        executes these:
+  deploy-src-jsp
+  deploy-src-javadoc
+
+  deploy-clean        Purges the output and deployment tree; suitable for use
+                        before either "deploy" or "deploy-src"
+
+-----------------
+Packaging Targets
+-----------------
+  installer           Generates an installer; executes the "deploy" target and
+                        the "zip" target (incremental)
+  installer-clean     Purges the output and deployment tree then generates an
+                        installer (from clean)
+  installer-src       Generates an installer; executes the "deploy-src" target
+                        and the "zip-src" target
+  installer-src-clean Purges the output and deployment tree then generates an
+                        installer with source (from clean)
+  zip                 Creates a zip file in releases directory based on the
+                        current deployment (incremental)
+  zip-src             Creates a zip file in deployment directory, including
+                        the source (incremental)
+  create-escrow-source Creates a zip file containing escrow software
+
+-----------------
+Unit Test Targets
+-----------------
+   compile-unit-test    Compiles unit test stubs and all unit test classes
+   unit-test            Compiles and executes all unit tests
+   run-single-unit-test Runs a single unit test.  The unit test class to run
+                          is passed on the command line as follows:
+
+                          build run-single-unit-test
+                              -Dunittest.to.run=fullyqualifiedclassname
+
+                          where fullyqualifiedclassname is a unit test class
+
+-----------------
+Other Targets
+-----------------
+   run                Run an application server instance
+
+    </echo>
+  </target>
+
+
+  <!--
+       This target constructs the properties required for building the product.
+    -->
+  <target name="-init" depends="-init-base-directories, -init-directories, -init-classpath, -debug-on">
+
+      <!-- Set compilation properties -->
+      <property name="build.compiler" value="jikes"/>
+      <property name="build.rmic" value="sun"/>
+      <property name="deprecation" value="off"/>
+
+      <!-- Version Properties contains properties:
+               product.version
+	           product.version.codename
+	           autogenerate.warning
+      -->
+      <property file="${config.src.dir}/version.properties" />
+
+      <echo message="Compilation debug setting is ${debug}" />
+  </target>
+
+  <!-- Allows compilation debug info to be turned off via a dependency -->
+  <target name="-debug-off">
+      <property name="debug" value="off"/>
+  </target>
+
+  <!--
+        Allows compilation debug info to be turned on via a dependency.
+        This should be set ahead of the "init" target
+    -->
+  <target name="-debug-on">
+      <property name="debug" value="on"/>
+  </target>
+
+  <!-- Checks for presence of build.properties; sets build-properties-present -->
+  <target name="-check-build-properties">
+     <condition property="build-properties-present">
+          <available file="build.properties" />
+     </condition>
+  </target>
+
+  <!-- Copies build.properties.example to build.properties if build.properties
+       is not present -->
+  <target name="-ensure-build-properties" depends="-check-build-properties" unless="build-properties-present" >
+    <echo>No build.properties file found; creating default properties file</echo>
+    <copy file="build.properties.example" tofile="build.properties" />
+    <fail>Created build.properties.  Please review its contents before restarting build.</fail>
+  </target>
+
+  <!--
+       Setup base directories from properties file.
+       These include:
+           bluestone.dir - bluestone installation
+           website.dir - website root
+           output.dir  - prm directory in output
+           deploy.dir  - prm directory in deploy
+
+           source.dir  - prm directory in source
+           devroot.dir - parent of all module directories in source
+    -->
+  <target name="-init-base-directories" depends="-ensure-build-properties">
+
+      <!-- Set properties from build.properties file -->
+      <property file="build.properties"/>
+
+      <!-- Set a flag if required directories do not exist -->
+      <condition property="error.cannot-find-default-directories">
+        <not>
+          <and>
+            <available file="${bluestone.dir}"/>
+          </and>
+        </not>
+      </condition>
+
+      <!-- Fail if above condiition is true -->
+      <fail if="error.cannot-find-default-directories">
+One or more required properties was not set in build.properties.  Current
+values are:
+    bluestone.dir: ${bluestone.dir}
+    website.dir:   ${website.dir}
+      </fail>
+
+      <!-- Set the source directory which is really the base directory -->
+      <property name="source.dir" value="${basedir}" />
+
+      <!-- Set a development root property to the parent directory of the
+           base directory -->
+      <property name="devroot.dir" location="${basedir}/.." />
+
+  </target>
+
+  <!--
+       Set all properties that specify directories.
+    -->
+  <target name="-init-directories" depends="-init-base-directories">
+
+      <!-- Source directories -->
+      <property name="tools.dir" location="${devroot.dir}/tools" />
+      <property name="optional.dir" location="${devroot.dir}/optional" />
+      <property name="database.src.dir" location="${optional.dir}/database" />
+      <property name="config.src.dir" location="${source.dir}/Config" />
+      <property name="jdiff.src.dir" location="${config.src.dir}/JDiff" />
+      <property name="bin.src.dir" location="${source.dir}/bin" />
+      <property name="java.src.dir" location="${source.dir}/Java" />
+      <property name="jsp.packagename" value="pnet" />
+      <property name="jsp.src.dir" location="${source.dir}/Jsp" />
+      <property name="jsp.src.package.dir" location="${jsp.src.dir}/${jsp.packagename}" />
+      <property name="resource.src.dir" location="${source.dir}/Resources" />
+      <property name="docs.src.dir" location="${source.dir}/Docs/product" />
+      <property name="test.dir" location="${tools.dir}/test"/>
+
+      <!-- Output directories -->
+      <property name="resource.dest" location="${website.dir}" />
+      <property name="etc.dest" location="${output.dir}/etc"/>
+      <property name="bin.dest" location="${output.dir}/bin"/>
+      <property name="compile.dest" location="${output.dir}/java"/>
+      <property name="jars.dest" location="${output.dir}/jars"/>
+      <property name="javadoc.dest" location="${output.dir}/docs/api"/>
+      <property name="pnetpatch.dest" location="${output.dir}/pnetpatch"/>
+      <property name="rmic.dest" location="${output.dir}/rmic"/>
+
+      <!-- Deploy directories -->
+      <property name="etc.deploy.dest" location="${deploy.dir}/etc" />
+      <property name="lib.deploy.dest" location="${deploy.dir}/lib" />
+      <property name="bin.deploy.dest" location="${deploy.dir}/bin" />
+      <property name="classes.deploy.dest" location="${deploy.dir}/classes" />
+      <property name="xsl.deploy.dest" location="${deploy.dir}/app" />
+      <property name="resource.deploy.dest" location="${deploy.dir}/resource" />
+      <property name="database.deploy.dest" location="${deploy.dir}/database"/>
+      <property name="docs.deploy.dest" location="${deploy.dir}/docs" />
+      <property name="src.deploy.dest" location="${deploy.dir}/src" />
+      <property name="jdiff.deploy.dest" location="${src.deploy.dest}/apidiff"/>
+      <property name="javadoc.deploy.dest" location="${src.deploy.dest}/apiDocs" />
+
+  </target>
+
+  <!--
+       Sets all properties that specify classpaths
+    -->
+  <target name="-init-classpath" depends="-init-directories">
+
+      <!-- Grab the environment to get JAVA_HOME -->
+      <property environment="env" />
+
+      <condition property="error.missing-java-home">
+        <not>
+            <available file="${env.JAVA_HOME}" type="dir" />
+        </not>
+      </condition>
+
+      <!-- Fail if above condiition is true -->
+      <fail if="error.missing-java-home">
+The environment variable JAVA_HOME is not set or does not represent a valid
+directory.  JAVA_HOME is required to locate additional JAR files required
+for compilation with Jikes.
+Current value: ${env.JAVA_HOME}
+      </fail>
+
+      <!-- Constructs the base classpath -->
+      <path id="prm.classpath">
+          <pathelement location="${jars.dest}\pnetpatch.jar"/>
+          <pathelement location="${jars.dest}\activation.jar"/>
+          <pathelement location="${jars.dest}\mail.jar"/>
+          <pathelement location="${jars.dest}\jdom.jar"/>
+          <pathelement location="${jars.dest}\cos.jar"/>
+          <pathelement location="${jars.dest}\chart.jar"/>
+          <pathelement location="${jars.dest}\iTextXML.jar"/>
+          <pathelement location="${jars.dest}\itext.jar"/>
+          <pathelement location="${jars.dest}\commons-validator.jar"/>
+          <pathelement location="${jars.dest}\commons-collections.jar"/>
+          <pathelement location="${jars.dest}\jakarta-oro-2.0.6.jar"/>
+          <pathelement location="${jars.dest}\ojdbc14.jar"/>
+          <pathelement location="${jars.dest}\xerces.jar"/>
+          <pathelement location="${jars.dest}\Verisign.jar"/>
+          <pathelement location="${jars.dest}\log4j-1.2.8.jar"/>
+          <pathelement location="${bluestone.dir}\jars\ubs.jar"/>
+          <pathelement location="${bluestone.dir}\jars\jta-spec1_0_1.jar"/>
+          <pathelement location="${bluestone.dir}\jars\bullejb.jar"/>
+          <pathelement location="${compile.dest}"/>
+          <pathelement location="${env.JAVA_HOME}\jre\lib\jce.jar" />
+          <pathelement location="${env.JAVA_HOME}\jre\lib\jsse.jar" />
+      </path>
+
+      <!-- Constructs the runtime classpath -->
+      <path id="run.classpath">
+          <path refid="prm.classpath"/>
+      </path>
+
+      <!-- Constructs the compilation classpath -->
+      <path id="src.compile.classpath">
+          <pathelement location="c:\java"/>
+          <path refid="prm.classpath"/>
+          <pathelement location="${test.dir}\lib\junit.jar"/>
+      </path>
+
+      <path id="jdiff.classpath">
+          <path refid="src.compile.classpath"/>
+          <pathelement location="${java.src.dir}/jdiff/jdiff.jar"/>
+          <pathelement location="${java.src.dir}/jdiff/xerces.jar"/>
+      </path>
+
+      <path id="unittest.compile.classpath">
+          <pathelement location="c:\java"/>
+          <pathelement location="${test.dir}\mockobjects\output"/>
+          <path refid="prm.classpath"/>
+          <pathelement location="${test.dir}\lib\junit.jar"/>
+          <pathelement location="${test.dir}\lib\junit-addons-1.4.jar"/>
+      </path>
+
+      <!-- Constructs the JSP compilation classpath -->
+      <path id="jsp.src.compile.classpath">
+          <pathelement location="${tools.dir}\bluestone"/>
+          <path refid="src.compile.classpath"/>
+      </path>
+
+  </target>
+
+
+  <!-- =========================================================================
+
+		TARGET PREPARES
+
+		These targets simply prepare output directories for builds
+
+       ===================================================================== -->
+
+  <!-- ===================================================================
+       Prepares the output build directory
+       =================================================================== -->
+  <target name="-prepare" depends="-init">
+    <mkdir dir="${output.dir}"/>
+  </target>
+
+  <!-- ===================================================================
+       Prepares the output directories for compile targets
+       =================================================================== -->
+  <target name="prepare-compile" depends="-prepare">
+    <mkdir dir="${compile.dest}"/>
+  </target>
+
+  <!-- ===================================================================
+       Prepares the output directories for application files
+       =================================================================== -->
+  <target name="prepare-etc" depends="-prepare">
+    <mkdir dir="${etc.dest}"/>
+  </target>
+
+  <!-- ===================================================================
+       Prepares the output directories bin fules
+       =================================================================== -->
+  <target name="prepare-bin" depends="-prepare">
+    <mkdir dir="${bin.dest}"/>
+  </target>
+
+  <!-- ===================================================================
+       Prepares the output directories for jars
+       =================================================================== -->
+  <target name="prepare-jars" depends="-prepare">
+    <mkdir dir="${jars.dest}"/>
+  </target>
+
+  <!-- ===================================================================
+       Prepares the output directories for pnet patch
+       =================================================================== -->
+  <target name="prepare-pnetpatch" depends="-prepare">
+    <mkdir dir="${pnetpatch.dest}"/>
+  </target>
+
+  <!-- ===================================================================
+       Prepares the output directories for com classes
+       =================================================================== -->
+  <target name="prepare-com" depends="prepare-compile">
+    <mkdir dir="${rmic.dest}"/>
+  </target>
+
+  <!-- ===================================================================
+       Prepares the output directories for javadoc targets
+       =================================================================== -->
+  <target name="prepare-javadoc" depends="-prepare">
+    <mkdir dir="${javadoc.dest}"/>
+  </target>
+
+  <!-- ===================================================================
+       Prepares the resource directory
+       =================================================================== -->
+  <target name="prepare-resource" depends="-init">
+    <mkdir dir="${resource.dest}/styles"/>
+    <mkdir dir="${resource.dest}/src"/>
+  </target>
+
+  <!-- ===================================================================
+       Prepares for version stuff.
+       =================================================================== -->
+  <target name="prepare-update-version" depends="prepare-compile">
+	<property name="version.java.pre" value="net/project/util/Version.java.pre" />
+	<property name="version.java" value="net/project/util/Version.java" />
+
+        <!-- Set property if Version.java.pre exists -->
+	<available file="${java.src.dir}/${version.java.pre}" property="version.java.pre.present"/>
+
+	<!-- Determine whether translated java source is up to date: Source needs
+	     regenerated if version.properties of Version.java.pre file changes -->
+	<uptodate targetfile="${java.src.dir}/${version.java}" property="version.java.uptodate" >
+            <srcfiles dir="${config.src.dir}" includes="version.properties"/>
+            <srcfiles dir="${java.src.dir}" includes="${version.java.pre}"/>
+        </uptodate>
+  </target>
+
+
+  <!-- =========================================================================
+
+		TARGET BUILDS
+
+		These targets build, compile or copy files
+
+       ===================================================================== -->
+
+  <!-- ===================================================================
+       Compile any unit test stubs
+       =================================================================== -->
+  <target name="compile-unit-test-stubs" depends="-init">
+      <mkdir dir="${test.dir}/mockobjects/output"/>
+      <javac destdir="${test.dir}/mockobjects/output" debug="true" source="1.4">
+          <classpath refid="src.compile.classpath"/>
+          <src location="${test.dir}/mockobjects/src"/>
+      </javac>
+  </target>
+
+  <!-- ===================================================================
+       Compiles the PRM java source tree
+       =================================================================== -->
+  <target name="compile-java" depends="compile-java-com,compile-java-pnet,compile-java-net" description="Compile all non-JSP Java files."/>
+
+  <!-- ===================================================================
+       Compiles com classes
+	   =================================================================== -->
+  <target name="compile-java-com" depends="prepare-compile,jars">
+
+	<!-- Compile com sources -->
+	<javac srcdir="${java.src.dir}"
+	       destdir="${compile.dest}"
+		   debug="${debug}"
+           deprecation="${deprecation}"
+           nowarn="on"
+           source="1.4">
+      <classpath refid="src.compile.classpath"/>
+	  <include name="com/**" />
+	</javac>
+
+	<!-- RMI compile certain files -->
+	<rmic base="${compile.dest}">
+	  <include name="com/**/PublisherImpl.class" />
+	  <include name="com/**/MonitorConnectionImpl.class" />
+	  <include name="com/**/Logger.class" />
+      <classpath refid="src.compile.classpath"/>
+    </rmic>
+
+  </target>
+
+  <!-- ===================================================================
+       Compiles the pnet class
+       =================================================================== -->
+  <target name="compile-java-pnet" depends="prepare-compile,jars">
+    <javac srcdir="${java.src.dir}"
+           destdir="${compile.dest}"
+           debug="${debug}"
+           deprecation="${deprecation}"
+           nowarn="on"
+           source="1.4">
+      <classpath refid="src.compile.classpath"/>
+	  <include name="pnet/**" />
+	</javac>
+  </target>
+
+  <!-- ===================================================================
+       Compiles the net.project classes
+       =================================================================== -->
+  <target name="compile-java-net" depends="prepare-compile,jars">
+    <javac srcdir="${java.src.dir}"
+           destdir="${compile.dest}"
+           debug="${debug}"
+           deprecation="${deprecation}"
+           nowarn="on"
+           source="1.4">
+      <classpath refid="src.compile.classpath"/>
+	  <include name="net/project/**" />
+
+      <!-- Don't compile unit tests -->
+      <exclude name="**/*Test.java" />
+
+      <!-- Don't compile J2EE 1.3 sources (they are for Weblogic build only) -->
+      <exclude name="net/project/security/SessionAccessFilter.java" />
+      <exclude name="net/project/security/SecurityFilter.java" />
+	</javac>
+  </target>
+
+  <!-- ===================================================================
+       Compiles the jsp source tree
+       Process JSPs to Java level - note runs in separate fork to allow for
+       switching of directory and to avoid dying on System.exit() in processor.
+       Also, inserts tools/bluestone in front of Classpath to pick up
+       tweaked JSP compiler (which actually avoids compiling unchanged files)
+
+       IMPORTANT:
+         1)  The directory that is passed here is very specific.  It MUST be
+             the JSP package directory to make the modification checking work.
+             This is a quirk of the Bentley timestamp-compare hack.
+             If none of your JSPs are compiling, this is why.
+             E.g. c:/pnet/src/pnet-main/prm/jsp/prm  or
+                  c:/pnet/src/pnet-main/prm/jsp/pnet  would work
+       =================================================================== -->
+  <target name="compile-jsp-only" depends="prepare-compile" description="Compiles JSP files with no dependency checks">
+
+    <java classname="SaApi.servlet.jsp.SaJspProcessor"
+          dir="${jsp.src.package.dir}"
+          fork="yes"
+          failonerror="yes">
+      <classpath refid="jsp.src.compile.classpath"/>
+      <arg line="-app ${jsp.packagename}.class -level java -recurse -quiet -packageName ${jsp.packagename} -compilePath ${compile.dest} ${jsp.src.package.dir}" />
+    </java>
+
+    <!-- Now compile java versions of jsps (only those in JSP package directory and below -->
+    <javac srcdir="${compile.dest}"
+           destdir="${compile.dest}"
+           debug="${debug}"
+           deprecation="${deprecation}"
+           includes="${jsp.packagename}/**"
+           nowarn="on"
+           source="1.4">
+      <classpath refid="src.compile.classpath"/>
+    </javac>
+
+  </target>
+
+  <target name="compile-jsp" depends="compile-java-net,compile-pnetpatch,compile-jsp-only" description="Compiles JSP files" />
+
+  <target name="-check-jsp-specified" unless="jsp.to.compile">
+      <fail>
+          Please set the jsp.to.compile property before calling this target.
+      </fail>
+  </target>
+
+  <target name="compile-single-jsp" depends="-check-jsp-specified, prepare-compile" description="Compile a single JSP file without compiling everything else">
+      <echo message="Compiling file ${jsp.to.compile}"/>
+
+      <java classname="SaApi.servlet.jsp.SaJspProcessor"
+            dir="${jsp.src.package.dir}"
+            fork="yes"
+            failonerror="yes">
+        <classpath refid="jsp.src.compile.classpath"/>
+        <arg line="-app ${jsp.packagename}.class -level java -recurse -quiet -packageName ${jsp.packagename} -compilePath ${compile.dest} ${jsp.to.compile}" />
+      </java>
+
+      <!-- Now compile java versions of jsps (only those in JSP package directory and below -->
+      <javac srcdir="${compile.dest}"
+             destdir="${compile.dest}"
+             debug="${debug}"
+             deprecation="${deprecation}"
+             includes="${jsp.packagename}/**"
+             nowarn="on"
+             source="1.4>
+        <classpath refid="src.compile.classpath"/>
+      </javac>
+  </target>
+
+  <!-- ===================================================================
+       Unit Test Targets
+       =================================================================== -->
+
+    <target name="-test-format-plain">
+        <property name="test.format" value="plain" />
+    </target>
+
+    <target name="-test-format-xml">
+        <property name="test.format" value="xml" />
+    </target>
+
+    <!-- Compile unit test classes -->
+    <target name="compile-unit-test" depends="compile-unit-test-stubs, compile-java">
+        <javac srcdir="${java.src.dir}"
+               destdir="${compile.dest}"
+               debug="${debug}"
+               deprecation="${deprecation}"
+               nowarn="on"
+               source="1.4">
+          <classpath refid="unittest.compile.classpath"/>
+          <include name="net/project/**/*Test.java" />
+        </javac>
+    </target>
+
+    <!-- Run unit tests only; PLAIN format -->
+    <target name="run-unit-test" depends="-init, -test-format-plain, run-single-unit-test, run-all-unit-tests" description="Run unit tests without compiling first"/>
+
+    <target name="run-single-unit-test" if="unittest.to.run">
+        <junit printsummary="yes">
+            <classpath refid="unittest.compile.classpath"/>
+            <formatter type="${test.format}"/>
+            <sysproperty key="mockobject.properties.location" value="${test.dir}\mockobjects.properties"/>
+            <jvmarg value="-ea"/>
+            <!-- Even though the next line shows up as an error, it isn't.  The
+                 property is intended to be supplied on the command line in the
+                 form "make unit-test -Dunittest.to.run=net.project.schedule.TaskEndpointCalculationTest" -->
+            <test name="${unittest.to.run}" haltonfailure="false"/>
+        </junit>
+    </target>
+
+    <target name="run-all-unit-tests" unless="unittest.to.run">
+        <junit printsummary="yes">
+            <classpath refid="unittest.compile.classpath"/>
+            <formatter type="${test.format}"/>
+            <sysproperty key="mockobject.properties.location" value="${test.dir}\mockobjects.properties"/>
+            <!-- 05/06/2003 - Tim
+                 Enabling assertions when using batchtest appears to cause
+                 all assertions to fail.  Commenting it out for now. -->
+            <!--<jvmarg value="-ea"/>-->
+            <batchtest fork="yes">
+              <fileset dir="${java.src.dir}">
+                <include name="**/*Test.java"/>
+              </fileset>
+            </batchtest>
+        </junit>
+    </target>
+
+    <!-- Run unit test after compile; PLAIN format -->
+    <target name="unit-test" depends="compile-unit-test, -test-format-plain, run-unit-test" description="Run all unit tests" />
+
+    <!-- Run unit test after compile; XML format -->
+    <target name="unit-test-xml" depends="-test-format-xml, unit-test" />
+
+    <!-- Run unit test only; XML format -->
+    <target name="run-unit-test-xml" depends="-test-format-xml, run-unit-test" />
+
+
+  <!-- ===================================================================
+       Copies the xml files to output
+       =================================================================== -->
+  <target name="xsl" depends="prepare-compile">
+    <!-- Copy all XSL files from JSP src to output -->
+    <copy todir="${compile.dest}">
+        <fileset dir="${jsp.src.dir}" >
+			<exclude name="**/.#*" />
+            <include name="**/*.xsl" />
+        </fileset>
+    </copy>
+  </target>
+
+  <!-- ===================================================================
+       Version update
+       =================================================================== -->
+  <!-- Fail unless required files are present -->
+  <target name="-update-version-check" depends="prepare-update-version" unless="version.java.pre.present">
+	<fail message="Version check failed.  File: '${java.src.dir}/${version.java.pre}' not present." />
+  </target>
+
+  <!-- Regenerate Version.java unless up-to-date -->
+  <target name="update-version-regenerate" unless="version.java.uptodate" depends="-update-version-check">
+    <filter filtersfile="${config.src.dir}/version.properties" />
+	<copy file="${java.src.dir}/${version.java.pre}" tofile="${java.src.dir}/${version.java}"
+	      filtering="true" overwrite="true" />
+  </target>
+
+  <!-- Compile Version.java -->
+  <target name="compile-version" depends="-update-version-check, update-version-regenerate">
+    <javac srcdir="${java.src.dir}"
+           destdir="${compile.dest}"
+           debug="${debug}"
+           deprecation="${deprecation}"
+           nowarn="on"
+           source="1.4">
+      <classpath refid="src.compile.classpath"/>
+	  <include name="${version.java}" />
+	</javac>
+  </target>
+
+
+  <!-- ===================================================================
+       Makes the pnet patch
+       =================================================================== -->
+  <target name="compile-pnetpatch" depends="prepare-pnetpatch,jars,compile-java-com">
+
+    <!--
+
+		UBS_7 patch
+
+		Aplication server patches
+
+	-->
+
+    <!-- Copy class files which have no source to pnetpatch output dir -->
+	<copy todir="${pnetpatch.dest}">
+		<fileset dir="${config.src.dir}/Bluestone/patches/UBS_7">
+			<exclude name="**/.#*" />
+			<include name="**/*.class" />
+		</fileset>
+	</copy>
+
+	<!-- Compile java sources to pnetpatch output dir -->
+	<javac srcdir="${config.src.dir}/Bluestone/patches/UBS_7"
+	       destdir="${pnetpatch.dest}"
+		   debug="${debug}"
+           deprecation="${deprecation}"
+           nowarn="on"
+           source="1.4">
+      <classpath refid="src.compile.classpath"/>
+    </javac>
+
+    <!--
+
+		UBS_72GA patch
+
+		Character encoding patches
+
+	-->
+
+	<!-- Compile java sources to pnetpatch output dir -->
+	<javac srcdir="${config.src.dir}/Bluestone/patches/UBS_72GA"
+	       destdir="${pnetpatch.dest}"
+		   debug="${debug}"
+           deprecation="${deprecation}"
+           nowarn="on"
+           source="1.4">
+      <classpath refid="src.compile.classpath"/>
+    </javac>
+
+	<!-- Jar it up -->
+	<jar jarfile="${jars.dest}/pnetpatch.jar"
+	     basedir="${pnetpatch.dest}" />
+
+  </target>
+
+  <!-- ===================================================================
+       Copies jars to output
+       =================================================================== -->
+  <target name="jars" depends="prepare-jars">
+    <copy todir="${jars.dest}">
+        <fileset dir="${java.src.dir}/javax">
+			<exclude name="**/.#*" />
+			<include name="*.jar" />
+			<include name="*.zip" />
+		</fileset>
+        <fileset dir="${java.src.dir}/jars">
+			<exclude name="**/.#*" />
+			<include name="*.jar" />
+			<include name="*.zip" />
+		</fileset>
+        <fileset dir="${java.src.dir}/jars/jdbc">
+			<exclude name="**/.#*" />
+			<include name="*.jar" />
+			<include name="*.zip" />
+		</fileset>
+
+
+
+
+        <fileset dir="${java.src.dir}/jars/jdbc">
+			<exclude name="**/.#*" />
+			<include name="*.jar" />
+			<include name="*.zip" />
+		</fileset>
+        <fileset dir="${java.src.dir}/jars/jdbc">
+			<exclude name="**/.#*" />
+			<include name="*.jar" />
+			<include name="*.zip" />
+		</fileset>
+        <fileset dir="${java.src.dir}/jars/jdbc">
+			<exclude name="**/.#*" />
+			<include name="*.jar" />
+			<include name="*.zip" />
+		</fileset>
+        <fileset dir="${java.src.dir}/jars/jdbc">
+			<exclude name="**/.#*" />
+			<include name="*.jar" />
+			<include name="*.zip" />
+		</fileset>
+    </copy>
+  </target>
+
+  <!-- ===================================================================
+       Build javadoc
+       =================================================================== -->
+  <target name="javadoc" depends="prepare-javadoc" description="Generates JavaDoc for internal use">
+    <javadoc sourcepath="${java.src.dir}"
+              destdir="${javadoc.dest}"
+              packagenames="net.*"
+              windowtitle="Project.net PRMServer v${product.version} (${product.version.codename})"
+              maxmemory="256M"
+              verbose="false"
+              additionalparam="-source 1.4"
+              private="true">
+        <bottom>&lt;div align=&quot;center&quot;> &lt;a href=&quot;http://www.project.net/&quot; target=&quot;_top&quot;>&#169;2000-2003 Project.net, Inc.&lt;/a> All Rights Reserved.&lt;div></bottom>
+        <link href="http://java.sun.com/j2se/1.4.1/docs/api/"/>
+        <link href="http://java.sun.com/j2ee/sdk_1.2.1/techdocs/api/"/>
+        <link href="http://www.jdom.org/docs/apidocs/"/>
+        <link href="http://itext.sourceforge.net/docs/"/>
+    </javadoc>
+
+  </target>
+
+  <!-- ===================================================================
+       Build the resources
+       =================================================================== -->
+  <target name="resource" depends="prepare-resource">
+
+	<!-- Images -->
+    <copy todir="${resource.dest}/images">
+      <fileset dir="${resource.src.dir}/Images">
+		<exclude name="**/.#*" />
+		<exclude name="tabs/src/*" />
+		<exclude name="toolbar/src/*" />
+	  </fileset>
+    </copy>
+
+	<!-- Javascript Source -->
+    <copy todir="${resource.dest}/src">
+        <javadoc sourcepath="${java.src.dir}"
+                  destdir="${javadoc.dest}"
+                  packagenames="net.*"
+                  windowtitle="Project.net PRMServer v${product.version} (${product.version.codename})"
+                  maxmemory="256M"
+                  verbose="false"
+                  additionalparam="-source 1.4"
+                  private="true">
+            <bottom>&lt;div align=&quot;center&quot;> &lt;a href=&quot;http://www.project.net/&quot; target=&quot;_top&quot;>&#169;2000-2003 Project.net, Inc.&lt;/a> All Rights Reserved.&lt;div></bottom>
+            <link href="http://java.sun.com/j2se/1.4.1/docs/api/"/>
+            <link href="http://java.sun.com/j2ee/sdk_1.2.1/techdocs/api/"/>
+            <link href="http://www.jdom.org/docs/apidocs/"/>
+            <link href="http://itext.sourceforge.net/docs/"/>
+        </javadoc>
+
+      <fileset dir="${resource.src.dir}/src" excludes="**/.#*" />
+    </copy>
+
+	<!-- CSS -->
+    <copy todir="${resource.dest}/styles">
+
+      <fileset dir="${resource.src.dir}/styles" excludes="**/.#*" />
+    </copy>
+
+	<!-- HTML files and other resources -->
+    <copy todir="${resource.dest}">
+      <fileset dir="${resource.src.dir}">
+		<exclude name="**/.#*" />
+		<include name="**/*.html" />
+		<include name="**/*.htm" />
+		<include name="**/*.ico" />
+		<include name="hosted" />
+	  </fileset>
+    </copy>
+
+  </target>
+
+  <!-- ===================================================================
+       Builds etc files
+       =================================================================== -->
+  <target name="etc" depends="prepare-etc">
+
+	<copy todir="${etc.dest}">
+        <fileset dir="${config.src.dir}/crypto" excludes="**/.#*" />
+    </copy>
+
+    <!-- Project.net Scheduler files -->
+	<copy todir="${etc.dest}">
+        <fileset dir="${config.src.dir}/scheduler">
+			<exclude name="**/.#*" />
+			<include name="*.properties" />
+		</fileset>
+    </copy>
+
+	<!-- Bluestone config files -->
+	<copy todir="${etc.dest}/ubs/config">
+		<fileset dir="${config.src.dir}/Bluestone/ubs">
+			<exclude name="**/.#*" />
+		</fileset>
+	</copy>
+
+  	<!-- Bluestone lbb files -->
+	<copy todir="${etc.dest}/ubs/lbb">
+		<fileset dir="${config.src.dir}/Bluestone/lbb">
+			<exclude name="**/.#*" />
+		</fileset>
+	</copy>
+
+    <!-- Log4j configuration files -->
+	<copy todir="${etc.dest}">
+        <fileset dir="${config.src.dir}/log4j">
+			<exclude name="**/.#*" />
+			<include name="*.xml" />
+		</fileset>
+    </copy>
+
+  </target>
+
+  <!-- ===================================================================
+       Copies bin files to output
+       =================================================================== -->
+  <target name="bin" depends="prepare-bin">
+    <!-- Copy and fix Unix scripts -->
+    <fixcrlf srcdir="${bin.src.dir}"
+             destdir="${bin.dest}"
+             eol="lf"
+             eof="remove">
+        <exclude name="**/.#*" />
+    	<include name="*.sh" />
+    	<include name="pnet-init" />
+    </fixcrlf>
+
+    <!-- Copy and fix DOS scripts -->
+    <fixcrlf srcdir="${bin.src.dir}"
+             destdir="${bin.dest}"
+             eol="crlf"
+             eof="add">
+        <exclude name="**/.#*" />
+			<include name="*.bat" />
+    </fixcrlf>
+
+    <!-- Copy remaining bin items -->
+    <copy todir="${bin.dest}">
+        <fileset dir="${bin.src.dir}">
+			<exclude name="**/.#*" />
+			<include name="*.exe" />
+  		</fileset>
+    </copy>
+
+  </target>
+
+  <!-- ===================================================================
+       Compiles the ALL source
+       =================================================================== -->
+  <target name="compile" depends="compile-java,compile-pnetpatch,compile-jsp,xsl,compile-version,compile-unit-test" />
+
+  <!-- ===================================================================
+       Builds output
+       =================================================================== -->
+  <target name="build" depends="jars,compile,etc,bin,resource" description="Builds all of the files in the output directory"/>
+
+  <!-- Builds after updating from cvs -->
+  <target name="cvs-build" depends="cvs-update-source, build" />
+  <target name="cvs-build-clean" depends="cvs-update-source, clean, build" />
+  <target name="cvs-build-test" depends="cvs-build, unit-test-xml" />
+  <target name="cvs-build-clean-test" depends="cvs-build-clean, unit-test-xml" />
+
+
+  <!-- =========================================================================
+
+	   Deploys the application
+
+       ===================================================================== -->
+
+    <target name="prepare-deploy" depends="-prepare">
+	   <echo message="Preparing to deploy product: ${product.version.codename} (${product.version})" />
+       <mkdir dir="${deploy.dir}" />
+    </target>
+
+    <!-- Deletes deployment directory -->
+    <target name="prepare-deploy-clean" depends="-init">
+        <delete dir="${deploy.dir}" />
+    </target>
+
+	<target name="prepare-deploy-src" depends="prepare-deploy">
+        <mkdir dir="${src.deploy.dest}" />
+    </target>
+
+    <target name="prepare-deploy-prm" depends="prepare-deploy">
+        <mkdir dir="${lib.deploy.dest}" />
+        <mkdir dir="${classes.deploy.dest}" />
+    </target>
+
+    <target name="prepare-deploy-xsl" depends="prepare-deploy">
+        <mkdir dir="${xsl.deploy.dest}" />
+    </target>
+
+    <target name="prepare-deploy-etc" depends="prepare-deploy">
+        <mkdir dir="${etc.deploy.dest}" />
+    </target>
+
+    <target name="prepare-deploy-bin" depends="prepare-deploy">
+        <mkdir dir="${bin.deploy.dest}" />
+    </target>
+
+    <target name="prepare-deploy-resource" depends="prepare-deploy">
+        <mkdir dir="${resource.deploy.dest}" />
+    </target>
+
+    <target name="prepare-deploy-database" depends="prepare-deploy">
+        <mkdir dir="${database.deploy.dest}" />
+    </target>
+
+    <target name="prepare-deploy-docs" depends="prepare-deploy">
+        <mkdir dir="${docs.deploy.dest}" />
+    </target>
+
+	<target name="prepare-deploy-src-javadoc" depends="prepare-deploy-src">
+        <mkdir dir="${javadoc.deploy.dest}" />
+    </target>
+
+    <target name="prepare-deploy-api-diff" depends="prepare-deploy">
+        <mkdir dir="${jdiff.deploy.dest}"/>
+    </target>
+
+	<!--
+		Deploy targets
+	-->
+
+    <target name="deploy-prm" depends="build, prepare-deploy-prm">
+
+            <jar jarfile="${lib.deploy.dest}/prm.jar"
+                basedir="${compile.dest}">
+
+				<exclude name="**/.#*" />
+				<exclude name="**/*.java" />
+				<exclude name="**/*.xsl" />
+				<exclude name="**/xsl/**" />
+				<exclude name="**/*.jsp" />
+            </jar>
+    </target>
+
+	<!-- Deploy XSL files -->
+    <target name="deploy-xsl" depends="xsl, prepare-deploy-xsl">
+        <copy todir="${xsl.deploy.dest}">
+            <fileset dir="${compile.dest}" >
+			    <exclude name="**/.#*" />
+                <include name="**/*.xsl" />
+				<!-- Must specify possible empty directories here -->
+                <include name="**/include" />
+            </fileset>
+        </copy>
+    </target>
+
+
+  <!-- Deploy JAR files -->
+  <target name="deploy-jars" depends="jars, prepare-deploy-prm">
+    <copy todir="asdgjagsd" asdh="${lib.deploy.dest}" asgd="">
+        <fileset>
+            <and>
+                ajshdkjhaskjdh
+    <type description="sdad"/>
+            </and>
+        </fileset>
+        <fileset dir="${jars.dest}">
+			<exclude name="**/.#*" />
+			<include name="*.jar" />
+			<include name="*.zip" />
+   	</fileset>
+    </copy>
+  </target>
+
+    <!-- Deploy license.txt file -->
+    <target name="deploy-jars-license" depends="prepare-deploy-prm,prepare-deploy-docs,-init">
+        <copy todir="${lib.deploy.dest}">
+            <fileset dir="${java.src.dir}/jars">
+                <include name="License.txt"/>
+            </fileset>
+        </copy>
+
+        <copy todir="${docs.deploy.dest}">
+            <fileset dir="${java.src.dir}/jars">
+                <include name="License.txt"/>
+            </fileset>
+        </copy>
+    </target>
+
+
+    <!-- Updates source from cvs -->
+	<target name="cvs-update-source" depends="-init">
+        <exec dir="${devroot.dir}" executable="cvs">
+			<arg line="-q update -dP prm tools" />
+		</exec>
+	</target>
+
+	<!-- Deploy etc files
+         Note - These are deployed form the source directory, as the files
+         in the output directory have already had tokens replaced, etc.
+      -->
+    <target name="deploy-etc" depends="prepare-deploy-etc">
+
+		<copy todir="${etc.deploy.dest}">
+			<fileset dir="${config.src.dir}/crypto" excludes="**/.#*" />
+        </copy>
+
+        <!-- Project.net Scheduler files -->
+        <copy todir="${etc.deploy.dest}">
+            <fileset dir="${config.src.dir}/scheduler">
+			    <exclude name="**/.#*" />
+			    <include name="*.properties" />
+		    </fileset>
+        </copy>
+
+        <!-- UBS config files -->
+		<copy todir="${etc.deploy.dest}/ubs/config">
+			<fileset dir="${etc.dest}/ubs/config">
+			    <exclude name="**/.#*" />
+			</fileset>
+        </copy>
+
+        <!-- LBB Plugins -->
+		<copy todir="${etc.deploy.dest}/ubs/lbb">
+			<fileset dir="${etc.dest}/ubs/lbb">
+			    <exclude name="**/.#*" />
+			</fileset>
+        </copy>
+
+		<copy todir="${etc.deploy.dest}">
+			<fileset dir="${config.src.dir}/log4j" excludes="**/.#*" />
+        </copy>
+
+    </target>
+
+	<!-- Deploy bin files -->
+    <target name="deploy-bin" depends="prepare-deploy-bin, bin">
+        <copy todir="${bin.deploy.dest}">
+			<fileset dir="${bin.dest}" excludes="**/.#*" />
+        </copy>
+    </target>
+
+  <!-- Deploy web server resources -->
+  <target name="deploy-resource" depends="resource, prepare-deploy-resource">
+
+	<!-- Images -->
+    <copy todir="${resource.deploy.dest}/images">
+      <fileset dir="${resource.src.dir}/images">
+		<exclude name="**/.#*" />
+		<exclude name="tabs/src/*" />
+		<exclude name="toolbar/src/*" />
+	  </fileset>
+    </copy>
+
+	<!-- Javascript Source -->
+    <copy todir="${resource.deploy.dest}/src">
+      <fileset dir="${resource.src.dir}/src" excludes="**/.#*" />
+    </copy>
+
+	<!-- CSS -->
+    <copy todir="${resource.deploy.dest}/styles">
+      <fileset dir="${resource.src.dir}/styles" excludes="**/.#*" />
+    </copy>
+
+	<!-- HTML files and other resources -->
+    <copy todir="${resource.deploy.dest}">
+      <fileset dir="${resource.src.dir}">
+		<exclude name="**/.#*" />
+		<include name="**/*.html" />
+		<include name="**/*.htm" />
+		<include name="**/*.ico" />
+		<include name="hosted" />
+	  </fileset>
+        <fileset></fileset>
+    </copy>
+
+  </target>
+
+	<!-- Deploy database files -->
+    <target name="deploy-database" depends="prepare-deploy-database">
+        <copy todir="${database.deploy.dest}">
+			<fileset dir="${database.src.dir}">
+			  <exclude name="**/.#*" />
+			  <include name="CreateScripts/**" />
+			</fileset>
+        </copy>
+
+
+      <!-- Images -->
+      <copy todir="${resource.deploy.dest}/images">
+        <fileset dir="${resource.src.dir}/images">
+          <exclude name="**/.#*" />
+          <exclude name="tabs/src/*" />
+          <exclude name="toolbar/src/*" />
+        </fileset>
+      </copy>
+
+      <!-- Javascript Source -->
+      <copy todir="${resource.deploy.dest}/src">
+        <fileset dir="${resource.src.dir}/src" excludes="**/.#*" />
+      </copy>
+
+      <!-- CSS -->
+      <copy todir="${resource.deploy.dest}/styles">
+        <fileset dir="${resource.src.dir}/styles" excludes="**/.#*" />
+      </copy>
+
+      <!-- HTML files and other resources -->
+      <copy todir="${resource.deploy.dest}">
+        <fileset dir="${resource.src.dir}">
+          <exclude name="**/.#*" />
+          <include name="**/*.html" />
+          <include name="**/*.htm" />
+          <include name="**/*.ico" />
+          <include name="hosted" />
+        </fileset>
+          <fileset></fileset>
+      </copy>
+
+
+
+      <!-- Images -->
+      <copy todir="${resource.deploy.dest}/images">
+        <fileset dir="${resource.src.dir}/images">
+          <exclude name="**/.#*" />
+          <exclude name="tabs/src/*" />
+          <exclude name="toolbar/src/*" />
+        </fileset>
+      </copy>
+
+      <!-- Javascript Source -->
+      <copy todir="${resource.deploy.dest}/src">
+        <fileset dir="${resource.src.dir}/src" excludes="**/.#*" />
+      </copy>
+
+      <!-- CSS -->
+      <copy todir="${resource.deploy.dest}/styles">
+        <fileset dir="${resource.src.dir}/styles" excludes="**/.#*" />
+      </copy>
+
+      <!-- HTML files and other resources -->
+      <copy todir="${resource.deploy.dest}">
+        <fileset dir="${resource.src.dir}">
+          <exclude name="**/.#*" />
+          <include name="**/*.html" />
+          <include name="**/*.htm" />
+          <include name="**/*.ico" />
+          <include name="hosted" />
+        </fileset>
+          <fileset></fileset>
+      </copy>
+
+
+    </target>
+
+	<!-- Deploy docs -->
+    <target name="deploy-docs" depends="prepare-deploy-docs">
+
+		<!-- Copy all docs except for Word Documents to deployment area
+		     Assumes Word documents are created as PDF files -->
+		<copy todir="${docs.deploy.dest}">
+			<fileset dir="${docs.src.dir}">
+			    <exclude name="**/.#*" />
+				<exclude name="**/*.doc" />
+			</fileset>
+        </copy>
+
+    </target>
+
+  <!-- ===================================================================
+       Deployments for Source releases
+       =================================================================== -->
+
+	<!-- Deploy JSP files -->
+    <target name="deploy-src-jsp" depends="compile-jsp, prepare-deploy-src">
+        <copy todir="${src.deploy.dest}/jsp">
+            <fileset dir="${jsp.src.dir}" >
+			    <exclude name="**/.#*" />
+            </fileset>
+        </copy>
+    </target>
+
+	<!-- Deploy api docs -->
+	<!--packagenames="net.project.*"-->
+	<target name="deploy-src-javadoc" depends="prepare-deploy-src-javadoc">
+		<javadoc packagenames="net.*"
+                 sourcepath="${java.src.dir}"
+			     destdir="${src.deploy.dest}/apiDocs"
+			     author="false"
+			     public="true"
+                 maxmemory="256M"
+                 additionalparam="-source 1.4"
+                 defaultexcludes="yes"
+			     windowtitle="Project.net PRMServer v${product.version} (${product.version.codename})">
+            <bottom>&lt;div align=&quot;center&quot;> &lt;a href=&quot;http://www.project.net/&quot; target=&quot;_top&quot;>&#169;2000-2003 Project.net, Inc.&lt;/a> All Rights Reserved.&lt;div></bottom>
+            <link href="http://java.sun.com/j2se/1.4.1/docs/api/"/>
+            <link href="http://java.sun.com/j2ee/sdk_1.2.1/techdocs/api/"/>
+            <link href="http://www.jdom.org/docs/apidocs/"/>
+            <link href="http://itext.sourceforge.net/docs/"/>
+        </javadoc>
+	</target>
+
+    <target name="generate-new-api-diff" depends="-init">
+
+        <!-- The name of apis, used for naming files -->
+        <property name="newapiname" value="${product.version.codename}" />
+
+        <!-- Produce XML for this version's Javadoc -->
+		<javadoc packagenames="net.project.*"
+                 sourcepath="${java.src.dir}"
+			     destdir=""
+			     author="false"
+			     public="true"
+                 maxmemory="256M"
+                 defaultexcludes="yes"
+			     windowtitle="Project.net PRMServer v${product.version} (${product.version.codename})"
+                 additionalparam="-source 1.4">
+            <classpath refid="jdiff.classpath"/>
+            <doclet name="jdiff.JDiff" path="${java.src.dir}/jdiff/jdiff.jar:${java.src.dir}/diff/xerces.jar">
+                <param name="-apidir" value="${jdiff.src.dir}"/>
+                <param name="-apiname" value="${newapiname}"/>
+            </doclet>
+        </javadoc>
+    </target>
+
+    <!-- Produce a report which will outline the API differences between this
+         version and the previous one. -->
+	<target name="deploy-api-diff" depends="prepare-deploy-api-diff,generate-new-api-diff" description="Produce an API difference report between this version and the previous one." >
+
+        <!-- The name of apis, used for naming files -->
+        <property name="oldapiname" value="7_5_1_release" />
+        <property name="newapiname" value="${product.version.codename}" />
+
+        <!-- Produce the diff between this and last version's Javadoc -->
+		<javadoc packagenames="net.project.*"
+                 sourcepath="${java.src.dir}"
+			     destdir=""
+			     author="false"
+			     public="true"
+                 maxmemory="256m"
+                 additionalparam="-source 1.4"
+                 defaultexcludes="yes"
+			     windowtitle="Project.net PRMServer v${product.version} (${product.version.codename})">
+            <doclet name="jdiff.JDiff" path="${java.src.dir}/jdiff/jdiff.jar:${java.src.dir}/jdiff/xerces.jar">
+                <param name="-d" value="${jdiff.deploy.dest}"/>
+                <param name="-oldapi" value="${oldapiname}"/>
+                <param name="-oldapidir" value="${jdiff.src.dir}"/>
+                <param name="-newapi" value="${newapiname}"/>
+                <param name="-newapidir" value="${jdiff.src.dir}"/>
+                <param name="-javadocold" value="../../oldapiDocs/"/>
+                <param name="-javadocnew" value="../../apiDocs/"/>
+            </doclet>
+        </javadoc>
+
+        <!-- Delete some files that shouldn't be shipped to the user. -->
+        <delete file="${jdiff.deploy.dest}/missingSinces.txt"/>
+        <delete file="${jdiff.deploy.dest}/user_comments_for_${oldapiname}_to_${newapiname}.xml"/>
+    </target>
+
+    <!-- Makes a deployment; incrementally (does not clean first) -->
+    <target name="deploy" depends="-debug-off, prepare-deploy, deploy-prm, deploy-jars, deploy-jars-license, deploy-xsl, deploy-resource, deploy-etc, deploy-bin, deploy-docs, deploy-database" />
+
+    <!-- Makes a source deployment; incrementally (does not clean first) -->
+    <target name="deploy-src" depends="-debug-off, deploy, deploy-src-jsp, deploy-src-javadoc, deploy-api-diff" />
+
+    <!-- Makes a source deployment; incrementally (does not clean first) -->
+    <target name="deploy-src-no-javadoc" depends="-debug-off, deploy, deploy-src-jsp" />
+
+    <!-- Cleans pending a deployment -->
+    <target name="deploy-clean" depends="-debug-off, prepare-deploy-clean, clean" description="Deletes all of the files from the deploy directory" />
+
+  <!-- ===================================================================
+       Run the application
+       =================================================================== -->
+    <target name="copy-runtime-config-file" depends="-init" description="Customizes the sajava.ini file in the bluestone configuration directory based on your local runtime configuration.">
+        <filter filtersfile="./runtime.properties"/>
+        <copy todir="${bluestone.dir}/config" filtering="true" overwrite="true" >
+            <fileset dir="${config.src.dir}/Bluestone/ubs" includes="sajava.ini SaLBB.ini"/>
+        </copy>
+        <copy file="${config.src.dir}/Bluestone/ubs/apserver.txt.noproxy.example" tofile="${bluestone.dir}/config/apserver.txt" filtering="true" overwrite="true" />
+    </target>
+
+    <target name="run" depends="-init">
+        <java classname="SaApi.SaAppServController" fork="yes" classpathref="run.classpath">
+            <arg value="-port"/>
+            <arg value="20000"/>
+            <arg value="-debug"/>
+            <arg value="true"/>
+        </java>
+
+    </target>
+
+  <!-- ===================================================================
+       Escrow creation target
+       =================================================================== -->
+  <target name="create-escrow-source" depends="-init" description="Create full source zip for escrow account">
+      <zip zipfile="../prm_${product.version.codename}_full_src.zip">
+          <zipfileset dir="../prm" prefix="prm">
+              <exclude name="**/CVS"/>
+              <exclude name="**/CVS/*"/>
+          </zipfileset>
+          <zipfileset dir="../optional" prefix="optional">
+              <exclude name="**/CVS"/>
+              <exclude name="**/CVS/*"/>
+          </zipfileset>
+          <zipfileset dir="../tools" prefix="tools">
+              <exclude name="**/CVS"/>
+              <exclude name="**/CVS/*"/>
+          </zipfileset>
+      </zip>
+      <echo>
+          Now, manually add the contents of the \\lion\\Development\Development Documentation\
+          directory to the zip file.  The zip file creation will be complete then.
+      </echo>
+  </target>
+
+  <!-- ===================================================================
+       Installer
+       =================================================================== -->
+
+  <!-- Build Zip file -->
+  <target name="zip" depends="prepare-deploy">
+	<!-- Zip file placed in root of deployment directory -->
+	<zip zipfile="${deploy.dir}/../prm_${product.version.codename}.zip">
+      <zipfileset dir="${deploy.dir}" prefix="prm"
+	      excludes="src/**" />
+	</zip>
+  </target>
+
+  <!-- Build Zip file including source -->
+  <target name="zip-src" depends="prepare-deploy-src">
+	<!-- Zip file placed in deploy directory with product version -->
+	<zip zipfile="${deploy.dir}/../prm_${product.version.codename}-src.zip">
+      <zipfileset dir="${deploy.dir}" prefix="prm" />
+	</zip>
+  </target>
+
+  <!-- Builds the Installer (which is currently a Zip) -->
+  <target name="installer" depends="deploy, zip" />
+
+  <!-- Builds the Installer from clean (which is currently a Zip) -->
+  <target name="installer-clean" depends="deploy-clean, installer" description="Builds the entire product from scratch into an installer"/>
+
+  <!-- Builds the Installer from source (which is currently a Zip) -->
+  <target name="installer-src" depends="deploy-src, zip-src" />
+
+  <!-- Builds the Installer from clean (which is currently a Zip) -->
+  <target name="installer-src-clean" depends="deploy-clean, installer-src" description="Builds the entire product with sources from scratch into an installer"/>
+
+    <target name="-prepare-patch" depends="-init">
+        <property name="patch.output.dir" value="${output.dir}/../patch" />
+        <mkdir dir="${patch.output.dir}"/>
+    </target>
+
+    <!-- This patch has been delivered to: ST -->
+    <target name="create-7.6.3-patch-1" depends="-prepare-patch" description="Create Patch 1 for 7.6.3">
+        <property name="currentpatch.output.dir" value="${patch.output.dir}/patch1" />
+        <mkdir dir="${currentpatch.output.dir}"/>
+
+        <delete file="${currentpatch.output.dir}/763Patch1-classes.zip"/>
+        <zip zipfile="${currentpatch.output.dir}/763Patch1-classes.zip">
+            <zipfileset dir="${output.dir}/java/" prefix="classes">
+                <include name="pnet/schedule/fixoverallocations_sjsp.class"/>
+                <include name="net/project/schedule/ScheduleEntry.class"/>
+                <include name="net/project/schedule/ScheduleEntry$*.class"/>
+                <include name="net/project/schedule/TaskEndpointCalculation.class"/>
+                <include name="net/project/schedule/TaskEndpointCalculation$*.class"/>
+                <include name="net/project/schedule/Schedule.class"/>
+                <include name="net/project/schedule/Schedule$*.class"/>
+                <include name="net/project/space/SpaceFactory.class"/>
+                <include name="net/project/space/SpaceFactory$*.class"/>
+                <include name="net/project/base/finder/Finder.class"/>
+                <include name="net/project/base/finder/Finder$*.class"/>
+                <include name="net/project/schedule/TaskFinder.class"/>
+                <include name="net/project/schedule/TaskFinder$*.class"/>
+                <include name="net/project/persistence/PersistenceException.class"/>
+                <include name="net/project/persistence/PersistenceException$*.class"/>
+                <!--<include name=""/>-->
+            </zipfileset>
+        </zip>
+
+        <delete file="${currentpatch.output.dir}/763Patch1-database.zip"/>
+        <zip zipfile="${currentpatch.output.dir}/763Patch1-database.zip">
+            <zipfileset dir="${source.dir}/patch/">
+                <include name="patch1.sql"/>
+            </zipfileset>
+        </zip>
+
+        <copy file="${source.dir}/patch/7.6.3-Patch1-ReleaseNotes.txt"
+              todir="${currentpatch.output.dir}"/>
+    </target>
+
+    <!-- ENW Bugs -->
+    <target name="create-7.6.3-patch-2" depends="-prepare-patch" description="Create Patch 2 for 7.6.3">
+        <property name="currentpatch.output.dir" value="${patch.output.dir}/patch2" />
+        <mkdir dir="${currentpatch.output.dir}"/>
+
+        <delete file="${currentpatch.output.dir}/763Patch2-classes.zip"/>
+        <zip zipfile="${currentpatch.output.dir}/763Patch2-classes.zip">
+            <zipfileset dir="${output.dir}/java/" prefix="classes">
+                <include name="pnet/channel/customizechannels_sjsp.class"/>
+                <include name="pnet/document/documentaddlink_sjsp.class"/>
+                <include name="pnet/discussion/postnewprocessing_sjsp.class"/>
+                <include name="pnet/schedule/main_sjsp.class"/>
+                <include name="pnet/schedule/workingtime/edit_sjsp.class"/>
+                <include name="pnet/schedule/workingtime/list_sjsp.class"/>
+                <include name="net/project/discussion/DiscussionGroup.class"/>
+                <include name="net/project/discussion/DiscussionGroup$*.class"/>
+                <include name="net/project/discussion/Post.class"/>
+                <include name="net/project/discussion/Post$*.class"/>
+                <include name="net/project/notification/EventCodes.class"/>
+                <include name="net/project/notification/EventCodes$*.class"/>
+                <include name="net/project/resource/ResourceAllocationCalendar.class"/>
+                <include name="net/project/resource/ResourceAllocationCalendar$*.class"/>
+                <include name="net/project/schedule/mvc/ScheduleHandlerMapping.class"/>
+                <include name="net/project/schedule/mvc/ScheduleHandlerMapping$*.class"/>
+            </zipfileset>
+
+            <!-- BFD-1900
+                Java/net/project/news/News.java
+                Java/net/project/news/NewsManager.java
+                Java/net/project/util/XSLFormat.java
+                Java/net/project/util/XSLFormatTest.java
+                Jsp/pnet/news/include/NewsChannel.jsp
+                Jsp/pnet/news/xsl/news-channel.xsl
+            -->
+            <zipfileset dir="${output.dir}/java/" prefix="classes">
+                <include name="net/project/news/News.class"/>
+                <include name="net/project/news/News$*.class"/>
+                <include name="net/project/news/NewsManager.class"/>
+                <include name="net/project/news/NewsManager$*.class"/>
+                <include name="net/project/util/XSLFormat.class"/>
+                <include name="net/project/util/XSLFormat$*.class"/>
+                <include name="pnet/news/include/newschannel_sjsp.class"/>
+
+            </zipfileset>
+            <zipfileset dir="${output.dir}/java/" prefix="app">
+                <include name="pnet/news/xsl/news-channel.xsl"/>
+
+            </zipfileset>
+
+            <!-- BFD-1906
+                Jsp/pnet/schedule/MPXImportResult.jsp
+                Jsp/pnet/workflow/envelope/EnvelopeWizardPage2.jsp
+            -->
+            <zipfileset dir="${output.dir}/java/" prefix="classes">
+                <include name="pnet/schedule/mpximportresult_sjsp.class"/>
+                <include name="pnet/workflow/envelope/envelopewizardpage2_sjsp.class"/>
+            </zipfileset>
+            <!-- BFD-1907
+                Jsp/pnet/business/Setup.jsp
+                Jsp/pnet/methodology/Actions.jsp
+                Jsp/pnet/methodology/TemplifySpace.jsp
+            -->
+            <zipfileset dir="${output.dir}/java/" prefix="classes">
+                <include name="pnet/business/setup_sjsp.class"/>
+                <include name="pnet/methodology/actions_sjsp.class"/>
+                <include name="pnet/methodology/templifyspace_sjsp.class"/>
+            </zipfileset>
+        </zip>
+
+        <delete file="${currentpatch.output.dir}/763Patch2-database.zip"/>
+        <zip zipfile="${currentpatch.output.dir}/763Patch2-database.zip">
+            <zipfileset dir="${source.dir}/patch/">
+                <include name="Patch2.sql"/>
+            </zipfileset>
+        </zip>
+
+        <copy file="${source.dir}/patch/7.6.3-Patch2-ReleaseNotes.txt"
+              todir="${currentpatch.output.dir}"/>
+    </target>
+
+    <target name="create-7.6.3-patch-3" depends="-prepare-patch" description="Create Patch 3 for 7.6.3">
+        <property name="currentpatch.output.dir" value="${patch.output.dir}/patch3" />
+        <mkdir dir="${currentpatch.output.dir}"/>
+
+        <delete file="${currentpatch.output.dir}/763Patch3-classes.zip"/>
+        <zip zipfile="${currentpatch.output.dir}/763Patch3-classes.zip">
+            <zipfileset dir="${output.dir}/java/" prefix="classes">
+                <include name="pnet/document/documentaddlink_sjsp.class"/>
+                <include name="net/project/schedule/ScheduleEntry.class"/>
+                <include name="net/project/schedule/ScheduleEntry$*.class"/>
+                <!--<include name=""/>-->
+            </zipfileset>
+        </zip>
+
+        <delete file="${currentpatch.output.dir}/763Patch1-database.zip"/>
+        <zip zipfile="${currentpatch.output.dir}/763Patch1-database.zip">
+            <zipfileset dir="${source.dir}/patch/">
+                <include name="patch1.sql"/>
+            </zipfileset>
+        </zip>
+
+        <copy file="${source.dir}/patch/7.6.3-Patch3-ReleaseNotes.txt"
+              todir="${currentpatch.output.dir}"/>
+    </target>
+
+  <!-- ===================================================================
+       Cleans everything: build tree
+               - build tree
+       =================================================================== -->
+  <target name="clean" depends="-init" description="Delete all of the files from the resource and output directories">
+    <delete dir="${output.dir}" />
+	<delete dir="${resource.dest}" />
+  </target>
+
+
+</project>
diff --git a/xml/tests/testData/psi/incrementalReparse42_after.xml b/xml/tests/testData/psi/incrementalReparse42_after.xml
new file mode 100644
index 000000000000..c40c0e2507aa
--- /dev/null
+++ b/xml/tests/testData/psi/incrementalReparse42_after.xml
@@ -0,0 +1,10 @@
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="namespace" >
+    <xsd:element name="tag" type="type"/>
+    <xsd:complexType name="type"/>
+    <xsd:simpleType name="type1">
+    </xsd:simpleType>
+</xsd:schema>
+
+
+<xsd:element name="IntellijIdeaRulezzz " type=""
\ No newline at end of file
diff --git a/xml/tests/testData/psi/incrementalReparse42_before.xml b/xml/tests/testData/psi/incrementalReparse42_before.xml
new file mode 100644
index 000000000000..1cd3171db267
--- /dev/null
+++ b/xml/tests/testData/psi/incrementalReparse42_before.xml
@@ -0,0 +1,10 @@
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="namespace" >
+    <xsd:element name="tag" type="type"/>
+    <xsd:complexType name="type"/>
+    <xsd:simpleType name="type1">
+    </xsd:simpleType>
+</xsd:schema>
+
+
+<xsd:element name="" type=""
\ No newline at end of file
diff --git a/xml/tests/testData/psi/incrementalReparse43_after.xml b/xml/tests/testData/psi/incrementalReparse43_after.xml
new file mode 100644
index 000000000000..340bb72c207a
--- /dev/null
+++ b/xml/tests/testData/psi/incrementalReparse43_after.xml
@@ -0,0 +1,100 @@
+
+<fb:context
+            xmlns:fb="http://apache.org/cocoon/forms/1.0#binding"
+            xmlns:fd="http://apache.org/cocoon/forms/1.0#definition"
+            path="/data/wrapper/context" >
+
+  <fb:context path="info">
+    <!-- the email value will not be saved because of the @direction="load" -->
+    <fb:value id="email" path="email" direction="load"/>
+
+    <!-- jxpath binds to nodes as well as to attributes -->
+    <fb:value id="number" path="number/@value">
+      <!-- for non-string datatypes, a convertor must be specified. These are
+      the same convertors as can be used in form definitions, but require an
+      extra datatype attribute. Here we use the default convertor for longs. -->
+      <fd:convertor datatype="integer"/>
+    </fb:value>
+
+    <fb:value id="choose" path="choose/@value">
+      <fd:convertor datatype="boolean"/>
+    </fb:value>
+
+    <!-- one entry field in the client maps through aggregate fields -->
+    <fb:aggregate id="phone" path="phone" >
+      <!-- to multiple fields in the XML file -->
+      <fb:value id="number" path="number" />
+      <fb:value id="zone" path="zone" />
+      <fb:value id="cntr" path="@cntr" />
+    </fb:aggregate>
+
+  </fb:context>
+
+
+  <fb:value id="ipaddress" path="ipaddress">
+    <fb:on-update>
+      <!-- if the value has changed, the attribute will be set -->
+      <fb:set-attribute name="changed" value="true"/>
+    </fb:on-update>
+  </fb:value>
+
+  <fb:value id="birthday" path="birthday">
+    <fd:convertor datatype="date" type="formatting">
+      <fd:patterns>
+        <fd:pattern>yyyy-MM-dd</fd:pattern>
+      </fd:patterns>
+    </fd:convertor>
+  </fb:value>
+
+  <fb:multi-value id="drinks" parent-path="drinks" row-path="drink"/>
+
+  <!--
+    - Repeater requires unique identification mechanism of the row-nodes.
+    - (it is of course possible to implement other binding strategies)
+    -
+    - Important NOTE: When adding rows, the row-path is used inside
+    - jxpath-createPath context, as a consequence it cannot have dependent
+    - children or predicates.
+    -->
+  <fb:repeater id="contacts"
+               parent-path="contacts"
+               row-path="contact">
+
+    <fb:identity>
+      <fb:value id="id" path="@id">
+        <!-- optional convertor to use for mapping the unique id -->
+        <fd:convertor datatype="long" />
+      </fb:value>
+    </fb:identity>
+
+    <fb:on-bind>
+        <!-- executed on updates AND right after the insert -->
+      <fb:value id="firstname" path="firstname" />
+      <fb:value id="lastname" path="lastname" />
+      <fb:value id="phone" path="phone/@nr" />
+      <fb:value id="email" path="email" />
+    </fb:on-bind>
+
+    <fb:on-delete-row>
+        <!-- chose on of these to test -->
+        <!--
+      <fb:set-attribute name="row-state" value="deleted" />
+      -->
+      <fb:delete-node />
+    </fb:on-delete-row>
+
+    <fb:on-insert-row>
+      <!-- The insert-node element contains a piece of template XML to be
+      inserted for new rows. Alternatively, you could also add a "src"
+      attribute on the insert-node element pointing to an external source
+      to retrieve the template from. -->
+      <fb:insert-node>
+        <!-- template inserted by the binding for new rows (mapping new nodes) -->
+        <contact id="" row-state="new">
+          <firstname/><lastname/><phone nr=""/><email/>
+        </contact>
+      </fb:insert-node>
+    </fb:on-insert-row>
+  </fb:repeater>
+
+</fb:context>
\ No newline at end of file
diff --git a/xml/tests/testData/psi/incrementalReparse43_before.xml b/xml/tests/testData/psi/incrementalReparse43_before.xml
new file mode 100644
index 000000000000..345dc0476d1a
--- /dev/null
+++ b/xml/tests/testData/psi/incrementalReparse43_before.xml
@@ -0,0 +1,99 @@
+<fb:context
+            xmlns:fb="http://apache.org/cocoon/forms/1.0#binding"
+            xmlns:fd="http://apache.org/cocoon/forms/1.0#definition"
+            path="/data/wrapper/context" >
+
+  <fb:context path="info">
+    <!-- the email value will not be saved because of the @direction="load" -->
+    <fb:value id="email" path="email" direction="load"/>
+
+    <!-- jxpath binds to nodes as well as to attributes -->
+    <fb:value id="number" path="number/@value">
+      <!-- for non-string datatypes, a convertor must be specified. These are
+      the same convertors as can be used in form definitions, but require an
+      extra datatype attribute. Here we use the default convertor for longs. -->
+      <fd:convertor datatype="integer"/>
+    </fb:value>
+
+    <fb:value id="choose" path="choose/@value">
+      <fd:convertor datatype="boolean"/>
+    </fb:value>
+
+    <!-- one entry field in the client maps through aggregate fields -->
+    <fb:aggregate id="phone" path="phone" >
+      <!-- to multiple fields in the XML file -->
+      <fb:value id="number" path="number" />
+      <fb:value id="zone" path="zone" />
+      <fb:value id="cntr" path="@cntr" />
+    </fb:aggregate>
+
+  </fb:context>
+
+
+  <fb:value id="ipaddress" path="ipaddress">
+    <fb:on-update>
+      <!-- if the value has changed, the attribute will be set -->
+      <fb:set-attribute name="changed" value="true"/>
+    </fb:on-update>
+  </fb:value>
+
+  <fb:value id="birthday" path="birthday">
+    <fd:convertor datatype="date" type="formatting">
+      <fd:patterns>
+        <fd:pattern>yyyy-MM-dd</fd:pattern>
+      </fd:patterns>
+    </fd:convertor>
+  </fb:value>
+
+  <fb:multi-value id="drinks" parent-path="drinks" row-path="drink"/>
+
+  <!--
+    - Repeater requires unique identification mechanism of the row-nodes.
+    - (it is of course possible to implement other binding strategies)
+    -
+    - Important NOTE: When adding rows, the row-path is used inside
+    - jxpath-createPath context, as a consequence it cannot have dependent
+    - children or predicates.
+    -->
+  <fb:repeater id="contacts"
+               parent-path="contacts"
+               row-path="contact">
+
+    <fb:identity>
+      <fb:value id="id" path="@id">
+        <!-- optional convertor to use for mapping the unique id -->
+        <fd:convertor datatype="long" />
+      </fb:value>
+    </fb:identity>
+
+    <fb:on-bind>
+        <!-- executed on updates AND right after the insert -->
+      <fb:value id="firstname" path="firstname" />
+      <fb:value id="lastname" path="lastname" />
+      <fb:value id="phone" path="phone/@nr" />
+      <fb:value id="email" path="email" />
+    </fb:on-bind>
+
+    <fb:on-delete-row>
+        <!-- chose on of these to test -->
+        <!--
+      <fb:set-attribute name="row-state" value="deleted" />
+      -->
+      <fb:delete-node />
+    </fb:on-delete-row>
+
+    <fb:on-insert-row>
+      <!-- The insert-node element contains a piece of template XML to be
+      inserted for new rows. Alternatively, you could also add a "src"
+      attribute on the insert-node element pointing to an external source
+      to retrieve the template from. -->
+      <fb:insert-node>
+        <!-- template inserted by the binding for new rows (mapping new nodes) -->
+        <contact id="" row-state="new">
+          <firstname/><lastname/><phone nr=""/><email/>
+        </contact>
+      </fb:insert-node>
+    </fb:on-insert-row>
+  </fb:repeater>
+
+</fb:context>
\ No newline at end of file
diff --git a/xml/tests/testData/psi/incrementalReparse46_after.xml b/xml/tests/testData/psi/incrementalReparse46_after.xml
new file mode 100644
index 000000000000..dfe39d1e963b
--- /dev/null
+++ b/xml/tests/testData/psi/incrementalReparse46_after.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" xmlns:view="http://schemas.niku.com/2002/view" exclude-result-prefixes="view">
+
+  <xsl:template match="view:view/view:group">
+    ${aaa aaa aaa
+    <table border="0" cellspacing="0" cellpadding="0" width="100%" width="100%">
+      <tr>
+        <xsl:for-each select="view:section">
+          <td valign="top">&space;</td>
+        </xsl:for-each>
+      </tr>
+    </table>
+  </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/xml/tests/testData/psi/incrementalReparse46_before.xml b/xml/tests/testData/psi/incrementalReparse46_before.xml
new file mode 100644
index 000000000000..5d8f26da1592
--- /dev/null
+++ b/xml/tests/testData/psi/incrementalReparse46_before.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" xmlns:view="http://schemas.niku.com/2002/view" exclude-result-prefixes="view">
+
+  <xsl:template match="view:view/view:group">
+    ${aaa aaa aaa}
+    <table border="0" cellspacing="0" cellpadding="0" width="100%" width="100%">
+      <tr>
+        <xsl:for-each select="view:section">
+          <td valign="top">&space;</td>
+        </xsl:for-each>
+      </tr>
+    </table>
+  </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/xml/tests/testData/psi/incrementalReparse47_after.xml b/xml/tests/testData/psi/incrementalReparse47_after.xml
new file mode 100644
index 000000000000..c2696d863f2d
--- /dev/null
+++ b/xml/tests/testData/psi/incrementalReparse47_after.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" xmlns:view="http://schemas.niku.com/2002/view" exclude-result-prefixes="view">
+
+  <xsl:template match="view:view/view:group">
+    ${aaa aaa aaa}
+    <table border="0" cellspacing="0" cellpadding="0" width="100%" width="100%" width="100%">
+      <tr>
+        <xsl:for-each select="view:section">
+          <td valign="top">&space;</td>
+        </xsl:for-each>
+      </tr>
+    </table>
+  </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/xml/tests/testData/psi/incrementalReparse47_before.xml b/xml/tests/testData/psi/incrementalReparse47_before.xml
new file mode 100644
index 000000000000..df5bb2134eeb
--- /dev/null
+++ b/xml/tests/testData/psi/incrementalReparse47_before.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" xmlns:view="http://schemas.niku.com/2002/view" exclude-result-prefixes="view">
+
+  <xsl:template match="view:view/view:group">
+    ${aaa aaa aaa
+    <table border="0" cellspacing="0" cellpadding="0" width="100%" width="100%" width="100%">
+      <tr>
+        <xsl:for-each select="view:section">
+          <td valign="top">&space;</td>
+        </xsl:for-each>
+      </tr>
+    </table>
+  </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/xml/tests/testData/psi/manyErrors.xml b/xml/tests/testData/psi/manyErrors.xml
new file mode 100644
index 000000000000..ff46eddc202f
--- /dev/null
+++ b/xml/tests/testData/psi/manyErrors.xml
@@ -0,0 +1,258 @@
+<html>
+<HEAD>
+	<TITLE>AppletViewer Tags</TITLE>
+</HEAD>
+
+<BODY bgcolor="white">
+
+<TABLE BORDER="0" WIDTH="100%" summary="layout">
+<TR>
+<TD>
+   <IMG SRC="../images/javalogo52x88.gif" ALT="Java" BORDER=0 WIDTH=52 HEIGHT=88>
+</TD>
+
+<TD>
+<center>
+           <h1>AppletViewer Tags</h1>
+</center>
+</TD>
+
+<TD ALIGN=RIGHT VALIGN=TOP>
+<font size="-1"><a href="../index.html">Documentation Contents</a></font>
+</TD>
+</TR>
+</TABLE>
+
+
+<!-- ======================== Body text begins here ===================== -->
+The applet viewer makes it possible to run a Java applet without using
+a browser. AppletViewer ignores any HTML that is not immediately relevant
+to launching an applet. However, it recognizes a wide variety of applet-
+launching syntax. The HTML code that AppletViewer recognizes is shown
+below. All other HTML code is ignored.
+<p>
+<b>object</b><br>
+<blockquote>
+The <code>object</code> tag is the HTML 4.0 tag for embedding applets 
+and mult-media objects into an HTML page. It is also an Internet Explorer
+4.x extension to HTML 3.2 which allows IE to run a Java applet using the 
+latest Java plugin from Sun.
+<pre>
+&lt;object
+  width="<i>pixelWidth</i>"
+  height="<i>pixelHeight</i>"
+&gt;
+  &lt;param name="code" value="<i>yourClass.class</i>"&gt;
+  &lt;param name="object" value="<i>serializedObjectOrJavaBean</i>"&gt;
+  &lt;param name="codebase" value="<i>classFileDirectory</i>"&gt;
+   ...
+  <i>alternate-text</i>
+&lt;/object&gt;
+</pre>
+<b>Notes:</b><br><ul>
+<li>AppletViewer ignores the "classID" attribute, on the assumption
+    that it is pointing to the Java plugin, with the value:<br>
+    &nbsp;&nbsp;<code>
+      classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"
+    </code>
+	 <p>
+<li>AppletViewer also ignores the "codebase" attribute that is usually included
+    as part of the object tag, assuming that it points to a Java plugin
+    in a network <b>cab</b> file with a value like:<br>
+    <code>&nbsp;&nbsp;
+      codebase="http://java.sun.com/products/plugin/1.1/jinstall-11-win32.cab#Version=1,1,0,0"
+    </code>
+	 <p>
+<li>The optional <code>codebase</code> param tag supplies a relative URL that
+    specifies the location of the applet class.
+	 <p>
+<li>Either <code>code</code> or <code>object</code> is specified, not both.
+	 <p>
+<li>The <code>type</code> param tag is not used by AppletViewer, but should be
+    present so that browsers load the plugin properly.<br>
+	 For an applet, the value should be something like:<br>
+    <code>&nbsp;&nbsp;
+      &lt;param name="type" value="application/x-java-applet;version=1.1"&gt;
+    </code><br>
+    or<br>
+    <code>&nbsp;&nbsp;
+      &lt;param name="type" value="application/x-java-applet"&gt;
+    </code><br><br>
+    For a serialized object or JavaBean, the <code>type</code> param 
+	 value should be something like:<br>
+    <code>&nbsp;&nbsp;
+      &lt;param name="type" value="application/x-java-bean;version=1.1"&gt;
+    </code><br>
+    or<br>
+    <code>&nbsp;&nbsp;
+      &lt;param name="type" value="application/x-java-bean"&gt;
+    </code>
+	 <p>
+<li>Other param tags are argument values supplied to the applet.
+	 <p>
+<li>The <code>object</code> tag recognized by IE4.x and the <code>embed</code> tag
+    recognized by Netscape 4.x can be combined so that an applet can
+    use the latest Java plugin from Sun, regardless of the browser that
+    downloads the applet.<br>
+	 For more information, see
+    <a href="http://java.sun.com/products/plugin/1.3/docs/tags.html">Java
+    PlugIn HTML Specification</a>
+	 <p>
+<li>AppletViewer does not recognize the <code>java_code</code>, <code>java_codebase</code>,
+    <code>java_object</code>, or <code>java_type</code> param tags. These tags
+    are only needed when the applet defines parameters with the names
+    code, codebase, object, or type, respectively. (In that situation, the
+    plugin recognizes and uses the <code>java_</code> version in preference to the
+    version that will be used by the applet.) If the applet requires a
+    parameter with one of these 4 names, it may not run in AppletViewer.
+</ul>
+</blockquote>
+<p>
+<b>embed</b><br>
+<blockquote>
+The <code>embed</code> tag is the Netscape extension to HTML 3.2 that allows 
+embedding an applet or a multimedia object in an HTML page. It allows a
+Netscape 4.x browser (which supports HTML 3.2) to run a Java applet using the 
+latest Java plugin from Sun.
+<pre>
+&lt;embed
+  code="<i>yourClass.class</i>"
+  object="<i>serializedObjectOrJavaBean</i>"
+  codebase="<i>classFileDirectory</i>"
+  width="<i>pixelWidth</i>"
+  height="<i>pixelHeight</i>"
+&gt;
+   ...
+&lt;/embed&gt;
+</pre>
+<b>Notes:</b><br>
+<ul>
+<li>The <code>object</code> and <code>embed</code> tags can be combined so that
+    an applet can use the latest Java plugin from Sun, regardless of
+    the browser that downloads the applet.<br>
+	 For more information, see the
+    <a href="http://java.sun.com/products/plugin/1.3/docs/tags.html">Java 
+    PlugIn HTML Specification</a>
+	 <p>
+<li>Unlike the <code>object</code> tag, all values specified in an <code>embed</code>
+    tag are attributes (part of the tag) rather than parameters (between the start
+	 tag and end tag, specified with a <code>param</code> tag.
+	 <p>
+<li>To supply argument values for applet parameters, you add additional
+    attributes to the <code>&lt;embed&gt;</code> tag.
+	 <p>
+<li>AppletViewer ignores the "src" attribute that is usually part of an 
+    <code>&lt;embed&gt;</code> tag.
+	 <p>
+<li>Either <code>code</code> or <code>object</code> is specified, not both.
+	 <p>
+<li>The optional <code>codebase</code> attribute supplies a relative URL that
+    specifies the location of the applet class.
+	 <p>
+<li>The <code>type</code> attribute is not used by AppletViewer, but should be
+    present so that browsers load the plugin properly.<br>
+	 For an applet, the value should be something like:<br>
+    <code>&nbsp;&nbsp;
+      &lt;type="application/x-java-applet;version=1.1"&gt;...
+    </code><br>
+    or<br>
+    <code>&nbsp;&nbsp;
+      &lt;type="application/x-java-applet"&gt;...
+    </code><br><br>
+    For a serialized object or JavaBean, the <code>type</code> param 
+	 value should be something like:<br>
+    <code>&nbsp;&nbsp;
+      &lt;type="application/x-java-bean;version=1.1"&gt;...
+    </code><br>
+    or<br>
+    <code>&nbsp;&nbsp;
+      &lt;type="application/x-java-bean"&gt;...
+    </code>
+	 <p>
+<li>The "pluginspage" attribute is not used by AppletViewer, but should be
+    present so that browsers load the plugin properly. It should point to a Java plugin
+    in a network <b>cab</b> file with a value like:<br>
+    <code>&nbsp;&nbsp;
+      pluginspage="http://java.sun.com/products/plugin/1.1/jinstall-11-win32.cab#Version=1,1,0,0"
+    </code>
+</ul>
+</blockquote>
+<p>
+<b>applet</b><br>
+<blockquote>
+The <code>applet</code> tag is the original HTML 3.2 tag for 
+embedding an applet in an HTML page. Applets loaded using the
+<code>applet</code> tag are run by the browser, which may not
+be using the latest version of the Java platform. To ensure that
+the applet runs with the latest version, use the <code>object</code>
+tag to load the Java plugin into the browser. The plugin will then
+run the applet.
+<pre>
+&lt;applet
+  code="<i>yourClass.class</i>"
+  object="<i>serializedObjectOrJavaBean</i>"
+  codebase="<i>classFileDirectory</i>"
+  width="<i>pixelWidth</i>"
+  height="<i>pixelHeight</i>"
+&gt;
+  &lt;param name="<i>...</i>" value="<i>...</i>"&gt;
+   ...
+  <i>alternate-text</i>
+&lt;/applet&gt;
+</pre>
+<b>Notes:</b><br>
+<ul>
+<li>Either <code>code</code> or <code>object</code> is specified, not both.
+	 <p>
+<li>The optional <code>codebase</code> attribute supplies a relative URL that
+    specifies the location of the applet class.
+	 <p>
+<li>Param tags supply argument values for applet parameters.
+</ul>
+</blockquote>
+<p>
+<b>app</b><br>
+<blockquote>
+The <code>app</code> tag was a short-lived abbreviation for 
+<code>applet</code> that is no longer supported. AppletViewer 
+translates the tag and prints out an equivalent tag that is supported.
+<pre>
+&lt;app
+  class="<i>classFileName</i>" (<i>without</i> a .class suffix)
+  src="<i>classFileDirectory</i>"
+  width="<i>pixelWidth</i>"
+  height="<i>pixelHeight</i>"
+&gt;
+&lt;param name="..." value="..."&gt;
+ ...
+&lt;/app&gt;
+</pre>
+</blockquote>
+
+For more information on the tags that AppletViewer supports and<br> 
+how to combine them, see the 
+<a href="http://java.sun.com/products/plugin/1.3/docs/tags.html">Java 
+PlugIn HTML Specification</a>.
+<P>
+<HR SIZE=3 NOSHADE>
+<TABLE BORDER="0" WIDTH="100%" summary="layout">
+<TR VALIGN=TOP>
+<TD>
+<P><FONT SIZE="-2">
+  <A HREF="../relnotes/SMICopyright.html">Copyright</A> &#169; 2001
+  <A HREF="http://www.sun.com">Sun Microsystems, Inc.</A>
+  All Rights Reserved.</FONT></P>
+</TD>
+<TD ALIGN=RIGHT>
+  <IMG SRC="../images/sunlogo64x30.gif" ALT="Sun" BORDER=0 WIDTH=64 HEIGHT=30>
+  <BR>
+  <FONT SIZE="+1">
+  <i>Java Software</i>
+  </FONT>
+</TD>
+</TR>
+</TABLE>
+<BR><BR><BR><BR><BR><BR><BR><BR>
+
+</body>
+</html>
diff --git a/xml/tests/testData/psi/pallada.xml b/xml/tests/testData/psi/pallada.xml
new file mode 100644
index 000000000000..4f533e082980
--- /dev/null
+++ b/xml/tests/testData/psi/pallada.xml
@@ -0,0 +1,2424 @@
+<project name="pallada" default="all">
+  
+  
+  <!-- Uncomment the following property if no tests compilation is needed -->
+  <!-- 
+  <property name="skip.tests" value="true"/>
+   -->
+  
+  <!-- The task requires the following libraries from IntelliJ IDEA distribution: -->
+  <!--   javac2.jar; jdom.jar; bcel.jar -->
+  <taskdef name="javac2" classname="com.intellij.ant.Javac2"/>
+  
+  <!-- Compiler options -->
+  
+  <property name="compiler.debug" value="on"/>
+  <property name="compiler.generate.no.warnings" value="off"/>
+  <property name="compiler.args" value=""/>
+  <property name="compiler.max.memory" value="256m"/>
+  <patternset id="compiler.excluded">
+    <exclude name="D:/work/Pallada/tools/parserGen/testSource/**"/>
+    <exclude name="D:/work/Pallada/tools/parserGen/source/com/intellij/parserGen/**"/>
+  </patternset>
+  <patternset id="compiler.resources">
+    <include name="**/?*.properties"/>
+    <include name="**/?*.gif"/>
+    <include name="**/?*.png"/>
+    <include name="**/?*.jpeg"/>
+    <include name="**/?*.jpg"/>
+    <include name="**/?*.xml"/>
+    <include name="**/?*.dtd"/>
+    <include name="**/?*.tld"/>
+    <include name="**/?*.xsd"/>
+    <include name="**/?*.ft"/>
+    <include name="**/?*.html"/>
+    <include name="**/?*.template"/>
+    <include name="**/primes.bin"/>
+    <include name="**/?*.ico"/>
+  </patternset>
+  <!-- JDK definitions -->
+  
+  <property name="jdk.home.idea_jdk" value="D:/java/j2sdk1.4.2_04"/>
+  <path id="jdk.classpath.idea_jdk">
+    <fileset dir="${jdk.home.idea_jdk}">
+      <include name="jre/lib/charsets.jar"/>
+      <include name="lib/tools.jar"/>
+      <include name="jre/lib/jce.jar"/>
+      <include name="jre/lib/jsse.jar"/>
+      <include name="jre/lib/plugin.jar"/>
+      <include name="jre/lib/rt.jar"/>
+      <include name="jre/lib/sunrsasign.jar"/>
+      <include name="jre/lib/tools.jar"/>
+      <include name="jre/lib/ext/dnsns.jar"/>
+      <include name="jre/lib/ext/ldapsec.jar"/>
+      <include name="jre/lib/ext/localedata.jar"/>
+      <include name="jre/lib/ext/sunjce_provider.jar"/>
+      <include name="lib/tools.jar"/>
+    </fileset>
+  </path>
+  
+  <property name="jdk.home.jdk_131" value="D:/java/jdk1.3.1_10"/>
+  <path id="jdk.classpath.jdk_131">
+    <fileset dir="${jdk.home.jdk_131}">
+      <include name="jre/lib/i18n.jar"/>
+      <include name="jre/lib/jaws.jar"/>
+      <include name="jre/lib/rt.jar"/>
+      <include name="jre/lib/sunrsasign.jar"/>
+      <include name="jre/lib/tools.jar"/>
+    </fileset>
+  </path>
+  
+  <property name="jdk.home.jdk_122" value="D:/java/jdk1.2.2"/>
+  <path id="jdk.classpath.jdk_122">
+    <fileset dir="${jdk.home.jdk_122}">
+      <include name="jre/lib/i18n.jar"/>
+      <include name="jre/lib/jaws.jar"/>
+      <include name="jre/lib/plugprov.jar"/>
+      <include name="jre/lib/rt.jar"/>
+      <include name="jre/lib/tools.jar"/>
+      <include name="jre/lib/ext/iiimp.jar"/>
+    </fileset>
+  </path>
+  
+  <property name="project.jdk.home" value="${jdk.home.idea_jdk}"/>
+  <property name="project.jdk.classpath" value="jdk.classpath.idea_jdk"/>
+  <!-- Project Libraries -->
+  
+  <path id="library.generic_collections.classpath">
+    <pathelement location="${basedir}/lib/generics/collect.jar"/>
+  </path>
+  
+  <path id="library.jdom.classpath">
+    <pathelement location="${basedir}/lib/jdom.jar"/>
+  </path>
+  
+  <path id="library.junit.classpath">
+    <pathelement location="${basedir}/lib/junit.jar"/>
+  </path>
+  
+  <path id="library.ant.classpath">
+    <pathelement location="${basedir}/lib/ant/lib/ant-jakarta-oro.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/ant-apache-resolver.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/ant-nodeps.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/ant-xalan2.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/ant-xalan1.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/ant-vaj.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/ant-antlr.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/ant-jakarta-log4j.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/ant-jmf.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/xml-apis.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/ant-icontract.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/ant-jakarta-regexp.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/ant-javamail.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/ant-netrexx.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/ant-jdepend.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/ant-commons-logging.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/ant-swing.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/ant-jai.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/ant-xslp.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/ant-junit.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/ant-launcher.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/ant-commons-net.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/ant-weblogic.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/ant-jakarta-bcel.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/ant-stylebook.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/ant-apache-bsf.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/xercesImpl.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/ant-starteam.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/ant.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/ant-trax.jar"/>
+    <pathelement location="${basedir}/lib/ant/lib/ant-jsch.jar"/>
+  </path>
+  
+  <path id="library.mocks.classpath">
+    <pathelement location="${basedir}/lib/dev/easymock.jar"/>
+    <pathelement location="${basedir}/lib/dev/mockobjects-core-0.09.jar"/>
+  </path>
+  
+  <path id="library.velocity.classpath">
+    <pathelement location="${basedir}/lib/velocity.jar"/>
+  </path>
+  
+  <path id="library.jasper2.classpath">
+    <pathelement location="${basedir}/lib/rt/jasper2/commons-collections.jar"/>
+    <pathelement location="${basedir}/lib/rt/jasper2/commons-el.jar"/>
+    <pathelement location="${basedir}/lib/rt/jasper2/commons-logging-api.jar"/>
+    <pathelement location="${basedir}/lib/rt/jasper2/jasper-compiler.jar"/>
+    <pathelement location="${basedir}/lib/rt/jasper2/jasper-runtime.jar"/>
+    <pathelement location="${basedir}/lib/rt/jasper2/jsp-api.jar"/>
+    <pathelement location="${basedir}/lib/rt/jasper2/servlet-api.jar"/>
+  </path>
+  
+  <path id="library.bcel.classpath">
+    <pathelement location="${basedir}/lib/bcel.jar"/>
+  </path>
+  
+  <path id="library.log4j.classpath">
+    <pathelement location="${basedir}/lib/log4j.jar"/>
+  </path>
+  
+  <path id="library.mockweblogic.classpath">
+    <pathelement location="${basedir}/lib/dev/mockweblogic.jar"/>
+  </path>
+  
+  <path id="library.trove4j.classpath">
+    <pathelement location="${basedir}/lib/trove4j.jar"/>
+  </path>
+  
+  <path id="library.servlets.classpath">
+    <pathelement location="${basedir}/lib/servlet.jar"/>
+  </path>
+  <!-- Global Libraries -->
+  
+  
+  <dirname property="module.internalresources.basedir" file="${ant.file}"/>
+  
+  
+  <property name="module.jdk.home.internalresources" value="${project.jdk.home}"/>
+  <property name="module.jdk.classpath.internalresources" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.internalresources" value="${compiler.args}"/>
+  
+  <property name="internalresources.output.dir" value="${module.internalresources.basedir}/internalResources/classes"/>
+  <property name="internalresources.testoutput.dir" value="${module.internalresources.basedir}/internalResources/classes"/>
+  
+  <path id="internalresources.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="internalresources.module.classpath">
+    <path refid="${module.jdk.classpath.internalresources}"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.internalresources"/>
+  
+  <patternset id="excluded.from.compilation.internalresources">
+    <patternset refid="excluded.from.module.internalresources"/>
+    <patternset refid="compiler.excluded"/>
+  </patternset>
+  
+  <path id="internalresources.module.sourcepath">
+    <dirset dir="${module.internalresources.basedir}/internalResources">
+      <include name="src"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.internalresources" depends="compile.module.internalresources.production,compile.module.internalresources.tests" description="compile module internalResources"/>
+  
+  <target name="compile.module.internalresources.production" description="compile module internalResources production classes">
+    <mkdir dir="${internalresources.output.dir}"/>
+    <javac2 destdir="${internalresources.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.internalresources}/bin/javac">
+      <compilerarg line="${compiler.args.internalresources}"/>
+      <bootclasspath refid="internalresources.module.bootclasspath"/>
+      <classpath refid="internalresources.module.classpath"/>
+      <src refid="internalresources.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.internalresources"/>
+    </javac2>
+    <copy todir="${internalresources.output.dir}">
+      <fileset dir="${module.internalresources.basedir}/internalResources/src">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.internalresources"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.internalresources.tests" depends="compile.module.internalresources.production" description="compile module internalResources test classes" unless="skip.tests"/>
+  
+  <target name="clean.module.internalresources" description="cleanup module">
+    <delete dir="${internalresources.output.dir}"/>
+    <delete dir="${internalresources.testoutput.dir}"/>
+  </target>
+  
+  
+  <dirname property="module.forms_rt.basedir" file="${ant.file}"/>
+  
+  
+  <property name="module.jdk.home.forms_rt" value="${project.jdk.home}"/>
+  <property name="module.jdk.classpath.forms_rt" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.forms_rt" value="${compiler.args}"/>
+  
+  <property name="forms_rt.output.dir" value="${module.forms_rt.basedir}/forms_rt/classes"/>
+  <property name="forms_rt.testoutput.dir" value="${module.forms_rt.basedir}/forms_rt/classes"/>
+  
+  <path id="forms_rt.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="forms_rt.module.classpath">
+    <path refid="${module.jdk.classpath.forms_rt}"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.forms_rt"/>
+  
+  <patternset id="excluded.from.compilation.forms_rt">
+    <patternset refid="excluded.from.module.forms_rt"/>
+    <patternset refid="compiler.excluded"/>
+  </patternset>
+  
+  <path id="forms_rt.module.sourcepath">
+    <dirset dir="${module.forms_rt.basedir}/forms_rt">
+      <include name="src"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.forms_rt" depends="compile.module.forms_rt.production,compile.module.forms_rt.tests" description="compile module forms_rt"/>
+  
+  <target name="compile.module.forms_rt.production" description="compile module forms_rt production classes">
+    <mkdir dir="${forms_rt.output.dir}"/>
+    <javac2 destdir="${forms_rt.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.forms_rt}/bin/javac">
+      <compilerarg line="${compiler.args.forms_rt}"/>
+      <bootclasspath refid="forms_rt.module.bootclasspath"/>
+      <classpath refid="forms_rt.module.classpath"/>
+      <src refid="forms_rt.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.forms_rt"/>
+    </javac2>
+    <copy todir="${forms_rt.output.dir}">
+      <fileset dir="${module.forms_rt.basedir}/forms_rt/src">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.forms_rt"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.forms_rt.tests" depends="compile.module.forms_rt.production" description="compile module forms_rt test classes" unless="skip.tests"/>
+  
+  <target name="clean.module.forms_rt" description="cleanup module">
+    <delete dir="${forms_rt.output.dir}"/>
+    <delete dir="${forms_rt.testoutput.dir}"/>
+  </target>
+  
+  
+  <dirname property="module.uidesignercore.basedir" file="${ant.file}"/>
+  
+  
+  <property name="module.jdk.home.uidesignercore" value="${project.jdk.home}"/>
+  <property name="module.jdk.classpath.uidesignercore" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.uidesignercore" value="${compiler.args}"/>
+  
+  <property name="uidesignercore.output.dir" value="${module.uidesignercore.basedir}/UIDesignerCore/classes"/>
+  <property name="uidesignercore.testoutput.dir" value="${module.uidesignercore.basedir}/UIDesignerCore/testClasses"/>
+  
+  <path id="uidesignercore.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="uidesignercore.module.classpath">
+    <path refid="library.generic_collections.classpath"/>
+    <path refid="${module.jdk.classpath.uidesignercore}"/>
+    <path refid="library.junit.classpath"/>
+    <path refid="library.bcel.classpath"/>
+    <path refid="library.jdom.classpath"/>
+    <pathelement location="${forms_rt.output.dir}"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.uidesignercore"/>
+  
+  <patternset id="excluded.from.compilation.uidesignercore">
+    <patternset refid="excluded.from.module.uidesignercore"/>
+    <patternset refid="compiler.excluded"/>
+  </patternset>
+  
+  <path id="uidesignercore.module.sourcepath">
+    <dirset dir="${module.uidesignercore.basedir}/UIDesignerCore">
+      <include name="src"/>
+    </dirset>
+  </path>
+  
+  <path id="uidesignercore.module.test.sourcepath">
+    <dirset dir="${module.uidesignercore.basedir}/UIDesignerCore">
+      <include name="testSource"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.uidesignercore" depends="compile.module.uidesignercore.production,compile.module.uidesignercore.tests" description="compile module UIDesignerCore"/>
+  
+  <target name="compile.module.uidesignercore.production" depends="compile.module.forms_rt" description="compile module UIDesignerCore production classes">
+    <mkdir dir="${uidesignercore.output.dir}"/>
+    <javac2 destdir="${uidesignercore.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.uidesignercore}/bin/javac">
+      <compilerarg line="${compiler.args.uidesignercore}"/>
+      <bootclasspath refid="uidesignercore.module.bootclasspath"/>
+      <classpath refid="uidesignercore.module.classpath"/>
+      <src refid="uidesignercore.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.uidesignercore"/>
+    </javac2>
+    <copy todir="${uidesignercore.output.dir}">
+      <fileset dir="${module.uidesignercore.basedir}/UIDesignerCore/src">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.uidesignercore"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.uidesignercore.tests" depends="compile.module.uidesignercore.production" description="compile module UIDesignerCore test classes" unless="skip.tests">
+    <mkdir dir="${uidesignercore.testoutput.dir}"/>
+    <javac2 destdir="${uidesignercore.testoutput.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.uidesignercore}/bin/javac">
+      <compilerarg line="${compiler.args.uidesignercore}"/>
+      <classpath refid="uidesignercore.module.classpath"/>
+      <classpath location="${uidesignercore.output.dir}"/>
+      <src refid="uidesignercore.module.test.sourcepath"/>
+      <patternset refid="excluded.from.compilation.uidesignercore"/>
+    </javac2>
+    <copy todir="${uidesignercore.testoutput.dir}">
+      <fileset dir="${module.uidesignercore.basedir}/UIDesignerCore/testSource">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.uidesignercore"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="clean.module.uidesignercore" description="cleanup module">
+    <delete dir="${uidesignercore.output.dir}"/>
+    <delete dir="${uidesignercore.testoutput.dir}"/>
+  </target>
+  
+  
+  <dirname property="module.javac2.basedir" file="${ant.file}"/>
+  
+  
+  <property name="module.jdk.home.javac2" value="${project.jdk.home}"/>
+  <property name="module.jdk.classpath.javac2" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.javac2" value="${compiler.args}"/>
+  
+  <property name="javac2.output.dir" value="${module.javac2.basedir}/javac2/classes"/>
+  <property name="javac2.testoutput.dir" value="${module.javac2.basedir}/javac2/classes"/>
+  
+  <path id="javac2.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="javac2.module.classpath">
+    <path refid="${module.jdk.classpath.javac2}"/>
+    <path refid="library.ant.classpath"/>
+    <pathelement location="${uidesignercore.output.dir}"/>
+    <pathelement location="${uidesignercore.testoutput.dir}"/>
+    <path refid="library.bcel.classpath"/>
+    <pathelement location="${forms_rt.output.dir}"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.javac2"/>
+  
+  <patternset id="excluded.from.compilation.javac2">
+    <patternset refid="excluded.from.module.javac2"/>
+    <patternset refid="compiler.excluded"/>
+  </patternset>
+  
+  <path id="javac2.module.sourcepath">
+    <dirset dir="${module.javac2.basedir}/javac2">
+      <include name="src"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.javac2" depends="compile.module.javac2.production,compile.module.javac2.tests" description="compile module javac2"/>
+  
+  <target name="compile.module.javac2.production" depends="compile.module.uidesignercore,compile.module.forms_rt" description="compile module javac2 production classes">
+    <mkdir dir="${javac2.output.dir}"/>
+    <javac2 destdir="${javac2.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.javac2}/bin/javac">
+      <compilerarg line="${compiler.args.javac2}"/>
+      <bootclasspath refid="javac2.module.bootclasspath"/>
+      <classpath refid="javac2.module.classpath"/>
+      <src refid="javac2.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.javac2"/>
+    </javac2>
+    <copy todir="${javac2.output.dir}">
+      <fileset dir="${module.javac2.basedir}/javac2/src">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.javac2"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.javac2.tests" depends="compile.module.javac2.production" description="compile module javac2 test classes" unless="skip.tests"/>
+  
+  <target name="clean.module.javac2" description="cleanup module">
+    <delete dir="${javac2.output.dir}"/>
+    <delete dir="${javac2.testoutput.dir}"/>
+  </target>
+  
+  
+  <dirname property="module.idea_rt.basedir" file="${ant.file}"/>
+  
+  
+  <property name="module.jdk.home.idea_rt" value="${project.jdk.home}"/>
+  <property name="module.jdk.classpath.idea_rt" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.idea_rt" value="${compiler.args}"/>
+  
+  <property name="idea_rt.output.dir" value="${module.idea_rt.basedir}/classes/rt"/>
+  <property name="idea_rt.testoutput.dir" value="${module.idea_rt.basedir}/classes/rt"/>
+  
+  <path id="idea_rt.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="idea_rt.module.classpath">
+    <path refid="library.generic_collections.classpath"/>
+    <path refid="${module.jdk.classpath.idea_rt}"/>
+    <path refid="library.junit.classpath"/>
+    <path refid="library.ant.classpath"/>
+    <path refid="library.jasper2.classpath"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.idea_rt"/>
+  
+  <patternset id="excluded.from.compilation.idea_rt">
+    <patternset refid="excluded.from.module.idea_rt"/>
+    <patternset refid="compiler.excluded"/>
+  </patternset>
+  
+  <path id="idea_rt.module.sourcepath">
+    <dirset dir="${module.idea_rt.basedir}">
+      <include name="runtimesource"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.idea_rt" depends="compile.module.idea_rt.production,compile.module.idea_rt.tests" description="compile module idea_rt"/>
+  
+  <target name="compile.module.idea_rt.production" description="compile module idea_rt production classes">
+    <mkdir dir="${idea_rt.output.dir}"/>
+    <javac2 destdir="${idea_rt.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.idea_rt}/bin/javac">
+      <compilerarg line="${compiler.args.idea_rt}"/>
+      <bootclasspath refid="idea_rt.module.bootclasspath"/>
+      <classpath refid="idea_rt.module.classpath"/>
+      <src refid="idea_rt.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.idea_rt"/>
+    </javac2>
+    <copy todir="${idea_rt.output.dir}">
+      <fileset dir="${module.idea_rt.basedir}/runtimesource">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.idea_rt"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.idea_rt.tests" depends="compile.module.idea_rt.production" description="compile module idea_rt test classes" unless="skip.tests"/>
+  
+  <target name="clean.module.idea_rt" description="cleanup module">
+    <delete dir="${idea_rt.output.dir}"/>
+    <delete dir="${idea_rt.testoutput.dir}"/>
+  </target>
+  
+  
+  <dirname property="module.weblogicwrapper.basedir" file="${ant.file}"/>
+  
+  
+  <property name="module.jdk.home.weblogicwrapper" value="${project.jdk.home}"/>
+  <property name="module.jdk.classpath.weblogicwrapper" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.weblogicwrapper" value="${compiler.args}"/>
+  
+  <property name="weblogicwrapper.output.dir" value="${module.weblogicwrapper.basedir}/plugins/weblogic/weblogicWrapper/classes"/>
+  <property name="weblogicwrapper.testoutput.dir" value="${module.weblogicwrapper.basedir}/plugins/weblogic/weblogicWrapper/classes"/>
+  
+  <path id="weblogicwrapper.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="weblogicwrapper.module.classpath">
+    <path refid="${module.jdk.classpath.weblogicwrapper}"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.weblogicwrapper"/>
+  
+  <patternset id="excluded.from.compilation.weblogicwrapper">
+    <patternset refid="excluded.from.module.weblogicwrapper"/>
+    <patternset refid="compiler.excluded"/>
+  </patternset>
+  
+  <path id="weblogicwrapper.module.sourcepath">
+    <dirset dir="${module.weblogicwrapper.basedir}/plugins/weblogic/weblogicWrapper">
+      <include name="src"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.weblogicwrapper" depends="compile.module.weblogicwrapper.production,compile.module.weblogicwrapper.tests" description="compile module weblogicWrapper"/>
+  
+  <target name="compile.module.weblogicwrapper.production" description="compile module weblogicWrapper production classes">
+    <mkdir dir="${weblogicwrapper.output.dir}"/>
+    <javac2 destdir="${weblogicwrapper.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.weblogicwrapper}/bin/javac">
+      <compilerarg line="${compiler.args.weblogicwrapper}"/>
+      <bootclasspath refid="weblogicwrapper.module.bootclasspath"/>
+      <classpath refid="weblogicwrapper.module.classpath"/>
+      <src refid="weblogicwrapper.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.weblogicwrapper"/>
+    </javac2>
+    <copy todir="${weblogicwrapper.output.dir}">
+      <fileset dir="${module.weblogicwrapper.basedir}/plugins/weblogic/weblogicWrapper/src">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.weblogicwrapper"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.weblogicwrapper.tests" depends="compile.module.weblogicwrapper.production" description="compile module weblogicWrapper test classes" unless="skip.tests"/>
+  
+  <target name="clean.module.weblogicwrapper" description="cleanup module">
+    <delete dir="${weblogicwrapper.output.dir}"/>
+    <delete dir="${weblogicwrapper.testoutput.dir}"/>
+  </target>
+  
+  
+  <dirname property="module.weblogicwrapperimpl.basedir" file="${ant.file}"/>
+  
+  
+  <property name="module.jdk.home.weblogicwrapperimpl" value="${project.jdk.home}"/>
+  <property name="module.jdk.classpath.weblogicwrapperimpl" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.weblogicwrapperimpl" value="${compiler.args}"/>
+  
+  <property name="weblogicwrapperimpl.output.dir" value="${module.weblogicwrapperimpl.basedir}/plugins/weblogic/weblogicLogin/classes"/>
+  <property name="weblogicwrapperimpl.testoutput.dir" value="${module.weblogicwrapperimpl.basedir}/plugins/weblogic/weblogicLogin/classes"/>
+  
+  <path id="weblogicwrapperimpl.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="weblogicwrapperimpl.module.classpath">
+    <path refid="library.generic_collections.classpath"/>
+    <path refid="${module.jdk.classpath.weblogicwrapperimpl}"/>
+    <pathelement location="${weblogicwrapper.output.dir}"/>
+    <path refid="library.mockweblogic.classpath"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.weblogicwrapperimpl"/>
+  
+  <patternset id="excluded.from.compilation.weblogicwrapperimpl">
+    <patternset refid="excluded.from.module.weblogicwrapperimpl"/>
+    <patternset refid="compiler.excluded"/>
+  </patternset>
+  
+  <path id="weblogicwrapperimpl.module.sourcepath">
+    <dirset dir="${module.weblogicwrapperimpl.basedir}/plugins/weblogic/weblogicLogin">
+      <include name="src"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.weblogicwrapperimpl" depends="compile.module.weblogicwrapperimpl.production,compile.module.weblogicwrapperimpl.tests" description="compile module weblogicWrapperImpl"/>
+  
+  <target name="compile.module.weblogicwrapperimpl.production" depends="compile.module.weblogicwrapper" description="compile module weblogicWrapperImpl production classes">
+    <mkdir dir="${weblogicwrapperimpl.output.dir}"/>
+    <javac2 destdir="${weblogicwrapperimpl.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.weblogicwrapperimpl}/bin/javac">
+      <compilerarg line="${compiler.args.weblogicwrapperimpl}"/>
+      <bootclasspath refid="weblogicwrapperimpl.module.bootclasspath"/>
+      <classpath refid="weblogicwrapperimpl.module.classpath"/>
+      <src refid="weblogicwrapperimpl.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.weblogicwrapperimpl"/>
+    </javac2>
+    <copy todir="${weblogicwrapperimpl.output.dir}">
+      <fileset dir="${module.weblogicwrapperimpl.basedir}/plugins/weblogic/weblogicLogin/src">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.weblogicwrapperimpl"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.weblogicwrapperimpl.tests" depends="compile.module.weblogicwrapperimpl.production" description="compile module weblogicWrapperImpl test classes" unless="skip.tests"/>
+  
+  <target name="clean.module.weblogicwrapperimpl" description="cleanup module">
+    <delete dir="${weblogicwrapperimpl.output.dir}"/>
+    <delete dir="${weblogicwrapperimpl.testoutput.dir}"/>
+  </target>
+  
+  
+  <dirname property="module.resources.basedir" file="${ant.file}"/>
+  
+  
+  <property name="module.jdk.home.resources" value="${project.jdk.home}"/>
+  <property name="module.jdk.classpath.resources" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.resources" value="${compiler.args}"/>
+  
+  <property name="resources.output.dir" value="${module.resources.basedir}/resources/classes"/>
+  <property name="resources.testoutput.dir" value="${module.resources.basedir}/resources/classes"/>
+  
+  <path id="resources.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="resources.module.classpath">
+    <path refid="${module.jdk.classpath.resources}"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.resources"/>
+  
+  <patternset id="excluded.from.compilation.resources">
+    <patternset refid="excluded.from.module.resources"/>
+    <patternset refid="compiler.excluded"/>
+  </patternset>
+  
+  <path id="resources.module.sourcepath">
+    <dirset dir="${module.resources.basedir}/resources">
+      <include name="src"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.resources" depends="compile.module.resources.production,compile.module.resources.tests" description="compile module resources"/>
+  
+  <target name="compile.module.resources.production" description="compile module resources production classes">
+    <mkdir dir="${resources.output.dir}"/>
+    <javac2 destdir="${resources.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.resources}/bin/javac">
+      <compilerarg line="${compiler.args.resources}"/>
+      <bootclasspath refid="resources.module.bootclasspath"/>
+      <classpath refid="resources.module.classpath"/>
+      <src refid="resources.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.resources"/>
+    </javac2>
+    <copy todir="${resources.output.dir}">
+      <fileset dir="${module.resources.basedir}/resources/src">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.resources"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.resources.tests" depends="compile.module.resources.production" description="compile module resources test classes" unless="skip.tests"/>
+  
+  <target name="clean.module.resources" description="cleanup module">
+    <delete dir="${resources.output.dir}"/>
+    <delete dir="${resources.testoutput.dir}"/>
+  </target>
+  
+  
+  <dirname property="module.util.basedir" file="${ant.file}"/>
+  
+  
+  <property name="module.jdk.home.util" value="${project.jdk.home}"/>
+  <property name="module.jdk.classpath.util" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.util" value="${compiler.args}"/>
+  
+  <property name="util.output.dir" value="${module.util.basedir}/util/classes"/>
+  <property name="util.testoutput.dir" value="${module.util.basedir}/util/classes"/>
+  
+  <path id="util.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="util.module.classpath">
+    <path refid="library.generic_collections.classpath"/>
+    <path refid="${module.jdk.classpath.util}"/>
+    <path refid="library.bcel.classpath"/>
+    <path refid="library.jdom.classpath"/>
+    <path refid="library.junit.classpath"/>
+    <path refid="library.log4j.classpath"/>
+    <path refid="library.trove4j.classpath"/>
+    <pathelement location="${module.util.basedir}/lib/yjp-controller-api-redist.jar"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.util"/>
+  
+  <patternset id="excluded.from.compilation.util">
+    <patternset refid="excluded.from.module.util"/>
+    <patternset refid="compiler.excluded"/>
+  </patternset>
+  
+  <path id="util.module.sourcepath">
+    <dirset dir="${module.util.basedir}/util">
+      <include name="src"/>
+    </dirset>
+  </path>
+  
+  <path id="util.module.test.sourcepath">
+    <dirset dir="${module.util.basedir}/util">
+      <include name="testSource"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.util" depends="compile.module.util.production,compile.module.util.tests" description="compile module util"/>
+  
+  <target name="compile.module.util.production" description="compile module util production classes">
+    <mkdir dir="${util.output.dir}"/>
+    <javac2 destdir="${util.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.util}/bin/javac">
+      <compilerarg line="${compiler.args.util}"/>
+      <bootclasspath refid="util.module.bootclasspath"/>
+      <classpath refid="util.module.classpath"/>
+      <src refid="util.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.util"/>
+    </javac2>
+    <copy todir="${util.output.dir}">
+      <fileset dir="${module.util.basedir}/util/src">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.util"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.util.tests" depends="compile.module.util.production" description="compile module util test classes" unless="skip.tests">
+    <mkdir dir="${util.testoutput.dir}"/>
+    <javac2 destdir="${util.testoutput.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.util}/bin/javac">
+      <compilerarg line="${compiler.args.util}"/>
+      <classpath refid="util.module.classpath"/>
+      <classpath location="${util.output.dir}"/>
+      <src refid="util.module.test.sourcepath"/>
+      <patternset refid="excluded.from.compilation.util"/>
+    </javac2>
+    <copy todir="${util.testoutput.dir}">
+      <fileset dir="${module.util.basedir}/util/testSource">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.util"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="clean.module.util" description="cleanup module">
+    <delete dir="${util.output.dir}"/>
+    <delete dir="${util.testoutput.dir}"/>
+  </target>
+  
+  
+  <dirname property="module.parsergen.basedir" file="${ant.file}"/>
+  
+  
+  <property name="module.jdk.home.parsergen" value="${project.jdk.home}"/>
+  <property name="module.jdk.classpath.parsergen" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.parsergen" value="${compiler.args}"/>
+  
+  <property name="parsergen.output.dir" value="${module.parsergen.basedir}/tools/parserGen/classes/main"/>
+  <property name="parsergen.testoutput.dir" value="${module.parsergen.basedir}/tools/parserGen/classes/test"/>
+  
+  <path id="parsergen.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="parsergen.module.classpath">
+    <path refid="library.generic_collections.classpath"/>
+    <path refid="${module.jdk.classpath.parsergen}"/>
+    <pathelement location="${module.parsergen.basedir}/lib/xerces.jar"/>
+    <pathelement location="${module.parsergen.basedir}/tools/parserGen/lib/antlr-2.7.1.jar"/>
+    <path refid="library.junit.classpath"/>
+    <path refid="library.velocity.classpath"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.parsergen"/>
+  
+  <patternset id="excluded.from.compilation.parsergen">
+    <patternset refid="excluded.from.module.parsergen"/>
+    <patternset refid="compiler.excluded"/>
+  </patternset>
+  
+  <path id="parsergen.module.sourcepath">
+    <dirset dir="${module.parsergen.basedir}/tools/parserGen">
+      <include name="internalResources"/>
+      <include name="source"/>
+    </dirset>
+  </path>
+  
+  <path id="parsergen.module.test.sourcepath">
+    <dirset dir="${module.parsergen.basedir}/tools/parserGen">
+      <include name="testSource"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.parsergen" depends="compile.module.parsergen.production,compile.module.parsergen.tests" description="compile module parserGen"/>
+  
+  <target name="compile.module.parsergen.production" description="compile module parserGen production classes">
+    <mkdir dir="${parsergen.output.dir}"/>
+    <javac2 destdir="${parsergen.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.parsergen}/bin/javac">
+      <compilerarg line="${compiler.args.parsergen}"/>
+      <bootclasspath refid="parsergen.module.bootclasspath"/>
+      <classpath refid="parsergen.module.classpath"/>
+      <src refid="parsergen.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.parsergen"/>
+    </javac2>
+    <copy todir="${parsergen.output.dir}">
+      <fileset dir="${module.parsergen.basedir}/tools/parserGen/internalResources">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.parsergen"/>
+      </fileset>
+      <fileset dir="${module.parsergen.basedir}/tools/parserGen/source">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.parsergen"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.parsergen.tests" depends="compile.module.parsergen.production" description="compile module parserGen test classes" unless="skip.tests">
+    <mkdir dir="${parsergen.testoutput.dir}"/>
+    <javac2 destdir="${parsergen.testoutput.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.parsergen}/bin/javac">
+      <compilerarg line="${compiler.args.parsergen}"/>
+      <classpath refid="parsergen.module.classpath"/>
+      <classpath location="${parsergen.output.dir}"/>
+      <src refid="parsergen.module.test.sourcepath"/>
+      <patternset refid="excluded.from.compilation.parsergen"/>
+    </javac2>
+    <copy todir="${parsergen.testoutput.dir}">
+      <fileset dir="${module.parsergen.basedir}/tools/parserGen/testSource">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.parsergen"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="clean.module.parsergen" description="cleanup module">
+    <delete dir="${parsergen.output.dir}"/>
+    <delete dir="${parsergen.testoutput.dir}"/>
+  </target>
+  
+  
+  <dirname property="module.openapi.basedir" file="${ant.file}"/>
+  
+  
+  <property name="module.jdk.home.openapi" value="${project.jdk.home}"/>
+  <property name="module.jdk.classpath.openapi" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.openapi" value="${compiler.args}"/>
+  
+  <property name="openapi.output.dir" value="${module.openapi.basedir}/openapi/classes"/>
+  <property name="openapi.testoutput.dir" value="${module.openapi.basedir}/openapi/classes"/>
+  
+  <path id="openapi.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="openapi.module.classpath">
+    <path refid="library.generic_collections.classpath"/>
+    <path refid="${module.jdk.classpath.openapi}"/>
+    <pathelement location="${util.output.dir}"/>
+    <pathelement location="${idea_rt.output.dir}"/>
+    <pathelement location="${parsergen.output.dir}"/>
+    <pathelement location="${parsergen.testoutput.dir}"/>
+    <path refid="library.junit.classpath"/>
+    <path refid="library.jdom.classpath"/>
+    <pathelement location="${forms_rt.output.dir}"/>
+    <path refid="library.trove4j.classpath"/>
+    <path refid="library.jasper2.classpath"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.openapi"/>
+  
+  <patternset id="excluded.from.compilation.openapi">
+    <patternset refid="excluded.from.module.openapi"/>
+    <patternset refid="compiler.excluded"/>
+  </patternset>
+  
+  <path id="openapi.module.sourcepath">
+    <dirset dir="${module.openapi.basedir}/openapi">
+      <include name="src"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.openapi" depends="compile.module.openapi.production,compile.module.openapi.tests" description="compile module openapi"/>
+  
+  <target name="compile.module.openapi.production" depends="compile.module.util,compile.module.idea_rt,compile.module.parsergen,compile.module.forms_rt" description="compile module openapi production classes">
+    <mkdir dir="${openapi.output.dir}"/>
+    <javac2 destdir="${openapi.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.openapi}/bin/javac">
+      <compilerarg line="${compiler.args.openapi}"/>
+      <bootclasspath refid="openapi.module.bootclasspath"/>
+      <classpath refid="openapi.module.classpath"/>
+      <src refid="openapi.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.openapi"/>
+    </javac2>
+    <copy todir="${openapi.output.dir}">
+      <fileset dir="${module.openapi.basedir}/openapi/src">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.openapi"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.openapi.tests" depends="compile.module.openapi.production" description="compile module openapi test classes" unless="skip.tests"/>
+  
+  <target name="clean.module.openapi" description="cleanup module">
+    <delete dir="${openapi.output.dir}"/>
+    <delete dir="${openapi.testoutput.dir}"/>
+  </target>
+  
+  
+  <dirname property="module.weblogic.basedir" file="${ant.file}"/>
+  
+  
+  <property name="module.jdk.home.weblogic" value="${project.jdk.home}"/>
+  <property name="module.jdk.classpath.weblogic" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.weblogic" value="${compiler.args}"/>
+  
+  <property name="weblogic.output.dir" value="${module.weblogic.basedir}/plugins/weblogic/classes"/>
+  <property name="weblogic.testoutput.dir" value="${module.weblogic.basedir}/plugins/weblogic/classes"/>
+  
+  <path id="weblogic.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="weblogic.module.classpath">
+    <path refid="library.generic_collections.classpath"/>
+    <path refid="${module.jdk.classpath.weblogic}"/>
+    <pathelement location="${idea_rt.output.dir}"/>
+    <pathelement location="${util.output.dir}"/>
+    <path refid="library.jdom.classpath"/>
+    <path refid="library.junit.classpath"/>
+    <pathelement location="${openapi.output.dir}"/>
+    <pathelement location="${forms_rt.output.dir}"/>
+    <pathelement location="${weblogicwrapper.output.dir}"/>
+    <pathelement location="${weblogicwrapperimpl.output.dir}"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.weblogic"/>
+  
+  <patternset id="excluded.from.compilation.weblogic">
+    <patternset refid="excluded.from.module.weblogic"/>
+    <patternset refid="compiler.excluded"/>
+  </patternset>
+  
+  <path id="weblogic.module.sourcepath">
+    <dirset dir="${module.weblogic.basedir}/plugins/weblogic">
+      <include name="source"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.weblogic" depends="compile.module.weblogic.production,compile.module.weblogic.tests" description="compile module weblogic"/>
+  
+  <target name="compile.module.weblogic.production" depends="compile.module.idea_rt,compile.module.util,compile.module.openapi,compile.module.forms_rt,compile.module.weblogicwrapper,compile.module.weblogicwrapperimpl" description="compile module weblogic production classes">
+    <mkdir dir="${weblogic.output.dir}"/>
+    <javac2 destdir="${weblogic.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.weblogic}/bin/javac">
+      <compilerarg line="${compiler.args.weblogic}"/>
+      <bootclasspath refid="weblogic.module.bootclasspath"/>
+      <classpath refid="weblogic.module.classpath"/>
+      <src refid="weblogic.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.weblogic"/>
+    </javac2>
+    <copy todir="${weblogic.output.dir}">
+      <fileset dir="${module.weblogic.basedir}/plugins/weblogic/source">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.weblogic"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.weblogic.tests" depends="compile.module.weblogic.production" description="compile module weblogic test classes" unless="skip.tests"/>
+  
+  <target name="clean.module.weblogic" description="cleanup module">
+    <delete dir="${weblogic.output.dir}"/>
+    <delete dir="${weblogic.testoutput.dir}"/>
+  </target>
+  
+  
+  <dirname property="module.jsr45debug.basedir" file="${ant.file}"/>
+  
+  
+  <property name="module.jdk.home.jsr45debug" value="${project.jdk.home}"/>
+  <property name="module.jdk.classpath.jsr45debug" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.jsr45debug" value="${compiler.args}"/>
+  
+  <property name="jsr45debug.output.dir" value="${module.jsr45debug.basedir}/plugins/jsr45debug/classes"/>
+  <property name="jsr45debug.testoutput.dir" value="${module.jsr45debug.basedir}/plugins/jsr45debug/testClasses"/>
+  
+  <path id="jsr45debug.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="jsr45debug.module.classpath">
+    <path refid="${module.jdk.classpath.jsr45debug}"/>
+    <path refid="library.jdom.classpath"/>
+    <pathelement location="${util.output.dir}"/>
+    <pathelement location="${openapi.output.dir}"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.jsr45debug"/>
+  
+  <patternset id="excluded.from.compilation.jsr45debug">
+    <patternset refid="excluded.from.module.jsr45debug"/>
+    <patternset refid="compiler.excluded"/>
+  </patternset>
+  
+  <path id="jsr45debug.module.sourcepath">
+    <dirset dir="${module.jsr45debug.basedir}/plugins/jsr45debug">
+      <include name="source"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.jsr45debug" depends="compile.module.jsr45debug.production,compile.module.jsr45debug.tests" description="compile module jsr45debug"/>
+  
+  <target name="compile.module.jsr45debug.production" depends="compile.module.util,compile.module.openapi" description="compile module jsr45debug production classes">
+    <mkdir dir="${jsr45debug.output.dir}"/>
+    <javac2 destdir="${jsr45debug.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.jsr45debug}/bin/javac">
+      <compilerarg line="${compiler.args.jsr45debug}"/>
+      <bootclasspath refid="jsr45debug.module.bootclasspath"/>
+      <classpath refid="jsr45debug.module.classpath"/>
+      <src refid="jsr45debug.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.jsr45debug"/>
+    </javac2>
+    <copy todir="${jsr45debug.output.dir}">
+      <fileset dir="${module.jsr45debug.basedir}/plugins/jsr45debug/source">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.jsr45debug"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.jsr45debug.tests" depends="compile.module.jsr45debug.production" description="compile module jsr45debug test classes" unless="skip.tests"/>
+  
+  <target name="clean.module.jsr45debug" description="cleanup module">
+    <delete dir="${jsr45debug.output.dir}"/>
+    <delete dir="${jsr45debug.testoutput.dir}"/>
+  </target>
+  
+  
+  <dirname property="module.tomcatintegration.basedir" file="${ant.file}"/>
+  
+  
+  <property name="module.jdk.home.tomcatintegration" value="${project.jdk.home}"/>
+  <property name="module.jdk.classpath.tomcatintegration" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.tomcatintegration" value="${compiler.args}"/>
+  
+  <property name="tomcatintegration.output.dir" value="${module.tomcatintegration.basedir}/plugins/tomcatIntegration/classes"/>
+  <property name="tomcatintegration.testoutput.dir" value="${module.tomcatintegration.basedir}/plugins/tomcatIntegration/testClasses"/>
+  
+  <path id="tomcatintegration.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="tomcatintegration.module.classpath">
+    <path refid="library.generic_collections.classpath"/>
+    <path refid="${module.jdk.classpath.tomcatintegration}"/>
+    <path refid="library.jdom.classpath"/>
+    <pathelement location="${util.output.dir}"/>
+    <pathelement location="${openapi.output.dir}"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.tomcatintegration"/>
+  
+  <patternset id="excluded.from.compilation.tomcatintegration">
+    <patternset refid="excluded.from.module.tomcatintegration"/>
+    <patternset refid="compiler.excluded"/>
+  </patternset>
+  
+  <path id="tomcatintegration.module.sourcepath">
+    <dirset dir="${module.tomcatintegration.basedir}/plugins/tomcatIntegration">
+      <include name="source"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.tomcatintegration" depends="compile.module.tomcatintegration.production,compile.module.tomcatintegration.tests" description="compile module tomcatIntegration"/>
+  
+  <target name="compile.module.tomcatintegration.production" depends="compile.module.util,compile.module.openapi" description="compile module tomcatIntegration production classes">
+    <mkdir dir="${tomcatintegration.output.dir}"/>
+    <javac2 destdir="${tomcatintegration.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.tomcatintegration}/bin/javac">
+      <compilerarg line="${compiler.args.tomcatintegration}"/>
+      <bootclasspath refid="tomcatintegration.module.bootclasspath"/>
+      <classpath refid="tomcatintegration.module.classpath"/>
+      <src refid="tomcatintegration.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.tomcatintegration"/>
+    </javac2>
+    <copy todir="${tomcatintegration.output.dir}">
+      <fileset dir="${module.tomcatintegration.basedir}/plugins/tomcatIntegration/source">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.tomcatintegration"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.tomcatintegration.tests" depends="compile.module.tomcatintegration.production" description="compile module tomcatIntegration test classes" unless="skip.tests"/>
+  
+  <target name="clean.module.tomcatintegration" description="cleanup module">
+    <delete dir="${tomcatintegration.output.dir}"/>
+    <delete dir="${tomcatintegration.testoutput.dir}"/>
+  </target>
+  
+  
+  <dirname property="module.starteamintegration.basedir" file="${ant.file}"/>
+  
+  
+  <property name="module.jdk.home.starteamintegration" value="${project.jdk.home}"/>
+  <property name="module.jdk.classpath.starteamintegration" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.starteamintegration" value="${compiler.args}"/>
+  
+  <property name="starteamintegration.output.dir" value="${module.starteamintegration.basedir}/plugins/starteam/classes"/>
+  <property name="starteamintegration.testoutput.dir" value="${module.starteamintegration.basedir}/plugins/starteam/classes"/>
+  
+  <path id="starteamintegration.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="starteamintegration.module.classpath">
+    <path refid="library.generic_collections.classpath"/>
+    <path refid="${module.jdk.classpath.starteamintegration}"/>
+    <pathelement location="${module.starteamintegration.basedir}/plugins/starteam/lib/starteam-sdk.jar"/>
+    <pathelement location="${util.output.dir}"/>
+    <pathelement location="${openapi.output.dir}"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.starteamintegration"/>
+  
+  <patternset id="excluded.from.compilation.starteamintegration">
+    <patternset refid="excluded.from.module.starteamintegration"/>
+    <patternset refid="compiler.excluded"/>
+  </patternset>
+  
+  <path id="starteamintegration.module.sourcepath">
+    <dirset dir="${module.starteamintegration.basedir}/plugins/starteam">
+      <include name="source"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.starteamintegration" depends="compile.module.starteamintegration.production,compile.module.starteamintegration.tests" description="compile module starteamIntegration"/>
+  
+  <target name="compile.module.starteamintegration.production" depends="compile.module.util,compile.module.openapi" description="compile module starteamIntegration production classes">
+    <mkdir dir="${starteamintegration.output.dir}"/>
+    <javac2 destdir="${starteamintegration.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.starteamintegration}/bin/javac">
+      <compilerarg line="${compiler.args.starteamintegration}"/>
+      <bootclasspath refid="starteamintegration.module.bootclasspath"/>
+      <classpath refid="starteamintegration.module.classpath"/>
+      <src refid="starteamintegration.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.starteamintegration"/>
+    </javac2>
+    <copy todir="${starteamintegration.output.dir}">
+      <fileset dir="${module.starteamintegration.basedir}/plugins/starteam/source">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.starteamintegration"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.starteamintegration.tests" depends="compile.module.starteamintegration.production" description="compile module starteamIntegration test classes" unless="skip.tests"/>
+  
+  <target name="clean.module.starteamintegration" description="cleanup module">
+    <delete dir="${starteamintegration.output.dir}"/>
+    <delete dir="${starteamintegration.testoutput.dir}"/>
+  </target>
+  
+  
+  <dirname property="module.samples.basedir" file="${ant.file}"/>
+  
+  
+  <property name="module.jdk.home.samples" value="${project.jdk.home}"/>
+  <property name="module.jdk.classpath.samples" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.samples" value="${compiler.args}"/>
+  
+  <property name="samples.output.dir" value="${module.samples.basedir}/doc/classes"/>
+  <property name="samples.testoutput.dir" value="${module.samples.basedir}/doc/classes"/>
+  
+  <path id="samples.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="samples.module.classpath">
+    <path refid="${module.jdk.classpath.samples}"/>
+    <pathelement location="${openapi.output.dir}"/>
+    <pathelement location="${util.output.dir}"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.samples"/>
+  
+  <patternset id="excluded.from.compilation.samples">
+    <patternset refid="excluded.from.module.samples"/>
+    <patternset refid="compiler.excluded"/>
+  </patternset>
+  
+  <path id="samples.module.sourcepath">
+    <dirset dir="${module.samples.basedir}/doc">
+      <include name="openapi/examples/actions/src"/>
+      <include name="openapi/examples/plugin/src"/>
+      <include name="openapi/examples/toolWindow/src"/>
+      <include name="openapi/examples/vfs/src"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.samples" depends="compile.module.samples.production,compile.module.samples.tests" description="compile module samples"/>
+  
+  <target name="compile.module.samples.production" depends="compile.module.openapi,compile.module.util" description="compile module samples production classes">
+    <mkdir dir="${samples.output.dir}"/>
+    <javac2 destdir="${samples.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.samples}/bin/javac">
+      <compilerarg line="${compiler.args.samples}"/>
+      <bootclasspath refid="samples.module.bootclasspath"/>
+      <classpath refid="samples.module.classpath"/>
+      <src refid="samples.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.samples"/>
+    </javac2>
+    <copy todir="${samples.output.dir}">
+      <fileset dir="${module.samples.basedir}/doc/openapi/examples/actions/src">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.samples"/>
+      </fileset>
+      <fileset dir="${module.samples.basedir}/doc/openapi/examples/plugin/src">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.samples"/>
+      </fileset>
+      <fileset dir="${module.samples.basedir}/doc/openapi/examples/toolWindow/src">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.samples"/>
+      </fileset>
+      <fileset dir="${module.samples.basedir}/doc/openapi/examples/vfs/src">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.samples"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.samples.tests" depends="compile.module.samples.production" description="compile module samples test classes" unless="skip.tests"/>
+  
+  <target name="clean.module.samples" description="cleanup module">
+    <delete dir="${samples.output.dir}"/>
+    <delete dir="${samples.testoutput.dir}"/>
+  </target>
+  
+  
+  <dirname property="module.inspectiongadgetsplugin.basedir" file="${ant.file}"/>
+  
+  
+  <property name="module.jdk.home.inspectiongadgetsplugin" value="${project.jdk.home}"/>
+  <property name="module.jdk.classpath.inspectiongadgetsplugin" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.inspectiongadgetsplugin" value="${compiler.args}"/>
+  
+  <property name="inspectiongadgetsplugin.output.dir" value="${module.inspectiongadgetsplugin.basedir}/plugins/InspectionGadgets/classes"/>
+  <property name="inspectiongadgetsplugin.testoutput.dir" value="${module.inspectiongadgetsplugin.basedir}/plugins/InspectionGadgets/classes"/>
+  
+  <path id="inspectiongadgetsplugin.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="inspectiongadgetsplugin.module.classpath">
+    <path refid="${module.jdk.classpath.inspectiongadgetsplugin}"/>
+    <path refid="library.jdom.classpath"/>
+    <path refid="library.junit.classpath"/>
+    <path refid="library.log4j.classpath"/>
+    <pathelement location="${openapi.output.dir}"/>
+    <pathelement location="${util.output.dir}"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.inspectiongadgetsplugin"/>
+  
+  <patternset id="excluded.from.compilation.inspectiongadgetsplugin">
+    <patternset refid="excluded.from.module.inspectiongadgetsplugin"/>
+    <patternset refid="compiler.excluded"/>
+  </patternset>
+  
+  <path id="inspectiongadgetsplugin.module.sourcepath">
+    <dirset dir="${module.inspectiongadgetsplugin.basedir}/plugins/InspectionGadgets">
+      <include name="src"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.inspectiongadgetsplugin" depends="compile.module.inspectiongadgetsplugin.production,compile.module.inspectiongadgetsplugin.tests" description="compile module InspectionGadgetsPlugin"/>
+  
+  <target name="compile.module.inspectiongadgetsplugin.production" depends="compile.module.openapi,compile.module.util" description="compile module InspectionGadgetsPlugin production classes">
+    <mkdir dir="${inspectiongadgetsplugin.output.dir}"/>
+    <javac2 destdir="${inspectiongadgetsplugin.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.inspectiongadgetsplugin}/bin/javac">
+      <compilerarg line="${compiler.args.inspectiongadgetsplugin}"/>
+      <bootclasspath refid="inspectiongadgetsplugin.module.bootclasspath"/>
+      <classpath refid="inspectiongadgetsplugin.module.classpath"/>
+      <src refid="inspectiongadgetsplugin.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.inspectiongadgetsplugin"/>
+    </javac2>
+    <copy todir="${inspectiongadgetsplugin.output.dir}">
+      <fileset dir="${module.inspectiongadgetsplugin.basedir}/plugins/InspectionGadgets/src">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.inspectiongadgetsplugin"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.inspectiongadgetsplugin.tests" depends="compile.module.inspectiongadgetsplugin.production" description="compile module InspectionGadgetsPlugin test classes" unless="skip.tests"/>
+  
+  <target name="clean.module.inspectiongadgetsplugin" description="cleanup module">
+    <delete dir="${inspectiongadgetsplugin.output.dir}"/>
+    <delete dir="${inspectiongadgetsplugin.testoutput.dir}"/>
+  </target>
+  
+  
+  <dirname property="module.intentionpowerpackplugin.basedir" file="${ant.file}"/>
+  
+  
+  <property name="module.jdk.home.intentionpowerpackplugin" value="${project.jdk.home}"/>
+  <property name="module.jdk.classpath.intentionpowerpackplugin" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.intentionpowerpackplugin" value="${compiler.args}"/>
+  
+  <property name="intentionpowerpackplugin.output.dir" value="${module.intentionpowerpackplugin.basedir}/plugins/IntentionPowerPak/classes"/>
+  <property name="intentionpowerpackplugin.testoutput.dir" value="${module.intentionpowerpackplugin.basedir}/plugins/IntentionPowerPak/classes"/>
+  
+  <path id="intentionpowerpackplugin.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="intentionpowerpackplugin.module.classpath">
+    <path refid="${module.jdk.classpath.intentionpowerpackplugin}"/>
+    <pathelement location="${openapi.output.dir}"/>
+    <pathelement location="${util.output.dir}"/>
+    <path refid="library.log4j.classpath"/>
+    <path refid="library.jdom.classpath"/>
+    <path refid="library.junit.classpath"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.intentionpowerpackplugin"/>
+  
+  <patternset id="excluded.from.compilation.intentionpowerpackplugin">
+    <patternset refid="excluded.from.module.intentionpowerpackplugin"/>
+    <patternset refid="compiler.excluded"/>
+  </patternset>
+  
+  <path id="intentionpowerpackplugin.module.sourcepath">
+    <dirset dir="${module.intentionpowerpackplugin.basedir}/plugins/IntentionPowerPak">
+      <include name="src"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.intentionpowerpackplugin" depends="compile.module.intentionpowerpackplugin.production,compile.module.intentionpowerpackplugin.tests" description="compile module IntentionPowerPackPlugin"/>
+  
+  <target name="compile.module.intentionpowerpackplugin.production" depends="compile.module.openapi,compile.module.util" description="compile module IntentionPowerPackPlugin production classes">
+    <mkdir dir="${intentionpowerpackplugin.output.dir}"/>
+    <javac2 destdir="${intentionpowerpackplugin.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.intentionpowerpackplugin}/bin/javac">
+      <compilerarg line="${compiler.args.intentionpowerpackplugin}"/>
+      <bootclasspath refid="intentionpowerpackplugin.module.bootclasspath"/>
+      <classpath refid="intentionpowerpackplugin.module.classpath"/>
+      <src refid="intentionpowerpackplugin.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.intentionpowerpackplugin"/>
+    </javac2>
+    <copy todir="${intentionpowerpackplugin.output.dir}">
+      <fileset dir="${module.intentionpowerpackplugin.basedir}/plugins/IntentionPowerPak/src">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.intentionpowerpackplugin"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.intentionpowerpackplugin.tests" depends="compile.module.intentionpowerpackplugin.production" description="compile module IntentionPowerPackPlugin test classes" unless="skip.tests"/>
+  
+  <target name="clean.module.intentionpowerpackplugin" description="cleanup module">
+    <delete dir="${intentionpowerpackplugin.output.dir}"/>
+    <delete dir="${intentionpowerpackplugin.testoutput.dir}"/>
+  </target>
+  
+  
+  <dirname property="module.icons.basedir" file="${ant.file}"/>
+  
+  
+  <property name="module.jdk.home.icons" value="${project.jdk.home}"/>
+  <property name="module.jdk.classpath.icons" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.icons" value="${compiler.args}"/>
+  
+  <property name="icons.output.dir" value="${module.icons.basedir}/icons/classes"/>
+  <property name="icons.testoutput.dir" value="${module.icons.basedir}/icons/classes"/>
+  
+  <path id="icons.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="icons.module.classpath">
+    <path refid="${module.jdk.classpath.icons}"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.icons"/>
+  
+  <patternset id="excluded.from.compilation.icons">
+    <patternset refid="excluded.from.module.icons"/>
+    <patternset refid="compiler.excluded"/>
+  </patternset>
+  
+  <path id="icons.module.sourcepath">
+    <dirset dir="${module.icons.basedir}/icons">
+      <include name="src"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.icons" depends="compile.module.icons.production,compile.module.icons.tests" description="compile module icons"/>
+  
+  <target name="compile.module.icons.production" description="compile module icons production classes">
+    <mkdir dir="${icons.output.dir}"/>
+    <javac2 destdir="${icons.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.icons}/bin/javac">
+      <compilerarg line="${compiler.args.icons}"/>
+      <bootclasspath refid="icons.module.bootclasspath"/>
+      <classpath refid="icons.module.classpath"/>
+      <src refid="icons.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.icons"/>
+    </javac2>
+    <copy todir="${icons.output.dir}">
+      <fileset dir="${module.icons.basedir}/icons/src">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.icons"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.icons.tests" depends="compile.module.icons.production" description="compile module icons test classes" unless="skip.tests"/>
+  
+  <target name="clean.module.icons" description="cleanup module">
+    <delete dir="${icons.output.dir}"/>
+    <delete dir="${icons.testoutput.dir}"/>
+  </target>
+  
+  
+  <dirname property="module.jasper2.basedir" file="${ant.file}"/>
+  
+  
+  <property name="module.jdk.home.jasper2" value="${project.jdk.home}"/>
+  <property name="module.jdk.classpath.jasper2" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.jasper2" value="${compiler.args}"/>
+  
+  <property name="jasper2.output.dir" value="${module.jasper2.basedir}/jasper2/classes"/>
+  <property name="jasper2.testoutput.dir" value="${module.jasper2.basedir}/jasper2/classes"/>
+  
+  <path id="jasper2.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="jasper2.module.classpath">
+    <path refid="${module.jdk.classpath.jasper2}"/>
+    <path refid="library.jasper2.classpath"/>
+    <path refid="library.ant.classpath"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.jasper2"/>
+  
+  <patternset id="excluded.from.compilation.jasper2">
+    <patternset refid="excluded.from.module.jasper2"/>
+    <patternset refid="compiler.excluded"/>
+  </patternset>
+  
+  <path id="jasper2.module.sourcepath">
+    <dirset dir="${module.jasper2.basedir}/jasper2">
+      <include name="src"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.jasper2" depends="compile.module.jasper2.production,compile.module.jasper2.tests" description="compile module jasper2"/>
+  
+  <target name="compile.module.jasper2.production" description="compile module jasper2 production classes">
+    <mkdir dir="${jasper2.output.dir}"/>
+    <javac2 destdir="${jasper2.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.jasper2}/bin/javac">
+      <compilerarg line="${compiler.args.jasper2}"/>
+      <bootclasspath refid="jasper2.module.bootclasspath"/>
+      <classpath refid="jasper2.module.classpath"/>
+      <src refid="jasper2.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.jasper2"/>
+    </javac2>
+    <copy todir="${jasper2.output.dir}">
+      <fileset dir="${module.jasper2.basedir}/jasper2/src">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.jasper2"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.jasper2.tests" depends="compile.module.jasper2.production" description="compile module jasper2 test classes" unless="skip.tests"/>
+  
+  <target name="clean.module.jasper2" description="cleanup module">
+    <delete dir="${jasper2.output.dir}"/>
+    <delete dir="${jasper2.testoutput.dir}"/>
+  </target>
+  
+  
+  <dirname property="module.license_common.basedir" file="${ant.file}"/>
+  
+  
+  <property name="module.jdk.home.license_common" value="${project.jdk.home}"/>
+  <property name="module.jdk.classpath.license_common" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.license_common" value="${compiler.args}"/>
+  
+  <property name="license_common.output.dir" value="${module.license_common.basedir}/licenseCommon/classes"/>
+  <property name="license_common.testoutput.dir" value="${module.license_common.basedir}/licenseCommon/testClasses"/>
+  
+  <path id="license_common.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="license_common.module.classpath">
+    <path refid="${module.jdk.classpath.license_common}"/>
+    <path refid="library.jdom.classpath"/>
+    <path refid="library.junit.classpath"/>
+    <path refid="library.mocks.classpath"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.license_common"/>
+  
+  <patternset id="excluded.from.compilation.license_common">
+    <patternset refid="excluded.from.module.license_common"/>
+    <patternset refid="compiler.excluded"/>
+  </patternset>
+  
+  <path id="license_common.module.sourcepath">
+    <dirset dir="${module.license_common.basedir}/licenseCommon">
+      <include name="source"/>
+    </dirset>
+  </path>
+  
+  <path id="license_common.module.test.sourcepath">
+    <dirset dir="${module.license_common.basedir}/licenseCommon">
+      <include name="testSource"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.license_common" depends="compile.module.license_common.production,compile.module.license_common.tests" description="compile module license_common"/>
+  
+  <target name="compile.module.license_common.production" description="compile module license_common production classes">
+    <mkdir dir="${license_common.output.dir}"/>
+    <javac2 destdir="${license_common.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.license_common}/bin/javac">
+      <compilerarg line="${compiler.args.license_common}"/>
+      <bootclasspath refid="license_common.module.bootclasspath"/>
+      <classpath refid="license_common.module.classpath"/>
+      <src refid="license_common.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.license_common"/>
+    </javac2>
+    <copy todir="${license_common.output.dir}">
+      <fileset dir="${module.license_common.basedir}/licenseCommon/source">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.license_common"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.license_common.tests" depends="compile.module.license_common.production" description="compile module license_common test classes" unless="skip.tests">
+    <mkdir dir="${license_common.testoutput.dir}"/>
+    <javac2 destdir="${license_common.testoutput.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.license_common}/bin/javac">
+      <compilerarg line="${compiler.args.license_common}"/>
+      <classpath refid="license_common.module.classpath"/>
+      <classpath location="${license_common.output.dir}"/>
+      <src refid="license_common.module.test.sourcepath"/>
+      <patternset refid="excluded.from.compilation.license_common"/>
+    </javac2>
+    <copy todir="${license_common.testoutput.dir}">
+      <fileset dir="${module.license_common.basedir}/licenseCommon/testSource">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.license_common"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="clean.module.license_common" description="cleanup module">
+    <delete dir="${license_common.output.dir}"/>
+    <delete dir="${license_common.testoutput.dir}"/>
+  </target>
+  
+  
+  <dirname property="module.pallada.basedir" file="${ant.file}"/>
+  
+  
+  <property name="module.jdk.home.pallada" value="${project.jdk.home}"/>
+  <property name="module.jdk.classpath.pallada" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.pallada" value="${compiler.args}"/>
+  
+  <property name="pallada.output.dir" value="${module.pallada.basedir}/classes/main"/>
+  <property name="pallada.testoutput.dir" value="${module.pallada.basedir}/classes/test"/>
+  
+  <path id="pallada.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="pallada.module.classpath">
+    <path refid="library.generic_collections.classpath"/>
+    <path refid="${module.jdk.classpath.pallada}"/>
+    <pathelement location="${module.pallada.basedir}/lib/xerces.jar"/>
+    <pathelement location="${idea_rt.output.dir}"/>
+    <pathelement location="${module.pallada.basedir}/lib/GLUE.jar"/>
+    <pathelement location="${module.pallada.basedir}/lib/jh.jar"/>
+    <pathelement location="${module.pallada.basedir}/lib/JNIWrap.jar"/>
+    <pathelement location="${module.pallada.basedir}/lib/xmlrpc-1.1.jar"/>
+    <pathelement location="${parsergen.output.dir}"/>
+    <pathelement location="${parsergen.testoutput.dir}"/>
+    <pathelement location="${license_common.output.dir}"/>
+    <pathelement location="${license_common.testoutput.dir}"/>
+    <pathelement location="${module.pallada.basedir}/lib/ui.jar"/>
+    <pathelement location="${module.pallada.basedir}/lib/JLmgr.jar"/>
+    <path refid="library.jdom.classpath"/>
+    <path refid="library.junit.classpath"/>
+    <path refid="library.ant.classpath"/>
+    <path refid="library.mocks.classpath"/>
+    <path refid="library.velocity.classpath"/>
+    <pathelement location="${util.output.dir}"/>
+    <path refid="library.bcel.classpath"/>
+    <path refid="library.log4j.classpath"/>
+    <pathelement location="${uidesignercore.output.dir}"/>
+    <pathelement location="${uidesignercore.testoutput.dir}"/>
+    <pathelement location="${openapi.output.dir}"/>
+    <pathelement location="${jasper2.output.dir}"/>
+    <pathelement location="${forms_rt.output.dir}"/>
+    <path refid="library.trove4j.classpath"/>
+    <path refid="library.servlets.classpath"/>
+    <pathelement location="${module.pallada.basedir}/lib/yjp-controller-api-redist.jar"/>
+    <pathelement location="${internalresources.output.dir}"/>
+    <pathelement location="${icons.output.dir}"/>
+    <pathelement location="${resources.output.dir}"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.pallada"/>
+  
+  <patternset id="excluded.from.compilation.pallada">
+    <patternset refid="excluded.from.module.pallada"/>
+    <patternset refid="compiler.excluded"/>
+  </patternset>
+  
+  <path id="pallada.module.sourcepath">
+    <dirset dir="${module.pallada.basedir}">
+      <include name="rtaspectsource"/>
+      <include name="source"/>
+    </dirset>
+  </path>
+  
+  <path id="pallada.module.test.sourcepath">
+    <dirset dir="${module.pallada.basedir}">
+      <include name="testSource"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.pallada" depends="compile.module.pallada.production,compile.module.pallada.tests" description="compile module pallada"/>
+  
+  <target name="compile.module.pallada.production" depends="compile.module.idea_rt,compile.module.parsergen,compile.module.license_common,compile.module.util,compile.module.uidesignercore,compile.module.openapi,compile.module.jasper2,compile.module.forms_rt,compile.module.internalresources,compile.module.icons,compile.module.resources" description="compile module pallada production classes">
+    <mkdir dir="${pallada.output.dir}"/>
+    <javac2 destdir="${pallada.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.pallada}/bin/javac">
+      <compilerarg line="${compiler.args.pallada}"/>
+      <bootclasspath refid="pallada.module.bootclasspath"/>
+      <classpath refid="pallada.module.classpath"/>
+      <src refid="pallada.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.pallada"/>
+    </javac2>
+    <copy todir="${pallada.output.dir}">
+      <fileset dir="${module.pallada.basedir}/rtaspectsource">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.pallada"/>
+      </fileset>
+      <fileset dir="${module.pallada.basedir}/source">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.pallada"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.pallada.tests" depends="compile.module.pallada.production" description="compile module pallada test classes" unless="skip.tests">
+    <mkdir dir="${pallada.testoutput.dir}"/>
+    <javac2 destdir="${pallada.testoutput.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.pallada}/bin/javac">
+      <compilerarg line="${compiler.args.pallada}"/>
+      <classpath refid="pallada.module.classpath"/>
+      <classpath location="${pallada.output.dir}"/>
+      <src refid="pallada.module.test.sourcepath"/>
+      <patternset refid="excluded.from.compilation.pallada"/>
+    </javac2>
+    <copy todir="${pallada.testoutput.dir}">
+      <fileset dir="${module.pallada.basedir}/testSource">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.pallada"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="clean.module.pallada" description="cleanup module">
+    <delete dir="${pallada.output.dir}"/>
+    <delete dir="${pallada.testoutput.dir}"/>
+  </target>
+  
+  
+  <dirname property="module.weblogictests.basedir" file="${ant.file}"/>
+  
+  
+  <property name="module.jdk.home.weblogictests" value="${project.jdk.home}"/>
+  <property name="module.jdk.classpath.weblogictests" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.weblogictests" value="${compiler.args}"/>
+  
+  <property name="weblogictests.output.dir" value="${module.weblogictests.basedir}/plugins/weblogic/classes/testClasses"/>
+  <property name="weblogictests.testoutput.dir" value="${module.weblogictests.basedir}/plugins/weblogic/classes/testClasses"/>
+  
+  <path id="weblogictests.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="weblogictests.module.classpath">
+    <path refid="library.generic_collections.classpath"/>
+    <path refid="${module.jdk.classpath.weblogictests}"/>
+    <pathelement location="${pallada.output.dir}"/>
+    <pathelement location="${pallada.testoutput.dir}"/>
+    <pathelement location="${openapi.output.dir}"/>
+    <pathelement location="${util.output.dir}"/>
+    <pathelement location="${weblogic.output.dir}"/>
+    <pathelement location="${forms_rt.output.dir}"/>
+    <pathelement location="${idea_rt.output.dir}"/>
+    <path refid="library.junit.classpath"/>
+    <path refid="library.jdom.classpath"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.weblogictests"/>
+  
+  <patternset id="excluded.from.compilation.weblogictests">
+    <patternset refid="excluded.from.module.weblogictests"/>
+    <patternset refid="compiler.excluded"/>
+  </patternset>
+  
+  <path id="weblogictests.module.test.sourcepath">
+    <dirset dir="${module.weblogictests.basedir}/plugins/weblogic">
+      <include name="testSource"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.weblogictests" depends="compile.module.weblogictests.production,compile.module.weblogictests.tests" description="compile module weblogicTests"/>
+  
+  <target name="compile.module.weblogictests.production" depends="compile.module.pallada,compile.module.openapi,compile.module.util,compile.module.weblogic,compile.module.forms_rt,compile.module.idea_rt" description="compile module weblogicTests production classes"/>
+  
+  <target name="compile.module.weblogictests.tests" depends="compile.module.weblogictests.production" description="compile module weblogicTests test classes" unless="skip.tests">
+    <mkdir dir="${weblogictests.testoutput.dir}"/>
+    <javac2 destdir="${weblogictests.testoutput.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.weblogictests}/bin/javac">
+      <compilerarg line="${compiler.args.weblogictests}"/>
+      <classpath refid="weblogictests.module.classpath"/>
+      <classpath location="${weblogictests.output.dir}"/>
+      <src refid="weblogictests.module.test.sourcepath"/>
+      <patternset refid="excluded.from.compilation.weblogictests"/>
+    </javac2>
+    <copy todir="${weblogictests.testoutput.dir}">
+      <fileset dir="${module.weblogictests.basedir}/plugins/weblogic/testSource">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.weblogictests"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="clean.module.weblogictests" description="cleanup module">
+    <delete dir="${weblogictests.output.dir}"/>
+    <delete dir="${weblogictests.testoutput.dir}"/>
+  </target>
+  
+  
+  <dirname property="module.internalplugins.basedir" file="${ant.file}"/>
+  
+  
+  <property name="module.jdk.home.internalplugins" value="${project.jdk.home}"/>
+  <property name="module.jdk.classpath.internalplugins" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.internalplugins" value="${compiler.args}"/>
+  
+  <property name="internalplugins.output.dir" value="${module.internalplugins.basedir}/internalPlugins/classes"/>
+  <property name="internalplugins.testoutput.dir" value="${module.internalplugins.basedir}/internalPlugins/testClasses"/>
+  
+  <path id="internalplugins.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="internalplugins.module.classpath">
+    <path refid="library.generic_collections.classpath"/>
+    <path refid="${module.jdk.classpath.internalplugins}"/>
+    <pathelement location="${openapi.output.dir}"/>
+    <pathelement location="${util.output.dir}"/>
+    <pathelement location="${pallada.output.dir}"/>
+    <pathelement location="${pallada.testoutput.dir}"/>
+    <path refid="library.junit.classpath"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.internalplugins"/>
+  
+  <patternset id="excluded.from.compilation.internalplugins">
+    <patternset refid="excluded.from.module.internalplugins"/>
+    <patternset refid="compiler.excluded"/>
+  </patternset>
+  
+  <path id="internalplugins.module.sourcepath">
+    <dirset dir="${module.internalplugins.basedir}/plugins/comparingReferences">
+      <include name="source"/>
+    </dirset>
+    <dirset dir="${module.internalplugins.basedir}/plugins/conditionalOperatorConvertor">
+      <include name="source"/>
+    </dirset>
+    <dirset dir="${module.internalplugins.basedir}/plugins/performance">
+      <include name="source"/>
+    </dirset>
+  </path>
+  
+  <path id="internalplugins.module.test.sourcepath">
+    <dirset dir="${module.internalplugins.basedir}/plugins/conditionalOperatorConvertor">
+      <include name="testSrc"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.internalplugins" depends="compile.module.internalplugins.production,compile.module.internalplugins.tests" description="compile module internalPlugins"/>
+  
+  <target name="compile.module.internalplugins.production" depends="compile.module.openapi,compile.module.util,compile.module.pallada" description="compile module internalPlugins production classes">
+    <mkdir dir="${internalplugins.output.dir}"/>
+    <javac2 destdir="${internalplugins.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.internalplugins}/bin/javac">
+      <compilerarg line="${compiler.args.internalplugins}"/>
+      <bootclasspath refid="internalplugins.module.bootclasspath"/>
+      <classpath refid="internalplugins.module.classpath"/>
+      <src refid="internalplugins.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.internalplugins"/>
+    </javac2>
+    <copy todir="${internalplugins.output.dir}">
+      <fileset dir="${module.internalplugins.basedir}/plugins/comparingReferences/source">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.internalplugins"/>
+      </fileset>
+      <fileset dir="${module.internalplugins.basedir}/plugins/conditionalOperatorConvertor/source">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.internalplugins"/>
+      </fileset>
+      <fileset dir="${module.internalplugins.basedir}/plugins/performance/source">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.internalplugins"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.internalplugins.tests" depends="compile.module.internalplugins.production" description="compile module internalPlugins test classes" unless="skip.tests">
+    <mkdir dir="${internalplugins.testoutput.dir}"/>
+    <javac2 destdir="${internalplugins.testoutput.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.internalplugins}/bin/javac">
+      <compilerarg line="${compiler.args.internalplugins}"/>
+      <classpath refid="internalplugins.module.classpath"/>
+      <classpath location="${internalplugins.output.dir}"/>
+      <src refid="internalplugins.module.test.sourcepath"/>
+      <patternset refid="excluded.from.compilation.internalplugins"/>
+    </javac2>
+    <copy todir="${internalplugins.testoutput.dir}">
+      <fileset dir="${module.internalplugins.basedir}/plugins/conditionalOperatorConvertor/testSrc">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.internalplugins"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="clean.module.internalplugins" description="cleanup module">
+    <delete dir="${internalplugins.output.dir}"/>
+    <delete dir="${internalplugins.testoutput.dir}"/>
+  </target>
+  
+  
+  <dirname property="module.structuralsearch.basedir" file="${ant.file}"/>
+  
+  
+  <property name="module.jdk.home.structuralsearch" value="${project.jdk.home}"/>
+  <property name="module.jdk.classpath.structuralsearch" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.structuralsearch" value="${compiler.args}"/>
+  
+  <property name="structuralsearch.output.dir" value="${module.structuralsearch.basedir}/plugins/structuralsearch/classes"/>
+  <property name="structuralsearch.testoutput.dir" value="${module.structuralsearch.basedir}/plugins/structuralsearch/testClasses"/>
+  
+  <path id="structuralsearch.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="structuralsearch.module.classpath">
+    <path refid="library.generic_collections.classpath"/>
+    <path refid="${module.jdk.classpath.structuralsearch}"/>
+    <pathelement location="${pallada.output.dir}"/>
+    <pathelement location="${pallada.testoutput.dir}"/>
+    <path refid="library.junit.classpath"/>
+    <pathelement location="${util.output.dir}"/>
+    <path refid="library.jdom.classpath"/>
+    <pathelement location="${openapi.output.dir}"/>
+    <path refid="library.trove4j.classpath"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.structuralsearch"/>
+  
+  <patternset id="excluded.from.compilation.structuralsearch">
+    <patternset refid="excluded.from.module.structuralsearch"/>
+    <patternset refid="compiler.excluded"/>
+  </patternset>
+  
+  <path id="structuralsearch.module.sourcepath">
+    <dirset dir="${module.structuralsearch.basedir}/plugins/structuralsearch">
+      <include name="source"/>
+    </dirset>
+  </path>
+  
+  <path id="structuralsearch.module.test.sourcepath">
+    <dirset dir="${module.structuralsearch.basedir}/plugins/structuralsearch">
+      <include name="testSource"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.structuralsearch" depends="compile.module.structuralsearch.production,compile.module.structuralsearch.tests" description="compile module structuralsearch"/>
+  
+  <target name="compile.module.structuralsearch.production" depends="compile.module.pallada,compile.module.util,compile.module.openapi" description="compile module structuralsearch production classes">
+    <mkdir dir="${structuralsearch.output.dir}"/>
+    <javac2 destdir="${structuralsearch.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.structuralsearch}/bin/javac">
+      <compilerarg line="${compiler.args.structuralsearch}"/>
+      <bootclasspath refid="structuralsearch.module.bootclasspath"/>
+      <classpath refid="structuralsearch.module.classpath"/>
+      <src refid="structuralsearch.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.structuralsearch"/>
+    </javac2>
+    <copy todir="${structuralsearch.output.dir}">
+      <fileset dir="${module.structuralsearch.basedir}/plugins/structuralsearch/source">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.structuralsearch"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.structuralsearch.tests" depends="compile.module.structuralsearch.production" description="compile module structuralsearch test classes" unless="skip.tests">
+    <mkdir dir="${structuralsearch.testoutput.dir}"/>
+    <javac2 destdir="${structuralsearch.testoutput.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.structuralsearch}/bin/javac">
+      <compilerarg line="${compiler.args.structuralsearch}"/>
+      <classpath refid="structuralsearch.module.classpath"/>
+      <classpath location="${structuralsearch.output.dir}"/>
+      <src refid="structuralsearch.module.test.sourcepath"/>
+      <patternset refid="excluded.from.compilation.structuralsearch"/>
+    </javac2>
+    <copy todir="${structuralsearch.testoutput.dir}">
+      <fileset dir="${module.structuralsearch.basedir}/plugins/structuralsearch/testSource">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.structuralsearch"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="clean.module.structuralsearch" description="cleanup module">
+    <delete dir="${structuralsearch.output.dir}"/>
+    <delete dir="${structuralsearch.testoutput.dir}"/>
+  </target>
+  
+  
+  <dirname property="module.cc_special.basedir" file="${ant.file}"/>
+  
+  
+  <property name="module.jdk.home.cc_special" value="${project.jdk.home}"/>
+  <property name="module.jdk.classpath.cc_special" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.cc_special" value="${compiler.args}"/>
+  
+  <property name="cc_special.output.dir" value="${module.cc_special.basedir}/cc_special/classes"/>
+  <property name="cc_special.testoutput.dir" value="${module.cc_special.basedir}/cc_special/classes"/>
+  
+  <path id="cc_special.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="cc_special.module.classpath">
+    <path refid="${module.jdk.classpath.cc_special}"/>
+    <pathelement location="${util.output.dir}"/>
+    <path refid="library.junit.classpath"/>
+    <pathelement location="${module.cc_special.basedir}/lib/optional.jar"/>
+    <path refid="library.ant.classpath"/>
+    <pathelement location="${pallada.output.dir}"/>
+    <pathelement location="${pallada.testoutput.dir}"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.cc_special"/>
+  
+  <patternset id="excluded.from.compilation.cc_special">
+    <patternset refid="excluded.from.module.cc_special"/>
+    <patternset refid="compiler.excluded"/>
+  </patternset>
+  
+  <path id="cc_special.module.sourcepath">
+    <dirset dir="${module.cc_special.basedir}/cc_special">
+      <include name="src"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.cc_special" depends="compile.module.cc_special.production,compile.module.cc_special.tests" description="compile module cc_special"/>
+  
+  <target name="compile.module.cc_special.production" depends="compile.module.util,compile.module.pallada" description="compile module cc_special production classes">
+    <mkdir dir="${cc_special.output.dir}"/>
+    <javac2 destdir="${cc_special.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.cc_special}/bin/javac">
+      <compilerarg line="${compiler.args.cc_special}"/>
+      <bootclasspath refid="cc_special.module.bootclasspath"/>
+      <classpath refid="cc_special.module.classpath"/>
+      <src refid="cc_special.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.cc_special"/>
+    </javac2>
+    <copy todir="${cc_special.output.dir}">
+      <fileset dir="${module.cc_special.basedir}/cc_special/src">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.cc_special"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.cc_special.tests" depends="compile.module.cc_special.production" description="compile module cc_special test classes" unless="skip.tests"/>
+  
+  <target name="clean.module.cc_special" description="cleanup module">
+    <delete dir="${cc_special.output.dir}"/>
+    <delete dir="${cc_special.testoutput.dir}"/>
+  </target>
+  
+  
+  <dirname property="module.cvs_support.basedir" file="${ant.file}"/>
+  
+  
+  <property name="module.jdk.home.cvs_support" value="${project.jdk.home}"/>
+  <property name="module.jdk.classpath.cvs_support" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.cvs_support" value="${compiler.args}"/>
+  
+  <property name="cvs_support.output.dir" value="${module.cvs_support.basedir}/plugins/cvs2/classes"/>
+  <property name="cvs_support.testoutput.dir" value="${module.cvs_support.basedir}/plugins/cvs2/testClasses"/>
+  
+  <path id="cvs_support.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="cvs_support.module.classpath">
+    <path refid="library.generic_collections.classpath"/>
+    <path refid="${module.jdk.classpath.cvs_support}"/>
+    <pathelement location="${pallada.output.dir}"/>
+    <pathelement location="${pallada.testoutput.dir}"/>
+    <path refid="library.jdom.classpath"/>
+    <path refid="library.junit.classpath"/>
+    <pathelement location="${util.output.dir}"/>
+    <pathelement location="${openapi.output.dir}"/>
+    <pathelement location="${forms_rt.output.dir}"/>
+    <pathelement location="${module.cvs_support.basedir}/plugins/cvs2/lib/sshtools-zlib.jar"/>
+    <pathelement location="${module.cvs_support.basedir}/plugins/cvs2/lib/maverick-ssh1.jar"/>
+    <pathelement location="${module.cvs_support.basedir}/plugins/cvs2/lib/sshtools-ant.jar"/>
+    <pathelement location="${module.cvs_support.basedir}/plugins/cvs2/lib/maverick-ssh2.jar"/>
+    <pathelement location="${module.cvs_support.basedir}/plugins/cvs2/lib/maverick-sftp.jar"/>
+    <pathelement location="${module.cvs_support.basedir}/plugins/cvs2/lib/sshtools-net.jar"/>
+    <pathelement location="${module.cvs_support.basedir}/plugins/cvs2/lib/sshtools-cipher.jar"/>
+    <pathelement location="${module.cvs_support.basedir}/plugins/cvs2/lib/maverick.jar"/>
+    <pathelement location="${module.cvs_support.basedir}/plugins/cvs2/lib/sshtools-scp.jar"/>
+    <pathelement location="${module.cvs_support.basedir}/plugins/cvs2/lib/sshtools-sftp.jar"/>
+    <pathelement location="${module.cvs_support.basedir}/plugins/cvs2/lib/sshtools-util.jar"/>
+    <pathelement location="${module.cvs_support.basedir}/plugins/cvs2/lib/sshtools-publickey.jar"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.cvs_support"/>
+  
+  <patternset id="excluded.from.compilation.cvs_support">
+    <patternset refid="excluded.from.module.cvs_support"/>
+    <patternset refid="compiler.excluded"/>
+  </patternset>
+  
+  <path id="cvs_support.module.sourcepath">
+    <dirset dir="${module.cvs_support.basedir}/plugins/cvs2">
+      <include name="javacvs-src"/>
+      <include name="maverick/examples"/>
+      <include name="maverick_utils"/>
+      <include name="smartcvs-src"/>
+      <include name="source"/>
+    </dirset>
+  </path>
+  
+  <path id="cvs_support.module.test.sourcepath">
+    <dirset dir="${module.cvs_support.basedir}/plugins/cvs2">
+      <include name="testSource"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.cvs_support" depends="compile.module.cvs_support.production,compile.module.cvs_support.tests" description="compile module cvs_support"/>
+  
+  <target name="compile.module.cvs_support.production" depends="compile.module.pallada,compile.module.util,compile.module.openapi,compile.module.forms_rt" description="compile module cvs_support production classes">
+    <mkdir dir="${cvs_support.output.dir}"/>
+    <javac2 destdir="${cvs_support.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.cvs_support}/bin/javac">
+      <compilerarg line="${compiler.args.cvs_support}"/>
+      <bootclasspath refid="cvs_support.module.bootclasspath"/>
+      <classpath refid="cvs_support.module.classpath"/>
+      <src refid="cvs_support.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.cvs_support"/>
+    </javac2>
+    <copy todir="${cvs_support.output.dir}">
+      <fileset dir="${module.cvs_support.basedir}/plugins/cvs2/javacvs-src">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.cvs_support"/>
+      </fileset>
+      <fileset dir="${module.cvs_support.basedir}/plugins/cvs2/maverick/examples">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.cvs_support"/>
+      </fileset>
+      <fileset dir="${module.cvs_support.basedir}/plugins/cvs2/maverick_utils">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.cvs_support"/>
+      </fileset>
+      <fileset dir="${module.cvs_support.basedir}/plugins/cvs2/smartcvs-src">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.cvs_support"/>
+      </fileset>
+      <fileset dir="${module.cvs_support.basedir}/plugins/cvs2/source">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.cvs_support"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.cvs_support.tests" depends="compile.module.cvs_support.production" description="compile module cvs_support test classes" unless="skip.tests">
+    <mkdir dir="${cvs_support.testoutput.dir}"/>
+    <javac2 destdir="${cvs_support.testoutput.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.cvs_support}/bin/javac">
+      <compilerarg line="${compiler.args.cvs_support}"/>
+      <classpath refid="cvs_support.module.classpath"/>
+      <classpath location="${cvs_support.output.dir}"/>
+      <src refid="cvs_support.module.test.sourcepath"/>
+      <patternset refid="excluded.from.compilation.cvs_support"/>
+    </javac2>
+    <copy todir="${cvs_support.testoutput.dir}">
+      <fileset dir="${module.cvs_support.basedir}/plugins/cvs2/testSource">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.cvs_support"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="clean.module.cvs_support" description="cleanup module">
+    <delete dir="${cvs_support.output.dir}"/>
+    <delete dir="${cvs_support.testoutput.dir}"/>
+  </target>
+  
+  
+  <dirname property="module.license_server.basedir" file="${ant.file}"/>
+  
+  
+  <property name="module.jdk.home.license_server" value="${project.jdk.home}"/>
+  <property name="module.jdk.classpath.license_server" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.license_server" value="${compiler.args}"/>
+  
+  <property name="license_server.output.dir" value="${module.license_server.basedir}/licenseServer/classes"/>
+  <property name="license_server.testoutput.dir" value="${module.license_server.basedir}/licenseServer/testClasses"/>
+  
+  <path id="license_server.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="license_server.module.classpath">
+    <path refid="${module.jdk.classpath.license_server}"/>
+    <pathelement location="${license_common.output.dir}"/>
+    <pathelement location="${license_common.testoutput.dir}"/>
+    <path refid="library.jdom.classpath"/>
+    <path refid="library.junit.classpath"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.license_server"/>
+  
+  <patternset id="excluded.from.compilation.license_server">
+    <patternset refid="excluded.from.module.license_server"/>
+    <patternset refid="compiler.excluded"/>
+  </patternset>
+  
+  <path id="license_server.module.sourcepath">
+    <dirset dir="${module.license_server.basedir}/licenseServer">
+      <include name="source"/>
+    </dirset>
+  </path>
+  
+  <path id="license_server.module.test.sourcepath">
+    <dirset dir="${module.license_server.basedir}/licenseServer">
+      <include name="testSource"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.license_server" depends="compile.module.license_server.production,compile.module.license_server.tests" description="compile module license_server"/>
+  
+  <target name="compile.module.license_server.production" depends="compile.module.license_common" description="compile module license_server production classes">
+    <mkdir dir="${license_server.output.dir}"/>
+    <javac2 destdir="${license_server.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.license_server}/bin/javac">
+      <compilerarg line="${compiler.args.license_server}"/>
+      <bootclasspath refid="license_server.module.bootclasspath"/>
+      <classpath refid="license_server.module.classpath"/>
+      <src refid="license_server.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.license_server"/>
+    </javac2>
+    <copy todir="${license_server.output.dir}">
+      <fileset dir="${module.license_server.basedir}/licenseServer/source">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.license_server"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.license_server.tests" depends="compile.module.license_server.production" description="compile module license_server test classes" unless="skip.tests">
+    <mkdir dir="${license_server.testoutput.dir}"/>
+    <javac2 destdir="${license_server.testoutput.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" fork="true" executable="${module.jdk.home.license_server}/bin/javac">
+      <compilerarg line="${compiler.args.license_server}"/>
+      <classpath refid="license_server.module.classpath"/>
+      <classpath location="${license_server.output.dir}"/>
+      <src refid="license_server.module.test.sourcepath"/>
+      <patternset refid="excluded.from.compilation.license_server"/>
+    </javac2>
+    <copy todir="${license_server.testoutput.dir}">
+      <fileset dir="${module.license_server.basedir}/licenseServer/testSource">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+        <patternset refid="excluded.from.compilation.license_server"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="clean.module.license_server" description="cleanup module">
+    <delete dir="${license_server.output.dir}"/>
+    <delete dir="${license_server.testoutput.dir}"/>
+  </target>
+  
+  
+  <dirname property="module.main.basedir" file="${ant.file}"/>
+  
+  
+  <property name="module.jdk.home.main" value="${project.jdk.home}"/>
+  <property name="module.jdk.classpath.main" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.main" value="${compiler.args}"/>
+  
+  <property name="main.output.dir" value="undefined"/>
+  <property name="main.testoutput.dir" value="undefined"/>
+  
+  <path id="main.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="main.module.classpath">
+    <path refid="library.generic_collections.classpath"/>
+    <path refid="${module.jdk.classpath.main}"/>
+    <pathelement location="${pallada.output.dir}"/>
+    <pathelement location="${pallada.testoutput.dir}"/>
+    <pathelement location="${cvs_support.output.dir}"/>
+    <pathelement location="${cvs_support.testoutput.dir}"/>
+    <pathelement location="${forms_rt.output.dir}"/>
+    <pathelement location="${idea_rt.output.dir}"/>
+    <pathelement location="${jasper2.output.dir}"/>
+    <pathelement location="${javac2.output.dir}"/>
+    <pathelement location="${jsr45debug.output.dir}"/>
+    <pathelement location="${jsr45debug.testoutput.dir}"/>
+    <pathelement location="${license_common.output.dir}"/>
+    <pathelement location="${license_common.testoutput.dir}"/>
+    <pathelement location="${license_server.output.dir}"/>
+    <pathelement location="${license_server.testoutput.dir}"/>
+    <pathelement location="${openapi.output.dir}"/>
+    <pathelement location="${parsergen.output.dir}"/>
+    <pathelement location="${parsergen.testoutput.dir}"/>
+    <pathelement location="${starteamintegration.output.dir}"/>
+    <pathelement location="${structuralsearch.output.dir}"/>
+    <pathelement location="${structuralsearch.testoutput.dir}"/>
+    <pathelement location="${tomcatintegration.output.dir}"/>
+    <pathelement location="${tomcatintegration.testoutput.dir}"/>
+    <pathelement location="${uidesignercore.output.dir}"/>
+    <pathelement location="${uidesignercore.testoutput.dir}"/>
+    <pathelement location="${util.output.dir}"/>
+    <pathelement location="${weblogic.output.dir}"/>
+    <pathelement location="${inspectiongadgetsplugin.output.dir}"/>
+    <pathelement location="${intentionpowerpackplugin.output.dir}"/>
+    <pathelement location="${icons.output.dir}"/>
+    <pathelement location="${internalplugins.output.dir}"/>
+    <pathelement location="${internalplugins.testoutput.dir}"/>
+    <pathelement location="${internalresources.output.dir}"/>
+    <pathelement location="${resources.output.dir}"/>
+    <pathelement location="${samples.output.dir}"/>
+    <pathelement location="${weblogicwrapper.output.dir}"/>
+    <pathelement location="${weblogicwrapperimpl.output.dir}"/>
+    <path refid="library.junit.classpath"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.main"/>
+  
+  <patternset id="excluded.from.compilation.main">
+    <patternset refid="excluded.from.module.main"/>
+    <patternset refid="compiler.excluded"/>
+  </patternset>
+  
+  
+  <target name="compile.module.main" depends="compile.module.main.production,compile.module.main.tests" description="compile module main"/>
+  
+  <target name="compile.module.main.production" depends="compile.module.pallada,compile.module.cvs_support,compile.module.forms_rt,compile.module.idea_rt,compile.module.jasper2,compile.module.javac2,compile.module.jsr45debug,compile.module.license_common,compile.module.license_server,compile.module.openapi,compile.module.parsergen,compile.module.starteamintegration,compile.module.structuralsearch,compile.module.tomcatintegration,compile.module.uidesignercore,compile.module.util,compile.module.weblogic,compile.module.inspectiongadgetsplugin,compile.module.intentionpowerpackplugin,compile.module.icons,compile.module.internalplugins,compile.module.internalresources,compile.module.resources,compile.module.samples,compile.module.weblogicwrapper,compile.module.weblogicwrapperimpl" description="compile module main production classes"/>
+  
+  <target name="compile.module.main.tests" depends="compile.module.main.production" description="compile module main test classes" unless="skip.tests"/>
+  
+  <target name="clean.module.main" description="cleanup module">
+    <delete dir="${main.output.dir}"/>
+    <delete dir="${main.testoutput.dir}"/>
+  </target>
+  
+  <target name="init" description="Build initialization">
+    <!-- Perform any build initialization in this target -->
+  </target>
+  
+  <target name="clean" depends="clean.module.license_server, clean.module.cc_special, clean.module.openapi, clean.module.tomcatintegration, clean.module.jasper2, clean.module.cvs_support, clean.module.weblogic, clean.module.parsergen, clean.module.weblogicwrapperimpl, clean.module.icons, clean.module.jsr45debug, clean.module.intentionpowerpackplugin, clean.module.internalplugins, clean.module.starteamintegration, clean.module.license_common, clean.module.inspectiongadgetsplugin, clean.module.javac2, clean.module.forms_rt, clean.module.structuralsearch, clean.module.internalresources, clean.module.util, clean.module.samples, clean.module.weblogictests, clean.module.resources, clean.module.idea_rt, clean.module.uidesignercore, clean.module.pallada, clean.module.weblogicwrapper, clean.module.main" description="cleanup all"/>
+  
+  <target name="all" depends="init, clean, compile.module.internalresources, compile.module.forms_rt, compile.module.uidesignercore, compile.module.javac2, compile.module.idea_rt, compile.module.weblogicwrapper, compile.module.weblogicwrapperimpl, compile.module.resources, compile.module.util, compile.module.parsergen, compile.module.openapi, compile.module.weblogic, compile.module.jsr45debug, compile.module.tomcatintegration, compile.module.starteamintegration, compile.module.samples, compile.module.inspectiongadgetsplugin, compile.module.intentionpowerpackplugin, compile.module.icons, compile.module.jasper2, compile.module.license_common, compile.module.pallada, compile.module.weblogictests, compile.module.internalplugins, compile.module.structuralsearch, compile.module.cc_special, compile.module.cvs_support, compile.module.license_server, compile.module.main" description="build all"/>
+</project>
\ No newline at end of file
diff --git a/xml/tests/testData/psi/performance2.xml b/xml/tests/testData/psi/performance2.xml
new file mode 100644
index 000000000000..ce115f8a459d
--- /dev/null
+++ b/xml/tests/testData/psi/performance2.xml
@@ -0,0 +1,7931 @@
+<root type="com.ubsw.eq.dm.mercury.app.MercurySpec">
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+    </entries>
+  </_xmlProperties>
+</root>
diff --git a/xml/tests/testData/psi/test1.xml b/xml/tests/testData/psi/test1.xml
new file mode 100644
index 000000000000..9003851c7a50
--- /dev/null
+++ b/xml/tests/testData/psi/test1.xml
@@ -0,0 +1,145 @@
+<root type="com.ubsw.eq.dm.mercury.app.MercurySpec">
+  <_xmlProperties type="java.util.HashMap">
+    <entries type="com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]">
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">DSApplication</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Mercury</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">DSEnvironment</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Mercury/ExtIDCleanUp</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">DSLocation</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">london</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">DSLanguage</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Java</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">outputOperationList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">Objects_InTransaction</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">Commit</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">LogFolder</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReportFileDir</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludedInstrumentListPath</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeRefSymList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ExcludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">?:AUTO-NonMarking</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">IncludeMarkingRunList</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve"></value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InsertDataFromEDS</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">True</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">InstrumentType</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">com.swissbank.eq.foundation.instruments.Stock</value>
+        </value>
+      </element>
+
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">ReadDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+      <element>
+        <key type="java.lang.String">
+          <value type="string" xml:space="preserve">WriteDataSource</value>
+        </key>
+        <value type="java.lang.String">
+          <value type="string" xml:space="preserve">eq=syb/schi6083dsy.chi.swissbank.com/9997/grCBEuro_EnA/grAppUser/a1rf0rce</value>
+        </value>
+      </element>
+
+
+    </entries>
+  </_xmlProperties>
+</root>
diff --git a/xml/tests/testData/psi/testAttlist1.txt b/xml/tests/testData/psi/testAttlist1.txt
new file mode 100644
index 000000000000..04ec4f6910d8
--- /dev/null
+++ b/xml/tests/testData/psi/testAttlist1.txt
@@ -0,0 +1,23 @@
+XmlFile:test.dtd
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    PsiElement(XML_ATTLIST_DECL)
+      XmlToken:XML_ATTLIST_DECL_START('<!ATTLIST')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('termdef')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE_DECL)
+        XmlToken:XML_NAME('id')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('ID')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_ATT_REQUIRED('#REQUIRED')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE_DECL)
+        XmlToken:XML_NAME('name')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('CDATA')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_ATT_IMPLIED('#IMPLIED')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testAttlist2.txt b/xml/tests/testData/psi/testAttlist2.txt
new file mode 100644
index 000000000000..10d0e2875456
--- /dev/null
+++ b/xml/tests/testData/psi/testAttlist2.txt
@@ -0,0 +1,26 @@
+XmlFile:test.dtd
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    PsiElement(XML_ATTLIST_DECL)
+      XmlToken:XML_ATTLIST_DECL_START('<!ATTLIST')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('termdef')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE_DECL)
+        XmlToken:XML_NAME('type')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ENUMERATED_TYPE)
+          XmlToken:XML_LEFT_PAREN('(')
+          XmlToken:XML_NAME('bullets')
+          XmlToken:XML_BAR('|')
+          XmlToken:XML_NAME('ordered')
+          XmlToken:XML_BAR('|')
+          XmlToken:XML_NAME('glossary')
+          XmlToken:XML_RIGHT_PAREN(')')
+        PsiWhiteSpace('  ')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('ordered')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testAttlist3.txt b/xml/tests/testData/psi/testAttlist3.txt
new file mode 100644
index 000000000000..a89d15265376
--- /dev/null
+++ b/xml/tests/testData/psi/testAttlist3.txt
@@ -0,0 +1,21 @@
+XmlFile:test.dtd
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    PsiElement(XML_ATTLIST_DECL)
+      XmlToken:XML_ATTLIST_DECL_START('<!ATTLIST')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('termdef')
+      PsiWhiteSpace('  ')
+      PsiElement(XML_ATTRIBUTE_DECL)
+        XmlToken:XML_NAME('method')
+        PsiWhiteSpace('  ')
+        XmlToken:XML_NAME('CDATA')
+        PsiWhiteSpace('   ')
+        XmlToken:XML_ATT_FIXED('#FIXED')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('POST')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testAttlist4.txt b/xml/tests/testData/psi/testAttlist4.txt
new file mode 100644
index 000000000000..7aed212314e1
--- /dev/null
+++ b/xml/tests/testData/psi/testAttlist4.txt
@@ -0,0 +1,20 @@
+XmlFile:test.dtd
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    PsiElement(XML_ATTLIST_DECL)
+      XmlToken:XML_ATTLIST_DECL_START('<!ATTLIST')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('termdef')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE_DECL)
+        XmlToken:XML_NAME('default-charset')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ENTITY_REF)
+          XmlToken:XML_ENTITY_REF_TOKEN('%CHARSET;')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('iso-8859-1')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testAttributes1.txt b/xml/tests/testData/psi/testAttributes1.txt
new file mode 100644
index 000000000000..eab9943e0ce3
--- /dev/null
+++ b/xml/tests/testData/psi/testAttributes1.txt
@@ -0,0 +1,27 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE)
+        XmlToken:XML_NAME('att1')
+        XmlToken:XML_EQ('=')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER(''')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('val1')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER(''')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE)
+        XmlToken:XML_NAME('att2')
+        XmlToken:XML_EQ('=')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('val2')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+      XmlToken:XML_TAG_END('>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testAttributes2.txt b/xml/tests/testData/psi/testAttributes2.txt
new file mode 100644
index 000000000000..3d9e35c1fca9
--- /dev/null
+++ b/xml/tests/testData/psi/testAttributes2.txt
@@ -0,0 +1,30 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlTag:b
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('b')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('c')
+          XmlToken:XML_EQ('=')
+          PsiElement(XML_ATTRIBUTE_VALUE)
+            XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+            XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace(' ')
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace(' ')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testAttributes3.txt b/xml/tests/testData/psi/testAttributes3.txt
new file mode 100644
index 000000000000..7697a9902dc6
--- /dev/null
+++ b/xml/tests/testData/psi/testAttributes3.txt
@@ -0,0 +1,31 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlTag:b
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('b')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('c')
+          XmlToken:XML_EQ('=')
+          PsiElement(XML_ATTRIBUTE_VALUE)
+            XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+            XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('a, b, c')
+            XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace(' ')
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace(' ')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testAttributes4.txt b/xml/tests/testData/psi/testAttributes4.txt
new file mode 100644
index 000000000000..96095b9924b7
--- /dev/null
+++ b/xml/tests/testData/psi/testAttributes4.txt
@@ -0,0 +1,31 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlTag:b
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('b')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('c')
+          XmlToken:XML_EQ('=')
+          PsiElement(XML_ATTRIBUTE_VALUE)
+            XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+            XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('a  b')
+            XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace(' ')
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace(' ')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testAttributes5.txt b/xml/tests/testData/psi/testAttributes5.txt
new file mode 100644
index 000000000000..0f477d685707
--- /dev/null
+++ b/xml/tests/testData/psi/testAttributes5.txt
@@ -0,0 +1,37 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlTag:b
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('b')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('c')
+          XmlToken:XML_EQ('=')
+          PsiElement(XML_ATTRIBUTE_VALUE)
+            XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+            XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('a')
+            XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('d')
+          XmlToken:XML_EQ('=')
+          PsiElement(XML_ATTRIBUTE_VALUE)
+            XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+            XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace(' ')
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace(' ')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testCdata1.txt b/xml/tests/testData/psi/testCdata1.txt
new file mode 100644
index 000000000000..cb1f5b7da2dd
--- /dev/null
+++ b/xml/tests/testData/psi/testCdata1.txt
@@ -0,0 +1,16 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiElement(XML_CDATA)
+          XmlToken:XML_CDATA_START('<![CDATA[')
+          XmlToken:XML_DATA_CHARACTERS('<greeting>Hello, world!</greeting>')
+          XmlToken:XML_CDATA_END(']]>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testCdata2.txt b/xml/tests/testData/psi/testCdata2.txt
new file mode 100644
index 000000000000..ea41da77375a
--- /dev/null
+++ b/xml/tests/testData/psi/testCdata2.txt
@@ -0,0 +1,16 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiElement(XML_CDATA)
+          XmlToken:XML_CDATA_START('<![CDATA[')
+          XmlToken:XML_DATA_CHARACTERS('someData <!--</greeting>--> more data')
+          XmlToken:XML_CDATA_END(']]>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testCharRef1.txt b/xml/tests/testData/psi/testCharRef1.txt
new file mode 100644
index 000000000000..7204f58e4dc0
--- /dev/null
+++ b/xml/tests/testData/psi/testCharRef1.txt
@@ -0,0 +1,13 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlText
+        XmlToken:XML_CHAR_ENTITY_REF('&#123;')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testCharRef2.txt b/xml/tests/testData/psi/testCharRef2.txt
new file mode 100644
index 000000000000..5844bc3e8564
--- /dev/null
+++ b/xml/tests/testData/psi/testCharRef2.txt
@@ -0,0 +1,13 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlText
+        XmlToken:XML_CHAR_ENTITY_REF('&#x123;')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testCharRef3.txt b/xml/tests/testData/psi/testCharRef3.txt
new file mode 100644
index 000000000000..b0bd39ddff05
--- /dev/null
+++ b/xml/tests/testData/psi/testCharRef3.txt
@@ -0,0 +1,9 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    PsiErrorElement:Top level element is not completed
+      XmlToken:XML_CHAR_ENTITY_REF('&#123;')
+    XmlTag:
+      PsiErrorElement:Valid XML document must have a root tag
+        <empty list>
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testCharRef4.txt b/xml/tests/testData/psi/testCharRef4.txt
new file mode 100644
index 000000000000..213207c91cf3
--- /dev/null
+++ b/xml/tests/testData/psi/testCharRef4.txt
@@ -0,0 +1,9 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    PsiErrorElement:Top level element is not completed
+      XmlToken:XML_CHAR_ENTITY_REF('&#xaBcD123;')
+    XmlTag:
+      PsiErrorElement:Valid XML document must have a root tag
+        <empty list>
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testCharRef5.txt b/xml/tests/testData/psi/testCharRef5.txt
new file mode 100644
index 000000000000..0e10d132d038
--- /dev/null
+++ b/xml/tests/testData/psi/testCharRef5.txt
@@ -0,0 +1,17 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE)
+        XmlToken:XML_NAME('attr')
+        XmlToken:XML_EQ('=')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('abc')
+          XmlToken:XML_CHAR_ENTITY_REF('&#123;')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+      XmlToken:XML_EMPTY_ELEMENT_END('/>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testCharacters1.txt b/xml/tests/testData/psi/testCharacters1.txt
new file mode 100644
index 000000000000..f83325c9ff79
--- /dev/null
+++ b/xml/tests/testData/psi/testCharacters1.txt
@@ -0,0 +1,15 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlText
+        XmlToken:XML_DATA_CHARACTERS('someChar')
+        PsiWhiteSpace('\n')
+        XmlToken:XML_DATA_CHARACTERS('Data')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testComment1.txt b/xml/tests/testData/psi/testComment1.txt
new file mode 100644
index 000000000000..c41382d11fd0
--- /dev/null
+++ b/xml/tests/testData/psi/testComment1.txt
@@ -0,0 +1,11 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_COMMENT)
+      XmlToken:XML_COMMENT_START('<!--')
+      XmlToken:XML_COMMENT_CHARACTERS(' declarations for <head> & <body> ')
+      XmlToken:XML_COMMENT_END('-->')
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:
+      PsiErrorElement:Valid XML document must have a root tag
+        <empty list>
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testComment2.txt b/xml/tests/testData/psi/testComment2.txt
new file mode 100644
index 000000000000..e44ec781fcef
--- /dev/null
+++ b/xml/tests/testData/psi/testComment2.txt
@@ -0,0 +1,32 @@
+XmlFile:test.dtd
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    PsiElement(XML_ELEMENT_DECL)
+      XmlToken:XML_ELEMENT_DECL_START('<!ELEMENT')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('data-sources')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ELEMENT_CONTENT_SPEC)
+        PsiElement(XML_ELEMENT_CONTENT_GROUP)
+          XmlToken:XML_LEFT_PAREN('(')
+          XmlToken:XML_PCDATA('#PCDATA')
+          XmlToken:XML_RIGHT_PAREN(')')
+      XmlToken:XML_TAG_END('>')
+    PsiWhiteSpace(' ')
+    PsiElement(XML_COMMENT)
+      XmlToken:XML_COMMENT_START('<!--')
+      XmlToken:XML_COMMENT_CHARACTERS(' abc ')
+      XmlToken:XML_COMMENT_END('-->')
+    PsiWhiteSpace(' ')
+    PsiElement(XML_ATTLIST_DECL)
+      XmlToken:XML_ATTLIST_DECL_START('<!ATTLIST')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('data-sources')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE_DECL)
+        XmlToken:XML_NAME('path')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('CDATA')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_ATT_IMPLIED('#IMPLIED')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testComment3.txt b/xml/tests/testData/psi/testComment3.txt
new file mode 100644
index 000000000000..774d308d4fc7
--- /dev/null
+++ b/xml/tests/testData/psi/testComment3.txt
@@ -0,0 +1,15 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      PsiElement(XML_COMMENT)
+        XmlToken:XML_COMMENT_START('<!--')
+        XmlToken:XML_COMMENT_CHARACTERS('<b>')
+        XmlToken:XML_COMMENT_END('-->')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testConditionalSection1.txt b/xml/tests/testData/psi/testConditionalSection1.txt
new file mode 100644
index 000000000000..3d5383765779
--- /dev/null
+++ b/xml/tests/testData/psi/testConditionalSection1.txt
@@ -0,0 +1,21 @@
+XmlFile:test.dtd
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    PsiElement(XML_CONDITIONAL_SECTION)
+      XmlToken:XML_CONDITIONAL_SECTION_START('<![')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_CONDITIONAL_INCLUDE('INCLUDE')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_MARKUP_START('[')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ELEMENT_DECL)
+        XmlToken:XML_ELEMENT_DECL_START('<!ELEMENT')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('data-sources')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ELEMENT_CONTENT_SPEC)
+          XmlToken:XML_CONTENT_ANY('ANY')
+        XmlToken:XML_TAG_END('>')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_CONDITIONAL_SECTION_END(']]>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testConditionalSection2.txt b/xml/tests/testData/psi/testConditionalSection2.txt
new file mode 100644
index 000000000000..ad6c661308c2
--- /dev/null
+++ b/xml/tests/testData/psi/testConditionalSection2.txt
@@ -0,0 +1,33 @@
+XmlFile:test.dtd
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    PsiElement(XML_CONDITIONAL_SECTION)
+      XmlToken:XML_CONDITIONAL_SECTION_START('<![')
+      PsiElement(XML_ENTITY_REF)
+        XmlToken:XML_ENTITY_REF_TOKEN('%sgml.features;')
+      XmlToken:XML_MARKUP_START('[')
+      PsiWhiteSpace('\n')
+      PsiElement(XML_CONDITIONAL_SECTION)
+        XmlToken:XML_CONDITIONAL_SECTION_START('<![')
+        XmlToken:XML_CONDITIONAL_IGNORE('IGNORE')
+        XmlToken:XML_MARKUP_START('[')
+        PsiWhiteSpace('\n')
+        PsiElement(XML_ENTITY_DECL)
+          XmlToken:XML_ENTITY_DECL_START('<!ENTITY')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_PERCENT('%')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_NAME('dbgenent')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DOCTYPE_SYSTEM('SYSTEM')
+          PsiWhiteSpace(' ')
+          PsiElement(XML_ATTRIBUTE_VALUE)
+            XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+            XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('http://www.oasis-open.org/docbook/xml/configerror.txt')
+            XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+          XmlToken:XML_TAG_END('>')
+        PsiWhiteSpace('\n')
+        XmlToken:XML_CONDITIONAL_SECTION_END(']]>')
+      PsiWhiteSpace('\n')
+      XmlToken:XML_CONDITIONAL_SECTION_END(']]>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testConditionalSection3.txt b/xml/tests/testData/psi/testConditionalSection3.txt
new file mode 100644
index 000000000000..73d3cab6bfab
--- /dev/null
+++ b/xml/tests/testData/psi/testConditionalSection3.txt
@@ -0,0 +1,49 @@
+XmlFile:test.dtd
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    PsiElement(XML_ENTITY_DECL)
+      XmlToken:XML_ENTITY_DECL_START('<!ENTITY')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_PERCENT('%')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('dbhier.module')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE_VALUE)
+        XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+        XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('INCLUDE')
+        XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+      XmlToken:XML_TAG_END('>')
+    PsiWhiteSpace('\n')
+    PsiElement(XML_CONDITIONAL_SECTION)
+      XmlToken:XML_CONDITIONAL_SECTION_START('<![')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ENTITY_REF)
+        XmlToken:XML_ENTITY_REF_TOKEN('%dbhier.module;')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_MARKUP_START('[')
+      PsiWhiteSpace('\n')
+      PsiElement(XML_ENTITY_DECL)
+        XmlToken:XML_ENTITY_DECL_START('<!ENTITY')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_PERCENT('%')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('dbhier')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DOCTYPE_PUBLIC('PUBLIC')
+        PsiWhiteSpace('\n')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4//EN')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        PsiWhiteSpace('\n')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('dbhierx.mod')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        XmlToken:XML_TAG_END('>')
+      PsiWhiteSpace('\n')
+      PsiElement(XML_ENTITY_REF)
+        XmlToken:XML_ENTITY_REF_TOKEN('%dbhier;')
+      PsiWhiteSpace('\n')
+      XmlToken:XML_CONDITIONAL_SECTION_END(']]>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testContent1.txt b/xml/tests/testData/psi/testContent1.txt
new file mode 100644
index 000000000000..af7e9d7ee4aa
--- /dev/null
+++ b/xml/tests/testData/psi/testContent1.txt
@@ -0,0 +1,15 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace('   \n')
+        XmlToken:XML_DATA_CHARACTERS('xxx')
+        PsiWhiteSpace('   \n')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testDoctype1.txt b/xml/tests/testData/psi/testDoctype1.txt
new file mode 100644
index 000000000000..4987170d4210
--- /dev/null
+++ b/xml/tests/testData/psi/testDoctype1.txt
@@ -0,0 +1,15 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      PsiElement(XML_DOCTYPE)
+        XmlToken:XML_DOCTYPE_START('<!DOCTYPE')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('greeting')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DOCTYPE_SYSTEM('SYSTEM')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('"hello.dtd"')
+        XmlToken:XML_DOCTYPE_END('>')
+    XmlTag:
+      PsiErrorElement:Valid XML document must have a root tag
+        <empty list>
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testDoctype2.txt b/xml/tests/testData/psi/testDoctype2.txt
new file mode 100644
index 000000000000..bede324d2baf
--- /dev/null
+++ b/xml/tests/testData/psi/testDoctype2.txt
@@ -0,0 +1,17 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      PsiElement(XML_DOCTYPE)
+        XmlToken:XML_DOCTYPE_START('<!DOCTYPE')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('toc')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DOCTYPE_PUBLIC('PUBLIC')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('"-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 1.0//EN"')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('"http://java.sun.com/products/javahelp/toc_1_0.dtd"')
+        XmlToken:XML_DOCTYPE_END('>')
+    XmlTag:
+      PsiErrorElement:Valid XML document must have a root tag
+        <empty list>
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testDoctype3.txt b/xml/tests/testData/psi/testDoctype3.txt
new file mode 100644
index 000000000000..07484c68fe8d
--- /dev/null
+++ b/xml/tests/testData/psi/testDoctype3.txt
@@ -0,0 +1,26 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      PsiElement(XML_DOCTYPE)
+        XmlToken:XML_DOCTYPE_START('<!DOCTYPE')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('greeting')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_MARKUP_DECL)
+          XmlToken:XML_MARKUP_START('[')
+          PsiElement(XML_ELEMENT_DECL)
+            XmlToken:XML_ELEMENT_DECL_START('<!ELEMENT')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_NAME('greeting')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ELEMENT_CONTENT_SPEC)
+              PsiElement(XML_ELEMENT_CONTENT_GROUP)
+                XmlToken:XML_LEFT_PAREN('(')
+                XmlToken:XML_PCDATA('#PCDATA')
+                XmlToken:XML_RIGHT_PAREN(')')
+            XmlToken:XML_TAG_END('>')
+          XmlToken:XML_MARKUP_END(']')
+        XmlToken:XML_DOCTYPE_END('>')
+    XmlTag:
+      PsiErrorElement:Valid XML document must have a root tag
+        <empty list>
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testDoctype4.txt b/xml/tests/testData/psi/testDoctype4.txt
new file mode 100644
index 000000000000..781699f7c40a
--- /dev/null
+++ b/xml/tests/testData/psi/testDoctype4.txt
@@ -0,0 +1,23 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      PsiElement(XML_DOCTYPE)
+        XmlToken:XML_DOCTYPE_START('<!DOCTYPE')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('greeting')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_MARKUP_DECL)
+          XmlToken:XML_MARKUP_START('[')
+          PsiElement(XML_ELEMENT_DECL)
+            XmlToken:XML_ELEMENT_DECL_START('<!ELEMENT')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_NAME('br')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ELEMENT_CONTENT_SPEC)
+              XmlToken:XML_CONTENT_EMPTY('EMPTY')
+            XmlToken:XML_TAG_END('>')
+          XmlToken:XML_MARKUP_END(']')
+        XmlToken:XML_DOCTYPE_END('>')
+    XmlTag:
+      PsiErrorElement:Valid XML document must have a root tag
+        <empty list>
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testDoctype5.txt b/xml/tests/testData/psi/testDoctype5.txt
new file mode 100644
index 000000000000..5872e1ce23fe
--- /dev/null
+++ b/xml/tests/testData/psi/testDoctype5.txt
@@ -0,0 +1,37 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      PsiElement(XML_DOCTYPE)
+        XmlToken:XML_DOCTYPE_START('<!DOCTYPE')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('greeting')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_MARKUP_DECL)
+          XmlToken:XML_MARKUP_START('[')
+          PsiElement(XML_ELEMENT_DECL)
+            XmlToken:XML_ELEMENT_DECL_START('<!ELEMENT')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_NAME('p')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ELEMENT_CONTENT_SPEC)
+              PsiElement(XML_ELEMENT_CONTENT_GROUP)
+                XmlToken:XML_LEFT_PAREN('(')
+                XmlToken:XML_PCDATA('#PCDATA')
+                XmlToken:XML_BAR('|')
+                XmlToken:XML_NAME('a')
+                XmlToken:XML_BAR('|')
+                XmlToken:XML_NAME('ul')
+                XmlToken:XML_BAR('|')
+                XmlToken:XML_NAME('b')
+                XmlToken:XML_BAR('|')
+                XmlToken:XML_NAME('i')
+                XmlToken:XML_BAR('|')
+                XmlToken:XML_NAME('em')
+                XmlToken:XML_RIGHT_PAREN(')')
+              XmlToken:XML_STAR('*')
+            XmlToken:XML_TAG_END('>')
+          XmlToken:XML_MARKUP_END(']')
+        XmlToken:XML_DOCTYPE_END('>')
+    XmlTag:
+      PsiErrorElement:Valid XML document must have a root tag
+        <empty list>
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testDoctype6.txt b/xml/tests/testData/psi/testDoctype6.txt
new file mode 100644
index 000000000000..faa84583b568
--- /dev/null
+++ b/xml/tests/testData/psi/testDoctype6.txt
@@ -0,0 +1,26 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      PsiElement(XML_DOCTYPE)
+        XmlToken:XML_DOCTYPE_START('<!DOCTYPE')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('greeting')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_MARKUP_DECL)
+          XmlToken:XML_MARKUP_START('[')
+          PsiElement(XML_ELEMENT_DECL)
+            XmlToken:XML_ELEMENT_DECL_START('<!ELEMENT')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ENTITY_REF)
+              XmlToken:XML_ENTITY_REF_TOKEN('%name.para;')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ELEMENT_CONTENT_SPEC)
+              PsiElement(XML_ENTITY_REF)
+                XmlToken:XML_ENTITY_REF_TOKEN('%content.para;')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_TAG_END('>')
+          XmlToken:XML_MARKUP_END(']')
+        XmlToken:XML_DOCTYPE_END('>')
+    XmlTag:
+      PsiErrorElement:Valid XML document must have a root tag
+        <empty list>
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testDoctype7.txt b/xml/tests/testData/psi/testDoctype7.txt
new file mode 100644
index 000000000000..af964966bbfd
--- /dev/null
+++ b/xml/tests/testData/psi/testDoctype7.txt
@@ -0,0 +1,38 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      PsiElement(XML_PROCESSING_INSTRUCTION)
+        XmlToken:XML_PI_START('<?')
+        XmlToken:XML_NAME('xml')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('version')
+        XmlToken:XML_EQ('=')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER(''')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('1.0')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER(''')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('encoding')
+        XmlToken:XML_EQ('=')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER(''')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('ISO-8859-1')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER(''')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_PI_END('?>')
+      PsiElement(XML_DOCTYPE)
+        XmlToken:XML_DOCTYPE_START('<!DOCTYPE')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('toc')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DOCTYPE_SYSTEM('SYSTEM')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_ATTRIBUTE_VALUE_TOKEN(''dtds/ejb-jar_2_0.dtd'')
+        XmlToken:XML_DOCTYPE_END('>')
+    XmlTag:test
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('test')
+      XmlToken:XML_TAG_END('>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('test')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testDtd1.txt b/xml/tests/testData/psi/testDtd1.txt
new file mode 100644
index 000000000000..1506a7a656a5
--- /dev/null
+++ b/xml/tests/testData/psi/testDtd1.txt
@@ -0,0 +1,28 @@
+XmlFile:test.dtd
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    PsiElement(XML_ELEMENT_DECL)
+      XmlToken:XML_ELEMENT_DECL_START('<!ELEMENT')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('data-sources')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ELEMENT_CONTENT_SPEC)
+        PsiElement(XML_ELEMENT_CONTENT_GROUP)
+          XmlToken:XML_LEFT_PAREN('(')
+          XmlToken:XML_PCDATA('#PCDATA')
+          XmlToken:XML_RIGHT_PAREN(')')
+      XmlToken:XML_TAG_END('>')
+    PsiWhiteSpace(' ')
+    PsiElement(XML_ATTLIST_DECL)
+      XmlToken:XML_ATTLIST_DECL_START('<!ATTLIST')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('data-sources')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE_DECL)
+        XmlToken:XML_NAME('path')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('CDATA')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_ATT_IMPLIED('#IMPLIED')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testEditing1.txt b/xml/tests/testData/psi/testEditing1.txt
new file mode 100644
index 000000000000..b59606a7da35
--- /dev/null
+++ b/xml/tests/testData/psi/testEditing1.txt
@@ -0,0 +1,16 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:
+      XmlToken:XML_START_TAG_START('<')
+      PsiErrorElement:Tag name expected
+        <empty list>
+    XmlTag:a
+      PsiErrorElement:Multiple root tags
+        XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testEditing2.txt b/xml/tests/testData/psi/testEditing2.txt
new file mode 100644
index 000000000000..4515e58446f7
--- /dev/null
+++ b/xml/tests/testData/psi/testEditing2.txt
@@ -0,0 +1,26 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlTag:b
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_EMPTY_ELEMENT_END('/>')
+      XmlText
+        PsiWhiteSpace(' ')
+      XmlTag:
+        XmlToken:XML_START_TAG_START('<')
+        PsiErrorElement:Tag name expected
+          <empty list>
+      PsiWhiteSpace(' ')
+      XmlTag:c
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('c')
+        XmlToken:XML_EMPTY_ELEMENT_END('/>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testEditing3.txt b/xml/tests/testData/psi/testEditing3.txt
new file mode 100644
index 000000000000..0a25d4914ee4
--- /dev/null
+++ b/xml/tests/testData/psi/testEditing3.txt
@@ -0,0 +1,21 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlTag:b
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('b')
+        PsiErrorElement:Tag start is not closed
+          <empty list>
+      PsiWhiteSpace(' ')
+      XmlTag:c
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('c')
+        XmlToken:XML_EMPTY_ELEMENT_END('/>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testEditing4.txt b/xml/tests/testData/psi/testEditing4.txt
new file mode 100644
index 000000000000..e52d634ee338
--- /dev/null
+++ b/xml/tests/testData/psi/testEditing4.txt
@@ -0,0 +1,26 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlTag:b
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_TAG_END('>')
+        PsiErrorElement:Element b is not closed
+          <empty list>
+      XmlTag:
+        XmlToken:XML_START_TAG_START('<')
+        PsiErrorElement:Tag name expected
+          <empty list>
+      PsiWhiteSpace(' ')
+      XmlTag:c
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('c')
+        XmlToken:XML_EMPTY_ELEMENT_END('/>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testEditing5.txt b/xml/tests/testData/psi/testEditing5.txt
new file mode 100644
index 000000000000..9201db85d1ca
--- /dev/null
+++ b/xml/tests/testData/psi/testEditing5.txt
@@ -0,0 +1,23 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlTag:b
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_TAG_END('>')
+        XmlToken:XML_END_TAG_START('</')
+        PsiErrorElement:Closing tag is not done
+          <empty list>
+      PsiWhiteSpace(' ')
+      XmlTag:c
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('c')
+        XmlToken:XML_EMPTY_ELEMENT_END('/>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testEditing6.txt b/xml/tests/testData/psi/testEditing6.txt
new file mode 100644
index 000000000000..18aeb592faf7
--- /dev/null
+++ b/xml/tests/testData/psi/testEditing6.txt
@@ -0,0 +1,21 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:one
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('one')
+      XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace('     ')
+      XmlTag:two
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('two')
+        PsiErrorElement:Tag start is not closed
+          <empty list>
+      PsiWhiteSpace(' ')
+      XmlText
+        XmlToken:XML_DATA_CHARACTERS(',b"/>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('one')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testEditing7.txt b/xml/tests/testData/psi/testEditing7.txt
new file mode 100644
index 000000000000..2854e06646e3
--- /dev/null
+++ b/xml/tests/testData/psi/testEditing7.txt
@@ -0,0 +1,23 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:one
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('one')
+      XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace('     ')
+      XmlTag:two
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('two')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('a')
+          PsiErrorElement:'=' expected
+            <empty list>
+      XmlText
+        XmlToken:XML_DATA_CHARACTERS(',b"/>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('one')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testEditing8.txt b/xml/tests/testData/psi/testEditing8.txt
new file mode 100644
index 000000000000..d554d301e9fc
--- /dev/null
+++ b/xml/tests/testData/psi/testEditing8.txt
@@ -0,0 +1,29 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:one
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('one')
+      XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace('     ')
+      XmlTag:two
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('two')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('a')
+          PsiErrorElement:'=' expected
+            <empty list>
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('b')
+          XmlToken:XML_EQ('=')
+          PsiElement(XML_ATTRIBUTE_VALUE)
+            XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+            XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        XmlToken:XML_EMPTY_ELEMENT_END('/>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('one')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testEditing9.txt b/xml/tests/testData/psi/testEditing9.txt
new file mode 100644
index 000000000000..20b1016d3f7e
--- /dev/null
+++ b/xml/tests/testData/psi/testEditing9.txt
@@ -0,0 +1,42 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:one
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('one')
+      XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace(' ')
+      XmlTag:two
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('two')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('a')
+          PsiErrorElement:'=' expected
+            <empty list>
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('b')
+          XmlToken:XML_EQ('=')
+          PsiElement(XML_ATTRIBUTE_VALUE)
+            XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+            XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('ashdgjkasgd')
+          PsiWhiteSpace(' ')
+        XmlTag:aksjhdk
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('aksjhdk')
+          XmlToken:XML_TAG_END('>')
+          PsiErrorElement:Element aksjhdk is not closed
+            <empty list>
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('two')
+        XmlToken:XML_TAG_END('>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('one')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testElementDecl1.txt b/xml/tests/testData/psi/testElementDecl1.txt
new file mode 100644
index 000000000000..ad9714006c8e
--- /dev/null
+++ b/xml/tests/testData/psi/testElementDecl1.txt
@@ -0,0 +1,12 @@
+XmlFile:test.dtd
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    PsiElement(XML_ELEMENT_DECL)
+      XmlToken:XML_ELEMENT_DECL_START('<!ELEMENT')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('data-sources')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ELEMENT_CONTENT_SPEC)
+        XmlToken:XML_CONTENT_EMPTY('EMPTY')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testElementDecl2.txt b/xml/tests/testData/psi/testElementDecl2.txt
new file mode 100644
index 000000000000..bdfc6b38397d
--- /dev/null
+++ b/xml/tests/testData/psi/testElementDecl2.txt
@@ -0,0 +1,12 @@
+XmlFile:test.dtd
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    PsiElement(XML_ELEMENT_DECL)
+      XmlToken:XML_ELEMENT_DECL_START('<!ELEMENT')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('data-sources')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ELEMENT_CONTENT_SPEC)
+        XmlToken:XML_CONTENT_ANY('ANY')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testElementDeclaration.txt b/xml/tests/testData/psi/testElementDeclaration.txt
new file mode 100644
index 000000000000..ed6b23544792
--- /dev/null
+++ b/xml/tests/testData/psi/testElementDeclaration.txt
@@ -0,0 +1,61 @@
+XmlFile:test.dtd
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    PsiElement(XML_ELEMENT_DECL)
+      XmlToken:XML_ELEMENT_DECL_START('<!ELEMENT')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('xxx')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ELEMENT_CONTENT_SPEC)
+        XmlToken:XML_CONTENT_EMPTY('EMPTY')
+      XmlToken:XML_TAG_END('>')
+    PsiWhiteSpace('\n')
+    PsiElement(XML_ELEMENT_DECL)
+      XmlToken:XML_ELEMENT_DECL_START('<!ELEMENT')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('xxx2')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ELEMENT_CONTENT_SPEC)
+        XmlToken:XML_CONTENT_ANY('ANY')
+      XmlToken:XML_TAG_END('>')
+    PsiWhiteSpace('\n')
+    PsiElement(XML_ELEMENT_DECL)
+      XmlToken:XML_ELEMENT_DECL_START('<!ELEMENT')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ENTITY_REF)
+        XmlToken:XML_ENTITY_REF_TOKEN('%name.para;')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ELEMENT_CONTENT_SPEC)
+        PsiElement(XML_ENTITY_REF)
+          XmlToken:XML_ENTITY_REF_TOKEN('%content.para;')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_TAG_END('>')
+    PsiWhiteSpace('\n')
+    PsiElement(XML_ELEMENT_DECL)
+      XmlToken:XML_ELEMENT_DECL_START('<!ELEMENT')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('xxx3')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ELEMENT_CONTENT_SPEC)
+        PsiElement(XML_ELEMENT_CONTENT_GROUP)
+          XmlToken:XML_LEFT_PAREN('(')
+          XmlToken:XML_PCDATA('#PCDATA')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_BAR('|')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_NAME('a')
+          XmlToken:XML_RIGHT_PAREN(')')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_TAG_END('>')
+    PsiWhiteSpace('\n')
+    PsiElement(XML_ELEMENT_DECL)
+      XmlToken:XML_ELEMENT_DECL_START('<!ELEMENT')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('xxx4')
+      PsiErrorElement:( or entity ref or EMPTY or ANY expected
+        <empty list>
+      PsiElement(XML_ELEMENT_CONTENT_SPEC)
+        <empty list>
+      PsiWhiteSpace(' ')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testElements1.txt b/xml/tests/testData/psi/testElements1.txt
new file mode 100644
index 000000000000..dfa4b916be9e
--- /dev/null
+++ b/xml/tests/testData/psi/testElements1.txt
@@ -0,0 +1,11 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testElements2.txt b/xml/tests/testData/psi/testElements2.txt
new file mode 100644
index 000000000000..a079c6ced0f4
--- /dev/null
+++ b/xml/tests/testData/psi/testElements2.txt
@@ -0,0 +1,8 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_EMPTY_ELEMENT_END('/>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testElements3.txt b/xml/tests/testData/psi/testElements3.txt
new file mode 100644
index 000000000000..3fe37e6c5606
--- /dev/null
+++ b/xml/tests/testData/psi/testElements3.txt
@@ -0,0 +1,41 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlTag:b
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_TAG_END('>')
+        XmlTag:c
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('c')
+          XmlToken:XML_EMPTY_ELEMENT_END('/>')
+        XmlTag:d
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('d')
+          XmlToken:XML_EMPTY_ELEMENT_END('/>')
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_TAG_END('>')
+      XmlTag:e
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('e')
+        XmlToken:XML_EMPTY_ELEMENT_END('/>')
+      XmlTag:f
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('f')
+        XmlToken:XML_TAG_END('>')
+        XmlTag:g
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('g')
+          XmlToken:XML_EMPTY_ELEMENT_END('/>')
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('f')
+        XmlToken:XML_TAG_END('>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testElements4.txt b/xml/tests/testData/psi/testElements4.txt
new file mode 100644
index 000000000000..0847a11df414
--- /dev/null
+++ b/xml/tests/testData/psi/testElements4.txt
@@ -0,0 +1,43 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:project
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('project')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE)
+        XmlToken:XML_NAME('name')
+        XmlToken:XML_EQ('=')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('IDEA_ZKM')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+      XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace('\n')
+      PsiElement(XML_COMMENT)
+        XmlToken:XML_COMMENT_START('<!--')
+        XmlToken:XML_COMMENT_CHARACTERS(' set global properties for this build ')
+        XmlToken:XML_COMMENT_END('-->')
+      XmlText
+        PsiWhiteSpace('\n')
+      XmlTag:property
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('property')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('value')
+          XmlToken:XML_EQ('=')
+          PsiElement(XML_ATTRIBUTE_VALUE)
+            XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+            XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('off')
+            XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_EMPTY_ELEMENT_END('/>')
+      XmlText
+        PsiWhiteSpace('\n')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('project')
+      XmlToken:XML_TAG_END('>')
+    PsiWhiteSpace('\n')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testElements5.txt b/xml/tests/testData/psi/testElements5.txt
new file mode 100644
index 000000000000..5608e15adc20
--- /dev/null
+++ b/xml/tests/testData/psi/testElements5.txt
@@ -0,0 +1,15 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:ns1:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('ns1:a')
+      XmlToken:XML_TAG_END('>')
+      XmlTag:ns2:b
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('ns2:b')
+        XmlToken:XML_EMPTY_ELEMENT_END('/>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('ns1:a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testElements6.txt b/xml/tests/testData/psi/testElements6.txt
new file mode 100644
index 000000000000..50721a0c14d4
--- /dev/null
+++ b/xml/tests/testData/psi/testElements6.txt
@@ -0,0 +1,31 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      PsiElement(XML_DOCTYPE)
+        XmlToken:XML_DOCTYPE_START('<!DOCTYPE')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('project')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_MARKUP_DECL)
+          XmlToken:XML_MARKUP_START('[')
+          PsiElement(XML_ENTITY_DECL)
+            XmlToken:XML_ENTITY_DECL_START('<!ENTITY')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_NAME('targets')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DOCTYPE_SYSTEM('SYSTEM')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE_VALUE)
+              XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+              XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('file:../myproject/targets.xml')
+              XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+          XmlToken:XML_MARKUP_END(']')
+        XmlToken:XML_DOCTYPE_END('>')
+    XmlTag:project
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('project')
+      XmlToken:XML_TAG_END('>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('project')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testEmptyCommentParsing.txt b/xml/tests/testData/psi/testEmptyCommentParsing.txt
new file mode 100644
index 000000000000..3a009cc31afa
--- /dev/null
+++ b/xml/tests/testData/psi/testEmptyCommentParsing.txt
@@ -0,0 +1,10 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_COMMENT)
+      XmlToken:XML_COMMENT_START('<!--')
+      XmlToken:XML_COMMENT_END('-->')
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:
+      PsiErrorElement:Valid XML document must have a root tag
+        <empty list>
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testEmptyElementsInDtd.txt b/xml/tests/testData/psi/testEmptyElementsInDtd.txt
new file mode 100644
index 000000000000..b15b4a0d79b2
--- /dev/null
+++ b/xml/tests/testData/psi/testEmptyElementsInDtd.txt
@@ -0,0 +1,69 @@
+XmlFile:test.dtd
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    PsiElement(XML_ELEMENT_DECL)
+      XmlToken:XML_ELEMENT_DECL_START('<!ELEMENT')
+      PsiErrorElement:xml name expected
+        <empty list>
+    PsiWhiteSpace(' ')
+    XmlToken:XML_TAG_END('>')
+    PsiWhiteSpace('\n')
+    PsiElement(XML_ELEMENT_DECL)
+      XmlToken:XML_ELEMENT_DECL_START('<!ELEMENT')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('name')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ELEMENT_CONTENT_SPEC)
+        PsiElement(XML_ELEMENT_CONTENT_GROUP)
+          XmlToken:XML_LEFT_PAREN('(')
+          PsiErrorElement:Xml name or entity ref expected
+            <empty list>
+    XmlToken:XML_COMMA(',')
+    XmlToken:XML_RIGHT_PAREN(')')
+    PsiWhiteSpace('\n')
+    PsiElement(XML_ATTLIST_DECL)
+      XmlToken:XML_ATTLIST_DECL_START('<!ATTLIST')
+      PsiErrorElement:xml name expected
+        <empty list>
+    PsiWhiteSpace(' ')
+    XmlToken:XML_TAG_END('>')
+    PsiWhiteSpace(' ')
+    PsiElement(XML_ELEMENT_DECL)
+      XmlToken:XML_ELEMENT_DECL_START('<!ELEMENT')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('zzz')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ELEMENT_CONTENT_SPEC)
+        PsiElement(XML_ELEMENT_CONTENT_GROUP)
+          XmlToken:XML_LEFT_PAREN('(')
+          XmlToken:XML_NAME('aa')
+          XmlToken:XML_QUESTION('?')
+          XmlToken:XML_COMMA(',')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_NAME('bb')
+          XmlToken:XML_RIGHT_PAREN(')')
+        XmlToken:XML_PLUS('+')
+      XmlToken:XML_TAG_END('>')
+    PsiWhiteSpace(' ')
+    PsiElement(XML_ELEMENT_DECL)
+      XmlToken:XML_ELEMENT_DECL_START('<!ELEMENT')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('xxx')
+      PsiErrorElement:Whitespace expected
+        <empty list>
+      PsiElement(XML_ELEMENT_CONTENT_SPEC)
+        PsiElement(XML_ELEMENT_CONTENT_GROUP)
+          XmlToken:XML_LEFT_PAREN('(')
+          XmlToken:XML_NAME('aaa')
+          XmlToken:XML_COMMA(',')
+          PsiErrorElement:Xml name or entity ref expected
+            <empty list>
+          XmlToken:XML_RIGHT_PAREN(')')
+      XmlToken:XML_TAG_END('>')
+    PsiElement(XML_ATTLIST_DECL)
+      XmlToken:XML_ATTLIST_DECL_START('<!ATTLIST')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ENTITY_REF)
+        XmlToken:XML_ENTITY_REF_TOKEN('%aaa;')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testEntityDecl1.txt b/xml/tests/testData/psi/testEntityDecl1.txt
new file mode 100644
index 000000000000..f4550fdc8744
--- /dev/null
+++ b/xml/tests/testData/psi/testEntityDecl1.txt
@@ -0,0 +1,16 @@
+XmlFile:test.dtd
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    PsiElement(XML_ENTITY_DECL)
+      XmlToken:XML_ENTITY_DECL_START('<!ENTITY')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_PERCENT('%')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('types')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE_VALUE)
+        XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+        XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('fileset | patternset mapper')
+        XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testEntityDecl2.txt b/xml/tests/testData/psi/testEntityDecl2.txt
new file mode 100644
index 000000000000..26c7ddddff60
--- /dev/null
+++ b/xml/tests/testData/psi/testEntityDecl2.txt
@@ -0,0 +1,14 @@
+XmlFile:test.dtd
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    PsiElement(XML_ENTITY_DECL)
+      XmlToken:XML_ENTITY_DECL_START('<!ENTITY')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('types')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE_VALUE)
+        XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+        XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('fileset | patternset mapper')
+        XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testEntityDecl3.txt b/xml/tests/testData/psi/testEntityDecl3.txt
new file mode 100644
index 000000000000..07ab5ee1934a
--- /dev/null
+++ b/xml/tests/testData/psi/testEntityDecl3.txt
@@ -0,0 +1,16 @@
+XmlFile:test.dtd
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    PsiElement(XML_ENTITY_DECL)
+      XmlToken:XML_ENTITY_DECL_START('<!ENTITY')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('build-common')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_DOCTYPE_SYSTEM('SYSTEM')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE_VALUE)
+        XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+        XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('common.xml')
+        XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testEntityDecl4.txt b/xml/tests/testData/psi/testEntityDecl4.txt
new file mode 100644
index 000000000000..b006b650bbf2
--- /dev/null
+++ b/xml/tests/testData/psi/testEntityDecl4.txt
@@ -0,0 +1,21 @@
+XmlFile:test.dtd
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    PsiElement(XML_ENTITY_DECL)
+      XmlToken:XML_ENTITY_DECL_START('<!ENTITY')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('open-hatch')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_DOCTYPE_PUBLIC('PUBLIC')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE_VALUE)
+        XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+        XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('-//Textuality//TEXT Standard open-hatch boilerplate//EN')
+        XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE_VALUE)
+        XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+        XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('http://www.textuality.com/boilerplate/OpenHatch.xml')
+        XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testEntityDeclaration.txt b/xml/tests/testData/psi/testEntityDeclaration.txt
new file mode 100644
index 000000000000..e8b81a6e4c48
--- /dev/null
+++ b/xml/tests/testData/psi/testEntityDeclaration.txt
@@ -0,0 +1,19 @@
+XmlFile:test.dtd
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    PsiElement(XML_ENTITY_DECL)
+      XmlToken:XML_ENTITY_DECL_START('<!ENTITY')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('xxx')
+      PsiErrorElement:Literal, PUBLIC or SYSTEM expected
+        <empty list>
+      PsiWhiteSpace(' ')
+      XmlToken:XML_TAG_END('>')
+    PsiWhiteSpace(' ')
+    PsiElement(XML_ENTITY_DECL)
+      XmlToken:XML_ENTITY_DECL_START('<!ENTITY')
+      PsiErrorElement:xml name expected
+        <empty list>
+    PsiWhiteSpace(' ')
+    XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testEntityDeclaration2.txt b/xml/tests/testData/psi/testEntityDeclaration2.txt
new file mode 100644
index 000000000000..1e67cf75c3b2
--- /dev/null
+++ b/xml/tests/testData/psi/testEntityDeclaration2.txt
@@ -0,0 +1,12 @@
+PsiElement(XML_ELEMENT_CONTENT_SPEC)
+  PsiElement(XML_ELEMENT_CONTENT_SPEC)
+    XmlToken:XML_BAR('|')
+    PsiElement(XML_ENTITY_REF)
+      XmlToken:XML_ENTITY_REF_TOKEN('%pre.qname;')
+    XmlToken:XML_BAR('|')
+    PsiElement(XML_ENTITY_REF)
+      XmlToken:XML_ENTITY_REF_TOKEN('%blockquote.qname;')
+    XmlToken:XML_BAR('|')
+    PsiElement(XML_ENTITY_REF)
+      XmlToken:XML_ENTITY_REF_TOKEN('%address.qname;')
+      
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testEntityInAttlistDeclaration.txt b/xml/tests/testData/psi/testEntityInAttlistDeclaration.txt
new file mode 100644
index 000000000000..118ee0111520
--- /dev/null
+++ b/xml/tests/testData/psi/testEntityInAttlistDeclaration.txt
@@ -0,0 +1,13 @@
+XmlFile:test.dtd
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    PsiElement(XML_ATTLIST_DECL)
+      XmlToken:XML_ATTLIST_DECL_START('<!ATTLIST')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ENTITY_REF)
+        XmlToken:XML_ENTITY_REF_TOKEN('%span.qname;')
+      PsiWhiteSpace('      ')
+      PsiElement(XML_ENTITY_REF)
+        XmlToken:XML_ENTITY_REF_TOKEN('%Common.attrib;')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testEntityInAttr.txt b/xml/tests/testData/psi/testEntityInAttr.txt
new file mode 100644
index 000000000000..41b4b5419f4e
--- /dev/null
+++ b/xml/tests/testData/psi/testEntityInAttr.txt
@@ -0,0 +1,18 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE)
+        XmlToken:XML_NAME('href')
+        XmlToken:XML_EQ('=')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+          PsiErrorElement:Unescaped & or nonterminated character/entity reference
+            XmlToken:XML_BAD_CHARACTER('&')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('n')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+      XmlToken:XML_EMPTY_ELEMENT_END('/>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testEntityInContent.txt b/xml/tests/testData/psi/testEntityInContent.txt
new file mode 100644
index 000000000000..9ba031262c51
--- /dev/null
+++ b/xml/tests/testData/psi/testEntityInContent.txt
@@ -0,0 +1,17 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace(' ')
+        PsiErrorElement:Unescaped & or nonterminated character/entity reference
+          XmlToken:XML_BAD_CHARACTER('&')
+        XmlToken:XML_DATA_CHARACTERS('n')
+        PsiWhiteSpace(' ')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testEntityRef1.txt b/xml/tests/testData/psi/testEntityRef1.txt
new file mode 100644
index 000000000000..5b35effccf87
--- /dev/null
+++ b/xml/tests/testData/psi/testEntityRef1.txt
@@ -0,0 +1,13 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlText
+        XmlToken:XML_DATA_CHARACTERS('%types;')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testEntityRef3.txt b/xml/tests/testData/psi/testEntityRef3.txt
new file mode 100644
index 000000000000..ae791fff450a
--- /dev/null
+++ b/xml/tests/testData/psi/testEntityRef3.txt
@@ -0,0 +1,30 @@
+XmlFile:test.dtd
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    PsiElement(XML_ELEMENT_DECL)
+      XmlToken:XML_ELEMENT_DECL_START('<!ELEMENT')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('project')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ELEMENT_CONTENT_SPEC)
+        PsiElement(XML_ELEMENT_CONTENT_GROUP)
+          XmlToken:XML_LEFT_PAREN('(')
+          XmlToken:XML_NAME('target')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_BAR('|')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_NAME('taskdef')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_BAR('|')
+          PsiWhiteSpace(' ')
+          PsiElement(XML_ENTITY_REF)
+            XmlToken:XML_ENTITY_REF_TOKEN('%types;')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_BAR('|')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_NAME('property')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_RIGHT_PAREN(')')
+        XmlToken:XML_STAR('*')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testEntityRef4.txt b/xml/tests/testData/psi/testEntityRef4.txt
new file mode 100644
index 000000000000..6c2ee3694a9e
--- /dev/null
+++ b/xml/tests/testData/psi/testEntityRef4.txt
@@ -0,0 +1,19 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE)
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_EQ('=')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('aa ')
+          XmlToken:XML_CHAR_ENTITY_REF('&gt;')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN(' bb')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_EMPTY_ELEMENT_END('/>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testEntityRef5.txt b/xml/tests/testData/psi/testEntityRef5.txt
new file mode 100644
index 000000000000..25f5576e824d
--- /dev/null
+++ b/xml/tests/testData/psi/testEntityRef5.txt
@@ -0,0 +1,23 @@
+XmlFile:test.dtd
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    PsiElement(XML_ATTLIST_DECL)
+      XmlToken:XML_ATTLIST_DECL_START('<!ATTLIST')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('a')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ENTITY_REF)
+        XmlToken:XML_ENTITY_REF_TOKEN('%coreattrs;')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE_DECL)
+        XmlToken:XML_NAME('version')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('CDATA')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_ATT_FIXED('#FIXED')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('1.0')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testEntityRef6.txt b/xml/tests/testData/psi/testEntityRef6.txt
new file mode 100644
index 000000000000..a7dbbfc4e4d4
--- /dev/null
+++ b/xml/tests/testData/psi/testEntityRef6.txt
@@ -0,0 +1,6 @@
+XmlFile:test.dtd
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    PsiElement(XML_ENTITY_REF)
+      XmlToken:XML_ENTITY_REF_TOKEN('&common;')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testEntityRef7.txt b/xml/tests/testData/psi/testEntityRef7.txt
new file mode 100644
index 000000000000..ed26182c7297
--- /dev/null
+++ b/xml/tests/testData/psi/testEntityRef7.txt
@@ -0,0 +1,31 @@
+XmlFile:test.dtd
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    PsiElement(XML_ATTLIST_DECL)
+      XmlToken:XML_ATTLIST_DECL_START('<!ATTLIST')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('foo')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE_DECL)
+        XmlToken:XML_NAME('someBoolean')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ENUMERATED_TYPE)
+          XmlToken:XML_LEFT_PAREN('(')
+          PsiElement(XML_ENTITY_REF)
+            XmlToken:XML_ENTITY_REF_TOKEN('%boolean;')
+          XmlToken:XML_RIGHT_PAREN(')')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('true')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE_DECL)
+        XmlToken:XML_NAME('someString')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('CDATA')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_ATT_IMPLIED('#IMPLIED')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testGtInTagContent.txt b/xml/tests/testData/psi/testGtInTagContent.txt
new file mode 100644
index 000000000000..9d0c4c974163
--- /dev/null
+++ b/xml/tests/testData/psi/testGtInTagContent.txt
@@ -0,0 +1,13 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlText
+        XmlToken:XML_DATA_CHARACTERS('>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testManualEmptyAttributeParsing.txt b/xml/tests/testData/psi/testManualEmptyAttributeParsing.txt
new file mode 100644
index 000000000000..c5b82f962a56
--- /dev/null
+++ b/xml/tests/testData/psi/testManualEmptyAttributeParsing.txt
@@ -0,0 +1,26 @@
+PsiElement(XML_ELEMENT_DECL)
+  XmlTag:a
+    XmlToken:XML_START_TAG_START('<')
+    XmlToken:XML_TAG_NAME('a')
+    XmlToken:XML_TAG_END('>')
+    XmlTag:b
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_TAG_NAME('b')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE)
+        XmlToken:XML_NAME('c')
+        XmlToken:XML_EQ('=')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_TAG_END('>')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_TAG_NAME('b')
+      XmlToken:XML_TAG_END('>')
+    PsiWhiteSpace(' ')
+    XmlToken:XML_END_TAG_START('</')
+    XmlToken:XML_TAG_NAME('a')
+    XmlToken:XML_TAG_END('>')
+    
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testManyErrors.txt b/xml/tests/testData/psi/testManyErrors.txt
new file mode 100644
index 000000000000..9f550bbcb077
--- /dev/null
+++ b/xml/tests/testData/psi/testManyErrors.txt
@@ -0,0 +1,3709 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:html
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('html')
+      XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace('\n')
+      XmlTag:HEAD
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('HEAD')
+        XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n\t')
+        XmlTag:TITLE
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('TITLE')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('AppletViewer')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('Tags')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('TITLE')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n')
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('HEAD')
+        XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace('\n\n')
+      XmlTag:BODY
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('BODY')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('bgcolor')
+          XmlToken:XML_EQ('=')
+          PsiElement(XML_ATTRIBUTE_VALUE)
+            XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+            XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('white')
+            XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        XmlToken:XML_TAG_END('>')
+        PsiErrorElement:Element BODY is not closed
+          <empty list>
+      XmlText
+        PsiWhiteSpace('\n\n')
+      XmlTag:TABLE
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('TABLE')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('BORDER')
+          XmlToken:XML_EQ('=')
+          PsiElement(XML_ATTRIBUTE_VALUE)
+            XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+            XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('0')
+            XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('WIDTH')
+          XmlToken:XML_EQ('=')
+          PsiElement(XML_ATTRIBUTE_VALUE)
+            XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+            XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('100%')
+            XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('summary')
+          XmlToken:XML_EQ('=')
+          PsiElement(XML_ATTRIBUTE_VALUE)
+            XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+            XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('layout')
+            XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n')
+        XmlTag:TR
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('TR')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n')
+          XmlTag:TD
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('TD')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n   ')
+            XmlTag:IMG
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('IMG')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('SRC')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('../images/javalogo52x88.gif')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('ALT')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('Java')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('BORDER')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  PsiErrorElement:Attribute value expected
+                    <empty list>
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('0')
+              PsiWhiteSpace(' ')
+              XmlToken:XML_DATA_CHARACTERS('WIDTH=52')
+              PsiWhiteSpace(' ')
+              XmlToken:XML_DATA_CHARACTERS('HEIGHT=88>')
+              PsiWhiteSpace('\n')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('TD')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n\n')
+          XmlTag:TD
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('TD')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n')
+            XmlTag:center
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('center')
+              XmlToken:XML_TAG_END('>')
+              XmlText
+                PsiWhiteSpace('\n           ')
+              XmlTag:h1
+                XmlToken:XML_START_TAG_START('<')
+                XmlToken:XML_NAME('h1')
+                XmlToken:XML_TAG_END('>')
+                XmlText
+                  XmlToken:XML_DATA_CHARACTERS('AppletViewer')
+                  PsiWhiteSpace(' ')
+                  XmlToken:XML_DATA_CHARACTERS('Tags')
+                XmlToken:XML_END_TAG_START('</')
+                XmlToken:XML_NAME('h1')
+                XmlToken:XML_TAG_END('>')
+              XmlText
+                PsiWhiteSpace('\n')
+              XmlToken:XML_END_TAG_START('</')
+              XmlToken:XML_NAME('center')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('TD')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n\n')
+          XmlTag:TD
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('TD')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('ALIGN')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                PsiErrorElement:Attribute value expected
+                  <empty list>
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('RIGHT')
+              PsiErrorElement:'=' expected
+                <empty list>
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('VALIGN')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                PsiErrorElement:Attribute value expected
+                  <empty list>
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('TOP')
+              PsiErrorElement:'=' expected
+                <empty list>
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n')
+            XmlTag:font
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('font')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('size')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('-1')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              XmlToken:XML_TAG_END('>')
+              XmlTag:a
+                XmlToken:XML_START_TAG_START('<')
+                XmlToken:XML_NAME('a')
+                PsiWhiteSpace(' ')
+                PsiElement(XML_ATTRIBUTE)
+                  XmlToken:XML_NAME('href')
+                  XmlToken:XML_EQ('=')
+                  PsiElement(XML_ATTRIBUTE_VALUE)
+                    XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                    XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('../index.html')
+                    XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+                XmlToken:XML_TAG_END('>')
+                XmlText
+                  XmlToken:XML_DATA_CHARACTERS('Documentation')
+                  PsiWhiteSpace(' ')
+                  XmlToken:XML_DATA_CHARACTERS('Contents')
+                XmlToken:XML_END_TAG_START('</')
+                XmlToken:XML_NAME('a')
+                XmlToken:XML_TAG_END('>')
+              XmlToken:XML_END_TAG_START('</')
+              XmlToken:XML_NAME('font')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('TD')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('TR')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n')
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('TABLE')
+        XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace('\n\n\n')
+      PsiElement(XML_COMMENT)
+        XmlToken:XML_COMMENT_START('<!--')
+        XmlToken:XML_COMMENT_CHARACTERS(' ======================== Body text begins here ===================== ')
+        XmlToken:XML_COMMENT_END('-->')
+      XmlText
+        PsiWhiteSpace('\n')
+        XmlToken:XML_DATA_CHARACTERS('The')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('applet')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('viewer')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('makes')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('it')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('possible')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('to')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('run')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('a')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('Java')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('applet')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('without')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('using')
+        PsiWhiteSpace('\n')
+        XmlToken:XML_DATA_CHARACTERS('a')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('browser.')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('AppletViewer')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('ignores')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('any')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('HTML')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('that')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('is')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('not')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('immediately')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('relevant')
+        PsiWhiteSpace('\n')
+        XmlToken:XML_DATA_CHARACTERS('to')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('launching')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('an')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('applet.')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('However,')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('it')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('recognizes')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('a')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('wide')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('variety')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('of')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('applet-')
+        PsiWhiteSpace('\n')
+        XmlToken:XML_DATA_CHARACTERS('launching')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('syntax.')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('The')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('HTML')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('code')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('that')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('AppletViewer')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('recognizes')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('is')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('shown')
+        PsiWhiteSpace('\n')
+        XmlToken:XML_DATA_CHARACTERS('below.')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('All')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('other')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('HTML')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('code')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('is')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('ignored.')
+        PsiWhiteSpace('\n')
+      XmlTag:p
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('p')
+        XmlToken:XML_TAG_END('>')
+        PsiErrorElement:Element p is not closed
+          <empty list>
+      XmlText
+        PsiWhiteSpace('\n')
+      XmlTag:b
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_TAG_END('>')
+        XmlText
+          XmlToken:XML_DATA_CHARACTERS('object')
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_TAG_END('>')
+      XmlTag:br
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('br')
+        XmlToken:XML_TAG_END('>')
+        PsiErrorElement:Element br is not closed
+          <empty list>
+      XmlText
+        PsiWhiteSpace('\n')
+      XmlTag:blockquote
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('blockquote')
+        XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n')
+          XmlToken:XML_DATA_CHARACTERS('The')
+          PsiWhiteSpace(' ')
+        XmlTag:code
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('code')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('object')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('code')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('tag')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('is')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('the')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('HTML')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('4.0')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('tag')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('for')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('embedding')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('applets')
+          PsiWhiteSpace(' \n')
+          XmlToken:XML_DATA_CHARACTERS('and')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('mult-media')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('objects')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('into')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('an')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('HTML')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('page.')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('It')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('is')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('also')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('an')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('Internet')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('Explorer')
+          PsiWhiteSpace('\n')
+          XmlToken:XML_DATA_CHARACTERS('4.x')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('extension')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('to')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('HTML')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('3.2')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('which')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('allows')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('IE')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('to')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('run')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('a')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('Java')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('applet')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('using')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('the')
+          PsiWhiteSpace(' \n')
+          XmlToken:XML_DATA_CHARACTERS('latest')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('Java')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('plugin')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('from')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('Sun.')
+          PsiWhiteSpace('\n')
+        XmlTag:pre
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('pre')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n')
+            XmlToken:XML_CHAR_ENTITY_REF('&lt;')
+            XmlToken:XML_DATA_CHARACTERS('object')
+            PsiWhiteSpace('\n  ')
+            XmlToken:XML_DATA_CHARACTERS('width="')
+          XmlTag:i
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('pixelWidth')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('"')
+            PsiWhiteSpace('\n  ')
+            XmlToken:XML_DATA_CHARACTERS('height="')
+          XmlTag:i
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('pixelHeight')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('"')
+            PsiWhiteSpace('\n')
+            XmlToken:XML_CHAR_ENTITY_REF('&gt;')
+            PsiWhiteSpace('\n  ')
+            XmlToken:XML_CHAR_ENTITY_REF('&lt;')
+            XmlToken:XML_DATA_CHARACTERS('param')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('name="code"')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('value="')
+          XmlTag:i
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('yourClass.class')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('"')
+            XmlToken:XML_CHAR_ENTITY_REF('&gt;')
+            PsiWhiteSpace('\n  ')
+            XmlToken:XML_CHAR_ENTITY_REF('&lt;')
+            XmlToken:XML_DATA_CHARACTERS('param')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('name="object"')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('value="')
+          XmlTag:i
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('serializedObjectOrJavaBean')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('"')
+            XmlToken:XML_CHAR_ENTITY_REF('&gt;')
+            PsiWhiteSpace('\n  ')
+            XmlToken:XML_CHAR_ENTITY_REF('&lt;')
+            XmlToken:XML_DATA_CHARACTERS('param')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('name="codebase"')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('value="')
+          XmlTag:i
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('classFileDirectory')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('"')
+            XmlToken:XML_CHAR_ENTITY_REF('&gt;')
+            PsiWhiteSpace('\n   ')
+            XmlToken:XML_DATA_CHARACTERS('...')
+            PsiWhiteSpace('\n  ')
+          XmlTag:i
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('alternate-text')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n')
+            XmlToken:XML_CHAR_ENTITY_REF('&lt;')
+            XmlToken:XML_DATA_CHARACTERS('/object')
+            XmlToken:XML_CHAR_ENTITY_REF('&gt;')
+            PsiWhiteSpace('\n')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('pre')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n')
+        XmlTag:b
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('b')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('Notes:')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('b')
+          XmlToken:XML_TAG_END('>')
+        XmlTag:br
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('br')
+          XmlToken:XML_TAG_END('>')
+          PsiErrorElement:Element br is not closed
+            <empty list>
+        XmlTag:ul
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('ul')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n')
+          XmlTag:li
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('li')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element li is not closed
+              <empty list>
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('AppletViewer')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('ignores')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('"classID"')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('attribute,')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('on')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('assumption')
+            PsiWhiteSpace('\n    ')
+            XmlToken:XML_DATA_CHARACTERS('that')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('it')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('is')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('pointing')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('to')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('Java')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('plugin,')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('with')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('value:')
+          XmlTag:br
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('br')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element br is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n    ')
+            XmlToken:XML_CHAR_ENTITY_REF('&nbsp;')
+            XmlToken:XML_CHAR_ENTITY_REF('&nbsp;')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n      ')
+              XmlToken:XML_DATA_CHARACTERS('classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"')
+              PsiWhiteSpace('\n    ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n\t ')
+          XmlTag:p
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('p')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element p is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n')
+          XmlTag:li
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('li')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element li is not closed
+              <empty list>
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('AppletViewer')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('also')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('ignores')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('"codebase"')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('attribute')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('that')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('is')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('usually')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('included')
+            PsiWhiteSpace('\n    ')
+            XmlToken:XML_DATA_CHARACTERS('as')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('part')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('of')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('object')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('tag,')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('assuming')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('that')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('it')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('points')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('to')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('a')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('Java')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('plugin')
+            PsiWhiteSpace('\n    ')
+            XmlToken:XML_DATA_CHARACTERS('in')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('a')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('network')
+            PsiWhiteSpace(' ')
+          XmlTag:b
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('b')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('cab')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('b')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('file')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('with')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('a')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('value')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('like:')
+          XmlTag:br
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('br')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element br is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n    ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_CHAR_ENTITY_REF('&nbsp;')
+              XmlToken:XML_CHAR_ENTITY_REF('&nbsp;')
+              PsiWhiteSpace('\n      ')
+              XmlToken:XML_DATA_CHARACTERS('codebase="http://java.sun.com/products/plugin/1.1/jinstall-11-win32.cab#Version=1,1,0,0"')
+              PsiWhiteSpace('\n    ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n\t ')
+          XmlTag:p
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('p')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element p is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n')
+          XmlTag:li
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('li')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element li is not closed
+              <empty list>
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('The')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('optional')
+            PsiWhiteSpace(' ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('codebase')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('param')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('tag')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('supplies')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('a')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('relative')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('URL')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('that')
+            PsiWhiteSpace('\n    ')
+            XmlToken:XML_DATA_CHARACTERS('specifies')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('location')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('of')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('applet')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('class.')
+            PsiWhiteSpace('\n\t ')
+          XmlTag:p
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('p')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element p is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n')
+          XmlTag:li
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('li')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element li is not closed
+              <empty list>
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('Either')
+            PsiWhiteSpace(' ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('code')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('or')
+            PsiWhiteSpace(' ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('object')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('is')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('specified,')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('not')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('both.')
+            PsiWhiteSpace('\n\t ')
+          XmlTag:p
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('p')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element p is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n')
+          XmlTag:li
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('li')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element li is not closed
+              <empty list>
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('The')
+            PsiWhiteSpace(' ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('type')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('param')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('tag')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('is')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('not')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('used')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('by')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('AppletViewer,')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('but')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('should')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('be')
+            PsiWhiteSpace('\n    ')
+            XmlToken:XML_DATA_CHARACTERS('present')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('so')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('that')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('browsers')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('load')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('plugin')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('properly.')
+          XmlTag:br
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('br')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element br is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n\t ')
+            XmlToken:XML_DATA_CHARACTERS('For')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('an')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('applet,')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('value')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('should')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('be')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('something')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('like:')
+          XmlTag:br
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('br')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element br is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n    ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_CHAR_ENTITY_REF('&nbsp;')
+              XmlToken:XML_CHAR_ENTITY_REF('&nbsp;')
+              PsiWhiteSpace('\n      ')
+              XmlToken:XML_CHAR_ENTITY_REF('&lt;')
+              XmlToken:XML_DATA_CHARACTERS('param')
+              PsiWhiteSpace(' ')
+              XmlToken:XML_DATA_CHARACTERS('name="type"')
+              PsiWhiteSpace(' ')
+              XmlToken:XML_DATA_CHARACTERS('value="application/x-java-applet;version=1.1"')
+              XmlToken:XML_CHAR_ENTITY_REF('&gt;')
+              PsiWhiteSpace('\n    ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlTag:br
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('br')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element br is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n    ')
+            XmlToken:XML_DATA_CHARACTERS('or')
+          XmlTag:br
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('br')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element br is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n    ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_CHAR_ENTITY_REF('&nbsp;')
+              XmlToken:XML_CHAR_ENTITY_REF('&nbsp;')
+              PsiWhiteSpace('\n      ')
+              XmlToken:XML_CHAR_ENTITY_REF('&lt;')
+              XmlToken:XML_DATA_CHARACTERS('param')
+              PsiWhiteSpace(' ')
+              XmlToken:XML_DATA_CHARACTERS('name="type"')
+              PsiWhiteSpace(' ')
+              XmlToken:XML_DATA_CHARACTERS('value="application/x-java-applet"')
+              XmlToken:XML_CHAR_ENTITY_REF('&gt;')
+              PsiWhiteSpace('\n    ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlTag:br
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('br')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element br is not closed
+              <empty list>
+          XmlTag:br
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('br')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element br is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n    ')
+            XmlToken:XML_DATA_CHARACTERS('For')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('a')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('serialized')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('object')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('or')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('JavaBean,')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('type')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('param')
+            PsiWhiteSpace(' \n\t ')
+            XmlToken:XML_DATA_CHARACTERS('value')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('should')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('be')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('something')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('like:')
+          XmlTag:br
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('br')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element br is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n    ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_CHAR_ENTITY_REF('&nbsp;')
+              XmlToken:XML_CHAR_ENTITY_REF('&nbsp;')
+              PsiWhiteSpace('\n      ')
+              XmlToken:XML_CHAR_ENTITY_REF('&lt;')
+              XmlToken:XML_DATA_CHARACTERS('param')
+              PsiWhiteSpace(' ')
+              XmlToken:XML_DATA_CHARACTERS('name="type"')
+              PsiWhiteSpace(' ')
+              XmlToken:XML_DATA_CHARACTERS('value="application/x-java-bean;version=1.1"')
+              XmlToken:XML_CHAR_ENTITY_REF('&gt;')
+              PsiWhiteSpace('\n    ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlTag:br
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('br')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element br is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n    ')
+            XmlToken:XML_DATA_CHARACTERS('or')
+          XmlTag:br
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('br')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element br is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n    ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_CHAR_ENTITY_REF('&nbsp;')
+              XmlToken:XML_CHAR_ENTITY_REF('&nbsp;')
+              PsiWhiteSpace('\n      ')
+              XmlToken:XML_CHAR_ENTITY_REF('&lt;')
+              XmlToken:XML_DATA_CHARACTERS('param')
+              PsiWhiteSpace(' ')
+              XmlToken:XML_DATA_CHARACTERS('name="type"')
+              PsiWhiteSpace(' ')
+              XmlToken:XML_DATA_CHARACTERS('value="application/x-java-bean"')
+              XmlToken:XML_CHAR_ENTITY_REF('&gt;')
+              PsiWhiteSpace('\n    ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n\t ')
+          XmlTag:p
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('p')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element p is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n')
+          XmlTag:li
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('li')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element li is not closed
+              <empty list>
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('Other')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('param')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('tags')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('are')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('argument')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('values')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('supplied')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('to')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('applet.')
+            PsiWhiteSpace('\n\t ')
+          XmlTag:p
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('p')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element p is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n')
+          XmlTag:li
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('li')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element li is not closed
+              <empty list>
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('The')
+            PsiWhiteSpace(' ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('object')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('tag')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('recognized')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('by')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('IE4.x')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('and')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('embed')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('tag')
+            PsiWhiteSpace('\n    ')
+            XmlToken:XML_DATA_CHARACTERS('recognized')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('by')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('Netscape')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('4.x')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('can')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('be')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('combined')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('so')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('that')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('an')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('applet')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('can')
+            PsiWhiteSpace('\n    ')
+            XmlToken:XML_DATA_CHARACTERS('use')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('latest')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('Java')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('plugin')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('from')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('Sun,')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('regardless')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('of')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('browser')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('that')
+            PsiWhiteSpace('\n    ')
+            XmlToken:XML_DATA_CHARACTERS('downloads')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('applet.')
+          XmlTag:br
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('br')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element br is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n\t ')
+            XmlToken:XML_DATA_CHARACTERS('For')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('more')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('information,')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('see')
+            PsiWhiteSpace('\n    ')
+          XmlTag:a
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('a')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('href')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('http://java.sun.com/products/plugin/1.3/docs/tags.html')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('Java')
+              PsiWhiteSpace('\n    ')
+              XmlToken:XML_DATA_CHARACTERS('PlugIn')
+              PsiWhiteSpace(' ')
+              XmlToken:XML_DATA_CHARACTERS('HTML')
+              PsiWhiteSpace(' ')
+              XmlToken:XML_DATA_CHARACTERS('Specification')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('a')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n\t ')
+          XmlTag:p
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('p')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element p is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n')
+          XmlTag:li
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('li')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element li is not closed
+              <empty list>
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('AppletViewer')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('does')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('not')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('recognize')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('java_code')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS(',')
+            PsiWhiteSpace(' ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('java_codebase')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS(',')
+            PsiWhiteSpace('\n    ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('java_object')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS(',')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('or')
+            PsiWhiteSpace(' ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('java_type')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('param')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('tags.')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('These')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('tags')
+            PsiWhiteSpace('\n    ')
+            XmlToken:XML_DATA_CHARACTERS('are')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('only')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('needed')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('when')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('applet')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('defines')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('parameters')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('with')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('names')
+            PsiWhiteSpace('\n    ')
+            XmlToken:XML_DATA_CHARACTERS('code,')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('codebase,')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('object,')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('or')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('type,')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('respectively.')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('(In')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('that')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('situation,')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace('\n    ')
+            XmlToken:XML_DATA_CHARACTERS('plugin')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('recognizes')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('and')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('uses')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('java_')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('version')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('in')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('preference')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('to')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace('\n    ')
+            XmlToken:XML_DATA_CHARACTERS('version')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('that')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('will')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('be')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('used')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('by')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('applet.)')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('If')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('applet')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('requires')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('a')
+            PsiWhiteSpace('\n    ')
+            XmlToken:XML_DATA_CHARACTERS('parameter')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('with')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('one')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('of')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('these')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('4')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('names,')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('it')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('may')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('not')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('run')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('in')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('AppletViewer.')
+            PsiWhiteSpace('\n')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('ul')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n')
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('blockquote')
+        XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace('\n')
+      XmlTag:p
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('p')
+        XmlToken:XML_TAG_END('>')
+        PsiErrorElement:Element p is not closed
+          <empty list>
+      XmlText
+        PsiWhiteSpace('\n')
+      XmlTag:b
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_TAG_END('>')
+        XmlText
+          XmlToken:XML_DATA_CHARACTERS('embed')
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_TAG_END('>')
+      XmlTag:br
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('br')
+        XmlToken:XML_TAG_END('>')
+        PsiErrorElement:Element br is not closed
+          <empty list>
+      XmlText
+        PsiWhiteSpace('\n')
+      XmlTag:blockquote
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('blockquote')
+        XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n')
+          XmlToken:XML_DATA_CHARACTERS('The')
+          PsiWhiteSpace(' ')
+        XmlTag:code
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('code')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('embed')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('code')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('tag')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('is')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('the')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('Netscape')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('extension')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('to')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('HTML')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('3.2')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('that')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('allows')
+          PsiWhiteSpace(' \n')
+          XmlToken:XML_DATA_CHARACTERS('embedding')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('an')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('applet')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('or')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('a')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('multimedia')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('object')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('in')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('an')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('HTML')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('page.')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('It')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('allows')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('a')
+          PsiWhiteSpace('\n')
+          XmlToken:XML_DATA_CHARACTERS('Netscape')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('4.x')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('browser')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('(which')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('supports')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('HTML')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('3.2)')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('to')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('run')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('a')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('Java')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('applet')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('using')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('the')
+          PsiWhiteSpace(' \n')
+          XmlToken:XML_DATA_CHARACTERS('latest')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('Java')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('plugin')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('from')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('Sun.')
+          PsiWhiteSpace('\n')
+        XmlTag:pre
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('pre')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n')
+            XmlToken:XML_CHAR_ENTITY_REF('&lt;')
+            XmlToken:XML_DATA_CHARACTERS('embed')
+            PsiWhiteSpace('\n  ')
+            XmlToken:XML_DATA_CHARACTERS('code="')
+          XmlTag:i
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('yourClass.class')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('"')
+            PsiWhiteSpace('\n  ')
+            XmlToken:XML_DATA_CHARACTERS('object="')
+          XmlTag:i
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('serializedObjectOrJavaBean')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('"')
+            PsiWhiteSpace('\n  ')
+            XmlToken:XML_DATA_CHARACTERS('codebase="')
+          XmlTag:i
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('classFileDirectory')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('"')
+            PsiWhiteSpace('\n  ')
+            XmlToken:XML_DATA_CHARACTERS('width="')
+          XmlTag:i
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('pixelWidth')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('"')
+            PsiWhiteSpace('\n  ')
+            XmlToken:XML_DATA_CHARACTERS('height="')
+          XmlTag:i
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('pixelHeight')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('"')
+            PsiWhiteSpace('\n')
+            XmlToken:XML_CHAR_ENTITY_REF('&gt;')
+            PsiWhiteSpace('\n   ')
+            XmlToken:XML_DATA_CHARACTERS('...')
+            PsiWhiteSpace('\n')
+            XmlToken:XML_CHAR_ENTITY_REF('&lt;')
+            XmlToken:XML_DATA_CHARACTERS('/embed')
+            XmlToken:XML_CHAR_ENTITY_REF('&gt;')
+            PsiWhiteSpace('\n')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('pre')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n')
+        XmlTag:b
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('b')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('Notes:')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('b')
+          XmlToken:XML_TAG_END('>')
+        XmlTag:br
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('br')
+          XmlToken:XML_TAG_END('>')
+          PsiErrorElement:Element br is not closed
+            <empty list>
+        XmlText
+          PsiWhiteSpace('\n')
+        XmlTag:ul
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('ul')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n')
+          XmlTag:li
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('li')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element li is not closed
+              <empty list>
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('The')
+            PsiWhiteSpace(' ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('object')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('and')
+            PsiWhiteSpace(' ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('embed')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('tags')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('can')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('be')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('combined')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('so')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('that')
+            PsiWhiteSpace('\n    ')
+            XmlToken:XML_DATA_CHARACTERS('an')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('applet')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('can')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('use')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('latest')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('Java')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('plugin')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('from')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('Sun,')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('regardless')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('of')
+            PsiWhiteSpace('\n    ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('browser')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('that')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('downloads')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('applet.')
+          XmlTag:br
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('br')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element br is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n\t ')
+            XmlToken:XML_DATA_CHARACTERS('For')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('more')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('information,')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('see')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace('\n    ')
+          XmlTag:a
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('a')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('href')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('http://java.sun.com/products/plugin/1.3/docs/tags.html')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('Java')
+              PsiWhiteSpace(' \n    ')
+              XmlToken:XML_DATA_CHARACTERS('PlugIn')
+              PsiWhiteSpace(' ')
+              XmlToken:XML_DATA_CHARACTERS('HTML')
+              PsiWhiteSpace(' ')
+              XmlToken:XML_DATA_CHARACTERS('Specification')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('a')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n\t ')
+          XmlTag:p
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('p')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element p is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n')
+          XmlTag:li
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('li')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element li is not closed
+              <empty list>
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('Unlike')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('object')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('tag,')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('all')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('values')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('specified')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('in')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('an')
+            PsiWhiteSpace(' ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('embed')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n    ')
+            XmlToken:XML_DATA_CHARACTERS('tag')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('are')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('attributes')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('(part')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('of')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('tag)')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('rather')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('than')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('parameters')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('(between')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('start')
+            PsiWhiteSpace('\n\t ')
+            XmlToken:XML_DATA_CHARACTERS('tag')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('and')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('end')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('tag,')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('specified')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('with')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('a')
+            PsiWhiteSpace(' ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('param')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('tag.')
+            PsiWhiteSpace('\n\t ')
+          XmlTag:p
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('p')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element p is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n')
+          XmlTag:li
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('li')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element li is not closed
+              <empty list>
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('To')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('supply')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('argument')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('values')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('for')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('applet')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('parameters,')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('you')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('add')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('additional')
+            PsiWhiteSpace('\n    ')
+            XmlToken:XML_DATA_CHARACTERS('attributes')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('to')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_CHAR_ENTITY_REF('&lt;')
+              XmlToken:XML_DATA_CHARACTERS('embed')
+              XmlToken:XML_CHAR_ENTITY_REF('&gt;')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('tag.')
+            PsiWhiteSpace('\n\t ')
+          XmlTag:p
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('p')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element p is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n')
+          XmlTag:li
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('li')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element li is not closed
+              <empty list>
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('AppletViewer')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('ignores')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('"src"')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('attribute')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('that')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('is')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('usually')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('part')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('of')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('an')
+            PsiWhiteSpace(' \n    ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_CHAR_ENTITY_REF('&lt;')
+              XmlToken:XML_DATA_CHARACTERS('embed')
+              XmlToken:XML_CHAR_ENTITY_REF('&gt;')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('tag.')
+            PsiWhiteSpace('\n\t ')
+          XmlTag:p
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('p')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element p is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n')
+          XmlTag:li
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('li')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element li is not closed
+              <empty list>
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('Either')
+            PsiWhiteSpace(' ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('code')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('or')
+            PsiWhiteSpace(' ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('object')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('is')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('specified,')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('not')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('both.')
+            PsiWhiteSpace('\n\t ')
+          XmlTag:p
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('p')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element p is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n')
+          XmlTag:li
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('li')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element li is not closed
+              <empty list>
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('The')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('optional')
+            PsiWhiteSpace(' ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('codebase')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('attribute')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('supplies')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('a')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('relative')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('URL')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('that')
+            PsiWhiteSpace('\n    ')
+            XmlToken:XML_DATA_CHARACTERS('specifies')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('location')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('of')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('applet')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('class.')
+            PsiWhiteSpace('\n\t ')
+          XmlTag:p
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('p')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element p is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n')
+          XmlTag:li
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('li')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element li is not closed
+              <empty list>
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('The')
+            PsiWhiteSpace(' ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('type')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('attribute')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('is')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('not')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('used')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('by')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('AppletViewer,')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('but')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('should')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('be')
+            PsiWhiteSpace('\n    ')
+            XmlToken:XML_DATA_CHARACTERS('present')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('so')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('that')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('browsers')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('load')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('plugin')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('properly.')
+          XmlTag:br
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('br')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element br is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n\t ')
+            XmlToken:XML_DATA_CHARACTERS('For')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('an')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('applet,')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('value')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('should')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('be')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('something')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('like:')
+          XmlTag:br
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('br')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element br is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n    ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_CHAR_ENTITY_REF('&nbsp;')
+              XmlToken:XML_CHAR_ENTITY_REF('&nbsp;')
+              PsiWhiteSpace('\n      ')
+              XmlToken:XML_CHAR_ENTITY_REF('&lt;')
+              XmlToken:XML_DATA_CHARACTERS('type="application/x-java-applet;version=1.1"')
+              XmlToken:XML_CHAR_ENTITY_REF('&gt;')
+              XmlToken:XML_DATA_CHARACTERS('...')
+              PsiWhiteSpace('\n    ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlTag:br
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('br')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element br is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n    ')
+            XmlToken:XML_DATA_CHARACTERS('or')
+          XmlTag:br
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('br')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element br is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n    ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_CHAR_ENTITY_REF('&nbsp;')
+              XmlToken:XML_CHAR_ENTITY_REF('&nbsp;')
+              PsiWhiteSpace('\n      ')
+              XmlToken:XML_CHAR_ENTITY_REF('&lt;')
+              XmlToken:XML_DATA_CHARACTERS('type="application/x-java-applet"')
+              XmlToken:XML_CHAR_ENTITY_REF('&gt;')
+              XmlToken:XML_DATA_CHARACTERS('...')
+              PsiWhiteSpace('\n    ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlTag:br
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('br')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element br is not closed
+              <empty list>
+          XmlTag:br
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('br')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element br is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n    ')
+            XmlToken:XML_DATA_CHARACTERS('For')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('a')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('serialized')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('object')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('or')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('JavaBean,')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('type')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('param')
+            PsiWhiteSpace(' \n\t ')
+            XmlToken:XML_DATA_CHARACTERS('value')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('should')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('be')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('something')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('like:')
+          XmlTag:br
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('br')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element br is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n    ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_CHAR_ENTITY_REF('&nbsp;')
+              XmlToken:XML_CHAR_ENTITY_REF('&nbsp;')
+              PsiWhiteSpace('\n      ')
+              XmlToken:XML_CHAR_ENTITY_REF('&lt;')
+              XmlToken:XML_DATA_CHARACTERS('type="application/x-java-bean;version=1.1"')
+              XmlToken:XML_CHAR_ENTITY_REF('&gt;')
+              XmlToken:XML_DATA_CHARACTERS('...')
+              PsiWhiteSpace('\n    ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlTag:br
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('br')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element br is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n    ')
+            XmlToken:XML_DATA_CHARACTERS('or')
+          XmlTag:br
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('br')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element br is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n    ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_CHAR_ENTITY_REF('&nbsp;')
+              XmlToken:XML_CHAR_ENTITY_REF('&nbsp;')
+              PsiWhiteSpace('\n      ')
+              XmlToken:XML_CHAR_ENTITY_REF('&lt;')
+              XmlToken:XML_DATA_CHARACTERS('type="application/x-java-bean"')
+              XmlToken:XML_CHAR_ENTITY_REF('&gt;')
+              XmlToken:XML_DATA_CHARACTERS('...')
+              PsiWhiteSpace('\n    ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n\t ')
+          XmlTag:p
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('p')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element p is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n')
+          XmlTag:li
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('li')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element li is not closed
+              <empty list>
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('The')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('"pluginspage"')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('attribute')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('is')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('not')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('used')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('by')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('AppletViewer,')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('but')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('should')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('be')
+            PsiWhiteSpace('\n    ')
+            XmlToken:XML_DATA_CHARACTERS('present')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('so')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('that')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('browsers')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('load')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('plugin')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('properly.')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('It')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('should')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('point')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('to')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('a')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('Java')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('plugin')
+            PsiWhiteSpace('\n    ')
+            XmlToken:XML_DATA_CHARACTERS('in')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('a')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('network')
+            PsiWhiteSpace(' ')
+          XmlTag:b
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('b')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('cab')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('b')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('file')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('with')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('a')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('value')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('like:')
+          XmlTag:br
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('br')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element br is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n    ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_CHAR_ENTITY_REF('&nbsp;')
+              XmlToken:XML_CHAR_ENTITY_REF('&nbsp;')
+              PsiWhiteSpace('\n      ')
+              XmlToken:XML_DATA_CHARACTERS('pluginspage="http://java.sun.com/products/plugin/1.1/jinstall-11-win32.cab#Version=1,1,0,0"')
+              PsiWhiteSpace('\n    ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('ul')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n')
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('blockquote')
+        XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace('\n')
+      XmlTag:p
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('p')
+        XmlToken:XML_TAG_END('>')
+        PsiErrorElement:Element p is not closed
+          <empty list>
+      XmlText
+        PsiWhiteSpace('\n')
+      XmlTag:b
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_TAG_END('>')
+        XmlText
+          XmlToken:XML_DATA_CHARACTERS('applet')
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_TAG_END('>')
+      XmlTag:br
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('br')
+        XmlToken:XML_TAG_END('>')
+        PsiErrorElement:Element br is not closed
+          <empty list>
+      XmlText
+        PsiWhiteSpace('\n')
+      XmlTag:blockquote
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('blockquote')
+        XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n')
+          XmlToken:XML_DATA_CHARACTERS('The')
+          PsiWhiteSpace(' ')
+        XmlTag:code
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('code')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('applet')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('code')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('tag')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('is')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('the')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('original')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('HTML')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('3.2')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('tag')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('for')
+          PsiWhiteSpace(' \n')
+          XmlToken:XML_DATA_CHARACTERS('embedding')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('an')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('applet')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('in')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('an')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('HTML')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('page.')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('Applets')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('loaded')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('using')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('the')
+          PsiWhiteSpace('\n')
+        XmlTag:code
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('code')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('applet')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('code')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('tag')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('are')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('run')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('by')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('the')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('browser,')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('which')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('may')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('not')
+          PsiWhiteSpace('\n')
+          XmlToken:XML_DATA_CHARACTERS('be')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('using')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('the')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('latest')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('version')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('of')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('the')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('Java')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('platform.')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('To')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('ensure')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('that')
+          PsiWhiteSpace('\n')
+          XmlToken:XML_DATA_CHARACTERS('the')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('applet')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('runs')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('with')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('the')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('latest')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('version,')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('use')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('the')
+          PsiWhiteSpace(' ')
+        XmlTag:code
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('code')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('object')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('code')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n')
+          XmlToken:XML_DATA_CHARACTERS('tag')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('to')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('load')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('the')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('Java')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('plugin')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('into')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('the')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('browser.')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('The')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('plugin')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('will')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('then')
+          PsiWhiteSpace('\n')
+          XmlToken:XML_DATA_CHARACTERS('run')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('the')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('applet.')
+          PsiWhiteSpace('\n')
+        XmlTag:pre
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('pre')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n')
+            XmlToken:XML_CHAR_ENTITY_REF('&lt;')
+            XmlToken:XML_DATA_CHARACTERS('applet')
+            PsiWhiteSpace('\n  ')
+            XmlToken:XML_DATA_CHARACTERS('code="')
+          XmlTag:i
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('yourClass.class')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('"')
+            PsiWhiteSpace('\n  ')
+            XmlToken:XML_DATA_CHARACTERS('object="')
+          XmlTag:i
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('serializedObjectOrJavaBean')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('"')
+            PsiWhiteSpace('\n  ')
+            XmlToken:XML_DATA_CHARACTERS('codebase="')
+          XmlTag:i
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('classFileDirectory')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('"')
+            PsiWhiteSpace('\n  ')
+            XmlToken:XML_DATA_CHARACTERS('width="')
+          XmlTag:i
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('pixelWidth')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('"')
+            PsiWhiteSpace('\n  ')
+            XmlToken:XML_DATA_CHARACTERS('height="')
+          XmlTag:i
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('pixelHeight')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('"')
+            PsiWhiteSpace('\n')
+            XmlToken:XML_CHAR_ENTITY_REF('&gt;')
+            PsiWhiteSpace('\n  ')
+            XmlToken:XML_CHAR_ENTITY_REF('&lt;')
+            XmlToken:XML_DATA_CHARACTERS('param')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('name="')
+          XmlTag:i
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('...')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('"')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('value="')
+          XmlTag:i
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('...')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('"')
+            XmlToken:XML_CHAR_ENTITY_REF('&gt;')
+            PsiWhiteSpace('\n   ')
+            XmlToken:XML_DATA_CHARACTERS('...')
+            PsiWhiteSpace('\n  ')
+          XmlTag:i
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('alternate-text')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n')
+            XmlToken:XML_CHAR_ENTITY_REF('&lt;')
+            XmlToken:XML_DATA_CHARACTERS('/applet')
+            XmlToken:XML_CHAR_ENTITY_REF('&gt;')
+            PsiWhiteSpace('\n')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('pre')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n')
+        XmlTag:b
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('b')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('Notes:')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('b')
+          XmlToken:XML_TAG_END('>')
+        XmlTag:br
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('br')
+          XmlToken:XML_TAG_END('>')
+          PsiErrorElement:Element br is not closed
+            <empty list>
+        XmlText
+          PsiWhiteSpace('\n')
+        XmlTag:ul
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('ul')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n')
+          XmlTag:li
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('li')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element li is not closed
+              <empty list>
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('Either')
+            PsiWhiteSpace(' ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('code')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('or')
+            PsiWhiteSpace(' ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('object')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('is')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('specified,')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('not')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('both.')
+            PsiWhiteSpace('\n\t ')
+          XmlTag:p
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('p')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element p is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n')
+          XmlTag:li
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('li')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element li is not closed
+              <empty list>
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('The')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('optional')
+            PsiWhiteSpace(' ')
+          XmlTag:code
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('codebase')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('code')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('attribute')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('supplies')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('a')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('relative')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('URL')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('that')
+            PsiWhiteSpace('\n    ')
+            XmlToken:XML_DATA_CHARACTERS('specifies')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('location')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('of')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('the')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('applet')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('class.')
+            PsiWhiteSpace('\n\t ')
+          XmlTag:p
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('p')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element p is not closed
+              <empty list>
+          XmlText
+            PsiWhiteSpace('\n')
+          XmlTag:li
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('li')
+            XmlToken:XML_TAG_END('>')
+            PsiErrorElement:Element li is not closed
+              <empty list>
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('Param')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('tags')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('supply')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('argument')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('values')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('for')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('applet')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('parameters.')
+            PsiWhiteSpace('\n')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('ul')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n')
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('blockquote')
+        XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace('\n')
+      XmlTag:p
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('p')
+        XmlToken:XML_TAG_END('>')
+        PsiErrorElement:Element p is not closed
+          <empty list>
+      XmlText
+        PsiWhiteSpace('\n')
+      XmlTag:b
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_TAG_END('>')
+        XmlText
+          XmlToken:XML_DATA_CHARACTERS('app')
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_TAG_END('>')
+      XmlTag:br
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('br')
+        XmlToken:XML_TAG_END('>')
+        PsiErrorElement:Element br is not closed
+          <empty list>
+      XmlText
+        PsiWhiteSpace('\n')
+      XmlTag:blockquote
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('blockquote')
+        XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n')
+          XmlToken:XML_DATA_CHARACTERS('The')
+          PsiWhiteSpace(' ')
+        XmlTag:code
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('code')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('app')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('code')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('tag')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('was')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('a')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('short-lived')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('abbreviation')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('for')
+          PsiWhiteSpace(' \n')
+        XmlTag:code
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('code')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('applet')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('code')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('that')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('is')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('no')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('longer')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('supported.')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('AppletViewer')
+          PsiWhiteSpace(' \n')
+          XmlToken:XML_DATA_CHARACTERS('translates')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('the')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('tag')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('and')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('prints')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('out')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('an')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('equivalent')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('tag')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('that')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('is')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('supported.')
+          PsiWhiteSpace('\n')
+        XmlTag:pre
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('pre')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n')
+            XmlToken:XML_CHAR_ENTITY_REF('&lt;')
+            XmlToken:XML_DATA_CHARACTERS('app')
+            PsiWhiteSpace('\n  ')
+            XmlToken:XML_DATA_CHARACTERS('class="')
+          XmlTag:i
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('classFileName')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('"')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('(')
+          XmlTag:i
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('without')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('a')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('.class')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('suffix)')
+            PsiWhiteSpace('\n  ')
+            XmlToken:XML_DATA_CHARACTERS('src="')
+          XmlTag:i
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('classFileDirectory')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('"')
+            PsiWhiteSpace('\n  ')
+            XmlToken:XML_DATA_CHARACTERS('width="')
+          XmlTag:i
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('pixelWidth')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('"')
+            PsiWhiteSpace('\n  ')
+            XmlToken:XML_DATA_CHARACTERS('height="')
+          XmlTag:i
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('pixelHeight')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('i')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            XmlToken:XML_DATA_CHARACTERS('"')
+            PsiWhiteSpace('\n')
+            XmlToken:XML_CHAR_ENTITY_REF('&gt;')
+            PsiWhiteSpace('\n')
+            XmlToken:XML_CHAR_ENTITY_REF('&lt;')
+            XmlToken:XML_DATA_CHARACTERS('param')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('name="..."')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DATA_CHARACTERS('value="..."')
+            XmlToken:XML_CHAR_ENTITY_REF('&gt;')
+            PsiWhiteSpace('\n ')
+            XmlToken:XML_DATA_CHARACTERS('...')
+            PsiWhiteSpace('\n')
+            XmlToken:XML_CHAR_ENTITY_REF('&lt;')
+            XmlToken:XML_DATA_CHARACTERS('/app')
+            XmlToken:XML_CHAR_ENTITY_REF('&gt;')
+            PsiWhiteSpace('\n')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('pre')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n')
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('blockquote')
+        XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace('\n\n')
+        XmlToken:XML_DATA_CHARACTERS('For')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('more')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('information')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('on')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('the')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('tags')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('that')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('AppletViewer')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('supports')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('and')
+      XmlTag:br
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('br')
+        XmlToken:XML_TAG_END('>')
+        PsiErrorElement:Element br is not closed
+          <empty list>
+      XmlText
+        PsiWhiteSpace(' \n')
+        XmlToken:XML_DATA_CHARACTERS('how')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('to')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('combine')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('them,')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('see')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('the')
+        PsiWhiteSpace(' \n')
+      XmlTag:a
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('a')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('href')
+          XmlToken:XML_EQ('=')
+          PsiElement(XML_ATTRIBUTE_VALUE)
+            XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+            XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('http://java.sun.com/products/plugin/1.3/docs/tags.html')
+            XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        XmlToken:XML_TAG_END('>')
+        XmlText
+          XmlToken:XML_DATA_CHARACTERS('Java')
+          PsiWhiteSpace(' \n')
+          XmlToken:XML_DATA_CHARACTERS('PlugIn')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('HTML')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_DATA_CHARACTERS('Specification')
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('a')
+        XmlToken:XML_TAG_END('>')
+      XmlText
+        XmlToken:XML_DATA_CHARACTERS('.')
+        PsiWhiteSpace('\n')
+      XmlTag:P
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('P')
+        XmlToken:XML_TAG_END('>')
+        PsiErrorElement:Element P is not closed
+          <empty list>
+      XmlText
+        PsiWhiteSpace('\n')
+      XmlTag:HR
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('HR')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('SIZE')
+          XmlToken:XML_EQ('=')
+          PsiElement(XML_ATTRIBUTE_VALUE)
+            PsiErrorElement:Attribute value expected
+              <empty list>
+      XmlText
+        XmlToken:XML_DATA_CHARACTERS('3')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DATA_CHARACTERS('NOSHADE>')
+        PsiWhiteSpace('\n')
+      XmlTag:TABLE
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('TABLE')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('BORDER')
+          XmlToken:XML_EQ('=')
+          PsiElement(XML_ATTRIBUTE_VALUE)
+            XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+            XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('0')
+            XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('WIDTH')
+          XmlToken:XML_EQ('=')
+          PsiElement(XML_ATTRIBUTE_VALUE)
+            XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+            XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('100%')
+            XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('summary')
+          XmlToken:XML_EQ('=')
+          PsiElement(XML_ATTRIBUTE_VALUE)
+            XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+            XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('layout')
+            XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n')
+        XmlTag:TR
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('TR')
+          PsiWhiteSpace(' ')
+          PsiElement(XML_ATTRIBUTE)
+            XmlToken:XML_NAME('VALIGN')
+            XmlToken:XML_EQ('=')
+            PsiElement(XML_ATTRIBUTE_VALUE)
+              PsiErrorElement:Attribute value expected
+                <empty list>
+          PsiElement(XML_ATTRIBUTE)
+            XmlToken:XML_NAME('TOP')
+            PsiErrorElement:'=' expected
+              <empty list>
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n')
+          XmlTag:TD
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('TD')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n')
+            XmlTag:P
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('P')
+              XmlToken:XML_TAG_END('>')
+              XmlTag:FONT
+                XmlToken:XML_START_TAG_START('<')
+                XmlToken:XML_NAME('FONT')
+                PsiWhiteSpace(' ')
+                PsiElement(XML_ATTRIBUTE)
+                  XmlToken:XML_NAME('SIZE')
+                  XmlToken:XML_EQ('=')
+                  PsiElement(XML_ATTRIBUTE_VALUE)
+                    XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                    XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('-2')
+                    XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+                XmlToken:XML_TAG_END('>')
+                XmlText
+                  PsiWhiteSpace('\n  ')
+                XmlTag:A
+                  XmlToken:XML_START_TAG_START('<')
+                  XmlToken:XML_NAME('A')
+                  PsiWhiteSpace(' ')
+                  PsiElement(XML_ATTRIBUTE)
+                    XmlToken:XML_NAME('HREF')
+                    XmlToken:XML_EQ('=')
+                    PsiElement(XML_ATTRIBUTE_VALUE)
+                      XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                      XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('../relnotes/SMICopyright.html')
+                      XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+                  XmlToken:XML_TAG_END('>')
+                  XmlText
+                    XmlToken:XML_DATA_CHARACTERS('Copyright')
+                  XmlToken:XML_END_TAG_START('</')
+                  XmlToken:XML_NAME('A')
+                  XmlToken:XML_TAG_END('>')
+                XmlText
+                  PsiWhiteSpace(' ')
+                  XmlToken:XML_CHAR_ENTITY_REF('&#169;')
+                  PsiWhiteSpace(' ')
+                  XmlToken:XML_DATA_CHARACTERS('2001')
+                  PsiWhiteSpace('\n  ')
+                XmlTag:A
+                  XmlToken:XML_START_TAG_START('<')
+                  XmlToken:XML_NAME('A')
+                  PsiWhiteSpace(' ')
+                  PsiElement(XML_ATTRIBUTE)
+                    XmlToken:XML_NAME('HREF')
+                    XmlToken:XML_EQ('=')
+                    PsiElement(XML_ATTRIBUTE_VALUE)
+                      XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                      XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('http://www.sun.com')
+                      XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+                  XmlToken:XML_TAG_END('>')
+                  XmlText
+                    XmlToken:XML_DATA_CHARACTERS('Sun')
+                    PsiWhiteSpace(' ')
+                    XmlToken:XML_DATA_CHARACTERS('Microsystems,')
+                    PsiWhiteSpace(' ')
+                    XmlToken:XML_DATA_CHARACTERS('Inc.')
+                  XmlToken:XML_END_TAG_START('</')
+                  XmlToken:XML_NAME('A')
+                  XmlToken:XML_TAG_END('>')
+                XmlText
+                  PsiWhiteSpace('\n  ')
+                  XmlToken:XML_DATA_CHARACTERS('All')
+                  PsiWhiteSpace(' ')
+                  XmlToken:XML_DATA_CHARACTERS('Rights')
+                  PsiWhiteSpace(' ')
+                  XmlToken:XML_DATA_CHARACTERS('Reserved.')
+                XmlToken:XML_END_TAG_START('</')
+                XmlToken:XML_NAME('FONT')
+                XmlToken:XML_TAG_END('>')
+              XmlToken:XML_END_TAG_START('</')
+              XmlToken:XML_NAME('P')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('TD')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n')
+          XmlTag:TD
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('TD')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('ALIGN')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                PsiErrorElement:Attribute value expected
+                  <empty list>
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('RIGHT')
+              PsiErrorElement:'=' expected
+                <empty list>
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n  ')
+            XmlTag:IMG
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('IMG')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('SRC')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('../images/sunlogo64x30.gif')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('ALT')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('Sun')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('BORDER')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  PsiErrorElement:Attribute value expected
+                    <empty list>
+            XmlText
+              XmlToken:XML_DATA_CHARACTERS('0')
+              PsiWhiteSpace(' ')
+              XmlToken:XML_DATA_CHARACTERS('WIDTH=64')
+              PsiWhiteSpace(' ')
+              XmlToken:XML_DATA_CHARACTERS('HEIGHT=30>')
+              PsiWhiteSpace('\n  ')
+            XmlTag:BR
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('BR')
+              XmlToken:XML_TAG_END('>')
+              PsiErrorElement:Element BR is not closed
+                <empty list>
+            XmlText
+              PsiWhiteSpace('\n  ')
+            XmlTag:FONT
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('FONT')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('SIZE')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('+1')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              XmlToken:XML_TAG_END('>')
+              XmlText
+                PsiWhiteSpace('\n  ')
+              XmlTag:i
+                XmlToken:XML_START_TAG_START('<')
+                XmlToken:XML_NAME('i')
+                XmlToken:XML_TAG_END('>')
+                XmlText
+                  XmlToken:XML_DATA_CHARACTERS('Java')
+                  PsiWhiteSpace(' ')
+                  XmlToken:XML_DATA_CHARACTERS('Software')
+                XmlToken:XML_END_TAG_START('</')
+                XmlToken:XML_NAME('i')
+                XmlToken:XML_TAG_END('>')
+              XmlText
+                PsiWhiteSpace('\n  ')
+              XmlToken:XML_END_TAG_START('</')
+              XmlToken:XML_NAME('FONT')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('TD')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('TR')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n')
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('TABLE')
+        XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace('\n')
+      XmlTag:BR
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('BR')
+        XmlToken:XML_TAG_END('>')
+        PsiErrorElement:Element BR is not closed
+          <empty list>
+      XmlTag:BR
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('BR')
+        XmlToken:XML_TAG_END('>')
+        PsiErrorElement:Element BR is not closed
+          <empty list>
+      XmlTag:BR
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('BR')
+        XmlToken:XML_TAG_END('>')
+        PsiErrorElement:Element BR is not closed
+          <empty list>
+      XmlTag:BR
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('BR')
+        XmlToken:XML_TAG_END('>')
+        PsiErrorElement:Element BR is not closed
+          <empty list>
+      XmlTag:BR
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('BR')
+        XmlToken:XML_TAG_END('>')
+        PsiErrorElement:Element BR is not closed
+          <empty list>
+      XmlTag:BR
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('BR')
+        XmlToken:XML_TAG_END('>')
+        PsiErrorElement:Element BR is not closed
+          <empty list>
+      XmlTag:BR
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('BR')
+        XmlToken:XML_TAG_END('>')
+        PsiErrorElement:Element BR is not closed
+          <empty list>
+      XmlTag:BR
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('BR')
+        XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n\n')
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('body')
+        XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace('\n')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('html')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testMultyRoots.txt b/xml/tests/testData/psi/testMultyRoots.txt
new file mode 100644
index 000000000000..75455e037432
--- /dev/null
+++ b/xml/tests/testData/psi/testMultyRoots.txt
@@ -0,0 +1,21 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE)
+        XmlToken:XML_NAME('href')
+        XmlToken:XML_EQ('=')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+      XmlToken:XML_EMPTY_ELEMENT_END('/>')
+    PsiWhiteSpace(' ')
+    XmlTag:b
+      PsiErrorElement:Multiple root tags
+        XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('b')
+      XmlToken:XML_EMPTY_ELEMENT_END('/>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testMultyRootsWithErrorsBetween.txt b/xml/tests/testData/psi/testMultyRootsWithErrorsBetween.txt
new file mode 100644
index 000000000000..45d6022e0d1e
--- /dev/null
+++ b/xml/tests/testData/psi/testMultyRootsWithErrorsBetween.txt
@@ -0,0 +1,25 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE)
+        XmlToken:XML_NAME('href')
+        XmlToken:XML_EQ('=')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+      XmlToken:XML_EMPTY_ELEMENT_END('/>')
+    PsiWhiteSpace(' ')
+    PsiErrorElement:Unexpected tokens
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('ss')
+      XmlToken:XML_TAG_END('>')
+    XmlTag:b
+      PsiErrorElement:Multiple root tags
+        XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('b')
+      XmlToken:XML_EMPTY_ELEMENT_END('/>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testNewParsing1.txt b/xml/tests/testData/psi/testNewParsing1.txt
new file mode 100644
index 000000000000..dfa4b916be9e
--- /dev/null
+++ b/xml/tests/testData/psi/testNewParsing1.txt
@@ -0,0 +1,11 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testNewParsing10.txt b/xml/tests/testData/psi/testNewParsing10.txt
new file mode 100644
index 000000000000..f679b82c1c20
--- /dev/null
+++ b/xml/tests/testData/psi/testNewParsing10.txt
@@ -0,0 +1,29 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE)
+        XmlToken:XML_NAME('asd')
+        XmlToken:XML_EQ('=')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('asd')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+      XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace(' ')
+      XmlTag:s
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('s')
+        XmlToken:XML_TAG_END('>')
+        PsiErrorElement:Element s is not closed
+          <empty list>
+      XmlText
+        PsiWhiteSpace(' ')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testNewParsing11.txt b/xml/tests/testData/psi/testNewParsing11.txt
new file mode 100644
index 000000000000..8a97f89c1d87
--- /dev/null
+++ b/xml/tests/testData/psi/testNewParsing11.txt
@@ -0,0 +1,36 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_COMMENT)
+      XmlToken:XML_COMMENT_START('<!--')
+      XmlToken:XML_COMMENT_CHARACTERS(' <!')
+      PsiErrorElement:Bad character
+        XmlToken:XML_BAD_CHARACTER('-')
+      XmlToken:XML_COMMENT_CHARACTERS('- ')
+      XmlToken:XML_COMMENT_END('-->')
+    PsiElement(XML_PROLOG)
+      PsiWhiteSpace(' ')
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE)
+        XmlToken:XML_NAME('asd')
+        XmlToken:XML_EQ('=')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('asd')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+      XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace(' ')
+      XmlTag:s
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('s')
+        XmlToken:XML_TAG_END('>')
+        PsiErrorElement:Element s is not closed
+          <empty list>
+      XmlText
+        PsiWhiteSpace(' ')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testNewParsing12.txt b/xml/tests/testData/psi/testNewParsing12.txt
new file mode 100644
index 000000000000..361029da0003
--- /dev/null
+++ b/xml/tests/testData/psi/testNewParsing12.txt
@@ -0,0 +1,26 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlTag:a
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('a')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('ajsdg')
+          PsiErrorElement:'=' expected
+            <empty list>
+      XmlTag:a
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('a')
+        XmlToken:XML_TAG_END('>')
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('a')
+        XmlToken:XML_TAG_END('>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testNewParsing13.txt b/xml/tests/testData/psi/testNewParsing13.txt
new file mode 100644
index 000000000000..7e9417fd154c
--- /dev/null
+++ b/xml/tests/testData/psi/testNewParsing13.txt
@@ -0,0 +1,34 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlTag:b
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_TAG_END('>')
+        XmlTag:c
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('c')
+          XmlToken:XML_TAG_END('>')
+          PsiErrorElement:Element c is not closed
+            <empty list>
+        XmlText
+          PsiWhiteSpace('\n')
+          XmlToken:XML_DATA_CHARACTERS('xxx')
+          PsiWhiteSpace(' \n')
+          XmlToken:XML_DATA_CHARACTERS('xxxx')
+          PsiWhiteSpace('\n')
+        XmlTag:
+          XmlToken:XML_START_TAG_START('<')
+          PsiErrorElement:Tag name expected
+            <empty list>
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_TAG_END('>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testNewParsing14.txt b/xml/tests/testData/psi/testNewParsing14.txt
new file mode 100644
index 000000000000..68db9c1b892f
--- /dev/null
+++ b/xml/tests/testData/psi/testNewParsing14.txt
@@ -0,0 +1,27 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlTag:a
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('a')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('ajsdg')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_EQ('=')
+          PsiWhiteSpace(' ')
+          PsiElement(XML_ATTRIBUTE_VALUE)
+            XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+            XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        XmlToken:XML_TAG_END('>')
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('a')
+        XmlToken:XML_TAG_END('>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testNewParsing15.txt b/xml/tests/testData/psi/testNewParsing15.txt
new file mode 100644
index 000000000000..e7ca8b7aefec
--- /dev/null
+++ b/xml/tests/testData/psi/testNewParsing15.txt
@@ -0,0 +1,47 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      PsiElement(XML_DOCTYPE)
+        XmlToken:XML_DOCTYPE_START('<!DOCTYPE')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('a')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_MARKUP_DECL)
+          XmlToken:XML_MARKUP_START('[')
+          PsiElement(XML_ELEMENT_DECL)
+            XmlToken:XML_ELEMENT_DECL_START('<!ELEMENT')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_NAME('a')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ELEMENT_CONTENT_SPEC)
+              PsiElement(XML_ELEMENT_CONTENT_GROUP)
+                XmlToken:XML_LEFT_PAREN('(')
+                XmlToken:XML_NAME('a')
+                XmlToken:XML_RIGHT_PAREN(')')
+            XmlToken:XML_TAG_END('>')
+          XmlToken:XML_MARKUP_END(']')
+        XmlToken:XML_DOCTYPE_END('>')
+      PsiWhiteSpace(' ')
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlTag:a
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('a')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('ajsdg')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_EQ('=')
+          PsiWhiteSpace(' ')
+          PsiElement(XML_ATTRIBUTE_VALUE)
+            XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+            XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        XmlToken:XML_TAG_END('>')
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('a')
+        XmlToken:XML_TAG_END('>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testNewParsing16.txt b/xml/tests/testData/psi/testNewParsing16.txt
new file mode 100644
index 000000000000..4ff3d9d2a259
--- /dev/null
+++ b/xml/tests/testData/psi/testNewParsing16.txt
@@ -0,0 +1,24 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlTag:b
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_TAG_END('>')
+        PsiErrorElement:Element is not closed
+          <empty list>
+      XmlTag:s
+        XmlToken:XML_START_TAG_START('<')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('s')
+        PsiErrorElement:Element is not closed
+          <empty list>
+      XmlToken:XML_DATA_CHARACTERS('/b>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testNewParsing17.txt b/xml/tests/testData/psi/testNewParsing17.txt
new file mode 100644
index 000000000000..c6be85348dfb
--- /dev/null
+++ b/xml/tests/testData/psi/testNewParsing17.txt
@@ -0,0 +1,334 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:project
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('project')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE)
+        XmlToken:XML_NAME('default')
+        XmlToken:XML_EQ('=')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('make')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+      XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace('\n ')
+      XmlTag:target
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('target')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('name')
+          XmlToken:XML_EQ('=')
+          PsiElement(XML_ATTRIBUTE_VALUE)
+            XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+            XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('make')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('description')
+          XmlToken:XML_EQ('=')
+          PsiElement(XML_ATTRIBUTE_VALUE)
+            XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+            XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('Create distributable ZIP file')
+            XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('depends')
+          XmlToken:XML_EQ('=')
+          PsiElement(XML_ATTRIBUTE_VALUE)
+            XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+            XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('init,clean,obfuscate,jar')
+            XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        XmlToken:XML_EMPTY_ELEMENT_END('/>')
+      XmlText
+        PsiWhiteSpace('\n ')
+      XmlTag:target
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('target')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('name')
+          XmlToken:XML_EQ('=')
+          PsiElement(XML_ATTRIBUTE_VALUE)
+            XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+            XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('init')
+            XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n ')
+        XmlTag:property
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('property')
+          PsiWhiteSpace(' ')
+          PsiElement(XML_ATTRIBUTE)
+            XmlToken:XML_NAME('name')
+            XmlToken:XML_EQ('=')
+            PsiElement(XML_ATTRIBUTE_VALUE)
+              XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+              XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('deploy')
+              XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+          PsiWhiteSpace(' ')
+          PsiElement(XML_ATTRIBUTE)
+            XmlToken:XML_NAME('value')
+            XmlToken:XML_EQ('=')
+            PsiElement(XML_ATTRIBUTE_VALUE)
+              XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+              XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('../deploy')
+              XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+          XmlToken:XML_EMPTY_ELEMENT_END('/>')
+        XmlText
+          PsiWhiteSpace('\n ')
+        XmlTag:mkdir
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('mkdir')
+          PsiWhiteSpace(' ')
+          PsiElement(XML_ATTRIBUTE)
+            XmlToken:XML_NAME('dir')
+            XmlToken:XML_EQ('=')
+            PsiElement(XML_ATTRIBUTE_VALUE)
+              XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+              XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('${deploy}')
+              XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+          XmlToken:XML_EMPTY_ELEMENT_END('/>')
+        XmlText
+          PsiWhiteSpace('\n ')
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('target')
+        XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace('\n ')
+      XmlTag:target
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('target')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('name')
+          XmlToken:XML_EQ('=')
+          PsiElement(XML_ATTRIBUTE_VALUE)
+            XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+            XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('clean')
+            XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n ')
+        XmlTag:delete
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('delete')
+          PsiWhiteSpace(' ')
+          PsiElement(XML_ATTRIBUTE)
+            XmlToken:XML_NAME('includeemptydirs')
+            XmlToken:XML_EQ('=')
+            PsiElement(XML_ATTRIBUTE_VALUE)
+              XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+              XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('true')
+              XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:fileset
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('fileset')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('dir')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('${deploy}')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('includes')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('**/*')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_EMPTY_ELEMENT_END('/>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('delete')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n ')
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('target')
+        XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace('\n ')
+      XmlTag:target
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('target')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('name')
+          XmlToken:XML_EQ('=')
+          PsiElement(XML_ATTRIBUTE_VALUE)
+            XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+            XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('obfuscate')
+            XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n ')
+        XmlTag:exec
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('exec')
+          PsiWhiteSpace(' ')
+          PsiElement(XML_ATTRIBUTE)
+            XmlToken:XML_NAME('executable')
+            XmlToken:XML_EQ('=')
+            PsiElement(XML_ATTRIBUTE_VALUE)
+              XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+              XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('C:/java/zkm/zkm.bat')
+              XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+          PsiWhiteSpace(' ')
+          PsiElement(XML_ATTRIBUTE)
+            XmlToken:XML_NAME('dir')
+            XmlToken:XML_EQ('=')
+            PsiElement(XML_ATTRIBUTE_VALUE)
+              XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+              XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('${deploy}')
+              XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:arg
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('arg')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('value')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('../plugin/obfuscate.properties')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_EMPTY_ELEMENT_END('/>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('exec')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n ')
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('target')
+        XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace('\n ')
+      XmlTag:target
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('target')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('name')
+          XmlToken:XML_EQ('=')
+          PsiElement(XML_ATTRIBUTE_VALUE)
+            XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+            XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('jar')
+            XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n ')
+        XmlTag:jar
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('jar')
+          PsiWhiteSpace(' ')
+          PsiElement(XML_ATTRIBUTE)
+            XmlToken:XML_NAME('jarfile')
+            XmlToken:XML_EQ('=')
+            PsiElement(XML_ATTRIBUTE_VALUE)
+              XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+              XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('${deploy}/idea4-jprofiler.jar')
+              XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:metainf
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('metainf')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('dir')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('./META-INF')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('includes')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('plugin.xml')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_EMPTY_ELEMENT_END('/>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:fileset
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('fileset')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('dir')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('${deploy}')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlTag:include
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('include')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('name')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('com/**')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              XmlToken:XML_EMPTY_ELEMENT_END('/>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('fileset')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:fileset
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('fileset')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('dir')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('rsc')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_EMPTY_ELEMENT_END('/>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('jar')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n ')
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('target')
+        XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace('\n')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('project')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testNewParsing18.txt b/xml/tests/testData/psi/testNewParsing18.txt
new file mode 100644
index 000000000000..b0a89d2f1b63
--- /dev/null
+++ b/xml/tests/testData/psi/testNewParsing18.txt
@@ -0,0 +1,1372 @@
+PsiElement(XML_DOCUMENT)
+  PsiElement(XML_PROLOG)
+    <empty list>
+  XmlTag:root
+    XmlToken:XML_START_TAG_START('<')
+    XmlToken:XML_NAME('root')
+    PsiWhiteSpace(' ')
+    PsiElement(XML_ATTRIBUTE)
+      XmlToken:XML_NAME('type')
+      XmlToken:XML_EQ('=')
+      PsiElement(XML_ATTRIBUTE_VALUE)
+        XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+        XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('com.ubsw.eq.dm.mercury.app.MercurySpec')
+        XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+    XmlToken:XML_TAG_END('>')
+    XmlText
+      PsiWhiteSpace('\n ')
+    XmlTag:_xmlProperties
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('_xmlProperties')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE)
+        XmlToken:XML_NAME('type')
+        XmlToken:XML_EQ('=')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('java.util.HashMap')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+      XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace('\n ')
+      XmlTag:entries
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('entries')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ATTRIBUTE)
+          XmlToken:XML_NAME('type')
+          XmlToken:XML_EQ('=')
+          PsiElement(XML_ATTRIBUTE_VALUE)
+            XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+            XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('com.ubsw.common.serialization.delegates.MapDelegate$MapEntry[]')
+            XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n ')
+        XmlTag:element
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('element')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:key
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('key')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('type')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('java.lang.String')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlTag:value
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('value')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('type')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('string')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('xml:space')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('preserve')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              XmlToken:XML_TAG_END('>')
+              XmlText
+                XmlToken:XML_DATA_CHARACTERS('DSApplication')
+              XmlToken:XML_END_TAG_START('</')
+              XmlToken:XML_NAME('value')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('key')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:value
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('value')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('type')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('java.lang.String')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlTag:value
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('value')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('type')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('string')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('xml:space')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('preserve')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              XmlToken:XML_TAG_END('>')
+              XmlText
+                XmlToken:XML_DATA_CHARACTERS('Mercury')
+              XmlToken:XML_END_TAG_START('</')
+              XmlToken:XML_NAME('value')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('value')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('element')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n ')
+        XmlTag:element
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('element')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:key
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('key')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('type')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('java.lang.String')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlTag:value
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('value')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('type')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('string')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('xml:space')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('preserve')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              XmlToken:XML_TAG_END('>')
+              XmlText
+                XmlToken:XML_DATA_CHARACTERS('DSEnvironment')
+              XmlToken:XML_END_TAG_START('</')
+              XmlToken:XML_NAME('value')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('key')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:value
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('value')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('type')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('java.lang.String')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlTag:value
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('value')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('type')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('string')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('xml:space')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('preserve')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              XmlToken:XML_TAG_END('>')
+              XmlText
+                XmlToken:XML_DATA_CHARACTERS('Mercury/ExtIDCleanUp')
+              XmlToken:XML_END_TAG_START('</')
+              XmlToken:XML_NAME('value')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('value')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('element')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n ')
+        XmlTag:element
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('element')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:key
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('key')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('type')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('java.lang.String')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlTag:value
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('value')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('type')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('string')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('xml:space')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('preserve')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              XmlToken:XML_TAG_END('>')
+              XmlText
+                XmlToken:XML_DATA_CHARACTERS('DSLocation')
+              XmlToken:XML_END_TAG_START('</')
+              XmlToken:XML_NAME('value')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('key')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:value
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('value')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('type')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('java.lang.String')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlTag:value
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('value')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('type')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('string')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('xml:space')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('preserve')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              XmlToken:XML_TAG_END('>')
+              XmlText
+                XmlToken:XML_DATA_CHARACTERS('london')
+              XmlToken:XML_END_TAG_START('</')
+              XmlToken:XML_NAME('value')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('value')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('element')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n ')
+        XmlTag:element
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('element')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:key
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('key')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('type')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('java.lang.String')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlTag:value
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('value')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('type')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('string')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('xml:space')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('preserve')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              XmlToken:XML_TAG_END('>')
+              XmlText
+                XmlToken:XML_DATA_CHARACTERS('DSLanguage')
+              XmlToken:XML_END_TAG_START('</')
+              XmlToken:XML_NAME('value')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('key')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:value
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('value')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('type')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('java.lang.String')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlTag:value
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('value')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('type')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('string')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('xml:space')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('preserve')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              XmlToken:XML_TAG_END('>')
+              XmlText
+                XmlToken:XML_DATA_CHARACTERS('Java')
+              XmlToken:XML_END_TAG_START('</')
+              XmlToken:XML_NAME('value')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('value')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('element')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n ')
+        XmlTag:element
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('element')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:key
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('key')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('type')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('java.lang.String')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlTag:value
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('value')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('type')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('string')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('xml:space')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('preserve')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              XmlToken:XML_TAG_END('>')
+              XmlText
+                XmlToken:XML_DATA_CHARACTERS('outputOperationList')
+              XmlToken:XML_END_TAG_START('</')
+              XmlToken:XML_NAME('value')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('key')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:value
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('value')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('type')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('java.lang.String')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlTag:value
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('value')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('type')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('string')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('xml:space')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('preserve')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              XmlToken:XML_TAG_END('>')
+              XmlText
+                XmlToken:XML_DATA_CHARACTERS('Commit')
+              XmlToken:XML_END_TAG_START('</')
+              XmlToken:XML_NAME('value')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('value')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('element')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n ')
+        XmlTag:element
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('element')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:key
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('key')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('type')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('java.lang.String')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlTag:value
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('value')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('type')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('string')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('xml:space')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('preserve')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              XmlToken:XML_TAG_END('>')
+              XmlText
+                XmlToken:XML_DATA_CHARACTERS('Objects_InTransaction')
+              XmlToken:XML_END_TAG_START('</')
+              XmlToken:XML_NAME('value')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('key')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:value
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('value')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('type')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('java.lang.String')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlTag:value
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('value')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('type')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('string')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('xml:space')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('preserve')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              XmlToken:XML_TAG_END('>')
+              XmlText
+                XmlToken:XML_DATA_CHARACTERS('Commit')
+              XmlToken:XML_END_TAG_START('</')
+              XmlToken:XML_NAME('value')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('value')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('element')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n ')
+        XmlTag:element
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('element')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:key
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('key')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('type')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('java.lang.String')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlTag:value
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('value')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('type')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('string')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('xml:space')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('preserve')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              XmlToken:XML_TAG_END('>')
+              XmlText
+                XmlToken:XML_DATA_CHARACTERS('LogFolder')
+              XmlToken:XML_END_TAG_START('</')
+              XmlToken:XML_NAME('value')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('key')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:value
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('value')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('type')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('java.lang.String')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlTag:value
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('value')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('type')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('string')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('xml:space')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('preserve')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              XmlToken:XML_TAG_END('>')
+              XmlText
+                XmlToken:XML_DATA_CHARACTERS('C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs')
+              XmlToken:XML_END_TAG_START('</')
+              XmlToken:XML_NAME('value')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('value')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('element')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n ')
+        XmlTag:element
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('element')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:key
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('key')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('type')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('java.lang.String')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlTag:value
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('value')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('type')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('string')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('xml:space')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('preserve')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              XmlToken:XML_TAG_END('>')
+              XmlText
+                XmlToken:XML_DATA_CHARACTERS('ReportFileDir')
+              XmlToken:XML_END_TAG_START('</')
+              XmlToken:XML_NAME('value')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('key')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:value
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('value')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('type')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('java.lang.String')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlTag:value
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('value')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('type')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('string')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('xml:space')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('preserve')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              XmlToken:XML_TAG_END('>')
+              XmlText
+                XmlToken:XML_DATA_CHARACTERS('C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/logs/')
+              XmlToken:XML_END_TAG_START('</')
+              XmlToken:XML_NAME('value')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('value')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('element')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n ')
+        XmlTag:element
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('element')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:key
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('key')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('type')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('java.lang.String')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlTag:value
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('value')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('type')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('string')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('xml:space')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('preserve')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              XmlToken:XML_TAG_END('>')
+              XmlText
+                XmlToken:XML_DATA_CHARACTERS('ExcludedInstrumentListPath')
+              XmlToken:XML_END_TAG_START('</')
+              XmlToken:XML_NAME('value')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('key')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:value
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('value')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('type')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('java.lang.String')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlTag:value
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('value')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('type')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('string')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('xml:space')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('preserve')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              XmlToken:XML_TAG_END('>')
+              XmlText
+                XmlToken:XML_DATA_CHARACTERS('C:/Developer/view_local/sherrach_instr.ext.id_local_nt/EQ_INSTR_EXT_ID/config/excludedStocks.txt')
+              XmlToken:XML_END_TAG_START('</')
+              XmlToken:XML_NAME('value')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('value')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('element')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n ')
+        XmlTag:element
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('element')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:key
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('key')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('type')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('java.lang.String')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlTag:value
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('value')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('type')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('string')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('xml:space')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('preserve')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              XmlToken:XML_TAG_END('>')
+              XmlText
+                XmlToken:XML_DATA_CHARACTERS('ExcludeRefSymList')
+              XmlToken:XML_END_TAG_START('</')
+              XmlToken:XML_NAME('value')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('key')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:value
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('value')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('type')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('java.lang.String')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlTag:value
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('value')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('type')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('string')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('xml:space')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('preserve')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('value')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('element')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n ')
+        XmlTag:element
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('element')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:key
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('key')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('type')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('java.lang.String')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlTag:value
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('value')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('type')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('string')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('xml:space')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('preserve')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              XmlToken:XML_TAG_END('>')
+              XmlText
+                XmlToken:XML_DATA_CHARACTERS('IncludeRefSymList')
+              XmlToken:XML_END_TAG_START('</')
+              XmlToken:XML_NAME('value')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('key')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:value
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('value')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('type')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('java.lang.String')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlTag:value
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('value')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('type')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('string')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('xml:space')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('preserve')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              XmlToken:XML_TAG_END('>')
+              XmlText
+                <empty list>
+              XmlToken:XML_END_TAG_START('</')
+              XmlToken:XML_NAME('value')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('value')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('element')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n ')
+        XmlTag:element
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('element')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:key
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('key')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('type')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('java.lang.String')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlTag:value
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('value')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('type')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('string')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('xml:space')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('preserve')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              XmlToken:XML_TAG_END('>')
+              XmlText
+                XmlToken:XML_DATA_CHARACTERS('ExcludeMarkingRunList')
+              XmlToken:XML_END_TAG_START('</')
+              XmlToken:XML_NAME('value')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('key')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:value
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('value')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('type')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('java.lang.String')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlTag:value
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('value')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('type')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('string')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('xml:space')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('preserve')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              XmlToken:XML_TAG_END('>')
+              XmlText
+                XmlToken:XML_DATA_CHARACTERS('?:AUTO-NonMarking')
+              XmlToken:XML_END_TAG_START('</')
+              XmlToken:XML_NAME('value')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('value')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlToken:XML_END_TAG_START('</')
+          XmlToken:XML_NAME('element')
+          XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace('\n ')
+        XmlTag:element
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('element')
+          XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:key
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('key')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('type')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('java.lang.String')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlTag:value
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('value')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('type')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('string')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('xml:space')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('preserve')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              XmlToken:XML_TAG_END('>')
+              XmlText
+                XmlToken:XML_DATA_CHARACTERS('IncludeMarkingRunList')
+              XmlToken:XML_END_TAG_START('</')
+              XmlToken:XML_NAME('value')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('key')
+            XmlToken:XML_TAG_END('>')
+          XmlText
+            PsiWhiteSpace('\n ')
+          XmlTag:value
+            XmlToken:XML_START_TAG_START('<')
+            XmlToken:XML_NAME('value')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE)
+              XmlToken:XML_NAME('type')
+              XmlToken:XML_EQ('=')
+              PsiElement(XML_ATTRIBUTE_VALUE)
+                XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('java.lang.String')
+                XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlTag:value
+              XmlToken:XML_START_TAG_START('<')
+              XmlToken:XML_NAME('value')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('type')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('string')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              PsiWhiteSpace(' ')
+              PsiElement(XML_ATTRIBUTE)
+                XmlToken:XML_NAME('xml:space')
+                XmlToken:XML_EQ('=')
+                PsiElement(XML_ATTRIBUTE_VALUE)
+                  XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+                  XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('preserve')
+                  XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+              XmlToken:XML_TAG_END('>')
+              XmlText
+                <empty list>
+              XmlToken:XML_END_TAG_START('</')
+              XmlToken:XML_NAME('value')
+              XmlToken:XML_TAG_END('>')
+            XmlText
+              PsiWhiteSpace('\n ')
+            XmlToken:XML_END_TAG_START('</')
+            XmlToken:XML_NAME('value')
+            Xml
diff --git a/xml/tests/testData/psi/testNewParsing19.txt b/xml/tests/testData/psi/testNewParsing19.txt
new file mode 100644
index 000000000000..e16bf8b863fc
--- /dev/null
+++ b/xml/tests/testData/psi/testNewParsing19.txt
@@ -0,0 +1,65 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      PsiElement(XML_DOCTYPE)
+        XmlToken:XML_DOCTYPE_START('<!DOCTYPE')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('aaa')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_MARKUP_DECL)
+          XmlToken:XML_MARKUP_START('[')
+          PsiElement(XML_ELEMENT_DECL)
+            XmlToken:XML_ELEMENT_DECL_START('<!ELEMENT')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_NAME('a')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_BAD_CHARACTER('#')
+            PsiElement(XML_ELEMENT_CONTENT_SPEC)
+              XmlToken:XML_CONTENT_EMPTY('EMPTY')
+            XmlToken:XML_TAG_END('>')
+          PsiElement(XML_ATTLIST_DECL)
+            XmlToken:XML_ATTLIST_DECL_START('<!ATTLIST')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_NAME('a')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE_DECL)
+              XmlToken:XML_NAME('xx')
+              PsiWhiteSpace(' ')
+              XmlToken:XML_NAME('CDATA')
+              PsiWhiteSpace(' ')
+              XmlToken:XML_ATT_IMPLIED('#IMPLIED')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE_DECL)
+              XmlToken:XML_NAME('yy')
+          PsiWhiteSpace('  ')
+          XmlToken:XML_ATT_IMPLIED('#IMPLIED')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_NAME('zz')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_NAME('CDATA')
+          PsiWhiteSpace(' ')
+          XmlToken:XML_ATT_IMPLIED('#IMPLIED')
+          XmlToken:XML_TAG_END('>')
+          XmlToken:XML_MARKUP_END(']')
+        XmlToken:XML_DOCTYPE_END('>')
+      PsiWhiteSpace('\n')
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace(' ')
+      XmlTag:b
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_TAG_END('>')
+        XmlText
+          PsiWhiteSpace(' ')
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace(' ')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testNewParsing2.txt b/xml/tests/testData/psi/testNewParsing2.txt
new file mode 100644
index 000000000000..10df473828d7
--- /dev/null
+++ b/xml/tests/testData/psi/testNewParsing2.txt
@@ -0,0 +1,13 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace('   ')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testNewParsing20.txt b/xml/tests/testData/psi/testNewParsing20.txt
new file mode 100644
index 000000000000..5dbd3a7aa2f3
--- /dev/null
+++ b/xml/tests/testData/psi/testNewParsing20.txt
@@ -0,0 +1,26 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      PsiElement(XML_DOCTYPE)
+        XmlToken:XML_DOCTYPE_START('<!DOCTYPE')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('root')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_MARKUP_DECL)
+          XmlToken:XML_MARKUP_START('[')
+          PsiWhiteSpace('\n')
+          XmlToken:XML_BAD_CHARACTER('<')
+          XmlToken:XML_BAD_CHARACTER('!')
+          PsiWhiteSpace('\n')
+          XmlToken:XML_MARKUP_END(']')
+        XmlToken:XML_DOCTYPE_END('>')
+      PsiWhiteSpace('\n')
+    XmlTag:root
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('root')
+      XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace('\n\n')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('root')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testNewParsing3.txt b/xml/tests/testData/psi/testNewParsing3.txt
new file mode 100644
index 000000000000..a6b55edf03e2
--- /dev/null
+++ b/xml/tests/testData/psi/testNewParsing3.txt
@@ -0,0 +1,14 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      PsiErrorElement:Tag start is not closed
+        <empty list>
+    PsiWhiteSpace('   ')
+    PsiErrorElement:Top level element is not completed
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testNewParsing4.txt b/xml/tests/testData/psi/testNewParsing4.txt
new file mode 100644
index 000000000000..0f27ec925c99
--- /dev/null
+++ b/xml/tests/testData/psi/testNewParsing4.txt
@@ -0,0 +1,21 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace(' ')
+      XmlTag:b
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_TAG_END('>')
+        PsiErrorElement:Element b is not closed
+          <empty list>
+      XmlText
+        PsiWhiteSpace(' ')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testNewParsing5.txt b/xml/tests/testData/psi/testNewParsing5.txt
new file mode 100644
index 000000000000..e67d46e07a7a
--- /dev/null
+++ b/xml/tests/testData/psi/testNewParsing5.txt
@@ -0,0 +1,19 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace(' ')
+      XmlTag:b
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_EMPTY_ELEMENT_END('/>')
+      XmlText
+        PsiWhiteSpace(' ')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testNewParsing6.txt b/xml/tests/testData/psi/testNewParsing6.txt
new file mode 100644
index 000000000000..ee331e6874fa
--- /dev/null
+++ b/xml/tests/testData/psi/testNewParsing6.txt
@@ -0,0 +1,40 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      PsiElement(XML_DOCTYPE)
+        XmlToken:XML_DOCTYPE_START('<!DOCTYPE')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('greeting')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DOCTYPE_SYSTEM('SYSTEM')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('"hello.dtd"')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_MARKUP_DECL)
+          XmlToken:XML_MARKUP_START('[')
+          PsiElement(XML_ELEMENT_DECL)
+            XmlToken:XML_ELEMENT_DECL_START('<!ELEMENT')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_NAME('greeting')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ELEMENT_CONTENT_SPEC)
+              XmlToken:XML_CONTENT_EMPTY('EMPTY')
+            XmlToken:XML_TAG_END('>')
+          XmlToken:XML_MARKUP_END(']')
+        XmlToken:XML_DOCTYPE_END('>')
+      PsiWhiteSpace(' ')
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace(' ')
+      XmlTag:b
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_EMPTY_ELEMENT_END('/>')
+      XmlText
+        PsiWhiteSpace(' ')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testNewParsing7.txt b/xml/tests/testData/psi/testNewParsing7.txt
new file mode 100644
index 000000000000..687ec6706f55
--- /dev/null
+++ b/xml/tests/testData/psi/testNewParsing7.txt
@@ -0,0 +1,37 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlText
+        PsiWhiteSpace(' ')
+      XmlTag:b
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_TAG_END('>')
+        PsiErrorElement:Element b is not closed
+          <empty list>
+      XmlText
+        PsiWhiteSpace(' ')
+      XmlTag:c
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('c')
+        XmlToken:XML_TAG_END('>')
+        PsiErrorElement:Element c is not closed
+          <empty list>
+      XmlText
+        PsiWhiteSpace(' ')
+      XmlTag:d
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('d')
+        XmlToken:XML_TAG_END('>')
+        PsiErrorElement:Element d is not closed
+          <empty list>
+      XmlText
+        PsiWhiteSpace(' ')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testNewParsing8.txt b/xml/tests/testData/psi/testNewParsing8.txt
new file mode 100644
index 000000000000..bc7ca62ab8ec
--- /dev/null
+++ b/xml/tests/testData/psi/testNewParsing8.txt
@@ -0,0 +1,16 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE)
+        XmlToken:XML_NAME('blah')
+        XmlToken:XML_EQ('=')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('blah')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+      XmlToken:XML_EMPTY_ELEMENT_END('/>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testNewParsing9.txt b/xml/tests/testData/psi/testNewParsing9.txt
new file mode 100644
index 000000000000..bbe29ddc08c6
--- /dev/null
+++ b/xml/tests/testData/psi/testNewParsing9.txt
@@ -0,0 +1,19 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE)
+        XmlToken:XML_NAME('asd')
+        XmlToken:XML_EQ('=')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('asd')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+      XmlToken:XML_TAG_END('>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testNotation1.txt b/xml/tests/testData/psi/testNotation1.txt
new file mode 100644
index 000000000000..600a0fe2ccd0
--- /dev/null
+++ b/xml/tests/testData/psi/testNotation1.txt
@@ -0,0 +1,16 @@
+XmlFile:test.dtd
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    PsiElement(XML_NOTATION_DECL)
+      XmlToken:XML_NOTATION_DECL_START('<!NOTATION')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('data-sources')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_DOCTYPE_SYSTEM('SYSTEM')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ATTRIBUTE_VALUE)
+        XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+        XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('x3')
+        XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testNotation2.txt b/xml/tests/testData/psi/testNotation2.txt
new file mode 100644
index 000000000000..71144f53ae01
--- /dev/null
+++ b/xml/tests/testData/psi/testNotation2.txt
@@ -0,0 +1,27 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      PsiElement(XML_DOCTYPE)
+        XmlToken:XML_DOCTYPE_START('<!DOCTYPE')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('x3')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_MARKUP_DECL)
+          XmlToken:XML_MARKUP_START('[')
+          PsiElement(XML_NOTATION_DECL)
+            XmlToken:XML_NOTATION_DECL_START('<!NOTATION')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_NAME('data-sources')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_DOCTYPE_SYSTEM('SYSTEM')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ATTRIBUTE_VALUE)
+              XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+              XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('x3')
+              XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+            XmlToken:XML_TAG_END('>')
+          XmlToken:XML_MARKUP_END(']')
+        XmlToken:XML_DOCTYPE_END('>')
+    XmlTag:
+      PsiErrorElement:Valid XML document must have a root tag
+        <empty list>
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testProcessingInstruction1.txt b/xml/tests/testData/psi/testProcessingInstruction1.txt
new file mode 100644
index 000000000000..5b95a61c937a
--- /dev/null
+++ b/xml/tests/testData/psi/testProcessingInstruction1.txt
@@ -0,0 +1,12 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      PsiElement(XML_PROCESSING_INSTRUCTION)
+        XmlToken:XML_PI_START('<?')
+        XmlToken:XML_NAME('This')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_TAG_CHARACTERS('is="PI"')
+        XmlToken:XML_PI_END('?>')
+    XmlTag:
+      PsiErrorElement:Valid XML document must have a root tag
+        <empty list>
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testProcessingInstruction2.txt b/xml/tests/testData/psi/testProcessingInstruction2.txt
new file mode 100644
index 000000000000..7bfd3655fb7b
--- /dev/null
+++ b/xml/tests/testData/psi/testProcessingInstruction2.txt
@@ -0,0 +1,17 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      PsiElement(XML_PROCESSING_INSTRUCTION)
+        XmlToken:XML_PI_START('<?')
+        XmlToken:XML_NAME('This')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_TAG_CHARACTERS('is="PI"')
+        XmlToken:XML_PI_END('?>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testProcessingInstruction3.txt b/xml/tests/testData/psi/testProcessingInstruction3.txt
new file mode 100644
index 000000000000..0bb15319cade
--- /dev/null
+++ b/xml/tests/testData/psi/testProcessingInstruction3.txt
@@ -0,0 +1,49 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      PsiElement(XML_PROCESSING_INSTRUCTION)
+        XmlToken:XML_PI_START('<?')
+        XmlToken:XML_NAME('xml')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('version')
+        XmlToken:XML_EQ('=')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('1.0')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('encoding')
+        XmlToken:XML_EQ('=')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('UTF-8')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        XmlToken:XML_PI_END('?>')
+      PsiElement(XML_PROCESSING_INSTRUCTION)
+        XmlToken:XML_PI_START('<?')
+        XmlToken:XML_NAME('xml-stylesheet')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_TAG_CHARACTERS('type="text/xsl"')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_TAG_CHARACTERS('href="document.xsl"')
+        XmlToken:XML_PI_END('?>')
+      PsiElement(XML_COMMENT)
+        XmlToken:XML_COMMENT_START('<!--')
+        XmlToken:XML_COMMENT_CHARACTERS(' @(#) $Id$ ')
+        XmlToken:XML_COMMENT_END('-->')
+      PsiElement(XML_DOCTYPE)
+        XmlToken:XML_DOCTYPE_START('<!DOCTYPE')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('api')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_DOCTYPE_SYSTEM('SYSTEM')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('"document.dtd"')
+        XmlToken:XML_DOCTYPE_END('>')
+    XmlTag:api
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('api')
+      XmlToken:XML_TAG_END('>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('api')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testPrologInDtd.txt b/xml/tests/testData/psi/testPrologInDtd.txt
new file mode 100644
index 000000000000..3fabbb9d38dc
--- /dev/null
+++ b/xml/tests/testData/psi/testPrologInDtd.txt
@@ -0,0 +1,40 @@
+XmlFile:test.dtd
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      PsiElement(XML_DECL)
+        XmlToken:XML_DECL_START('<?xml ')
+        XmlToken:XML_NAME('version')
+        XmlToken:XML_EQ('=')
+        XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+        XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('1.0')
+        XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('encoding')
+        XmlToken:XML_EQ('=')
+        XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+        XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('ISO-8859-1')
+        XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        XmlToken:XML_DECL_END('?>')
+    PsiWhiteSpace('\n')
+    PsiElement(XML_ELEMENT_DECL)
+      XmlToken:XML_ELEMENT_DECL_START('<!ELEMENT')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('idea-plugin')
+      PsiErrorElement:Whitespace expected
+        <empty list>
+      PsiElement(XML_ELEMENT_CONTENT_SPEC)
+        <empty list>
+      XmlToken:XML_TAG_END('>')
+    PsiWhiteSpace('\n')
+    PsiElement(XML_ATTLIST_DECL)
+      XmlToken:XML_ATTLIST_DECL_START('<!ATTLIST')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('idea-plugin')
+      PsiWhiteSpace('\n    ')
+      PsiElement(XML_ATTRIBUTE_DECL)
+        XmlToken:XML_NAME('url')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('CDATA')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_ATT_IMPLIED('#IMPLIED')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testSGMLDtd.txt b/xml/tests/testData/psi/testSGMLDtd.txt
new file mode 100644
index 000000000000..ef1320978c84
--- /dev/null
+++ b/xml/tests/testData/psi/testSGMLDtd.txt
@@ -0,0 +1,100 @@
+XmlFile:test.dtd
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    PsiElement(XML_ELEMENT_DECL)
+      XmlToken:XML_ELEMENT_DECL_START('<!ELEMENT')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('name')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ELEMENT_CONTENT_SPEC)
+        XmlToken:XML_NAME('-')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('-')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ELEMENT_CONTENT_GROUP)
+          XmlToken:XML_LEFT_PAREN('(')
+          PsiElement(XML_ENTITY_REF)
+            XmlToken:XML_ENTITY_REF_TOKEN('%inline;')
+          XmlToken:XML_RIGHT_PAREN(')')
+        XmlToken:XML_STAR('*')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_PLUS('+')
+        PsiElement(XML_ELEMENT_CONTENT_GROUP)
+          XmlToken:XML_LEFT_PAREN('(')
+          XmlToken:XML_NAME('A')
+          XmlToken:XML_RIGHT_PAREN(')')
+      XmlToken:XML_TAG_END('>')
+    PsiWhiteSpace(' ')
+    PsiElement(XML_ATTLIST_DECL)
+      XmlToken:XML_ATTLIST_DECL_START('<!ATTLIST')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ELEMENT_CONTENT_GROUP)
+        XmlToken:XML_LEFT_PAREN('(')
+        XmlToken:XML_NAME('A')
+        XmlToken:XML_BAR('|')
+        XmlToken:XML_NAME('B')
+        XmlToken:XML_RIGHT_PAREN(')')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_TAG_END('>')
+    PsiWhiteSpace('\n')
+    PsiElement(XML_ELEMENT_DECL)
+      XmlToken:XML_ELEMENT_DECL_START('<!ELEMENT')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ELEMENT_CONTENT_GROUP)
+        XmlToken:XML_LEFT_PAREN('(')
+        XmlToken:XML_NAME('E')
+        XmlToken:XML_BAR('|')
+        XmlToken:XML_NAME('E2')
+        XmlToken:XML_RIGHT_PAREN(')')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ELEMENT_CONTENT_SPEC)
+        XmlToken:XML_NAME('-')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('O')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ELEMENT_CONTENT_GROUP)
+          XmlToken:XML_LEFT_PAREN('(')
+          PsiElement(XML_ENTITY_REF)
+            XmlToken:XML_ENTITY_REF_TOKEN('%flow;')
+          XmlToken:XML_RIGHT_PAREN(')')
+        XmlToken:XML_STAR('*')
+      PsiWhiteSpace('       ')
+      PsiElement(XML_COMMENT)
+        XmlToken:XML_COMMENT_START('--')
+        XmlToken:XML_COMMENT_CHARACTERS(' table header cell, table data cell')
+        XmlToken:XML_COMMENT_END('--')
+      XmlToken:XML_TAG_END('>')
+    PsiWhiteSpace('\n')
+    PsiElement(XML_ELEMENT_DECL)
+      XmlToken:XML_ELEMENT_DECL_START('<!ELEMENT')
+      PsiWhiteSpace(' ')
+      XmlToken:XML_NAME('BODY')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_ELEMENT_CONTENT_SPEC)
+        XmlToken:XML_NAME('O')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('O')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_ELEMENT_CONTENT_GROUP)
+          XmlToken:XML_LEFT_PAREN('(')
+          PsiElement(XML_ENTITY_REF)
+            XmlToken:XML_ENTITY_REF_TOKEN('%block;')
+          XmlToken:XML_BAR('|')
+          XmlToken:XML_NAME('SCRIPT')
+          XmlToken:XML_RIGHT_PAREN(')')
+        XmlToken:XML_PLUS('+')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_PLUS('+')
+        PsiElement(XML_ELEMENT_CONTENT_GROUP)
+          XmlToken:XML_LEFT_PAREN('(')
+          XmlToken:XML_NAME('INS')
+          XmlToken:XML_BAR('|')
+          XmlToken:XML_NAME('DEL')
+          XmlToken:XML_RIGHT_PAREN(')')
+      PsiWhiteSpace(' ')
+      PsiElement(XML_COMMENT)
+        XmlToken:XML_COMMENT_START('--')
+        XmlToken:XML_COMMENT_CHARACTERS(' document body ')
+        XmlToken:XML_COMMENT_END('--')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testUnbalanced1.txt b/xml/tests/testData/psi/testUnbalanced1.txt
new file mode 100644
index 000000000000..bc219d901723
--- /dev/null
+++ b/xml/tests/testData/psi/testUnbalanced1.txt
@@ -0,0 +1,17 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlTag:b
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_TAG_END('>')
+        PsiErrorElement:Element b is not closed
+          <empty list>
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testUnbalanced2.txt b/xml/tests/testData/psi/testUnbalanced2.txt
new file mode 100644
index 000000000000..9de3f4f16526
--- /dev/null
+++ b/xml/tests/testData/psi/testUnbalanced2.txt
@@ -0,0 +1,23 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlTag:b
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_TAG_END('>')
+        PsiErrorElement:Element b is not closed
+          <empty list>
+      XmlTag:c
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('c')
+        XmlToken:XML_TAG_END('>')
+        PsiErrorElement:Element c is not closed
+          <empty list>
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testUnbalanced3.txt b/xml/tests/testData/psi/testUnbalanced3.txt
new file mode 100644
index 000000000000..e0f721ad904e
--- /dev/null
+++ b/xml/tests/testData/psi/testUnbalanced3.txt
@@ -0,0 +1,18 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlTag:b
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_TAG_END('>')
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('bb')
+        XmlToken:XML_TAG_END('>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testUnbalanced4.txt b/xml/tests/testData/psi/testUnbalanced4.txt
new file mode 100644
index 000000000000..85f4468c7dd6
--- /dev/null
+++ b/xml/tests/testData/psi/testUnbalanced4.txt
@@ -0,0 +1,22 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlTag:b
+        XmlToken:XML_START_TAG_START('<')
+        XmlToken:XML_NAME('b')
+        XmlToken:XML_TAG_END('>')
+        XmlTag:b
+          XmlToken:XML_START_TAG_START('<')
+          XmlToken:XML_NAME('b')
+          XmlToken:XML_EMPTY_ELEMENT_END('/>')
+        XmlToken:XML_END_TAG_START('</')
+        XmlToken:XML_NAME('c')
+        XmlToken:XML_TAG_END('>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testUnclosedTag.txt b/xml/tests/testData/psi/testUnclosedTag.txt
new file mode 100644
index 000000000000..e128c3ccf9ed
--- /dev/null
+++ b/xml/tests/testData/psi/testUnclosedTag.txt
@@ -0,0 +1,12 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      XmlToken:XML_TAG_END('>')
+      XmlText
+        XmlToken:XML_DATA_CHARACTERS('xxx')
+      PsiErrorElement:Unexpected end of file
+        <empty list>
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testUnclosedTag2.txt b/xml/tests/testData/psi/testUnclosedTag2.txt
new file mode 100644
index 000000000000..414fedc973df
--- /dev/null
+++ b/xml/tests/testData/psi/testUnclosedTag2.txt
@@ -0,0 +1,9 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    XmlTag:a
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('a')
+      PsiErrorElement:Tag start is not closed
+        <empty list>
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testUnopenedTag1.txt b/xml/tests/testData/psi/testUnopenedTag1.txt
new file mode 100644
index 000000000000..f20119b05737
--- /dev/null
+++ b/xml/tests/testData/psi/testUnopenedTag1.txt
@@ -0,0 +1,11 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      <empty list>
+    PsiErrorElement:Top level element is not completed
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('foo')
+      XmlToken:XML_TAG_END('>')
+    XmlTag:
+      PsiErrorElement:Valid XML document must have a root tag
+        <empty list>
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testXmlDecl.txt b/xml/tests/testData/psi/testXmlDecl.txt
new file mode 100644
index 000000000000..a014a77706cc
--- /dev/null
+++ b/xml/tests/testData/psi/testXmlDecl.txt
@@ -0,0 +1,25 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      PsiElement(XML_PROCESSING_INSTRUCTION)
+        XmlToken:XML_PI_START('<?')
+        XmlToken:XML_NAME('xml')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('version')
+        XmlToken:XML_EQ('=')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('1.0')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('encoding')
+        XmlToken:XML_EQ('=')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER(''')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('cp1251')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER(''')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_PI_END('?>')
+    XmlTag:
+      PsiErrorElement:Valid XML document must have a root tag
+        <empty list>
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testXmlDecl2.txt b/xml/tests/testData/psi/testXmlDecl2.txt
new file mode 100644
index 000000000000..d4c09ade8258
--- /dev/null
+++ b/xml/tests/testData/psi/testXmlDecl2.txt
@@ -0,0 +1,30 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      PsiElement(XML_PROCESSING_INSTRUCTION)
+        XmlToken:XML_PI_START('<?')
+        XmlToken:XML_NAME('xml')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('version')
+        XmlToken:XML_EQ('=')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('1.0')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('encoding')
+        XmlToken:XML_EQ('=')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER(''')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('cp1251')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER(''')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_PI_END('?>')
+      PsiWhiteSpace(' ')
+    XmlTag:foo
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('foo')
+      XmlToken:XML_TAG_END('>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('foo')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testXmlDecl3.txt b/xml/tests/testData/psi/testXmlDecl3.txt
new file mode 100644
index 000000000000..d7d6245d2a03
--- /dev/null
+++ b/xml/tests/testData/psi/testXmlDecl3.txt
@@ -0,0 +1,33 @@
+XmlFile:test.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      PsiElement(XML_PROCESSING_INSTRUCTION)
+        XmlToken:XML_PI_START('<?')
+        XmlToken:XML_NAME('xml')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('version')
+        XmlToken:XML_EQ('=')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER('"')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('1.0')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER('"')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('encoding')
+        XmlToken:XML_EQ('=')
+        PsiElement(XML_ATTRIBUTE_VALUE)
+          XmlToken:XML_ATTRIBUTE_VALUE_START_DELIMITER(''')
+          XmlToken:XML_ATTRIBUTE_VALUE_TOKEN('cp1251')
+          XmlToken:XML_ATTRIBUTE_VALUE_END_DELIMITER(''')
+        PsiErrorElement:Processing instruction not terminated
+          <empty list>
+    PsiWhiteSpace(' ')
+    PsiErrorElement:Unexpected tokens
+      XmlToken:XML_DATA_CHARACTERS('>')
+    PsiWhiteSpace(' ')
+    XmlTag:foo
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('foo')
+      XmlToken:XML_TAG_END('>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('foo')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/testXmlDeclDtd.txt b/xml/tests/testData/psi/testXmlDeclDtd.txt
new file mode 100644
index 000000000000..71f34176a27e
--- /dev/null
+++ b/xml/tests/testData/psi/testXmlDeclDtd.txt
@@ -0,0 +1,52 @@
+XmlFile:x.xml
+  PsiElement(XML_DOCUMENT)
+    PsiElement(XML_PROLOG)
+      PsiElement(XML_DOCTYPE)
+        XmlToken:XML_DOCTYPE_START('<!DOCTYPE')
+        PsiWhiteSpace(' ')
+        XmlToken:XML_NAME('name')
+        PsiWhiteSpace(' ')
+        PsiElement(XML_MARKUP_DECL)
+          XmlToken:XML_MARKUP_START('[')
+          PsiWhiteSpace('\n  ')
+          PsiElement(XML_ELEMENT_DECL)
+            XmlToken:XML_ELEMENT_DECL_START('<!ELEMENT')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_NAME('name')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ELEMENT_CONTENT_SPEC)
+              PsiElement(XML_ELEMENT_CONTENT_GROUP)
+                XmlToken:XML_LEFT_PAREN('(')
+                XmlToken:XML_NAME('a')
+                PsiWhiteSpace(' ')
+                XmlToken:XML_NAME('b')
+                PsiWhiteSpace(' ')
+                XmlToken:XML_NAME('c')
+                PsiWhiteSpace(' ')
+                XmlToken:XML_NAME('d')
+                XmlToken:XML_RIGHT_PAREN(')')
+            XmlToken:XML_TAG_END('>')
+          PsiWhiteSpace('\n  ')
+          PsiElement(XML_ELEMENT_DECL)
+            XmlToken:XML_ELEMENT_DECL_START('<!ELEMENT')
+            PsiWhiteSpace(' ')
+            XmlToken:XML_NAME('name2')
+            PsiWhiteSpace(' ')
+            PsiElement(XML_ELEMENT_CONTENT_SPEC)
+              PsiElement(XML_ELEMENT_CONTENT_GROUP)
+                XmlToken:XML_LEFT_PAREN('(')
+                PsiElement(XML_ENTITY_REF)
+                  XmlToken:XML_ENTITY_REF_TOKEN('%entity;')
+                XmlToken:XML_RIGHT_PAREN(')')
+            XmlToken:XML_TAG_END('>')
+          PsiWhiteSpace('\n')
+          XmlToken:XML_MARKUP_END(']')
+        XmlToken:XML_DOCTYPE_END('>')
+      PsiWhiteSpace('\n')
+    XmlTag:name
+      XmlToken:XML_START_TAG_START('<')
+      XmlToken:XML_NAME('name')
+      XmlToken:XML_TAG_END('>')
+      XmlToken:XML_END_TAG_START('</')
+      XmlToken:XML_NAME('name')
+      XmlToken:XML_TAG_END('>')
\ No newline at end of file
diff --git a/xml/tests/testData/psi/xi/include1.xml b/xml/tests/testData/psi/xi/include1.xml
new file mode 100644
index 000000000000..5c992d74cc71
--- /dev/null
+++ b/xml/tests/testData/psi/xi/include1.xml
@@ -0,0 +1,9 @@
+<include1>
+  <foo attr1="val1">
+    <fooChild/>
+  </foo>
+
+  <bar>
+
+  </bar>
+</include1>
\ No newline at end of file
diff --git a/xml/tests/testData/psi/xi/testBasicXi.xml b/xml/tests/testData/psi/xi/testBasicXi.xml
new file mode 100644
index 000000000000..315f45746d70
--- /dev/null
+++ b/xml/tests/testData/psi/xi/testBasicXi.xml
@@ -0,0 +1,5 @@
+<root xmlns:xi="http://www.w3.org/2001/XInclude">
+  <before/>
+  <xi:include href="include1.xml"/>
+  <after/>
+</root>
\ No newline at end of file
diff --git a/xml/tests/testData/psi/xi/testXpointerXi1.xml b/xml/tests/testData/psi/xi/testXpointerXi1.xml
new file mode 100644
index 000000000000..76e9f56eeac2
--- /dev/null
+++ b/xml/tests/testData/psi/xi/testXpointerXi1.xml
@@ -0,0 +1,5 @@
+<root xmlns:xi="http://www.w3.org/2001/XInclude">
+  <before/>
+  <xi:include href="include1.xml" xpointer="xpointer(/include1/*)"/>
+  <after/>
+</root>
\ No newline at end of file
diff --git a/xml/tests/testData/schemaPrefix/rename.xml b/xml/tests/testData/schemaPrefix/rename.xml
new file mode 100644
index 000000000000..99ee91d641d4
--- /dev/null
+++ b/xml/tests/testData/schemaPrefix/rename.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="http://mySchema"
+        xmlns:xs="http://www.w3.org/2001/XMLSchema"
+        xmlns:my="http://mySchema">
+
+    <xs:element name="myElement" type="my:TYPE"/>
+    <xs:simpleType name="TYPE" id="TYPE">
+        <xs:restriction base="x<caret>s:integer">
+            <xs:minInclusive value="0" id="nonNegativeInteger.minInclusive"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="T" id="T">
+        <xs:restriction base="xs:integer">
+            <xs:minInclusive value="0" id="id"/>
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
diff --git a/xml/tests/testData/schemaPrefix/rename1.xml b/xml/tests/testData/schemaPrefix/rename1.xml
new file mode 100644
index 000000000000..08a03c321666
--- /dev/null
+++ b/xml/tests/testData/schemaPrefix/rename1.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="http://mySchema"
+        xmlns:x<caret>s="http://www.w3.org/2001/XMLSchema"
+        xmlns:my="http://mySchema">
+
+    <xs:element name="myElement" type="my:TYPE"/>
+    <xs:simpleType name="TYPE" id="TYPE">
+        <xs:restriction base="xs:integer">
+            <xs:minInclusive value="0" id="nonNegativeInteger.minInclusive"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="T" id="T">
+        <xs:restriction base="xs:integer">
+            <xs:minInclusive value="0" id="id"/>
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
diff --git a/xml/tests/testData/schemaPrefix/rename1_after.xml b/xml/tests/testData/schemaPrefix/rename1_after.xml
new file mode 100644
index 000000000000..e375267a5c15
--- /dev/null
+++ b/xml/tests/testData/schemaPrefix/rename1_after.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema targetNamespace="http://mySchema"
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+        xmlns:my="http://mySchema">
+
+    <xsd:element name="myElement" type="my:TYPE"/>
+    <xsd:simpleType name="TYPE" id="TYPE">
+        <xsd:restriction base="xsd:integer">
+            <xsd:minInclusive value="0" id="nonNegativeInteger.minInclusive"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:simpleType name="T" id="T">
+        <xsd:restriction base="xsd:integer">
+            <xsd:minInclusive value="0" id="id"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+</xsd:schema>
diff --git a/xml/tests/testData/schemaPrefix/rename2.xml b/xml/tests/testData/schemaPrefix/rename2.xml
new file mode 100644
index 000000000000..220c831964c8
--- /dev/null
+++ b/xml/tests/testData/schemaPrefix/rename2.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="http://mySchema"
+        xmlns:xs="http://www.w3.org/2001/XMLSchema"
+        xmlns:my="http://mySchema">
+
+    <xs:element name="myElement" type="my:TYPE"/>
+    <xs:simpleType name="TYPE" id="TYPE">
+        <x<caret>s:restriction base="xs:integer">
+            <xs:minInclusive value="0" id="nonNegativeInteger.minInclusive"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="T" id="T">
+        <xs:restriction base="xs:integer">
+            <xs:minInclusive value="0" id="id"/>
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/schemaPrefix/rename2_after.xml b/xml/tests/testData/schemaPrefix/rename2_after.xml
new file mode 100644
index 000000000000..df27bea34663
--- /dev/null
+++ b/xml/tests/testData/schemaPrefix/rename2_after.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema targetNamespace="http://mySchema"
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+        xmlns:my="http://mySchema">
+
+    <xsd:element name="myElement" type="my:TYPE"/>
+    <xsd:simpleType name="TYPE" id="TYPE">
+        <xsd:restriction base="xsd:integer">
+            <xsd:minInclusive value="0" id="nonNegativeInteger.minInclusive"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:simpleType name="T" id="T">
+        <xsd:restriction base="xsd:integer">
+            <xsd:minInclusive value="0" id="id"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+</xsd:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/schemaPrefix/renameFromClosingTag.xml b/xml/tests/testData/schemaPrefix/renameFromClosingTag.xml
new file mode 100644
index 000000000000..5f6a6ec0f626
--- /dev/null
+++ b/xml/tests/testData/schemaPrefix/renameFromClosingTag.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="http://mySchema"
+        xmlns:xs="http://www.w3.org/2001/XMLSchema"
+        xmlns:my="http://mySchema">
+
+    <xs:element name="myElement" type="my:TYPE"/>
+    <xs:simpleType name="TYPE" id="TYPE">
+        <xs:restriction base="xs:integer">
+            <xs:minInclusive value="0" id="nonNegativeInteger.minInclusive"/>
+        </x<caret>s:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="T" id="T">
+        <xs:restriction base="xs:integer">
+            <xs:minInclusive value="0" id="id"/>
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/schemaPrefix/renameFromClosingTag_after.xml b/xml/tests/testData/schemaPrefix/renameFromClosingTag_after.xml
new file mode 100644
index 000000000000..df27bea34663
--- /dev/null
+++ b/xml/tests/testData/schemaPrefix/renameFromClosingTag_after.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema targetNamespace="http://mySchema"
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+        xmlns:my="http://mySchema">
+
+    <xsd:element name="myElement" type="my:TYPE"/>
+    <xsd:simpleType name="TYPE" id="TYPE">
+        <xsd:restriction base="xsd:integer">
+            <xsd:minInclusive value="0" id="nonNegativeInteger.minInclusive"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:simpleType name="T" id="T">
+        <xsd:restriction base="xsd:integer">
+            <xsd:minInclusive value="0" id="id"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+</xsd:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/schemaPrefix/rename_after.xml b/xml/tests/testData/schemaPrefix/rename_after.xml
new file mode 100644
index 000000000000..e375267a5c15
--- /dev/null
+++ b/xml/tests/testData/schemaPrefix/rename_after.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema targetNamespace="http://mySchema"
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+        xmlns:my="http://mySchema">
+
+    <xsd:element name="myElement" type="my:TYPE"/>
+    <xsd:simpleType name="TYPE" id="TYPE">
+        <xsd:restriction base="xsd:integer">
+            <xsd:minInclusive value="0" id="nonNegativeInteger.minInclusive"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:simpleType name="T" id="T">
+        <xsd:restriction base="xsd:integer">
+            <xsd:minInclusive value="0" id="id"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+</xsd:schema>
diff --git a/xml/tests/testData/schemaPrefix/usages.xml b/xml/tests/testData/schemaPrefix/usages.xml
new file mode 100644
index 000000000000..7d6cda75f2ed
--- /dev/null
+++ b/xml/tests/testData/schemaPrefix/usages.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="http://mySchema"
+        xmlns:xs<caret>="http://www.w3.org/2001/XMLSchema"
+        xmlns:my="http://mySchema">
+
+    <xs:element name="myElement" type="my:TYPE"/>
+    <xs:simpleType name="TYPE" id="TYPE">
+        <xs:restriction base="xs:integer">
+            <xs:minInclusive value="0" id="nonNegativeInteger.minInclusive"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="T" id="T">
+        <xs:restriction base="xs:integer">
+            <xs:minInclusive value="0" id="id"/>
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
+
diff --git a/xml/tests/testData/schemaPrefix/usages1.xml b/xml/tests/testData/schemaPrefix/usages1.xml
new file mode 100644
index 000000000000..240d92d4e44d
--- /dev/null
+++ b/xml/tests/testData/schemaPrefix/usages1.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="http://mySchema"
+        xmlns:xs="http://www.w3.org/2001/XMLSchema"
+        xmlns:my="http://mySchema">
+
+    <xs:element name="myElement" type="my:TYPE"/>
+    <xs:simpleType name="TYPE" id="TYPE">
+        <xs:restriction base="x<caret>s:integer">
+            <xs:minInclusive value="0" id="nonNegativeInteger.minInclusive"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="T" id="T">
+        <xs:restriction base="xs:integer">
+            <xs:minInclusive value="0" id="id"/>
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
+
diff --git a/xml/tests/testData/smartCompletion/Servlet.xml b/xml/tests/testData/smartCompletion/Servlet.xml
new file mode 100644
index 000000000000..3be15ed6dcae
--- /dev/null
+++ b/xml/tests/testData/smartCompletion/Servlet.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app
+        PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+        "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
+<web-app>
+
+    <servlet>
+        <<caret>
+    </servlet>
+</web-app>
\ No newline at end of file
diff --git a/xml/tests/testData/smartCompletion/test.xsd b/xml/tests/testData/smartCompletion/test.xsd
new file mode 100644
index 000000000000..64a520eb0103
--- /dev/null
+++ b/xml/tests/testData/smartCompletion/test.xsd
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema attributeFormDefault="unqualified"
+           elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:element name="a" type="aType"/>
+  <xs:complexType name="aType">
+    <xs:sequence>
+      <xs:element type="xs:string" name="b"/>
+      <xs:element type="xs:string" name="c" minOccurs="1" maxOccurs="5"/>
+      <xs:element type="xs:string" name="d" minOccurs="z" maxOccurs="x"/>
+      <xs:element type="xs:string" name="e" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>
diff --git a/xml/tests/testData/smartCompletion/testCompletion.xml b/xml/tests/testData/smartCompletion/testCompletion.xml
new file mode 100644
index 000000000000..3aa3ed06fc2a
--- /dev/null
+++ b/xml/tests/testData/smartCompletion/testCompletion.xml
@@ -0,0 +1,3 @@
+<a xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="test.xsd">
+  <<caret>
+</a>
diff --git a/xml/tests/testData/smartCompletion/testCompletion3.xml b/xml/tests/testData/smartCompletion/testCompletion3.xml
new file mode 100644
index 000000000000..bb8ff68f82ed
--- /dev/null
+++ b/xml/tests/testData/smartCompletion/testCompletion3.xml
@@ -0,0 +1,5 @@
+<a xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="test.xsd">
+  <b/>
+  <c/>
+  <<caret>
+</a>
diff --git a/xml/tests/testData/smartCompletion/testCompletionNext.xml b/xml/tests/testData/smartCompletion/testCompletionNext.xml
new file mode 100644
index 000000000000..cfb1b1acfeec
--- /dev/null
+++ b/xml/tests/testData/smartCompletion/testCompletionNext.xml
@@ -0,0 +1,4 @@
+<a xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="test.xsd">
+  <b/>
+  <<caret>
+</a>
diff --git a/xml/tests/testData/smartCompletion/web-app_2_3.dtd b/xml/tests/testData/smartCompletion/web-app_2_3.dtd
new file mode 100644
index 000000000000..5e3ab01c0fe8
--- /dev/null
+++ b/xml/tests/testData/smartCompletion/web-app_2_3.dtd
@@ -0,0 +1,1063 @@
+<!--
+Copyright (c) 2000 Sun Microsystems, Inc.,
+901 San Antonio Road,
+Palo Alto, California 94303, U.S.A.
+All rights reserved.
+
+Sun Microsystems, Inc. has intellectual property rights relating to
+technology embodied in the product that is described in this document.
+In particular, and without limitation, these intellectual property
+rights may include one or more of the U.S. patents listed at
+http://www.sun.com/patents and one or more additional patents or
+pending patent applications in the U.S. and in other countries.
+
+This document and the product to which it pertains are distributed
+under licenses restricting their use, copying, distribution, and
+decompilation.  This document may be reproduced and distributed but may
+not be changed without prior written authorization of Sun and its
+licensors, if any.
+
+Third-party software, including font technology, is copyrighted and
+licensed from Sun suppliers.
+
+Sun,  Sun Microsystems,  the Sun logo,  Java,  JavaServer Pages,  Java
+Naming and Directory Interface,  JDBC,  JDK,  JavaMail and  and
+Enterprise JavaBeans are trademarks or registered trademarks of Sun
+Microsystems, Inc. in the U.S. and other countries.
+
+Federal Acquisitions: Commercial Software - Government Users Subject to
+Standard License Terms and Conditions.
+
+DOCUMENTATION IS PROVIDED "AS IS" AND ALL EXPRESS OR IMPLIED
+CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED
+WARRANTY OF MERCHANTABILITY, FITNESS FOR FOR A PARTICULAR PURPOSE OR
+NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH
+DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
+
+
+_________________________________________________________________________
+
+Copyright (c) 2000 Sun Microsystems, Inc.,
+901 San Antonio Road,
+Palo Alto, California 94303, E'tats-Unis.
+Tous droits re'serve's.
+
+Sun Microsystems, Inc. a les droits de proprie'te' intellectuels
+relatants a` la technologie incorpore'e dans le produit qui est de'crit
+dans ce document. En particulier, et sans la limitation, ces droits de
+proprie'te' intellectuels peuvent inclure un ou plus des brevets
+ame'ricains e'nume're's a` http://www.sun.com/patents et un ou les
+brevets plus supple'mentaires ou les applications de brevet en attente
+dans les E'tats-Unis et dans les autres pays.
+
+Ce produit ou document est prote'ge' par un copyright et distribue'
+avec des licences qui en restreignent l'utilisation, la copie, la
+distribution, et la de'compilation.  Ce documention associe n peut
+e^tre reproduite et distribuer, par quelque moyen que ce soit, sans
+l'autorisation pre'alable et e'crite de Sun et de ses bailleurs de
+licence, le cas e'che'ant.
+
+Le logiciel de'tenu par des tiers, et qui comprend la technologie
+relative aux polices de caracte`res, est prote'ge' par un copyright et
+licencie' par des fournisseurs de Sun.
+
+Sun,  Sun Microsystems,  le logo Sun,  Java,  JavaServer Pages,  Java
+Naming and Directory Interface,  JDBC,  JDK,  JavaMail et  and
+Enterprise JavaBeans sont des marques de fabrique ou des marques
+de'pose'es de Sun Microsystems, Inc. aux E'tats-Unis et dans d'autres
+pays.
+
+LA DOCUMENTATION EST FOURNIE "EN L'E'TAT" ET TOUTES AUTRES CONDITIONS,
+DECLARATIONS ET GARANTIES EXPRESSES OU TACITES SONT FORMELLEMENT
+EXCLUES, DANS LA MESURE AUTORISEE PAR LA LOI APPLICABLE, Y COMPRIS
+NOTAMMENT TOUTE GARANTIE IMPLICITE RELATIVE A LA QUALITE MARCHANDE, A
+L'APTITUDE A UNE UTILISATION PARTICULIERE OU A L'ABSENCE DE
+CONTREFAC,ON.
+-->
+
+<!--
+This is the XML DTD for the Servlet 2.3 deployment descriptor.
+All Servlet 2.3 deployment descriptors must include a DOCTYPE
+of the following form:
+
+  <!DOCTYPE web-app PUBLIC
+	"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+	"http://java.sun.com/dtd/web-app_2_3.dtd">
+
+-->
+
+<!--
+The following conventions apply to all J2EE deployment descriptor
+elements unless indicated otherwise.
+
+- In elements that contain PCDATA, leading and trailing whitespace
+  in the data may be ignored.
+
+- In elements whose value is an "enumerated type", the value is
+  case sensitive.
+
+- In elements that specify a pathname to a file within the same
+  JAR file, relative filenames (i.e., those not starting with "/")
+  are considered relative to the root of the JAR file's namespace.
+  Absolute filenames (i.e., those starting with "/") also specify
+  names in the root of the JAR file's namespace.  In general, relative
+  names are preferred.  The exception is .war files where absolute
+  names are preferred for consistency with the servlet API.
+-->
+
+
+<!--
+The web-app element is the root of the deployment descriptor for
+a web application.
+-->
+<!ELEMENT web-app (icon?, display-name?, description?, distributable?,
+context-param*, filter*, filter-mapping*, listener*, servlet*,
+servlet-mapping*, session-config?, mime-mapping*, welcome-file-list?,
+error-page*, taglib*, resource-env-ref*, resource-ref*, security-constraint*,
+login-config?, security-role*, env-entry*, ejb-ref*,  ejb-local-ref*)>
+
+<!--
+The auth-constraint element indicates the user roles that should
+be permitted access to this resource collection. The role-name
+used here must either correspond to the role-name of one of the
+security-role elements defined for this web application, or be
+the specially reserved role-name "*" that is a compact syntax for
+indicating all roles in the web application. If both "*" and
+rolenames appear, the container interprets this as all roles.
+If no roles are defined, no user is allowed access to the portion of
+the web application described by the containing security-constraint.
+The container matches role names case sensitively when determining
+access.
+
+
+Used in: security-constraint
+-->
+<!ELEMENT auth-constraint (description?, role-name*)>
+
+<!--
+The auth-method element is used to configure the authentication
+mechanism for the web application. As a prerequisite to gaining access to any web resources which are protected by an authorization
+constraint, a user must have authenticated using the configured
+mechanism. Legal values for this element are "BASIC", "DIGEST",
+"FORM", or "CLIENT-CERT".
+
+Used in: login-config
+-->
+<!ELEMENT auth-method (#PCDATA)>
+
+<!--
+The context-param element contains the declaration of a web
+application's servlet context initialization parameters.
+
+Used in: web-app
+-->
+<!ELEMENT context-param (param-name, param-value, description?)>
+
+<!--
+The description element is used to provide text describing the parent
+element.  The description element should include any information that
+the web application war file producer wants to provide to the consumer of
+the web application war file (i.e., to the Deployer). Typically, the tools
+used by the web application war file consumer will display the description
+when processing the parent element that contains the description.
+
+Used in: auth-constraint, context-param, ejb-local-ref, ejb-ref,
+env-entry, filter, init-param, resource-env-ref, resource-ref, run-as,
+security-role, security-role-ref, servlet, user-data-constraint,
+web-app, web-resource-collection
+-->
+<!ELEMENT description (#PCDATA)>
+
+<!--
+The display-name element contains a short name that is intended to be
+displayed by tools.  The display name need not be unique.
+
+Used in: filter, security-constraint, servlet, web-app
+
+Example:
+
+<display-name>Employee Self Service</display-name>
+-->
+<!ELEMENT display-name (#PCDATA)>
+
+<!--
+The distributable element, by its presence in a web application
+deployment descriptor, indicates that this web application is
+programmed appropriately to be deployed into a distributed servlet
+container
+
+Used in: web-app
+-->
+<!ELEMENT distributable EMPTY>
+
+<!--
+The ejb-link element is used in the ejb-ref or ejb-local-ref
+elements to specify that an EJB reference is linked to an
+enterprise bean.
+
+The name in the ejb-link element is composed of a
+path name specifying the ejb-jar containing the referenced enterprise
+bean with the ejb-name of the target bean appended and separated from
+the path name by "#".  The path name is relative to the war file
+containing the web application that is referencing the enterprise bean.
+This allows multiple enterprise beans with the same ejb-name to be
+uniquely identified.
+
+Used in: ejb-local-ref, ejb-ref
+
+Examples:
+
+	<ejb-link>EmployeeRecord</ejb-link>
+
+	<ejb-link>../products/product.jar#ProductEJB</ejb-link>
+
+-->
+<!ELEMENT ejb-link (#PCDATA)>
+
+<!--
+The ejb-local-ref element is used for the declaration of a reference to
+an enterprise bean's local home. The declaration consists of:
+
+	- an optional description
+	- the EJB reference name used in the code of the web application
+	  that's referencing the enterprise bean
+	- the expected type of the referenced enterprise bean
+	- the expected local home and local interfaces of the referenced
+	  enterprise bean
+	- optional ejb-link information, used to specify the referenced
+	  enterprise bean
+
+Used in: web-app
+-->
+<!ELEMENT ejb-local-ref (description?, ejb-ref-name, ejb-ref-type,
+		local-home, local, ejb-link?)>
+
+<!--
+The ejb-ref element is used for the declaration of a reference to
+an enterprise bean's home. The declaration consists of:
+
+	- an optional description
+	- the EJB reference name used in the code of
+	  the web application that's referencing the enterprise bean
+	- the expected type of the referenced enterprise bean
+	- the expected home and remote interfaces of the referenced
+	  enterprise bean
+	- optional ejb-link information, used to specify the referenced
+	  enterprise bean
+
+Used in: web-app
+-->
+<!ELEMENT ejb-ref (description?, ejb-ref-name, ejb-ref-type,
+		home, remote, ejb-link?)>
+
+<!--
+The ejb-ref-name element contains the name of an EJB reference. The
+EJB reference is an entry in the web application's environment and is
+relative to the java:comp/env context.  The name must be unique
+within the web application.
+
+It is recommended that name is prefixed with "ejb/".
+
+Used in: ejb-local-ref, ejb-ref
+
+Example:
+
+<ejb-ref-name>ejb/Payroll</ejb-ref-name>
+-->
+<!ELEMENT ejb-ref-name (#PCDATA)>
+
+<!--
+The ejb-ref-type element contains the expected type of the
+referenced enterprise bean.
+
+The ejb-ref-type element must be one of the following:
+
+	<ejb-ref-type>Entity</ejb-ref-type>
+	<ejb-ref-type>Session</ejb-ref-type>
+
+Used in: ejb-local-ref, ejb-ref
+-->
+<!ELEMENT ejb-ref-type (#PCDATA)>
+
+<!--
+The env-entry element contains the declaration of a web application's
+environment entry. The declaration consists of an optional
+description, the name of the environment entry, and an optional
+value.  If a value is not specified, one must be supplied
+during deployment.
+-->
+<!ELEMENT env-entry (description?, env-entry-name, env-entry-value?,
+env-entry-type)>
+
+<!--
+The env-entry-name element contains the name of a web applications's
+environment entry.  The name is a JNDI name relative to the
+java:comp/env context.  The name must be unique within a web application.
+
+Example:
+
+<env-entry-name>minAmount</env-entry-name>
+
+Used in: env-entry
+-->
+<!ELEMENT env-entry-name (#PCDATA)>
+
+<!--
+The env-entry-type element contains the fully-qualified Java type of
+the environment entry value that is expected by the web application's
+code.
+
+The following are the legal values of env-entry-type:
+
+	java.lang.Boolean
+	java.lang.Byte
+	java.lang.Character
+	java.lang.String
+	java.lang.Short
+	java.lang.Integer
+	java.lang.Long
+	java.lang.Float
+	java.lang.Double
+
+Used in: env-entry
+-->
+<!ELEMENT env-entry-type (#PCDATA)>
+
+<!--
+The env-entry-value element contains the value of a web application's
+environment entry. The value must be a String that is valid for the
+constructor of the specified type that takes a single String
+parameter, or for java.lang.Character, a single character.
+
+Example:
+
+<env-entry-value>100.00</env-entry-value>
+
+Used in: env-entry
+-->
+<!ELEMENT env-entry-value (#PCDATA)>
+
+<!--
+The error-code contains an HTTP error code, ex: 404
+
+Used in: error-page
+-->
+<!ELEMENT error-code (#PCDATA)>
+
+<!--
+The error-page element contains a mapping between an error code
+or exception type to the path of a resource in the web application
+
+Used in: web-app
+-->
+<!ELEMENT error-page ((error-code | exception-type), location)>
+
+<!--
+The exception type contains a fully qualified class name of a
+Java exception type.
+
+Used in: error-page
+-->
+<!ELEMENT exception-type (#PCDATA)>
+
+<!--
+The extension element contains a string describing an
+extension. example: "txt"
+
+Used in: mime-mapping
+-->
+<!ELEMENT extension (#PCDATA)>
+
+<!--
+Declares a filter in the web application. The filter is mapped to
+either a servlet or a URL pattern in the filter-mapping element, using
+the filter-name value to reference. Filters can access the
+initialization parameters declared in the deployment descriptor at
+runtime via the FilterConfig interface.
+
+Used in: web-app
+-->
+<!ELEMENT filter (icon?, filter-name, display-name?, description?,
+filter-class, init-param*)>
+
+<!--
+The fully qualified classname of the filter.
+
+Used in: filter
+-->
+<!ELEMENT filter-class (#PCDATA)>
+
+<!--
+Declaration of the filter mappings in this web application. The
+container uses the filter-mapping declarations to decide which filters
+to apply to a request, and in what order. The container matches the
+request URI to a Servlet in the normal way. To determine which filters
+to apply it matches filter-mapping declarations either on servlet-name,
+or on url-pattern for each filter-mapping element, depending on which
+style is used. The order in which filters are invoked is the order in
+which filter-mapping declarations that match a request URI for a
+servlet appear in the list of filter-mapping elements.The filter-name
+value must be the value of the <filter-name> sub-elements of one of the
+<filter> declarations in the deployment descriptor.
+
+Used in: web-app
+-->
+<!ELEMENT filter-mapping (filter-name, (url-pattern | servlet-name))>
+
+<!--
+The logical name of the filter. This name is used to map the filter.
+Each filter name is unique within the web application.
+
+Used in: filter, filter-mapping
+-->
+<!ELEMENT filter-name (#PCDATA)>
+
+<!--
+The form-error-page element defines the location in the web app
+where the error page that is displayed when login is not successful
+can be found. The path begins with a leading / and is interpreted
+relative to the root of the WAR.
+
+Used in: form-login-config
+-->
+<!ELEMENT form-error-page (#PCDATA)>
+
+<!--
+The form-login-config element specifies the login and error pages
+that should be used in form based login. If form based authentication
+is not used, these elements are ignored.
+
+Used in: login-config
+-->
+<!ELEMENT form-login-config (form-login-page, form-error-page)>
+
+<!--
+The form-login-page element defines the location in the web app
+where the page that can be used for login can be found. The path
+begins with a leading / and is interpreted relative to the root of the WAR.
+
+Used in: form-login-config
+-->
+<!ELEMENT form-login-page (#PCDATA)>
+
+<!--
+The home element contains the fully-qualified name of the enterprise
+bean's home interface.
+
+Used in: ejb-ref
+
+Example:
+
+<home>com.aardvark.payroll.PayrollHome</home>
+-->
+<!ELEMENT home (#PCDATA)>
+
+<!--
+The http-method contains an HTTP method (GET | POST |...).
+
+Used in: web-resource-collection
+-->
+<!ELEMENT http-method (#PCDATA)>
+
+<!--
+The icon element contains small-icon and large-icon elements that
+specify the file names for small and a large GIF or JPEG icon images
+used to represent the parent element in a GUI tool.
+
+Used in: filter, servlet, web-app
+-->
+<!ELEMENT icon (small-icon?, large-icon?)>
+
+<!--
+The init-param element contains a name/value pair as an
+initialization param of the servlet
+
+Used in: filter, servlet
+-->
+<!ELEMENT init-param (param-name, param-value, description?)>
+
+<!--
+The jsp-file element contains the full path to a JSP file within
+the web application beginning with a `/'.
+
+Used in: servlet
+-->
+<!ELEMENT jsp-file (#PCDATA)>
+
+<!--
+The large-icon element contains the name of a file
+containing a large (32 x 32) icon image. The file
+name is a relative path within the web application's
+war file.
+
+The image may be either in the JPEG or GIF format.
+The icon can be used by tools.
+
+Used in: icon
+
+Example:
+
+<large-icon>employee-service-icon32x32.jpg</large-icon>
+-->
+<!ELEMENT large-icon (#PCDATA)>
+
+<!--
+The listener element indicates the deployment properties for a web
+application listener bean.
+
+Used in: web-app
+-->
+<!ELEMENT listener (listener-class)>
+
+<!--
+The listener-class element declares a class in the application must be
+registered as a web application listener bean. The value is the fully qualified classname of the listener class.
+
+
+Used in: listener
+-->
+<!ELEMENT listener-class (#PCDATA)>
+
+<!--
+The load-on-startup element indicates that this servlet should be
+loaded (instantiated and have its init() called) on the startup
+of the web application. The optional contents of
+these element must be an integer indicating the order in which
+the servlet should be loaded. If the value is a negative integer,
+or the element is not present, the container is free to load the
+servlet whenever it chooses. If the value is a positive integer
+or 0, the container must load and initialize the servlet as the
+application is deployed. The container must guarantee that
+servlets marked with lower integers are loaded before servlets
+marked with higher integers. The container may choose the order
+of loading of servlets with the same load-on-start-up value.
+
+Used in: servlet
+-->
+<!ELEMENT load-on-startup (#PCDATA)>
+
+<!--
+
+The local element contains the fully-qualified name of the
+enterprise bean's local interface.
+
+Used in: ejb-local-ref
+
+-->
+<!ELEMENT local (#PCDATA)>
+
+<!--
+
+The local-home element contains the fully-qualified name of the
+enterprise bean's local home interface.
+
+Used in: ejb-local-ref
+-->
+<!ELEMENT local-home (#PCDATA)>
+
+<!--
+The location element contains the location of the resource in the web
+application relative to the root of the web application. The value of
+the location must have a leading `/'.
+
+Used in: error-page
+-->
+<!ELEMENT location (#PCDATA)>
+
+<!--
+The login-config element is used to configure the authentication
+method that should be used, the realm name that should be used for
+this application, and the attributes that are needed by the form login
+mechanism.
+
+Used in: web-app
+-->
+<!ELEMENT login-config (auth-method?, realm-name?, form-login-config?)>
+
+<!--
+The mime-mapping element defines a mapping between an extension
+and a mime type.
+
+Used in: web-app
+-->
+<!ELEMENT mime-mapping (extension, mime-type)>
+
+<!--
+The mime-type element contains a defined mime type. example:
+"text/plain"
+
+Used in: mime-mapping
+-->
+<!ELEMENT mime-type (#PCDATA)>
+
+<!--
+The param-name element contains the name of a parameter. Each parameter
+name must be unique in the web application.
+
+
+Used in: context-param, init-param
+-->
+<!ELEMENT param-name (#PCDATA)>
+
+<!--
+The param-value element contains the value of a parameter.
+
+Used in: context-param, init-param
+-->
+<!ELEMENT param-value (#PCDATA)>
+
+<!--
+The realm name element specifies the realm name to use in HTTP
+Basic authorization.
+
+Used in: login-config
+-->
+<!ELEMENT realm-name (#PCDATA)>
+
+<!--
+The remote element contains the fully-qualified name of the enterprise
+bean's remote interface.
+
+Used in: ejb-ref
+
+Example:
+
+<remote>com.wombat.empl.EmployeeService</remote>
+-->
+<!ELEMENT remote (#PCDATA)>
+
+<!--
+The res-auth element specifies whether the web application code signs
+on programmatically to the resource manager, or whether the Container
+will sign on to the resource manager on behalf of the web application. In the
+latter case, the Container uses information that is supplied by the
+Deployer.
+
+The value of this element must be one of the two following:
+
+	<res-auth>Application</res-auth>
+	<res-auth>Container</res-auth>
+
+Used in: resource-ref
+-->
+<!ELEMENT res-auth (#PCDATA)>
+
+<!--
+The res-ref-name element specifies the name of a resource manager
+connection factory reference.  The name is a JNDI name relative to the
+java:comp/env context.  The name must be unique within a web application.
+
+Used in: resource-ref
+-->
+<!ELEMENT res-ref-name (#PCDATA)>
+
+<!--
+The res-sharing-scope element specifies whether connections obtained
+through the given resource manager connection factory reference can be
+shared. The value of this element, if specified, must be one of the
+two following:
+
+	<res-sharing-scope>Shareable</res-sharing-scope>
+	<res-sharing-scope>Unshareable</res-sharing-scope>
+
+The default value is Shareable.
+
+Used in: resource-ref
+-->
+<!ELEMENT res-sharing-scope (#PCDATA)>
+
+<!--
+The res-type element specifies the type of the data source. The type
+is specified by the fully qualified Java language class or interface
+expected to be implemented by the data source.
+
+Used in: resource-ref
+-->
+<!ELEMENT res-type (#PCDATA)>
+
+<!--
+The resource-env-ref element contains a declaration of a web application's
+reference to an administered object associated with a resource
+in the web application's environment.  It consists of an optional
+description, the resource environment reference name, and an
+indication of the resource environment reference type expected by
+the web application code.
+
+Used in: web-app
+
+Example:
+
+<resource-env-ref>
+    <resource-env-ref-name>jms/StockQueue</resource-env-ref-name>
+    <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+</resource-env-ref>
+-->
+<!ELEMENT resource-env-ref (description?, resource-env-ref-name,
+		resource-env-ref-type)>
+
+<!--
+The resource-env-ref-name element specifies the name of a resource
+environment reference; its value is the environment entry name used in
+the web application code.  The name is a JNDI name relative to the
+java:comp/env context and must be unique within a web application.
+
+Used in: resource-env-ref
+-->
+<!ELEMENT resource-env-ref-name (#PCDATA)>
+
+<!--
+The resource-env-ref-type element specifies the type of a resource
+environment reference.  It is the fully qualified name of a Java
+language class or interface.
+
+Used in: resource-env-ref
+-->
+<!ELEMENT resource-env-ref-type (#PCDATA)>
+
+<!--
+The resource-ref element contains a declaration of a web application's
+reference to an external resource. It consists of an optional
+description, the resource manager connection factory reference name,
+the indication of the resource manager connection factory type
+expected by the web application code, the type of authentication
+(Application or Container), and an optional specification of the
+shareability of connections obtained from the resource (Shareable or
+Unshareable).
+
+Used in: web-app
+
+Example:
+
+    <resource-ref>
+	<res-ref-name>jdbc/EmployeeAppDB</res-ref-name>
+	<res-type>javax.sql.DataSource</res-type>
+	<res-auth>Container</res-auth>
+	<res-sharing-scope>Shareable</res-sharing-scope>
+    </resource-ref>
+-->
+<!ELEMENT resource-ref (description?, res-ref-name, res-type, res-auth,
+		res-sharing-scope?)>
+
+<!--
+The role-link element is a reference to a defined security role. The
+role-link element must contain the name of one of the security roles
+defined in the security-role elements.
+
+Used in: security-role-ref
+-->
+<!ELEMENT role-link (#PCDATA)>
+
+<!--
+The role-name element contains the name of a security role.
+
+The name must conform to the lexical rules for an NMTOKEN.
+
+Used in: auth-constraint, run-as, security-role, security-role-ref
+-->
+<!ELEMENT role-name (#PCDATA)>
+
+<!--
+The run-as element specifies the run-as identity to be used for the
+execution of the web application. It contains an optional description, and
+the name of a security role.
+
+Used in: servlet
+-->
+<!ELEMENT run-as (description?, role-name)>
+
+<!--
+The security-constraint element is used to associate security
+constraints with one or more web resource collections
+
+Used in: web-app
+-->
+<!ELEMENT security-constraint (display-name?, web-resource-collection+,
+auth-constraint?, user-data-constraint?)>
+
+<!--
+The security-role element contains the definition of a security
+role. The definition consists of an optional description of the
+security role, and the security role name.
+
+Used in: web-app
+
+Example:
+
+    <security-role>
+	<description>
+	    This role includes all employees who are authorized
+	    to access the employee service application.
+	</description>
+	<role-name>employee</role-name>
+    </security-role>
+-->
+<!ELEMENT security-role (description?, role-name)>
+
+<!--
+The security-role-ref element contains the declaration of a security
+role reference in the web application's code. The declaration consists
+of an optional description, the security role name used in the code,
+and an optional link to a security role. If the security role is not
+specified, the Deployer must choose an appropriate security role.
+
+The value of the role-name element must be the String used as the
+parameter to the EJBContext.isCallerInRole(String roleName) method
+or the HttpServletRequest.isUserInRole(String role) method.
+
+Used in: servlet
+
+-->
+<!ELEMENT security-role-ref (description?, role-name, role-link?)>
+
+<!--
+The servlet element contains the declarative data of a
+servlet. If a jsp-file is specified and the load-on-startup element is
+present, then the JSP should be precompiled and loaded.
+
+Used in: web-app
+-->
+<!ELEMENT servlet (icon?, servlet-name, display-name?, description?,
+(servlet-class|jsp-file), init-param*, load-on-startup?, run-as?, security-role-ref*)>
+
+<!--
+The servlet-class element contains the fully qualified class name
+of the servlet.
+
+Used in: servlet
+-->
+<!ELEMENT servlet-class (#PCDATA)>
+
+<!--
+The servlet-mapping element defines a mapping between a servlet
+and a url pattern
+
+Used in: web-app
+-->
+<!ELEMENT servlet-mapping (servlet-name, url-pattern)>
+
+<!--
+The servlet-name element contains the canonical name of the
+servlet. Each servlet name is unique within the web application.
+
+Used in: filter-mapping, servlet, servlet-mapping
+-->
+<!ELEMENT servlet-name (#PCDATA)>
+
+<!--
+The session-config element defines the session parameters for
+this web application.
+
+Used in: web-app
+-->
+<!ELEMENT session-config (session-timeout?)>
+
+<!--
+The session-timeout element defines the default session timeout
+interval for all sessions created in this web application. The
+specified timeout must be expressed in a whole number of minutes.
+If the timeout is 0 or less, the container ensures the default
+behaviour of sessions is never to time out.
+
+Used in: session-config
+-->
+<!ELEMENT session-timeout (#PCDATA)>
+
+<!--
+The small-icon element contains the name of a file
+containing a small (16 x 16) icon image. The file
+name is a relative path within the web application's
+war file.
+
+The image may be either in the JPEG or GIF format.
+The icon can be used by tools.
+
+Used in: icon
+
+Example:
+
+<small-icon>employee-service-icon16x16.jpg</small-icon>
+-->
+<!ELEMENT small-icon (#PCDATA)>
+
+<!--
+The taglib element is used to describe a JSP tag library.
+
+Used in: web-app
+-->
+<!ELEMENT taglib (taglib-uri, taglib-location)>
+
+<!--
+the taglib-location element contains the location (as a resource
+relative to the root of the web application) where to find the Tag
+Libary Description file for the tag library.
+
+Used in: taglib
+-->
+<!ELEMENT taglib-location (#PCDATA)>
+
+<!--
+The taglib-uri element describes a URI, relative to the location
+of the web.xml document, identifying a Tag Library used in the Web
+Application.
+
+Used in: taglib
+-->
+<!ELEMENT taglib-uri (#PCDATA)>
+
+<!--
+The transport-guarantee element specifies that the communication
+between client and server should be NONE, INTEGRAL, or
+CONFIDENTIAL. NONE means that the application does not require any
+transport guarantees. A value of INTEGRAL means that the application
+requires that the data sent between the client and server be sent in
+such a way that it can't be changed in transit. CONFIDENTIAL means
+that the application requires that the data be transmitted in a
+fashion that prevents other entities from observing the contents of
+the transmission. In most cases, the presence of the INTEGRAL or
+CONFIDENTIAL flag will indicate that the use of SSL is required.
+
+Used in: user-data-constraint
+-->
+<!ELEMENT transport-guarantee (#PCDATA)>
+
+<!--
+The url-pattern element contains the url pattern of the mapping. Must
+follow the rules specified in Section 11.2 of the Servlet API
+Specification.
+
+Used in: filter-mapping, servlet-mapping, web-resource-collection
+-->
+<!ELEMENT url-pattern (#PCDATA)>
+
+<!--
+The user-data-constraint element is used to indicate how data
+communicated between the client and container should be protected.
+
+Used in: security-constraint
+-->
+<!ELEMENT user-data-constraint (description?, transport-guarantee)>
+
+<!--
+The web-resource-collection element is used to identify a subset
+of the resources and HTTP methods on those resources within a web
+application to which a security constraint applies. If no HTTP methods
+are specified, then the security constraint applies to all HTTP
+methods.
+
+Used in: security-constraint
+-->
+<!ELEMENT web-resource-collection (web-resource-name, description?,
+url-pattern*, http-method*)>
+
+<!--
+The web-resource-name contains the name of this web resource
+collection.
+
+Used in: web-resource-collection
+-->
+<!ELEMENT web-resource-name (#PCDATA)>
+
+<!--
+The welcome-file element contains file name to use as a default
+welcome file, such as index.html
+
+Used in: welcome-file-list
+-->
+<!ELEMENT welcome-file (#PCDATA)>
+
+<!--
+The welcome-file-list contains an ordered list of welcome files
+elements.
+
+Used in: web-app
+-->
+<!ELEMENT welcome-file-list (welcome-file+)>
+
+<!--
+The ID mechanism is to allow tools that produce additional deployment
+information (i.e., information beyond the standard deployment
+descriptor information) to store the non-standard information in a
+separate file, and easily refer from these tool-specific files to the
+information in the standard deployment descriptor.
+
+Tools are not allowed to add the non-standard information into the
+standard deployment descriptor.
+-->
+
+<!ATTLIST auth-constraint id ID #IMPLIED>
+<!ATTLIST auth-method id ID #IMPLIED>
+<!ATTLIST context-param id ID #IMPLIED>
+<!ATTLIST description id ID #IMPLIED>
+<!ATTLIST display-name id ID #IMPLIED>
+<!ATTLIST distributable id ID #IMPLIED>
+<!ATTLIST ejb-link id ID #IMPLIED>
+<!ATTLIST ejb-local-ref id ID #IMPLIED>
+<!ATTLIST ejb-ref id ID #IMPLIED>
+<!ATTLIST ejb-ref-name id ID #IMPLIED>
+<!ATTLIST ejb-ref-type id ID #IMPLIED>
+<!ATTLIST env-entry id ID #IMPLIED>
+<!ATTLIST env-entry-name id ID #IMPLIED>
+<!ATTLIST env-entry-type id ID #IMPLIED>
+<!ATTLIST env-entry-value id ID #IMPLIED>
+<!ATTLIST error-code id ID #IMPLIED>
+<!ATTLIST error-page id ID #IMPLIED>
+<!ATTLIST exception-type id ID #IMPLIED>
+<!ATTLIST extension id ID #IMPLIED>
+<!ATTLIST filter id ID #IMPLIED>
+<!ATTLIST filter-class id ID #IMPLIED>
+<!ATTLIST filter-mapping id ID #IMPLIED>
+<!ATTLIST filter-name id ID #IMPLIED>
+<!ATTLIST form-error-page id ID #IMPLIED>
+<!ATTLIST form-login-config id ID #IMPLIED>
+<!ATTLIST form-login-page id ID #IMPLIED>
+<!ATTLIST home id ID #IMPLIED>
+<!ATTLIST http-method id ID #IMPLIED>
+<!ATTLIST icon id ID #IMPLIED>
+<!ATTLIST init-param id ID #IMPLIED>
+<!ATTLIST jsp-file id ID #IMPLIED>
+<!ATTLIST large-icon id ID #IMPLIED>
+<!ATTLIST listener id ID #IMPLIED>
+<!ATTLIST listener-class id ID #IMPLIED>
+<!ATTLIST load-on-startup id ID #IMPLIED>
+<!ATTLIST local id ID #IMPLIED>
+<!ATTLIST local-home id ID #IMPLIED>
+<!ATTLIST location id ID #IMPLIED>
+<!ATTLIST login-config id ID #IMPLIED>
+<!ATTLIST mime-mapping id ID #IMPLIED>
+<!ATTLIST mime-type id ID #IMPLIED>
+<!ATTLIST param-name id ID #IMPLIED>
+<!ATTLIST param-value id ID #IMPLIED>
+<!ATTLIST realm-name id ID #IMPLIED>
+<!ATTLIST remote id ID #IMPLIED>
+<!ATTLIST res-auth id ID #IMPLIED>
+<!ATTLIST res-ref-name id ID #IMPLIED>
+<!ATTLIST res-sharing-scope id ID #IMPLIED>
+<!ATTLIST res-type id ID #IMPLIED>
+<!ATTLIST resource-env-ref id ID #IMPLIED>
+<!ATTLIST resource-env-ref-name id ID #IMPLIED>
+<!ATTLIST resource-env-ref-type id ID #IMPLIED>
+<!ATTLIST resource-ref id ID #IMPLIED>
+<!ATTLIST role-link id ID #IMPLIED>
+<!ATTLIST role-name id ID #IMPLIED>
+<!ATTLIST run-as id ID #IMPLIED>
+<!ATTLIST security-constraint id ID #IMPLIED>
+<!ATTLIST security-role id ID #IMPLIED>
+<!ATTLIST security-role-ref id ID #IMPLIED>
+<!ATTLIST servlet id ID #IMPLIED>
+<!ATTLIST servlet-class id ID #IMPLIED>
+<!ATTLIST servlet-mapping id ID #IMPLIED>
+<!ATTLIST servlet-name id ID #IMPLIED>
+<!ATTLIST session-config id ID #IMPLIED>
+<!ATTLIST session-timeout id ID #IMPLIED>
+<!ATTLIST small-icon id ID #IMPLIED>
+<!ATTLIST taglib id ID #IMPLIED>
+<!ATTLIST taglib-location id ID #IMPLIED>
+<!ATTLIST taglib-uri id ID #IMPLIED>
+<!ATTLIST transport-guarantee id ID #IMPLIED>
+<!ATTLIST url-pattern id ID #IMPLIED>
+<!ATTLIST user-data-constraint id ID #IMPLIED>
+<!ATTLIST web-app id ID #IMPLIED>
+<!ATTLIST web-resource-collection id ID #IMPLIED>
+<!ATTLIST web-resource-name id ID #IMPLIED>
+<!ATTLIST welcome-file id ID #IMPLIED>
+<!ATTLIST welcome-file-list id ID #IMPLIED>
diff --git a/xml/tests/testData/smartEnter/IDEADEV_29628.xml b/xml/tests/testData/smartEnter/IDEADEV_29628.xml
new file mode 100644
index 000000000000..211a8f2c8795
--- /dev/null
+++ b/xml/tests/testData/smartEnter/IDEADEV_29628.xml
@@ -0,0 +1 @@
+<label for="email<caret>"
\ No newline at end of file
diff --git a/xml/tests/testData/smartEnter/IDEADEV_29628_after.xml b/xml/tests/testData/smartEnter/IDEADEV_29628_after.xml
new file mode 100644
index 000000000000..7df43358b5e4
--- /dev/null
+++ b/xml/tests/testData/smartEnter/IDEADEV_29628_after.xml
@@ -0,0 +1 @@
+<label for="email"></label>
\ No newline at end of file
diff --git a/xml/tests/testData/smartEnter/IDEADEV_32164.jsp b/xml/tests/testData/smartEnter/IDEADEV_32164.jsp
new file mode 100644
index 000000000000..703f27ca8f45
--- /dev/null
+++ b/xml/tests/testData/smartEnter/IDEADEV_32164.jsp
@@ -0,0 +1 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" <caret>
\ No newline at end of file
diff --git a/xml/tests/testData/smartEnter/IDEADEV_32164_2.jsp b/xml/tests/testData/smartEnter/IDEADEV_32164_2.jsp
new file mode 100644
index 000000000000..47f2727bf3ca
--- /dev/null
+++ b/xml/tests/testData/smartEnter/IDEADEV_32164_2.jsp
@@ -0,0 +1,5 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java"
+<html>
+  <body><caret>
+  </body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/smartEnter/IDEADEV_32164_2_after.jsp b/xml/tests/testData/smartEnter/IDEADEV_32164_2_after.jsp
new file mode 100644
index 000000000000..a3f189ccb222
--- /dev/null
+++ b/xml/tests/testData/smartEnter/IDEADEV_32164_2_after.jsp
@@ -0,0 +1,5 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java"
+        <html>
+                <body>
+                </body>
+                </html>
\ No newline at end of file
diff --git a/xml/tests/testData/smartEnter/IDEADEV_32164_after.jsp b/xml/tests/testData/smartEnter/IDEADEV_32164_after.jsp
new file mode 100644
index 000000000000..80e206e48fe4
--- /dev/null
+++ b/xml/tests/testData/smartEnter/IDEADEV_32164_after.jsp
@@ -0,0 +1 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %><caret>
\ No newline at end of file
diff --git a/xml/tests/testData/smartEnter/OpenAttribute.xml b/xml/tests/testData/smartEnter/OpenAttribute.xml
new file mode 100644
index 000000000000..0bfad0e147dc
--- /dev/null
+++ b/xml/tests/testData/smartEnter/OpenAttribute.xml
@@ -0,0 +1 @@
+<label for="email<caret>text
\ No newline at end of file
diff --git a/xml/tests/testData/smartEnter/OpenAttribute_after.xml b/xml/tests/testData/smartEnter/OpenAttribute_after.xml
new file mode 100644
index 000000000000..f789f8e4992a
--- /dev/null
+++ b/xml/tests/testData/smartEnter/OpenAttribute_after.xml
@@ -0,0 +1 @@
+<label for="email">text<caret></label>
\ No newline at end of file
diff --git a/xml/tests/testData/smartEnter/SmartFinish1.xml b/xml/tests/testData/smartEnter/SmartFinish1.xml
new file mode 100644
index 000000000000..06c57cd032cb
--- /dev/null
+++ b/xml/tests/testData/smartEnter/SmartFinish1.xml
@@ -0,0 +1,4 @@
+<a>
+    <b>tttt</b>
+    <b<caret>test text
+</a>
\ No newline at end of file
diff --git a/xml/tests/testData/smartEnter/SmartFinish1_after.xml b/xml/tests/testData/smartEnter/SmartFinish1_after.xml
new file mode 100644
index 000000000000..19493cd4a68f
--- /dev/null
+++ b/xml/tests/testData/smartEnter/SmartFinish1_after.xml
@@ -0,0 +1,4 @@
+<a>
+    <b>tttt</b>
+    <b>test text<caret></b>
+</a>
\ No newline at end of file
diff --git a/xml/tests/testData/smartEnter/SmartFinish2.xml b/xml/tests/testData/smartEnter/SmartFinish2.xml
new file mode 100644
index 000000000000..338caad53457
--- /dev/null
+++ b/xml/tests/testData/smartEnter/SmartFinish2.xml
@@ -0,0 +1,4 @@
+<a>
+    <b><c>test</c></b>
+    <b<caret><c>test</c>
+</a>
\ No newline at end of file
diff --git a/xml/tests/testData/smartEnter/SmartFinish2_after.xml b/xml/tests/testData/smartEnter/SmartFinish2_after.xml
new file mode 100644
index 000000000000..a44ea191cb1c
--- /dev/null
+++ b/xml/tests/testData/smartEnter/SmartFinish2_after.xml
@@ -0,0 +1,6 @@
+<a>
+    <b><c>test</c></b>
+    <b>
+        <c>test</c><caret>
+    </b>
+</a>
\ No newline at end of file
diff --git a/xml/tests/testData/smartEnter/SmartFinish3.xml b/xml/tests/testData/smartEnter/SmartFinish3.xml
new file mode 100644
index 000000000000..02ac7e40f463
--- /dev/null
+++ b/xml/tests/testData/smartEnter/SmartFinish3.xml
@@ -0,0 +1,4 @@
+<a>
+    <b><c>test</c></b>
+    <b<caret> <c>test</c>
+</a>
\ No newline at end of file
diff --git a/xml/tests/testData/smartEnter/SmartFinish3_after.xml b/xml/tests/testData/smartEnter/SmartFinish3_after.xml
new file mode 100644
index 000000000000..a44ea191cb1c
--- /dev/null
+++ b/xml/tests/testData/smartEnter/SmartFinish3_after.xml
@@ -0,0 +1,6 @@
+<a>
+    <b><c>test</c></b>
+    <b>
+        <c>test</c><caret>
+    </b>
+</a>
\ No newline at end of file
diff --git a/xml/tests/testData/smartEnter/Tag.jsp b/xml/tests/testData/smartEnter/Tag.jsp
new file mode 100644
index 000000000000..4ab0f2ce326f
--- /dev/null
+++ b/xml/tests/testData/smartEnter/Tag.jsp
@@ -0,0 +1,3 @@
+<body>
+<div class="aaa" <caret>
+</body>
\ No newline at end of file
diff --git a/xml/tests/testData/smartEnter/Tag.xml b/xml/tests/testData/smartEnter/Tag.xml
new file mode 100644
index 000000000000..a20556df835b
--- /dev/null
+++ b/xml/tests/testData/smartEnter/Tag.xml
@@ -0,0 +1 @@
+<div <caret>
\ No newline at end of file
diff --git a/xml/tests/testData/smartEnter/Tag_after.jsp b/xml/tests/testData/smartEnter/Tag_after.jsp
new file mode 100644
index 000000000000..866f94775dc0
--- /dev/null
+++ b/xml/tests/testData/smartEnter/Tag_after.jsp
@@ -0,0 +1,3 @@
+<body>
+<div class="aaa"/><caret> 
+</body>
\ No newline at end of file
diff --git a/xml/tests/testData/smartEnter/Tag_after.xml b/xml/tests/testData/smartEnter/Tag_after.xml
new file mode 100644
index 000000000000..4a16c47dabc6
--- /dev/null
+++ b/xml/tests/testData/smartEnter/Tag_after.xml
@@ -0,0 +1 @@
+<div/><caret>
\ No newline at end of file
diff --git a/xml/tests/testData/smartEnter/WrongAttribute.xml b/xml/tests/testData/smartEnter/WrongAttribute.xml
new file mode 100644
index 000000000000..164c128dc507
--- /dev/null
+++ b/xml/tests/testData/smartEnter/WrongAttribute.xml
@@ -0,0 +1 @@
+<label for="email<caret>"wrong
\ No newline at end of file
diff --git a/xml/tests/testData/smartEnter/WrongAttribute_after.xml b/xml/tests/testData/smartEnter/WrongAttribute_after.xml
new file mode 100644
index 000000000000..884801cf81f2
--- /dev/null
+++ b/xml/tests/testData/smartEnter/WrongAttribute_after.xml
@@ -0,0 +1 @@
+<label for="email">wrong<caret></label>
\ No newline at end of file
diff --git a/xml/tests/testData/unusedNs/moved.xml b/xml/tests/testData/unusedNs/moved.xml
new file mode 100644
index 000000000000..c4b5e3c93a89
--- /dev/null
+++ b/xml/tests/testData/unusedNs/moved.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root xmlns="nsx" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="nsx trg/move-def.xsd">
+        String.
+</root>
\ No newline at end of file
diff --git a/xml/tests/testData/unusedNs/trg/move-def.xsd b/xml/tests/testData/unusedNs/trg/move-def.xsd
new file mode 100644
index 000000000000..5055e9465d7d
--- /dev/null
+++ b/xml/tests/testData/unusedNs/trg/move-def.xsd
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                   targetNamespace="nsx"
+                   xmlns="nsx"
+                   elementFormDefault="qualified"
+                   attributeFormDefault="unqualified">
+
+        <xs:element name="root" type="xs:string"/>
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/unusedNs/web-app_2_5.xsd b/xml/tests/testData/unusedNs/web-app_2_5.xsd
new file mode 100644
index 000000000000..28e956fd8ccf
--- /dev/null
+++ b/xml/tests/testData/unusedNs/web-app_2_5.xsd
@@ -0,0 +1,1290 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ The contents of this file are subject to the terms
+ of the Common Development and Distribution License
+ (the "License").  You may not use this file except
+ in compliance with the License.
+
+ You can obtain a copy of the license at
+ glassfish/bootstrap/legal/CDDLv1.0.txt or
+ https://glassfish.dev.java.net/public/CDDLv1.0.html.
+ See the License for the specific language governing
+ permissions and limitations under the License.
+
+ When distributing Covered Code, include this CDDL
+ HEADER in each file and include the License file at
+ glassfish/bootstrap/legal/CDDLv1.0.txt.  If applicable,
+ add the following below this CDDL HEADER, with the
+ fields enclosed by brackets "[]" replaced with your
+ own identifying information: Portions Copyright [yyyy]
+ [name of copyright owner]
+-->
+
+<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+	    targetNamespace="http://java.sun.com/xml/ns/javaee"
+	    xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	    elementFormDefault="qualified"
+	    attributeFormDefault="unqualified"
+	    version="2.5">
+  <xsd:annotation>
+    <xsd:documentation>
+      @(#)web-app_2_5.xsds	1.62 05/08/06
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
+
+      Copyright 2003-2005 Sun Microsystems, Inc.
+      4150 Network Circle
+      Santa Clara, California 95054
+      U.S.A
+      All rights reserved.
+
+      Sun Microsystems, Inc. has intellectual property rights
+      relating to technology described in this document. In
+      particular, and without limitation, these intellectual
+      property rights may include one or more of the U.S. patents
+      listed at http://www.sun.com/patents and one or more
+      additional patents or pending patent applications in the
+      U.S. and other countries.
+
+      This document and the technology which it describes are
+      distributed under licenses restricting their use, copying,
+      distribution, and decompilation. No part of this document
+      may be reproduced in any form by any means without prior
+      written authorization of Sun and its licensors, if any.
+
+      Third-party software, including font technology, is
+      copyrighted and licensed from Sun suppliers.
+
+      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
+      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
+      Cup logo are trademarks or registered trademarks of Sun
+      Microsystems, Inc. in the U.S. and other countries.
+
+      Federal Acquisitions: Commercial Software - Government Users
+      Subject to Standard License Terms and Conditions.
+
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
+      <![CDATA[
+
+	This is the XML Schema for the Servlet 2.5 deployment descriptor.
+	The deployment descriptor must be named "WEB-INF/web.xml" in the
+	web application's war file.  All Servlet deployment descriptors
+	must indicate the web application schema by using the Java EE
+	namespace:
+
+	http://java.sun.com/xml/ns/javaee
+
+	and by indicating the version of the schema by
+	using the version element as shown below:
+
+	    <web-app xmlns="http://java.sun.com/xml/ns/javaee"
+	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	      xsi:schemaLocation="..."
+	      version="2.5">
+	      ...
+	    </web-app>
+
+	The instance documents may indicate the published version of
+	the schema using the xsi:schemaLocation attribute for Java EE
+	namespace with the following location:
+
+	http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd
+
+	]]>
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
+
+      The following conventions apply to all Java EE
+      deployment descriptor elements unless indicated otherwise.
+
+      - In elements that specify a pathname to a file within the
+	same JAR file, relative filenames (i.e., those not
+	starting with "/") are considered relative to the root of
+	the JAR file's namespace.  Absolute filenames (i.e., those
+	starting with "/") also specify names in the root of the
+	JAR file's namespace.  In general, relative names are
+	preferred.  The exception is .war files where absolute
+	names are preferred for consistency with the Servlet API.
+
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:include schemaLocation="javaee_5.xsd"/>
+  <xsd:include schemaLocation="jsp_2_1.xsd"/>
+
+
+<!-- **************************************************** -->
+
+  <xsd:element name="web-app" type="javaee:web-appType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The web-app element is the root of the deployment
+	descriptor for a web application.  Note that the sub-elements
+	of this element can be in the arbitrary order. Because of
+	that, the multiplicity of the elements of distributable,
+	session-config, welcome-file-list, jsp-config, login-config,
+	and locale-encoding-mapping-list was changed from "?" to "*"
+	in this schema.  However, the deployment descriptor instance
+	file must not contain multiple elements of session-config,
+	jsp-config, and login-config. When there are multiple elements of
+	welcome-file-list or locale-encoding-mapping-list, the container
+	must concatenate the element contents.  The multiple occurence
+	of the element distributable is redundant and the container
+	treats that case exactly in the same way when there is only
+	one distributable.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:unique name="web-app-servlet-name-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The servlet element contains the name of a servlet.
+	  The name must be unique within the web application.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:servlet"/>
+      <xsd:field    xpath="javaee:servlet-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="web-app-filter-name-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The filter element contains the name of a filter.
+	  The name must be unique within the web application.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:filter"/>
+      <xsd:field    xpath="javaee:filter-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="web-app-ejb-local-ref-name-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The ejb-local-ref-name element contains the name of an EJB
+	  reference. The EJB reference is an entry in the web
+	  application's environment and is relative to the
+	  java:comp/env context.  The name must be unique within
+	  the web application.
+
+	  It is recommended that name is prefixed with "ejb/".
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:ejb-local-ref"/>
+      <xsd:field    xpath="javaee:ejb-ref-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="web-app-ejb-ref-name-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The ejb-ref-name element contains the name of an EJB
+	  reference. The EJB reference is an entry in the web
+	  application's environment and is relative to the
+	  java:comp/env context.  The name must be unique within
+	  the web application.
+
+	  It is recommended that name is prefixed with "ejb/".
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:ejb-ref"/>
+      <xsd:field    xpath="javaee:ejb-ref-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="web-app-resource-env-ref-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The resource-env-ref-name element specifies the name of
+	  a resource environment reference; its value is the
+	  environment entry name used in the web application code.
+	  The name is a JNDI name relative to the java:comp/env
+	  context and must be unique within a web application.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:resource-env-ref"/>
+      <xsd:field    xpath="javaee:resource-env-ref-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="web-app-message-destination-ref-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The message-destination-ref-name element specifies the name of
+	  a message destination reference; its value is the
+	  environment entry name used in the web application code.
+	  The name is a JNDI name relative to the java:comp/env
+	  context and must be unique within a web application.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:message-destination-ref"/>
+      <xsd:field    xpath="javaee:message-destination-ref-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="web-app-res-ref-name-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The res-ref-name element specifies the name of a
+	  resource manager connection factory reference.  The name
+	  is a JNDI name relative to the java:comp/env context.
+	  The name must be unique within a web application.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:resource-ref"/>
+      <xsd:field    xpath="javaee:res-ref-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="web-app-env-entry-name-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The env-entry-name element contains the name of a web
+	  application's environment entry.  The name is a JNDI
+	  name relative to the java:comp/env context.  The name
+	  must be unique within a web application.
+
+	</xsd:documentation>
+      </xsd:annotation>
+
+      <xsd:selector xpath="javaee:env-entry"/>
+      <xsd:field    xpath="javaee:env-entry-name"/>
+    </xsd:unique>
+
+    <xsd:key name="web-app-role-name-key">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  A role-name-key is specified to allow the references
+	  from the security-role-refs.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:security-role"/>
+      <xsd:field    xpath="javaee:role-name"/>
+    </xsd:key>
+
+    <xsd:keyref name="web-app-role-name-references"
+		refer="javaee:web-app-role-name-key">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The keyref indicates the references from
+	  security-role-ref to a specified role-name.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:servlet/javaee:security-role-ref"/>
+      <xsd:field    xpath="javaee:role-link"/>
+    </xsd:keyref>
+  </xsd:element>
+
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="auth-constraintType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The auth-constraintType indicates the user roles that
+	should be permitted access to this resource
+	collection. The role-name used here must either correspond
+	to the role-name of one of the security-role elements
+	defined for this web application, or be the specially
+	reserved role-name "*" that is a compact syntax for
+	indicating all roles in the web application. If both "*"
+	and rolenames appear, the container interprets this as all
+	roles.  If no roles are defined, no user is allowed access
+	to the portion of the web application described by the
+	containing security-constraint.  The container matches
+	role names case sensitively when determining access.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="role-name"
+		   type="javaee:role-nameType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="auth-methodType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The auth-methodType is used to configure the authentication
+	mechanism for the web application. As a prerequisite to
+	gaining access to any web resources which are protected by
+	an authorization constraint, a user must have authenticated
+	using the configured mechanism. Legal values are "BASIC",
+	"DIGEST", "FORM", "CLIENT-CERT", or a vendor-specific
+	authentication scheme.
+
+	Used in: login-config
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="dispatcherType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The dispatcher has four legal values: FORWARD, REQUEST, INCLUDE,
+	and ERROR. A value of FORWARD means the Filter will be applied
+	under RequestDispatcher.forward() calls.  A value of REQUEST
+	means the Filter will be applied under ordinary client calls to
+	the path or servlet. A value of INCLUDE means the Filter will be
+	applied under RequestDispatcher.include() calls.  A value of
+	ERROR means the Filter will be applied under the error page
+	mechanism.  The absence of any dispatcher elements in a
+	filter-mapping indicates a default of applying filters only under
+	ordinary client calls to the path or servlet.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:enumeration value="FORWARD"/>
+	<xsd:enumeration value="INCLUDE"/>
+	<xsd:enumeration value="REQUEST"/>
+	<xsd:enumeration value="ERROR"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:simpleType name="encodingType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The encodingType defines IANA character sets.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:restriction base="xsd:string">
+      <xsd:pattern value="[^\s]+"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="error-codeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The error-code contains an HTTP error code, ex: 404
+
+	Used in: error-page
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:xsdPositiveIntegerType">
+	<xsd:pattern value="\d{3}"/>
+	<xsd:attribute name="id" type="xsd:ID"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="error-pageType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The error-pageType contains a mapping between an error code
+	or exception type to the path of a resource in the web
+	application.
+
+	Used in: web-app
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:choice>
+	<xsd:element name="error-code"
+		     type="javaee:error-codeType"/>
+
+	<xsd:element name="exception-type"
+		     type="javaee:fully-qualified-classType">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The exception-type contains a fully qualified class
+	      name of a Java exception type.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	</xsd:element>
+      </xsd:choice>
+
+      <xsd:element name="location"
+		   type="javaee:war-pathType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The location element contains the location of the
+	    resource in the web application relative to the root of
+	    the web application. The value of the location must have
+	    a leading `/'.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="filter-mappingType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	Declaration of the filter mappings in this web
+	application is done by using filter-mappingType.
+	The container uses the filter-mapping
+	declarations to decide which filters to apply to a request,
+	and in what order. The container matches the request URI to
+	a Servlet in the normal way. To determine which filters to
+	apply it matches filter-mapping declarations either on
+	servlet-name, or on url-pattern for each filter-mapping
+	element, depending on which style is used. The order in
+	which filters are invoked is the order in which
+	filter-mapping declarations that match a request URI for a
+	servlet appear in the list of filter-mapping elements.The
+	filter-name value must be the value of the filter-name
+	sub-elements of one of the filter declarations in the
+	deployment descriptor.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="filter-name"
+		   type="javaee:filter-nameType"/>
+      <xsd:choice minOccurs="1" maxOccurs="unbounded">
+	<xsd:element name="url-pattern"
+		     type="javaee:url-patternType"/>
+	<xsd:element name="servlet-name"
+		     type="javaee:servlet-nameType"/>
+      </xsd:choice>
+      <xsd:element name="dispatcher"
+		   type="javaee:dispatcherType"
+		   minOccurs="0" maxOccurs="4"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="filter-nameType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The logical name of the filter is declare
+	by using filter-nameType. This name is used to map the
+	filter.  Each filter name is unique within the web
+	application.
+
+	Used in: filter, filter-mapping
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:simpleContent>
+      <xsd:extension base="javaee:nonEmptyStringType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="filterType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The filterType is used to declare a filter in the web
+	application. The filter is mapped to either a servlet or a
+	URL pattern in the filter-mapping element, using the
+	filter-name value to reference. Filters can access the
+	initialization parameters declared in the deployment
+	descriptor at runtime via the FilterConfig interface.
+
+	Used in: web-app
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:group ref="javaee:descriptionGroup"/>
+      <xsd:element name="filter-name"
+		   type="javaee:filter-nameType"/>
+      <xsd:element name="filter-class"
+		   type="javaee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The fully qualified classname of the filter.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="init-param"
+		   type="javaee:param-valueType"
+		   minOccurs="0" maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The init-param element contains a name/value pair as
+	    an initialization param of a servlet filter
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="form-login-configType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The form-login-configType specifies the login and error
+	pages that should be used in form based login. If form based
+	authentication is not used, these elements are ignored.
+
+	Used in: login-config
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+
+      <xsd:element name="form-login-page"
+		   type="javaee:war-pathType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The form-login-page element defines the location in the web
+	    app where the page that can be used for login can be
+	    found.  The path begins with a leading / and is interpreted
+	    relative to the root of the WAR.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="form-error-page"
+		   type="javaee:war-pathType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The form-error-page element defines the location in
+	    the web app where the error page that is displayed
+	    when login is not successful can be found.
+	    The path begins with a leading / and is interpreted
+	    relative to the root of the WAR.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:simpleType name="http-methodType">
+    <xsd:annotation>
+
+      <xsd:documentation>
+
+	A HTTP method type as defined in HTTP 1.1 section 2.2.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+     <xsd:restriction base="xsd:token">
+         <xsd:pattern value="[\p{L}-[\p{Cc}\p{Z}]]+"/>
+     </xsd:restriction>
+
+  </xsd:simpleType>
+
+<!-- **************************************************** -->
+
+  <xsd:simpleType name="load-on-startupType">
+    <xsd:union memberTypes="javaee:null-charType xsd:integer"/>
+  </xsd:simpleType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="locale-encoding-mapping-listType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The locale-encoding-mapping-list contains one or more
+	locale-encoding-mapping(s).
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="locale-encoding-mapping"
+		   type="javaee:locale-encoding-mappingType"
+		   maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="locale-encoding-mappingType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The locale-encoding-mapping contains locale name and
+	encoding name. The locale name must be either "Language-code",
+	such as "ja", defined by ISO-639 or "Language-code_Country-code",
+	such as "ja_JP".  "Country code" is defined by ISO-3166.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="locale"
+		   type="javaee:localeType"/>
+      <xsd:element name="encoding"
+		   type="javaee:encodingType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:simpleType name="localeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The localeType defines valid locale defined by ISO-639-1
+	and ISO-3166.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:restriction base="xsd:string">
+      <xsd:pattern value="[a-z]{2}(_|-)?([\p{L}\-\p{Nd}]{2})?"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="login-configType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The login-configType is used to configure the authentication
+	method that should be used, the realm name that should be
+	used for this application, and the attributes that are
+	needed by the form login mechanism.
+
+	Used in: web-app
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="auth-method"
+		   type="javaee:auth-methodType"
+		   minOccurs="0"/>
+      <xsd:element name="realm-name"
+		   type="javaee:string" minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The realm name element specifies the realm name to
+	    use in HTTP Basic authorization.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="form-login-config"
+		   type="javaee:form-login-configType"
+		   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="mime-mappingType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The mime-mappingType defines a mapping between an extension
+	and a mime type.
+
+	Used in: web-app
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The extension element contains a string describing an
+	  extension. example: "txt"
+
+	</xsd:documentation>
+      </xsd:annotation>
+
+      <xsd:element name="extension"
+		   type="javaee:string"/>
+      <xsd:element name="mime-type"
+		   type="javaee:mime-typeType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="mime-typeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The mime-typeType is used to indicate a defined mime type.
+
+	Example:
+	"text/plain"
+
+	Used in: mime-mapping
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:pattern value="[^\p{Cc}^\s]+/[^\p{Cc}^\s]+"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="nonEmptyStringType">
+    <xsd:annotation>
+      <xsd:documentation>
+	This type defines a string which contains at least one
+	character.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:minLength value="1"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:simpleType name="null-charType">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value=""/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="security-constraintType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The security-constraintType is used to associate
+	security constraints with one or more web resource
+	collections
+
+	Used in: web-app
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="display-name"
+		   type="javaee:display-nameType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="web-resource-collection"
+		   type="javaee:web-resource-collectionType"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="auth-constraint"
+		   type="javaee:auth-constraintType"
+		   minOccurs="0"/>
+      <xsd:element name="user-data-constraint"
+		   type="javaee:user-data-constraintType"
+		   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="servlet-mappingType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The servlet-mappingType defines a mapping between a
+	servlet and a url pattern.
+
+	Used in: web-app
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="servlet-name"
+		   type="javaee:servlet-nameType"/>
+      <xsd:element name="url-pattern"
+		   type="javaee:url-patternType"
+           minOccurs="1" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="servlet-nameType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The servlet-name element contains the canonical name of the
+	servlet. Each servlet name is unique within the web
+	application.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:simpleContent>
+      <xsd:extension base="javaee:nonEmptyStringType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="servletType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The servletType is used to declare a servlet.
+	It contains the declarative data of a
+	servlet. If a jsp-file is specified and the load-on-startup
+	element is present, then the JSP should be precompiled and
+	loaded.
+
+	Used in: web-app
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:group ref="javaee:descriptionGroup"/>
+      <xsd:element name="servlet-name"
+		   type="javaee:servlet-nameType"/>
+      <xsd:choice>
+	<xsd:element name="servlet-class"
+		     type="javaee:fully-qualified-classType">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The servlet-class element contains the fully
+	      qualified class name of the servlet.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	</xsd:element>
+
+	<xsd:element name="jsp-file"
+		     type="javaee:jsp-fileType"/>
+
+      </xsd:choice>
+
+      <xsd:element name="init-param"
+		   type="javaee:param-valueType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="load-on-startup"
+		   type="javaee:load-on-startupType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The load-on-startup element indicates that this
+	    servlet should be loaded (instantiated and have
+	    its init() called) on the startup of the web
+	    application. The optional contents of these
+	    element must be an integer indicating the order in
+	    which the servlet should be loaded. If the value
+	    is a negative integer, or the element is not
+	    present, the container is free to load the servlet
+	    whenever it chooses. If the value is a positive
+	    integer or 0, the container must load and
+	    initialize the servlet as the application is
+	    deployed. The container must guarantee that
+	    servlets marked with lower integers are loaded
+	    before servlets marked with higher integers. The
+	    container may choose the order of loading of
+	    servlets with the same load-on-start-up value.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="run-as"
+		   type="javaee:run-asType"
+		   minOccurs="0"/>
+      <xsd:element name="security-role-ref"
+		   type="javaee:security-role-refType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="session-configType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The session-configType defines the session parameters
+	for this web application.
+
+	Used in: web-app
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="session-timeout"
+		   type="javaee:xsdIntegerType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The session-timeout element defines the default
+	    session timeout interval for all sessions created
+	    in this web application. The specified timeout
+	    must be expressed in a whole number of minutes.
+	    If the timeout is 0 or less, the container ensures
+	    the default behaviour of sessions is never to time
+	    out. If this element is not specified, the container
+	    must set its default timeout period.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="transport-guaranteeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The transport-guaranteeType specifies that the communication
+	between client and server should be NONE, INTEGRAL, or
+	CONFIDENTIAL. NONE means that the application does not
+	require any transport guarantees. A value of INTEGRAL means
+	that the application requires that the data sent between the
+	client and server be sent in such a way that it can't be
+	changed in transit. CONFIDENTIAL means that the application
+	requires that the data be transmitted in a fashion that
+	prevents other entities from observing the contents of the
+	transmission. In most cases, the presence of the INTEGRAL or
+	CONFIDENTIAL flag will indicate that the use of SSL is
+	required.
+
+	Used in: user-data-constraint
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:enumeration value="NONE"/>
+	<xsd:enumeration value="INTEGRAL"/>
+	<xsd:enumeration value="CONFIDENTIAL"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="user-data-constraintType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The user-data-constraintType is used to indicate how
+	data communicated between the client and container should be
+	protected.
+
+	Used in: security-constraint
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="transport-guarantee"
+		   type="javaee:transport-guaranteeType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="war-pathType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The elements that use this type designate a path starting
+	with a "/" and interpreted relative to the root of a WAR
+	file.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:pattern value="/.*"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:simpleType name="web-app-versionType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	This type contains the recognized versions of
+	web-application supported. It is used to designate the
+	version of the web application.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:restriction base="xsd:token">
+      <xsd:enumeration value="2.5"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="web-appType">
+
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:group ref="javaee:descriptionGroup"/>
+      <xsd:element name="distributable"
+		   type="javaee:emptyType"/>
+      <xsd:element name="context-param"
+		   type="javaee:param-valueType">
+
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The context-param element contains the declaration
+	    of a web application's servlet context
+	    initialization parameters.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="filter"
+		   type="javaee:filterType"/>
+      <xsd:element name="filter-mapping"
+		   type="javaee:filter-mappingType"/>
+      <xsd:element name="listener"
+		   type="javaee:listenerType"/>
+      <xsd:element name="servlet"
+		   type="javaee:servletType"/>
+      <xsd:element name="servlet-mapping"
+		   type="javaee:servlet-mappingType"/>
+      <xsd:element name="session-config"
+		   type="javaee:session-configType"/>
+      <xsd:element name="mime-mapping"
+		   type="javaee:mime-mappingType"/>
+      <xsd:element name="welcome-file-list"
+		   type="javaee:welcome-file-listType"/>
+      <xsd:element name="error-page"
+		   type="javaee:error-pageType"/>
+      <xsd:element name="jsp-config"
+		   type="javaee:jsp-configType"/>
+      <xsd:element name="security-constraint"
+		   type="javaee:security-constraintType"/>
+      <xsd:element name="login-config"
+		   type="javaee:login-configType"/>
+      <xsd:element name="security-role"
+		   type="javaee:security-roleType"/>
+      <xsd:group ref="javaee:jndiEnvironmentRefsGroup"/>
+      <xsd:element name="message-destination"
+		   type="javaee:message-destinationType"/>
+      <xsd:element name="locale-encoding-mapping-list"
+		   type="javaee:locale-encoding-mapping-listType"/>
+    </xsd:choice>
+
+    <xsd:attribute name="version"
+		   type="javaee:web-app-versionType"
+		   use="required"/>
+    <xsd:attribute name="id" type="xsd:ID"/>
+
+    <xsd:attribute name="metadata-complete" type="xsd:boolean">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The metadata-complete attribute defines whether this
+	  deployment descriptor and other related deployment
+	  descriptors for this module (e.g., web service
+	  descriptors) are complete, or whether the class
+	  files available to this module and packaged with
+	  this application should be examined for annotations
+	  that specify deployment information.
+
+	  If metadata-complete is set to "true", the deployment
+	  tool must ignore any annotations that specify deployment
+	  information, which might be present in the class files
+	  of the application.
+
+	  If metadata-complete is not specified or is set to
+	  "false", the deployment tool must examine the class
+	  files of the application for annotations, as
+	  specified by the specifications.
+
+	</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="web-resource-collectionType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The web-resource-collectionType is used to identify a subset
+	of the resources and HTTP methods on those resources within
+	a web application to which a security constraint applies. If
+	no HTTP methods are specified, then the security constraint
+	applies to all HTTP methods.
+
+	Used in: security-constraint
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="web-resource-name"
+		   type="javaee:string">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The web-resource-name contains the name of this web
+	    resource collection.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="url-pattern"
+		   type="javaee:url-patternType"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="http-method"
+		   type="javaee:http-methodType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="welcome-file-listType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The welcome-file-list contains an ordered list of welcome
+	files elements.
+
+	Used in: web-app
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="welcome-file"
+		   type="xsd:string"
+		   maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The welcome-file element contains file name to use
+	    as a default welcome file, such as index.html
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+</xsd:schema>
+
diff --git a/xml/tests/testData/unusedNs/wsdd.dtd b/xml/tests/testData/unusedNs/wsdd.dtd
new file mode 100644
index 000000000000..6f42d2fa77d4
--- /dev/null
+++ b/xml/tests/testData/unusedNs/wsdd.dtd
@@ -0,0 +1,53 @@
+<!ELEMENT namespace (#PCDATA)>
+<!ELEMENT service (parameter|namespace|requestFlow|responseFlow|beanMapping|typeMapping|arrayMapping)*>
+<!ATTLIST service
+    name CDATA #REQUIRED
+    provider CDATA #REQUIRED
+    use CDATA #IMPLIED
+    style CDATA #IMPLIED>
+<!ELEMENT handler (parameter)*>
+<!ATTLIST handler
+    name CDATA #IMPLIED
+    type CDATA #REQUIRED>
+<!ELEMENT globalConfiguration (requestFlow?,responseFlow?,parameter*)>
+<!ELEMENT requestFlow (handler)*>
+<!ELEMENT responseFlow (handler)*>
+<!ELEMENT deployment (globalConfiguration|handler|service|transport|beanMapping|typeMapping|arrayMapping)*>
+<!ATTLIST deployment
+    name  CDATA
+    xmlns CDATA #REQUIRED
+    xmlns:java CDATA #REQUIRED>
+<!ELEMENT parameter (#PCDATA)>
+<!ATTLIST parameter
+    name CDATA #REQUIRED
+    value CDATA #REQUIRED>
+<!ELEMENT transport (requestFlow|parameter|responseFlow)*>
+<!ATTLIST transport
+    name  CDATA #REQUIRED
+    pivot CDATA>
+<!ELEMENT beanMapping (#PCDATA)>
+<!ATTLIST beanMapping
+    languageSpecificType CDATA #REQUIRED
+    qname CDATA #REQUIRED
+    xmlns:ns CDATA #IMPLIED
+    xmlns:ns1 CDATA #IMPLIED
+    xmlns:ns2 CDATA #IMPLIED>
+ <!ELEMENT typeMapping (#PCDATA)>
+ <!ATTLIST typeMapping
+     languageSpecificType CDATA #REQUIRED
+     qname CDATA #REQUIRED
+     serializer CDATA #REQUIRED
+     deserializer CDATA #REQUIRED
+     encodingStyle CDATA #REQUIRED
+     xmlns:ns CDATA #IMPLIED
+     xmlns:ns1 CDATA #IMPLIED
+     xmlns:ns2 CDATA #IMPLIED>
+ <!ELEMENT arrayMapping (#PCDATA)>
+ <!ATTLIST arrayMapping
+     qname CDATA #REQUIRED
+     type CDATA #REQUIRED
+     innerType CDATA #REQUIRED
+     encodingStyle CDATA #REQUIRED
+     xmlns:ns CDATA #IMPLIED
+     xmlns:ns1 CDATA #IMPLIED
+     xmlns:ns2 CDATA #IMPLIED>
\ No newline at end of file
diff --git a/xml/tests/testData/unusedNs/wsdd_provider_java.xsd b/xml/tests/testData/unusedNs/wsdd_provider_java.xsd
new file mode 100644
index 000000000000..57519c10eb41
--- /dev/null
+++ b/xml/tests/testData/unusedNs/wsdd_provider_java.xsd
@@ -0,0 +1 @@
+<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://xml.apache.org/axis/wsdd/providers/java"/>
\ No newline at end of file
diff --git a/xml/tests/xml-tests.iml b/xml/tests/xml-tests.iml
new file mode 100644
index 000000000000..54d2cb63d22f
--- /dev/null
+++ b/xml/tests/xml-tests.iml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
+    <orderEntry type="module" module-name="xml" />
+    <orderEntry type="module" module-name="testFramework-java" />
+    <orderEntry type="library" name="Xerces" level="project" />
+    <orderEntry type="library" scope="TEST" name="Groovy" level="project" />
+    <orderEntry type="module" module-name="idea-ui" scope="TEST" />
+  </component>
+  <component name="copyright">
+    <Base>
+      <setting name="state" value="1" />
+    </Base>
+  </component>
+</module>
+